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

- fixes in Panelize and Cutout Tool (Panelize has issues when exporting Gerber with aperture macros)

Browse Source
This commit is contained in:
Marius Stanciu
2021-01-17 23:25:23 +02:00
committed by Marius
parent 00a1b72553
commit 671b99912d
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
appTools/ToolCutOut.py
View File

@@ -1693,7 +1693,10 @@ class CutOut(AppTool):
# first subtract geometry for the total solid_geometry
new_solid_geometry = CutOut.subtract_geo(self.man_cutout_obj.solid_geometry, cut_poly)
new_solid_geometry = linemerge(new_solid_geometry)
try:
new_solid_geometry = linemerge(new_solid_geometry)
except ValueError:
pass
self.man_cutout_obj.solid_geometry = new_solid_geometry
# then do it on each tool in the manual cutout Geometry object

17
appTools/ToolPanelize.py
View File

@@ -554,8 +554,21 @@ class Panelize(AppTool):
# panelization
pol_nr = 0
for geo_el in panel_source_obj.tools[tool]['solid_geometry']:
trans_geo = translate_recursion(geo_el)
trans_geo = translate_recursion(panel_source_obj.tools[tool]['solid_geometry'])
try:
for trans_it in trans_geo:
if not trans_it.is_empty:
new_obj.tools[tool]['solid_geometry'].append(trans_it)
# update progress
pol_nr += 1
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
if old_disp_number < disp_number <= 100:
app_obj.proc_container.update_view_text(
' %s: %d %d%%' % (_("Copy"), int(element), disp_number))
old_disp_number = disp_number
except TypeError:
if not trans_geo.is_empty:
new_obj.tools[tool]['solid_geometry'].append(trans_geo)