diff --git a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui index 9f33af9868..9b3fb0ab6f 100644 --- a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui +++ b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui @@ -25,7 +25,7 @@ 0 0 424 - 529 + 268 @@ -90,34 +90,32 @@ - - - - - - Default Geometry Tolerance - - - - - - - Default value for new Jobs, used for computing Paths. Smaller increases accuracy, but slows down computation - - - - - - - Default Curve Accuracy - - - + + + + + Default Geometry Tolerance + + + + + + + Default value for new Jobs, used for computing Paths. Smaller increases accuracy, but slows down computation + + + + + + + Default Curve Accuracy + + + - - - - + + + @@ -142,8 +140,8 @@ 0 0 - 443 - 516 + 424 + 432 @@ -166,95 +164,81 @@ QFormLayout::AllNonFixedFieldsGrow - - - - - - Default Path - - - - - + + + + + Default Path + + + + - - - - 0 - 0 - - - - - - - <html><head/><body><p>Enter a path and optionally file name (see below) to be used as the default for the post processor export.</p><p>The following substitutions are performed before the name is resolved at the time of the post processing:</p><p>Substitution allows the following:</p><p>%D ... directory of the active document</p><p>%d ... name of the active document (with extension)</p><p>%M ... user macro directory</p><p>%j ... name of the active Job object</p><p><br/></p><p>The Following can be used if output is being split. If Output is not split</p><p>these will be ignored. </p><p>%T ... Tool Number</p><p>%t ... Tool Controller label</p><p><br/></p><p>%W ... Work Coordinate System</p><p>%O ... Operation Label</p><p><br/></p><p>When splitting output, a sequence number will always be added.</p><p><br/></p><p>if %S is included, you can specify where the number occurs. Without it, the number will be added to the end of the string.</p><p><br/></p><p>%S ... Sequence Number</p><p><br/></p><p>The following example store all files with the same name as the document the directory /home/freecad (please remove quotes):</p><p>&quot;/home/cnc/%d.g-code&quot;</p><p>See the file save policy below on how to deal with name conflicts.</p></body></html> - - - - - - - ... - - - - - + + + + + <html><head/><body><p>Enter a path and optionally file name (see below) to be used as the default for the post processor export.</p><p>The following substitutions are performed before the name is resolved at the time of the post processing:</p><p>Substitution allows the following:</p><p>%D ... directory of the active document</p><p>%d ... name of the active document (with extension)</p><p>%M ... user macro directory</p><p>%j ... name of the active Job object</p><p><br/></p><p>The Following can be used if output is being split. If Output is not split</p><p>these will be ignored. </p><p>%T ... Tool Number</p><p>%t ... Tool Controller label</p><p><br/></p><p>%W ... Work Coordinate System</p><p>%O ... Operation Label</p><p><br/></p><p>When splitting output, a sequence number will always be added.</p><p><br/></p><p>if %S is included, you can specify where the number occurs. Without it, the number will be added to the end of the string.</p><p><br/></p><p>%S ... Sequence Number</p><p><br/></p><p>The following example store all files with the same name as the document the directory /home/freecad (please remove quotes):</p><p>&quot;/home/cnc/%d.g-code&quot;</p><p>See the file save policy below on how to deal with name conflicts.</p></body></html> + + + + + + + ... + + + + - - - - - - File Save Policy - - - - - + + + + + File Save Policy + + + + - - - - - - - 0 - 0 - + + + + + + 0 + 0 + + + + <html><head/><body><p>Choose how to deal with potential file name conflicts. Always open a dialog, only open a dialog if the output file already exists, overwrite any existing file or add a unique (3 digit) sequential ID to the file name.</p></body></html> + + + + Open File Dialog - - <html><head/><body><p>Choose how to deal with potential file name conflicts. Always open a dialog, only open a dialog if the output file already exists, overwrite any existing file or add a unique (3 digit) sequential ID to the file name.</p></body></html> + + + + Open File Dialog on conflict - - - Open File Dialog - - - - - Open File Dialog on conflict - - - - - Overwrite existing file - - - - - Append Unique ID on conflict - - - - - - + + + + Overwrite existing file + + + + + Append Unique ID on conflict + + + + + @@ -348,7 +332,7 @@ 0 0 - 296 + 411 527 @@ -439,7 +423,7 @@ - + @@ -455,7 +439,7 @@ - + @@ -478,10 +462,10 @@ - + - + @@ -514,10 +498,10 @@ - + - + @@ -583,7 +567,7 @@ - + Position @@ -599,7 +583,7 @@ - + @@ -625,8 +609,8 @@ 0 0 - 196 - 74 + 424 + 200 @@ -660,6 +644,19 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/src/Mod/Path/Path/Op/Area.py b/src/Mod/Path/Path/Op/Area.py index 5309f10b47..cd8529aa6a 100644 --- a/src/Mod/Path/Path/Op/Area.py +++ b/src/Mod/Path/Path/Op/Area.py @@ -97,8 +97,6 @@ class ObjectOp(PathOp.ObjectOp): QT_TRANSLATE_NOOP("App::Property", "Split Arcs into discrete segments"), ) - # obj.Proxy = self - self.initAreaOp(obj) def initAreaOp(self, obj): @@ -196,8 +194,6 @@ class ObjectOp(PathOp.ObjectOp): startDepth = bb.ZMax finalDepth = bb.ZMin - # obj.StartDepth.Value = startDepth - # obj.FinalDepth.Value = finalDepth obj.OpStartDepth.Value = startDepth obj.OpFinalDepth.Value = finalDepth @@ -362,11 +358,9 @@ class ObjectOp(PathOp.ObjectOp): else: start = None - aOS = self.areaOpShapes(obj) - # Adjust tuples length received from other PathWB tools/operations shapes = [] - for shp in aOS: + for shp in self.areaOpShapes(obj): if len(shp) == 2: (fc, iH) = shp # fc, iH, sub or description @@ -421,15 +415,10 @@ class ObjectOp(PathOp.ObjectOp): ) raise e else: - if profileEdgesIsOpen: - ppCmds = pp - else: - ppCmds = pp.Commands + ppCmds = pp if profileEdgesIsOpen else pp.Commands - # Save gcode commands to object command list self.commandlist.extend(ppCmds) sims.append(sim) - # Eif if ( self.areaOpRetractTool(obj) @@ -475,7 +464,7 @@ class ObjectOp(PathOp.ObjectOp): # Support methods def _customDepthParams(self, obj, strDep, finDep): finish_step = obj.FinishDepth.Value if hasattr(obj, "FinishDepth") else 0.0 - cdp = PathUtils.depth_params( + return PathUtils.depth_params( clearance_height=obj.ClearanceHeight.Value, safe_height=obj.SafeHeight.Value, start_depth=strDep, @@ -484,10 +473,6 @@ class ObjectOp(PathOp.ObjectOp): final_depth=finDep, user_depths=None, ) - return cdp - - -# Eclass def SetupProperties(): diff --git a/src/Mod/Path/Path/Op/Profile.py b/src/Mod/Path/Path/Op/Profile.py index 05ee46943b..b26e461b9f 100644 --- a/src/Mod/Path/Path/Op/Profile.py +++ b/src/Mod/Path/Path/Op/Profile.py @@ -637,10 +637,6 @@ class ObjectProfile(PathAreaOp.ObjectOp): Path.Log.error(msg) else: Path.Log.error(self.inaccessibleMsg) - # Eif - # Eif - # Efor - # Efor return shapes