diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 14f7d04b..c91a4e52 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -8169,11 +8169,12 @@ class App(QtCore.QObject): try: # If there is no element in the overlapped objects list then make everyone inactive # because we selected "nothing" - if not objects_under_the_click_list: - self.collection.set_all_inactive() + self.collection.set_all_inactive() - # delete the possible selection box around a possible selected object - self.delete_selection_shape() + # delete the possible selection box around a possible selected object + self.delete_selection_shape() + + if not objects_under_the_click_list: # and as a convenience move the focus to the Project tab because Selected tab is now empty but # only when working on App diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 27ca4e98..bd6f1588 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -414,7 +414,7 @@ class FlatCAMObj(QtCore.QObject): return self.shapes.visible @visible.setter - def visible(self, value, threaded=True): + def visible(self, value, threaded=False): log.debug("FlatCAMObj.visible()") def worker_task(app_obj): diff --git a/flatcamParsers/ParseGerber.py b/flatcamParsers/ParseGerber.py index 372d7923..bfe0b9f3 100644 --- a/flatcamParsers/ParseGerber.py +++ b/flatcamParsers/ParseGerber.py @@ -66,7 +66,7 @@ class Gerber(Geometry): self.steps_per_circle = int(self.app.defaults["gerber_circle_steps"]) # Initialize parent - Geometry.__init__(self, geo_steps_per_circle=int(self.app.defaults["gerber_circle_steps"])) + Geometry.__init__(self, geo_steps_per_circle=self.steps_per_circle) # Number format self.int_digits = 3 diff --git a/flatcamTools/ToolMove.py b/flatcamTools/ToolMove.py index a9c36a2b..b0a08f73 100644 --- a/flatcamTools/ToolMove.py +++ b/flatcamTools/ToolMove.py @@ -263,6 +263,7 @@ class ToolMove(FlatCAMTool): self.mm = self.app.plotcanvas.graph_event_connect('mouse_move', self.on_move) self.mp = self.app.plotcanvas.graph_event_connect('mouse_press', self.on_left_click) self.kr = self.app.plotcanvas.graph_event_connect('key_release', self.on_key_press) + # first get a bounding box to fit all for obj in obj_list: xmin, ymin, xmax, ymax = obj.bounds()