Handle selecting the coolant mode in the forms

FreeCAD · Aug 28, 2019 · 2996b81 · 2996b81
1 parent bdcccc0
commit 2996b81
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 3 deletions.
diff --git a/src/Mod/Path/PathScripts/PathAdaptiveGui.py b/src/Mod/Path/PathScripts/PathAdaptiveGui.py
@@ -40,6 +40,15 @@ def getForm(self):
         hlayout.addWidget(form.ToolController)
         layout.addLayout(hlayout)
 
+
+        # Coolant controller
+        hlayout = QtGui.QHBoxLayout()
+        form.coolantController = QtGui.QComboBox()
+        form.coolantControllerLabel = QtGui.QLabel("Coolant Mode")
+        hlayout.addWidget(form.coolantControllerLabel)
+        hlayout.addWidget(form.coolantController)
+        layout.addLayout(hlayout)
+
         # cut region
         formLayout = QtGui.QFormLayout()
         form.Side = QtGui.QComboBox()
@@ -148,6 +157,7 @@ def getSignalsForUpdate(self, obj):
         signals.append(self.form.LiftDistance.valueChanged)
         signals.append(self.form.KeepToolDownRatio.valueChanged)
         signals.append(self.form.StockToLeave.valueChanged)
+        signals.append(self.form.coolantController.currentIndexChanged)
 
         # signals.append(self.form.ProcessHoles.stateChanged)
         signals.append(self.form.ForceInsideOut.stateChanged)
@@ -171,6 +181,7 @@ def setFields(self, obj):
         # self.form.ProcessHoles.setChecked(obj.ProcessHoles)
         self.form.ForceInsideOut.setChecked(obj.ForceInsideOut)
         self.setupToolController(obj, self.form.ToolController)
+        self.setupCoolant(obj, self.form.coolantController)
         self.form.StopButton.setChecked(obj.Stopped)
         obj.setEditorMode('AdaptiveInputState', 2)  # hide this property
         obj.setEditorMode('AdaptiveOutputState', 2)  # hide this property
@@ -203,6 +214,7 @@ def getFields(self, obj):
             obj.StopProcessing = True
 
         self.updateToolController(obj, self.form.ToolController)
+        self.updateCoolant(obj, self.form.coolantController)
         obj.setEditorMode('AdaptiveInputState', 2)  # hide this property
         obj.setEditorMode('AdaptiveOutputState', 2)  # hide this property
         obj.setEditorMode('StopProcessing', 2)  # hide this property

diff --git a/src/Mod/Path/PathScripts/PathDeburrGui.py b/src/Mod/Path/PathScripts/PathDeburrGui.py
@@ -74,11 +74,13 @@ def getFields(self, obj):
             obj.Join = 'Miter'
 
         self.updateToolController(obj, self.form.toolController)
+        self.updateCoolant(obj, self.form.coolantController)
 
     def setFields(self, obj):
         self.form.value_W.setText(FreeCAD.Units.Quantity(obj.Width.Value, FreeCAD.Units.Length).UserString)
         self.form.value_h.setText(FreeCAD.Units.Quantity(obj.ExtraDepth.Value, FreeCAD.Units.Length).UserString)
         self.setupToolController(obj, self.form.toolController)
+        self.setupCoolant(obj, self.form.coolantController)
         self.form.joinRound.setChecked('Round' == obj.Join)
         self.form.joinMiter.setChecked('Miter' == obj.Join)
         self.form.joinFrame.hide()
@@ -93,6 +95,7 @@ def getSignalsForUpdate(self, obj):
         signals = []
         signals.append(self.form.joinMiter.clicked)
         signals.append(self.form.joinRound.clicked)
+        signals.append(self.form.coolantController.currentIndexChanged)
         return signals
 
     def registerSignalHandlers(self, obj):

diff --git a/src/Mod/Path/PathScripts/PathDrillingGui.py b/src/Mod/Path/PathScripts/PathDrillingGui.py
@@ -99,6 +99,7 @@ def getFields(self, obj):
             obj.AddTipLength = self.form.useTipLength.isChecked()
 
         self.updateToolController(obj, self.form.toolController)
+        self.updateCoolant(obj, self.form.coolantController)
 
     def setFields(self, obj):
         '''setFields(obj) ... update UI with obj properties' values'''
@@ -121,6 +122,8 @@ def setFields(self, obj):
             self.form.useTipLength.setCheckState(QtCore.Qt.Unchecked)
 
         self.setupToolController(obj, self.form.toolController)
+        self.setupCoolant(obj, self.form.coolantController)
+
 
     def getSignalsForUpdate(self, obj):
         '''getSignalsForUpdate(obj) ... return list of signals which cause the receiver to update the model'''
@@ -133,6 +136,8 @@ def getSignalsForUpdate(self, obj):
         signals.append(self.form.peckEnabled.stateChanged)
         signals.append(self.form.useTipLength.stateChanged)
         signals.append(self.form.toolController.currentIndexChanged)
+        signals.append(self.form.coolantController.currentIndexChanged)
+        signals.append(self.form.coolantController.currentIndexChanged)
 
         return signals
 

diff --git a/src/Mod/Path/PathScripts/PathEngraveGui.py b/src/Mod/Path/PathScripts/PathEngraveGui.py
@@ -121,17 +121,20 @@ def getFields(self, obj):
         if obj.StartVertex != self.form.startVertex.value():
             obj.StartVertex = self.form.startVertex.value()
         self.updateToolController(obj, self.form.toolController)
+        self.updateCoolant(obj, self.form.coolantController)
 
     def setFields(self, obj):
         '''setFields(obj) ... transfers obj's property values to UI'''
         self.form.startVertex.setValue(obj.StartVertex)
         self.setupToolController(obj, self.form.toolController)
+        self.setupCoolant(obj, self.form.coolantController)
 
     def getSignalsForUpdate(self, obj):
         '''getSignalsForUpdate(obj) ... return list of signals for updating obj'''
         signals = []
         signals.append(self.form.startVertex.editingFinished)
         signals.append(self.form.toolController.currentIndexChanged)
+        signals.append(self.form.coolantController.currentIndexChanged)
         return signals
 
     def taskPanelBaseGeometryPage(self, obj, features):

diff --git a/src/Mod/Path/PathScripts/PathHelixGui.py b/src/Mod/Path/PathScripts/PathHelixGui.py
@@ -60,6 +60,7 @@ def getFields(self, obj):
             obj.StepOver = self.form.stepOverPercent.value()
 
         self.updateToolController(obj, self.form.toolController)
+        self.updateCoolant(obj, self.form.coolantController)
 
     def setFields(self, obj):
         '''setFields(obj) ... transfers obj's property values to UI'''
@@ -70,6 +71,7 @@ def setFields(self, obj):
         self.selectInComboBox(obj.StartSide, self.form.startSide)
 
         self.setupToolController(obj, self.form.toolController)
+        self.setupCoolant(obj, self.form.coolantController)
 
     def getSignalsForUpdate(self, obj):
         '''getSignalsForUpdate(obj) ... return list of signals for updating obj'''
@@ -79,6 +81,7 @@ def getSignalsForUpdate(self, obj):
         signals.append(self.form.direction.currentIndexChanged)
         signals.append(self.form.startSide.currentIndexChanged)
         signals.append(self.form.toolController.currentIndexChanged)
+        signals.append(self.form.coolantController.currentIndexChanged)
 
         return signals
 

diff --git a/src/Mod/Path/PathScripts/PathPocketBaseGui.py b/src/Mod/Path/PathScripts/PathPocketBaseGui.py
@@ -106,6 +106,7 @@ def getFields(self, obj):
 
         PathGui.updateInputField(obj, 'ExtraOffset', self.form.extraOffset)
         self.updateToolController(obj, self.form.toolController)
+        self.updateCoolant(obj, self.form.coolantController)
         self.updateZigZagAngle(obj)
 
         if obj.UseStartPoint != self.form.useStartPoint.isChecked():
@@ -138,6 +139,7 @@ def setFields(self, obj):
         self.selectInComboBox(obj.OffsetPattern, self.form.offsetPattern)
         self.selectInComboBox(obj.CutMode, self.form.cutMode)
         self.setupToolController(obj, self.form.toolController)
+        self.setupCoolant(obj, self.form.coolantController)
 
         if FeatureFacing & self.pocketFeatures():
             self.selectInComboBox(obj.BoundaryShape, self.form.boundaryShape)
@@ -155,6 +157,7 @@ def getSignalsForUpdate(self, obj):
         signals.append(self.form.useStartPoint.clicked)
         signals.append(self.form.useOutline.clicked)
         signals.append(self.form.minTravel.clicked)
+        signals.append(self.form.coolantController.currentIndexChanged)
 
         if FeatureFacing & self.pocketFeatures():
             signals.append(self.form.boundaryShape.currentIndexChanged)

diff --git a/src/Mod/Path/PathScripts/PathPocketShapeGui.py b/src/Mod/Path/PathScripts/PathPocketShapeGui.py
@@ -475,9 +475,6 @@ def taskPanelBaseLocationPage(self, obj, features):
             self.extensionsPanel = TaskPanelExtensionPage(obj, features) # pylint: disable=attribute-defined-outside-init
         return self.extensionsPanel
 
-    def pageRegisterSignalHandlers(self):
-        pass
-
 Command = PathOpGui.SetupOperation('Pocket Shape',
         PathPocketShape.Create,
         TaskPanelOpPage,

diff --git a/src/Mod/Path/PathScripts/PathProfileBaseGui.py b/src/Mod/Path/PathScripts/PathProfileBaseGui.py
@@ -80,6 +80,7 @@ def getFields(self, obj):
             obj.Direction = str(self.form.direction.currentText())
 
         self.updateToolController(obj, self.form.toolController)
+        self.updateCoolant(obj, self.form.coolantController)
 
         if FeatureSide & self.profileFeatures():
             if obj.Side != str(self.form.cutSide.currentText()):
@@ -101,6 +102,7 @@ def setFields(self, obj):
 
         self.selectInComboBox(obj.Direction, self.form.direction)
         self.setupToolController(obj, self.form.toolController)
+        self.setupCoolant(obj, self.form.coolantController)
 
         if FeatureSide & self.profileFeatures():
             self.selectInComboBox(obj.Side, self.form.cutSide)
@@ -117,6 +119,8 @@ def getSignalsForUpdate(self, obj):
         signals.append(self.form.useCompensation.clicked)
         signals.append(self.form.useStartPoint.clicked)
         signals.append(self.form.extraOffset.editingFinished)
+        signals.append(self.form.toolController.currentIndexChanged)
+        signals.append(self.form.coolantController.currentIndexChanged)
 
         if FeatureSide & self.profileFeatures():
             signals.append(self.form.cutSide.currentIndexChanged)

diff --git a/src/Mod/Path/PathScripts/PathSurfaceGui.py b/src/Mod/Path/PathScripts/PathSurfaceGui.py
@@ -67,6 +67,7 @@ def getFields(self, obj):
             obj.Optimize = self.form.optimizeEnabled.isChecked()
 
         self.updateToolController(obj, self.form.toolController)
+        self.updateCoolant(obj, self.form.coolantController)
 
     def setFields(self, obj):
         '''setFields(obj) ... transfers obj's property values to UI'''
@@ -86,6 +87,7 @@ def setFields(self, obj):
             self.form.optimizeEnabled.setCheckState(QtCore.Qt.Unchecked)
 
         self.setupToolController(obj, self.form.toolController)
+        self.setupCoolant(obj, self.form.coolantController)
 
     def getSignalsForUpdate(self, obj):
         '''getSignalsForUpdate(obj) ... return list of signals for updating obj'''
@@ -100,6 +102,7 @@ def getSignalsForUpdate(self, obj):
         signals.append(self.form.stepOver.editingFinished)
         signals.append(self.form.depthOffset.editingFinished)
         signals.append(self.form.optimizeEnabled.stateChanged)
+        signals.append(self.form.coolantController.currentIndexChanged)
 
         return signals