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

- fixed issue where the annotations for all the CNCJob objects are toggled together whenever the ones for an single object are toggled

Marius Stanciu 6 лет назад
Родитель
Сommit
a4728e966e
2 измененных файлов с 4 добавлено и 3 удалено
  1. 3 3
      FlatCAMObj.py
  2. 1 0
      README.md

+ 3 - 3
FlatCAMObj.py

@@ -358,7 +358,7 @@ class FlatCAMObj(QtCore.QObject):
                 pass
 
         if threaded is False:
-            worker_task(self)
+            worker_task(app_obj=self)
         else:
             self.app.worker_task.emit({'fcn': worker_task, 'params': [self]})
 
@@ -5937,9 +5937,9 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
             self.annotation.clear(update=True)
 
         if self.ui.annotation_cb.get_value() and self.ui.plot_cb.get_value():
-            self.app.plotcanvas.text_collection.enabled = True
+            self.annotation.enabled = True
         else:
-            self.app.plotcanvas.text_collection.enabled = False
+            self.annotation.enabled = False
 
     def on_annotation_change(self):
         if self.ui.annotation_cb.get_value():

+ 1 - 0
README.md

@@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
 - small changes regarding the Project Title
 - trying to fix reported bugs
 - made sure that the annotations are deleted when the object that contain them is deleted
+- fixed issue where the annotations for all the CNCJob objects are toggled together whenever the ones for an single object are toggled
 
 10.08.2019