Просмотр исходного кода

Merge remote-tracking branch 'origin/Beta' into Beta

Marius 6 лет назад
Родитель
Сommit
7e6554b7ab
3 измененных файлов с 7 добавлено и 6 удалено
  1. 5 4
      FlatCAMApp.py
  2. 1 1
      FlatCAMObj.py
  3. 1 1
      flatcamParsers/ParseGerber.py

+ 5 - 4
FlatCAMApp.py

@@ -8169,11 +8169,12 @@ class App(QtCore.QObject):
         try:
         try:
             # If there is no element in the overlapped objects list then make everyone inactive
             # If there is no element in the overlapped objects list then make everyone inactive
             # because we selected "nothing"
             # 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
                 # and as a convenience move the focus to the Project tab because Selected tab is now empty but
                 # only when working on App
                 # only when working on App

+ 1 - 1
FlatCAMObj.py

@@ -414,7 +414,7 @@ class FlatCAMObj(QtCore.QObject):
         return self.shapes.visible
         return self.shapes.visible
 
 
     @visible.setter
     @visible.setter
-    def visible(self, value, threaded=True):
+    def visible(self, value, threaded=False):
         log.debug("FlatCAMObj.visible()")
         log.debug("FlatCAMObj.visible()")
 
 
         def worker_task(app_obj):
         def worker_task(app_obj):

+ 1 - 1
flatcamParsers/ParseGerber.py

@@ -66,7 +66,7 @@ class Gerber(Geometry):
         self.steps_per_circle = int(self.app.defaults["gerber_circle_steps"])
         self.steps_per_circle = int(self.app.defaults["gerber_circle_steps"])
 
 
         # Initialize parent
         # 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
         # Number format
         self.int_digits = 3
         self.int_digits = 3