- when disabling plots, if the selection shape is visible, it will be deleted

- small changes in Tool Panel (eliminating some deepcopy() calls)
- made sure that all the progress counters count to 100%
This commit is contained in:
Marius Stanciu
2019-09-10 16:05:54 +03:00
parent dc6479210a
commit 4114e773dd
6 changed files with 26 additions and 18 deletions

View File

@@ -1694,7 +1694,7 @@ class ToolPaint(FlatCAMTool, Gerber):
return "fail"
pol_nr += 1
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
# log.debug("Polygons cleared: %d" % pol_nr)
if old_disp_number < disp_number <= 100:
@@ -1848,7 +1848,7 @@ class ToolPaint(FlatCAMTool, Gerber):
return "fail"
pol_nr += 1
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
# log.debug("Polygons cleared: %d" % pol_nr)
if old_disp_number < disp_number <= 100:
@@ -2155,7 +2155,7 @@ class ToolPaint(FlatCAMTool, Gerber):
return
pol_nr += 1
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
# log.debug("Polygons cleared: %d" % pol_nr)
if old_disp_number < disp_number <= 100:
@@ -2313,7 +2313,7 @@ class ToolPaint(FlatCAMTool, Gerber):
return
pol_nr += 1
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
# log.debug("Polygons cleared: %d" % pol_nr)
if old_disp_number < disp_number <= 100: