Merge pull request #2849 from Russ4262/3DSurface-FaceSelect

[Path] 3D-Surface: Add select face(s) feature to Drop Cutter algorithm
This commit is contained in:
sliptonic
2020-03-18 23:16:03 -05:00
committed by GitHub
4 changed files with 3174 additions and 864 deletions

View File

@@ -207,7 +207,12 @@ def adaptiveselect():
FreeCAD.Console.PrintWarning("Adaptive Select Mode\n")
def surfaceselect():
FreeCADGui.Selection.addSelectionGate(MESHGate())
if(MESHGate() is True or PROFILEGate() is True):
FreeCADGui.Selection.addSelectionGate(True)
else:
FreeCADGui.Selection.addSelectionGate(False)
# FreeCADGui.Selection.addSelectionGate(MESHGate())
# FreeCADGui.Selection.addSelectionGate(PROFILEGate()) # Added for face selection
FreeCAD.Console.PrintWarning("Surfacing Select Mode\n")
def select(op):

File diff suppressed because it is too large Load Diff

View File

@@ -63,8 +63,8 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
obj.DropCutterExtraOffset.x = FreeCAD.Units.Quantity(self.form.boundBoxExtraOffsetX.text()).Value
obj.DropCutterExtraOffset.y = FreeCAD.Units.Quantity(self.form.boundBoxExtraOffsetY.text()).Value
if obj.Optimize != self.form.optimizeEnabled.isChecked():
obj.Optimize = self.form.optimizeEnabled.isChecked()
if obj.OptimizeLinearPaths != self.form.optimizeEnabled.isChecked():
obj.OptimizeLinearPaths = self.form.optimizeEnabled.isChecked()
self.updateToolController(obj, self.form.toolController)
self.updateCoolant(obj, self.form.coolantController)
@@ -81,7 +81,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
self.form.sampleInterval.setText(str(obj.SampleInterval))
self.form.stepOver.setValue(obj.StepOver)
if obj.Optimize:
if obj.OptimizeLinearPaths:
self.form.optimizeEnabled.setCheckState(QtCore.Qt.Checked)
else:
self.form.optimizeEnabled.setCheckState(QtCore.Qt.Unchecked)