- updated the function for the project context menu 'Generate CNC' menu entry (Action) to use the modernized function FlatCAMObj.FlatCAMGeometry.on_generatecnc_button_click()

FlatCAMApp.py

@@ -6672,8 +6672,10 @@ The normal flow when working in FlatCAM is the following:</span></p>
     def generate_cnc_job(self, objects):
         self.report_usage("generate_cnc_job()")
 
+        # for obj in objects:
+        #     obj.generatecncjob()
         for obj in objects:
-            obj.generatecncjob()
+            obj.on_generatecnc_button_click()
 
     def save_project(self, filename):
         """

FlatCAMObj.py

@@ -3467,9 +3467,27 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         :rtype: list
         """
         table_tools_items = []
-        for x in self.ui.geo_tools_table.selectedItems():
-            table_tools_items.append([self.ui.geo_tools_table.item(x.row(), column).text()
-                                      for column in range(0, self.ui.geo_tools_table.columnCount())])
+        if self.multigeo:
+            for x in self.ui.geo_tools_table.selectedItems():
+                table_tools_items.append([self.ui.geo_tools_table.item(x.row(), column).text()
+                                          for column in range(0, self.ui.geo_tools_table.columnCount())])
+        else:
+            for x in self.ui.geo_tools_table.selectedItems():
+                r = []
+                # the last 2 columns for single-geo geometry are irrelevant and create problems reading
+                # so we don't read them
+                for column in range(0, self.ui.geo_tools_table.columnCount() - 2):
+                    # the columns have items that have text but also have items that are widgets
+                    # for which the text they hold has to be read differently
+                    try:
+                        txt = self.ui.geo_tools_table.item(x.row(), column).text()
+                    except AttributeError:
+                        txt = self.ui.geo_tools_table.cellWidget(x.row(), column).currentText()
+                    except:
+                        pass
+                    r.append(txt)
+                table_tools_items.append(r)
+
         for item in table_tools_items:
             item[0] = str(item[0])
         return table_tools_items
@@ -4042,7 +4060,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         """
 
         tooldia = tooldia if tooldia else float(self.options["cnctooldia"])
-        outname = outname if outname is not None else float(self.options["name"])
+        outname = outname if outname is not None else self.options["name"]
 
         z_cut = z_cut if z_cut is not None else float(self.options["cutz"])
         z_move = z_move if z_move is not None else float(self.options["travelz"])
@@ -4058,7 +4076,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         segy = segy if segy is not None else float(self.app.defaults['geometry_segy'])
 
         extracut = extracut if extracut is not None else float(self.options["extracut"])
-        startz = startz if startz is not None else float(self.options["startz"])
+        startz = startz if startz is not None else self.options["startz"]
         endz = endz if endz is not None else float(self.options["endz"])
 
         toolchangez = toolchangez if toolchangez else float(self.options["toolchangez"])
@@ -4068,7 +4086,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         offset = offset if offset else 0.0
 
         # int or None.
-        spindlespeed = spindlespeed if spindlespeed else int(self.options['spindlespeed'])
+        spindlespeed = spindlespeed if spindlespeed else self.options['spindlespeed']
         dwell = dwell if dwell else self.options["dwell"]
         dwelltime = dwelltime if dwelltime else float(self.options["dwelltime"])
 

README.md

@@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
 - added total travel distance for CNCJob object created from Excellon Object in the CNCJob Selected tab
 - added 'FlatCAM ' prefix to any detached tab, for easy identification
 - remade the Grids context menu (right mouse button click on canvas). Now it has values linked to the units type (inch or mm). Added ability to add or delete grid values and they are persistent.
+- updated the function for the project context menu 'Generate CNC' menu entry (Action) to use the modernized function FlatCAMObj.FlatCAMGeometry.on_generatecnc_button_click()
 
 13.02.2019