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

- in INFO functionality for Gerber Object made the difference if the Follow geometry is not a Point or a LineString

Browse Source
This commit is contained in:
Marius Stanciu
2021-09-19 04:13:25 +03:00
committed by Marius
parent 75499354aa
commit 7e30c10601
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta
- fixed Extract Plugin not extracting soldermask for aperture macros - fixed Extract Plugin not extracting soldermask for aperture macros
- fixed INFO in Gerber Object UI to show correctly the type of geometric element in Follow geometry - fixed INFO in Gerber Object UI to show correctly the type of geometric element in Follow geometry
- in INFO functionality for Gerber Object made the difference if the Follow geometry is not a Point or a LineString
18.09.2021 18.09.2021

8
appObjects/FlatCAMObj.py
View File

@@ -660,6 +660,7 @@ class FlatCAMObj(QtCore.QObject):
solid_nr = 0 solid_nr = 0
follow_nr_points = 0 follow_nr_points = 0
follow_nr_lines = 0 follow_nr_lines = 0
follow_nr = 0
clear_nr = 0 clear_nr = 0
if 'geometry' in obj.tools[ap]: if 'geometry' in obj.tools[ap]:
@@ -671,8 +672,10 @@ class FlatCAMObj(QtCore.QObject):
if 'follow' in el: if 'follow' in el:
if isinstance(el['follow'], Point): if isinstance(el['follow'], Point):
follow_nr_points += 1 follow_nr_points += 1
else: elif isinstance(el['follow'], LineString):
follow_nr_lines += 1 follow_nr_lines += 1
else:
follow_nr += 1
if 'clear' in el: if 'clear' in el:
clear_nr += 1 clear_nr += 1
else: else:
@@ -684,7 +687,8 @@ class FlatCAMObj(QtCore.QObject):
elif follow_nr_lines == 0 and follow_nr_points > 0: elif follow_nr_lines == 0 and follow_nr_points > 0:
temp_ap['Follow_Geo'] = '%s %s' % (str(follow_nr_points), _("Points")) temp_ap['Follow_Geo'] = '%s %s' % (str(follow_nr_points), _("Points"))
else: else:
temp_ap['Follow_Geo'] = '%s %s' % (str(follow_nr_lines + follow_nr_points), _("Elements")) temp_ap['Follow_Geo'] = '%s %s' % \
(str(follow_nr_lines + follow_nr_points + follow_nr), _("Elements"))
temp_ap['Clear_Geo'] = '%s %s' % (str(clear_nr), _("Polygons")) temp_ap['Clear_Geo'] = '%s %s' % (str(clear_nr), _("Polygons"))
apid = self.treeWidget.addParent( apid = self.treeWidget.addParent(