bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marius Stanciu
2021-03-03 23:21:10 +02:00
committed by Marius
parent f317061792
commit cda5f830be
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -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 2.03.2021
- removed the spacing between icons in toolbars - removed the spacing between icons in toolbars

2
appObjects/FlatCAMObj.py
View File

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

2
appParsers/ParseGerber.py
View File

@@ -229,7 +229,7 @@ class Gerber(Geometry):
# Attributes to be included in serialization # Attributes to be included in serialization
# Always append to it because it carries contents # Always append to it because it carries contents
# from Geometry. # 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): def aperture_parse(self, apertureId, apertureType, apParameters):
""" """

3
appPlugins/ToolExtract.py
View File

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

3
appPlugins/ToolPunchGerber.py
View File

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