浏览代码

- some init jobs in Editors

Marius Stanciu 6 年之前
父节点
当前提交
ce9e5a4546
共有 3 个文件被更改,包括 25 次插入3 次删除
  1. 10 1
      flatcamEditors/FlatCAMExcEditor.py
  2. 6 0
      flatcamEditors/FlatCAMGeoEditor.py
  3. 9 2
      flatcamEditors/FlatCAMGrbEditor.py

+ 10 - 1
flatcamEditors/FlatCAMExcEditor.py

@@ -1568,7 +1568,16 @@ class FlatCAMExcEditor(QtCore.QObject):
     def activate(self):
     def activate(self):
         self.connect_canvas_event_handlers()
         self.connect_canvas_event_handlers()
 
 
-        # self.app.collection.view.keyPressed.connect(self.on_canvas_key)
+        # initialize working objects
+        self.storage_dict = {}
+        self.current_storage = []
+        self.points_edit = {}
+        self.sorted_diameters = []
+        self.new_drills = []
+        self.new_tools = {}
+        self.new_slots = {}
+        self.new_tool_offset = {}
+        self.olddia_newdia = {}
 
 
         self.shapes.enabled = True
         self.shapes.enabled = True
         self.tool_shape.enabled = True
         self.tool_shape.enabled = True

+ 6 - 0
flatcamEditors/FlatCAMGeoEditor.py

@@ -2833,6 +2833,12 @@ class FlatCAMGeoEditor(QtCore.QObject):
 
 
     def activate(self):
     def activate(self):
         self.connect_canvas_event_handlers()
         self.connect_canvas_event_handlers()
+
+        # initialize working objects
+        self.storage = FlatCAMGeoEditor.make_storage()
+        self.utility = []
+        self.selected = []
+
         self.shapes.enabled = True
         self.shapes.enabled = True
         self.tool_shape.enabled = True
         self.tool_shape.enabled = True
         self.app.app_cursor.enabled = True
         self.app.app_cursor.enabled = True

+ 9 - 2
flatcamEditors/FlatCAMGrbEditor.py

@@ -1114,11 +1114,18 @@ class FlatCAMGrbEditor(QtCore.QObject):
     def activate(self):
     def activate(self):
         self.connect_canvas_event_handlers()
         self.connect_canvas_event_handlers()
 
 
-        # self.app.collection.view.keyPressed.connect(self.on_canvas_key)
+        # init working objects
+        self.storage_dict = {}
+        self.current_storage = []
+        self.sorted_apid = []
+        self.new_apertures = {}
+        self.new_aperture_macros = {}
+        self.grb_plot_promises = []
+        self.olddia_newdia = {}
+        self.tool2tooldia = {}
 
 
         self.shapes.enabled = True
         self.shapes.enabled = True
         self.tool_shape.enabled = True
         self.tool_shape.enabled = True
-        # self.app.app_cursor.enabled = True
 
 
         self.app.ui.snap_max_dist_entry.setEnabled(True)
         self.app.ui.snap_max_dist_entry.setEnabled(True)
         self.app.ui.corner_snap_btn.setEnabled(True)
         self.app.ui.corner_snap_btn.setEnabled(True)