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

- fixed Panelize Tool to work with objects made by merging other objects together

Browse Source
This commit is contained in:
Marius Stanciu
2021-02-28 01:03:13 +02:00
committed by Marius
parent 0dae92bd68
commit fe1ea7b12a
2 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -7,7 +7,11 @@ CHANGELOG for FlatCAM beta
================================================= =================================================
27.01.2021 28.02.2021
- fixed Panelize Tool to work with objects made by merging other objects together
27.02.2021
- added possibility of changing the Axis color and created a new parameter for that in Preferences - added possibility of changing the Axis color and created a new parameter for that in Preferences
- some refactoring - some refactoring

6
appPlugins/ToolPanelize.py
View File

@@ -415,6 +415,7 @@ class Panelize(AppTool):
old_disp_number = 0 old_disp_number = 0
for tool in panel_source_obj.tools: for tool in panel_source_obj.tools:
if 'drills' in panel_source_obj.tools[tool]:
if panel_source_obj.tools[tool]['drills']: if panel_source_obj.tools[tool]['drills']:
drill_nr = 0 drill_nr = 0
for drill in panel_source_obj.tools[tool]['drills']: for drill in panel_source_obj.tools[tool]['drills']:
@@ -435,7 +436,10 @@ class Panelize(AppTool):
int(element), int(element),
disp_number)) disp_number))
old_disp_number = disp_number old_disp_number = disp_number
else:
panel_source_obj.tools[tool]['drills'] = []
if 'slots' in panel_source_obj.tools[tool]:
if panel_source_obj.tools[tool]['slots']: if panel_source_obj.tools[tool]['slots']:
slot_nr = 0 slot_nr = 0
for slot in panel_source_obj.tools[tool]['slots']: for slot in panel_source_obj.tools[tool]['slots']:
@@ -461,6 +465,8 @@ class Panelize(AppTool):
int(element), int(element),
disp_number)) disp_number))
old_disp_number = disp_number old_disp_number = disp_number
else:
panel_source_obj.tools[tool]['slots'] = []
currentx += lenghtx currentx += lenghtx
currenty += lenghty currenty += lenghty