- 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
parent
dc6479210a
commit
4114e773dd
|
|
@ -9902,6 +9902,11 @@ The normal flow when working in FlatCAM is the following:</span></p>
|
|||
obj.options['plot'] = False
|
||||
obj.options.set_change_callback(obj.on_options_change)
|
||||
|
||||
try:
|
||||
self.delete_selection_shape()
|
||||
except Exception as e:
|
||||
log.debug("App.disable_plots() --> %s" % str(e))
|
||||
|
||||
# self.plots_updated.emit()
|
||||
def worker_task(objects):
|
||||
with self.proc_container.new(_("Disabling plots ...")):
|
||||
|
|
|
|||
|
|
@ -18,7 +18,10 @@ CAD program, and create G-Code for Isolation routing.
|
|||
- added progress for the generation of Isolation geometry
|
||||
- added progress and possibility of graceful exit in Panel Tool
|
||||
- added graceful exit possibility when creating Isolation
|
||||
- chagend the workers thread priority back to Normal
|
||||
- changed the workers thread priority back to Normal
|
||||
- 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%
|
||||
|
||||
9.09.2019
|
||||
|
||||
|
|
|
|||
|
|
@ -587,9 +587,9 @@ class Geometry(object):
|
|||
geo_iso.append(pol.buffer(offset, int(int(self.geo_steps_per_circle) / 4)),
|
||||
join_style=corner)
|
||||
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]))
|
||||
|
||||
if disp_number > old_disp_number and disp_number <= 100:
|
||||
if old_disp_number < disp_number <= 100:
|
||||
self.app.proc_container.update_view_text(' %s %d: %d%%' %
|
||||
(_("Pass"), int(passes + 1), int(disp_number)))
|
||||
old_disp_number = disp_number
|
||||
|
|
|
|||
|
|
@ -1750,7 +1750,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
|||
continue
|
||||
|
||||
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:
|
||||
|
|
@ -2107,10 +2107,10 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
|||
rest_geo.append(poly)
|
||||
|
||||
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 disp_number > old_disp_number and disp_number <= 100:
|
||||
if old_disp_number < disp_number <= 100:
|
||||
self.app.proc_container.update_view_text(' %d%%' % disp_number)
|
||||
old_disp_number = disp_number
|
||||
# log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number))
|
||||
|
|
@ -2587,9 +2587,9 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
|||
raise FlatCAMApp.GracefulException
|
||||
boundary = boundary.difference(el)
|
||||
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]))
|
||||
|
||||
if disp_number > old_disp_number and disp_number <= 100:
|
||||
if old_disp_number < disp_number <= 100:
|
||||
self.app.proc_container.update_view_text(' %d%%' % disp_number)
|
||||
old_disp_number = disp_number
|
||||
return boundary
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -662,7 +662,7 @@ class Panelize(FlatCAMTool):
|
|||
pol_nr += 1
|
||||
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
|
||||
|
||||
if disp_number > old_disp_number and disp_number <= 100:
|
||||
if old_disp_number < disp_number <= 100:
|
||||
self.app.proc_container.update_view_text(' %s: %d %d%%' %
|
||||
(_("Copy"),
|
||||
int(element),
|
||||
|
|
@ -696,7 +696,7 @@ class Panelize(FlatCAMTool):
|
|||
pol_nr += 1
|
||||
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
|
||||
|
||||
if disp_number > old_disp_number and disp_number <= 100:
|
||||
if old_disp_number < disp_number <= 100:
|
||||
self.app.proc_container.update_view_text(' %s: %d %d%%' %
|
||||
(_("Copy"),
|
||||
int(element),
|
||||
|
|
@ -746,22 +746,22 @@ class Panelize(FlatCAMTool):
|
|||
new_el = dict()
|
||||
if 'solid' in el:
|
||||
geo_aper = translate_recursion(el['solid'])
|
||||
new_el['solid'] = deepcopy(geo_aper)
|
||||
new_el['solid'] = geo_aper
|
||||
|
||||
if 'clear' in el:
|
||||
geo_aper = translate_recursion(el['clear'])
|
||||
new_el['clear'] = deepcopy(geo_aper)
|
||||
new_el['clear'] = geo_aper
|
||||
|
||||
if 'follow' in el:
|
||||
geo_aper = translate_recursion(el['follow'])
|
||||
new_el['follow'] = deepcopy(geo_aper)
|
||||
new_el['follow'] = geo_aper
|
||||
|
||||
obj_fin.apertures[apid]['geometry'].append(deepcopy(new_el))
|
||||
|
||||
pol_nr += 1
|
||||
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 100]))
|
||||
|
||||
if disp_number > old_disp_number and disp_number <= 100:
|
||||
if old_disp_number < disp_number <= 100:
|
||||
self.app.proc_container.update_view_text(' %s: %d %d%%' %
|
||||
(_("Copy"),
|
||||
int(element),
|
||||
|
|
|
|||
Loading…
Reference in New Issue