- fixed issues in the 'millslots' and 'milldrills' Tcl commands for the case when some parameters are not used

CHANGELOG.md

@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+17.01.2022
+
+- fixed issues in the 'millslots' and 'milldrills' Tcl commands for the case when some parameters are not used
+
 15.01.2022
 
 - All FCColorEntry GUI element instances have now a set icon for the title (and taskbar)

app_Main.py

@@ -654,7 +654,7 @@ class App(QtCore.QObject):
                                  'feedrate_z', 'GRBL_11', 'GRBL_laser', 'gridoffsety', 'gridx', 'gridy',
                                  'has_offset', 'holes', 'hpgl', 'iso_type', 'Line_xyz', 'margin', 'marlin', 'method',
                                  'milled_dias', 'minoffset', 'name', 'offset', 'opt_type', 'order',
-                                 'outname', 'overlap', 'passes', 'postamble', 'pp', 'ppname_e', 'ppname_g',
+                                 'outname', 'overlap', 'obj_name', 'passes', 'postamble', 'pp', 'ppname_e', 'ppname_g',
                                  'preamble', 'radius', 'ref', 'rest', 'rows', 'shellvar_', 'scale_factor',
                                  'spacing_columns',
                                  'spacing_rows', 'spindlespeed', 'startz', 'startxy',

defaults.py

@@ -800,7 +800,7 @@ class FlatCAMDefaults:
                                       'endxy, endz, extracut_length, f, feedrate, '
                                       'feedrate_z, grbl_11, GRBL_laser, gridoffsety, gridx, gridy, has_offset, '
                                       'holes, hpgl, iso_type, line_xyz, margin, marlin, method, milled_dias, '
-                                      'minoffset, name, offset, opt_type, order, outname, overlap, '
+                                      'minoffset, name, offset, opt_type, order, outname, overlap, obj_name'
                                       'passes, postamble, pp, ppname_e, ppname_g, preamble, radius, ref, rest, '
                                       'rows, shellvar_, scale_factor, spacing_columns, spacing_rows, spindlespeed, '
                                       'startz, startxy, toolchange_xy, toolchangez, '

tclCommands/TclCommandMillDrills.py

@@ -132,8 +132,10 @@ class TclCommandMillDrills(TclCommandSignaled):
                 args['tools'] = 'all'
 
             # no longer needed
-            del args['milled_dias']
-            del args['diatol']
+            if 'milled_dias' in args:
+                del args['milled_dias']
+            if 'diatol' in args:
+                del args['diatol']
         except Exception as e:
             self.raise_tcl_error("Bad tools: %s" % str(e))
 

tclCommands/TclCommandMillSlots.py

@@ -135,6 +135,13 @@ class TclCommandMillSlots(TclCommandSignaled):
                 # args['milled_dias'] = [x.strip() for x in args['tools'].split(",")]
             else:
                 args['tools'] = 'all'
+
+            # no longer needed
+            if 'milled_dias' in args:
+                del args['milled_dias']
+            if 'diatol' in args:
+                del args['diatol']
+
         except Exception as e:
             self.raise_tcl_error("Bad tools: %s" % str(e))