From 5c4c59d1a2232634be5c360053a5de6badba7e92 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 16 Aug 2019 16:37:54 +0300 Subject: [PATCH] - remade the enable/disable plots functions to work only where it needs to (no sense in disabling a plot already disabled) --- FlatCAMApp.py | 17 +++++------------ README.md | 1 + 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 096fa3d0..10284e71 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -5664,6 +5664,7 @@ class App(QtCore.QObject): self.plotcanvas.vispy_canvas.update() # TODO: Need update canvas? self.on_zoom_fit(None) self.collection.update_view() + # self.inform.emit(_("Plots updated ...")) # TODO: Rework toolbar 'clear', 'replot' functions def on_toolbar_replot(self): @@ -8901,7 +8902,8 @@ The normal flow when working in FlatCAM is the following:

log.debug("Enabling plots ...") self.inform.emit(_("Working ...")) for obj in objects: - obj.options['plot'] = True + if obj.options['plot'] is False: + obj.options['plot'] = True self.plots_updated.emit() def disable_plots(self, objects): @@ -8915,20 +8917,11 @@ The normal flow when working in FlatCAM is the following:

if not self.collection.get_selected(): return - # if at least one object is visible then do the disable - exit_flag = True - for obj in objects: - if obj.options['plot'] is True: - exit_flag = False - break - - if exit_flag: - return - log.debug("Disabling plots ...") self.inform.emit(_("Working ...")) for obj in objects: - obj.options['plot'] = False + if obj.options['plot'] is True: + obj.options['plot'] = False self.plots_updated.emit() def toggle_plots(self, objects): diff --git a/README.md b/README.md index 11d59ebb..7e47c270 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ CAD program, and create G-Code for Isolation routing. - fixed a weird error that created a crash in the following scenario: create a new excellon, edit it, add some drills/slots, delete it without saving, create a new excellon, try to edit and a crash is issued due of a wrapped C++ error - fixed bug selection in Excellon editor with a selection window in case that the number of selected items is even - updated the default values to more convenient ones +- remade the enable/disable plots functions to work only where it needs to (no sense in disabling a plot already disabled) 15.08.2019