- fixed errors on project load, in ParseGerber and Extract and Punch Gerber Plugins due of refactoring the 'apertures' attribute to 'tools'

CHANGELOG.md

@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+3.03.2021
+
+- fixed errors on project load, in ParseGerber and Extract and Punch Gerber Plugins due of refactoring the 'apertures' attribute to 'tools'
+
 2.03.2021
 
 - removed the spacing between icons in toolbars

appObjects/FlatCAMObj.py

@@ -963,7 +963,7 @@ class FlatCAMObj(QtCore.QObject):
         # Not all object types has annotations
         try:
             self.annotation.clear(update)
-        except AttributeError:
+        except Exception:
             pass
 
     def delete(self):

appParsers/ParseGerber.py

@@ -229,7 +229,7 @@ class Gerber(Geometry):
         # Attributes to be included in serialization
         # Always append to it because it carries contents
         # from Geometry.
-        self.ser_attrs += ['apertures', 'int_digits', 'frac_digits', 'aperture_macros', 'solid_geometry', 'source_file']
+        self.ser_attrs += ['tools', 'int_digits', 'frac_digits', 'aperture_macros', 'solid_geometry', 'source_file']
 
     def aperture_parse(self, apertureId, apertureType, apParameters):
         """

appPlugins/ToolExtract.py

@@ -215,7 +215,6 @@ class ToolExtract(AppTool):
         # calculate how many rows to add
         n = 0
         for ap_code in sorted_apertures:
-            ap_code = str(ap_code)
             ap_type = obj.tools[ap_code]['type']
 
             if ap_type == 'C' and self.ui.circular_cb.get_value() is True:
@@ -234,8 +233,6 @@ class ToolExtract(AppTool):
 
         row = 0
         for ap_code in sorted_apertures:
-            ap_code = str(ap_code)
-
             ap_type = obj.tools[ap_code]['type']
             if ap_type == 'C':
                 if self.ui.circular_cb.get_value() is False:

appPlugins/ToolPunchGerber.py

@@ -254,7 +254,6 @@ class ToolPunchGerber(AppTool, Gerber):
         # calculate how many rows to add
         n = 0
         for ap_code in sorted_apertures:
-            ap_code = str(ap_code)
             ap_type = obj.tools[ap_code]['type']
 
             if ap_type == 'C' and self.ui.circular_cb.get_value() is True:
@@ -273,8 +272,6 @@ class ToolPunchGerber(AppTool, Gerber):
 
         row = 0
         for ap_code in sorted_apertures:
-            ap_code = str(ap_code)
-
             ap_type = obj.tools[ap_code]['type']
             if ap_type == 'C':
                 if self.ui.circular_cb.get_value() is False: