kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Added default values for heights and rapid feed rates for new tools.

Browse Source
This commit is contained in:
Markus Lampert
2017-10-01 15:34:48 -07:00
parent da4d35ac89
commit a6847951e1
9 changed files with 325 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Mod/Path/PathScripts/PathJobGui.py
View File

@@ -27,6 +27,7 @@ import DraftVecUtils
import FreeCAD
import FreeCADGui
import PathScripts.PathJob as PathJob
import PathScripts.PathGui as PathGui
import PathScripts.PathLog as PathLog
import PathScripts.PathStock as PathStock
import PathScripts.PathToolController as PathToolController
@@ -476,6 +477,13 @@ class TaskPanel:
self.postProcessorDefaultTooltip = self.form.postProcessor.toolTip()
self.postProcessorArgsDefaultTooltip = self.form.postProcessorArguments.toolTip()
hicon = QtGui.QIcon.fromTheme('object-flip-horizontal')
vicon = QtGui.QIcon.fromTheme('object-flip-vertical')
iconSize = QtCore.QSize()
self.form.defaultRapidHorizontalIcon.setPixmap(hicon.pixmap(iconSize))
self.form.defaultRapidVerticalIcon.setPixmap(vicon.pixmap(iconSize))
self.vproxy.setupEditVisibility(self.obj)
self.stockFromBase = None
@@ -549,6 +557,12 @@ class TaskPanel:
self.updateTooltips()
self.stockEdit.getFields(self.obj)
PathGui.updateInputField(self.obj, 'DefaultSafeHeight', self.form.defaultHeightSafe)
PathGui.updateInputField(self.obj, 'DefaultClearanceHeight', self.form.defaultHeightClearance)
PathGui.updateInputField(self.obj, 'DefaultVertRapid', self.form.defaultRapidVertical)
PathGui.updateInputField(self.obj, 'DefaultHorizRapid', self.form.defaultRapidHorizontal)
self.obj.Proxy.execute(self.obj)
def selectComboBoxText(self, widget, text):
@@ -647,6 +661,11 @@ class TaskPanel:
self.updateToolController()
self.stockEdit.setFields(self.obj)
self.form.defaultRapidVertical.setText(self.obj.DefaultVertRapid.UserString)
self.form.defaultRapidHorizontal.setText(self.obj.DefaultHorizRapid.UserString)
self.form.defaultHeightSafe.setText(self.obj.DefaultSafeHeight.UserString)
self.form.defaultHeightClearance.setText(self.obj.DefaultClearanceHeight.UserString)
def setPostProcessorOutputFile(self):
filename = QtGui.QFileDialog.getSaveFileName(self.form, translate("Path_Job", "Select Output File"), None, translate("Path_Job", "All Files (*.*)"))
@@ -987,6 +1006,12 @@ class TaskPanel:
self.form.moveToOrigin.clicked.connect(self.alignMoveToOrigin)
self.updateSelection()
# Defaults
self.form.defaultRapidVertical.editingFinished.connect(self.getFields)
self.form.defaultRapidHorizontal.editingFinished.connect(self.getFields)
self.form.defaultHeightSafe.editingFinished.connect(self.getFields)
self.form.defaultHeightClearance.editingFinished.connect(self.getFields)
# set active page
if activate in ['General', 'Base']:
self.form.setCurrentIndex(0)