bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed another bug that when selecting an Excellon object after disabling it it crashed the app

Browse Source 
- RELEASE 8.92
This commit is contained in:
Marius Stanciu
2019-08-01 00:37:11 +03:00
parent 45d89a716e
commit 8cadcb3837
11 changed files with 66 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
flatcamEditors/FlatCAMExcEditor.py
View File

@@ -669,7 +669,7 @@ class FCDrillSelect(DrawTool):
# select the diameter of the selected shape in the tool table
try:
self.draw_app.tools_table_exc.cellPressed.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
sel_tools = set()
@@ -1258,12 +1258,12 @@ class FlatCAMExcEditor(QtCore.QObject):
try:
# if connected, disconnect the signal from the slot on item_changed as it creates issues
self.tools_table_exc.itemChanged.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.tools_table_exc.cellPressed.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
# updated units
@@ -1820,17 +1820,17 @@ class FlatCAMExcEditor(QtCore.QObject):
try:
self.app.ui.popmenu_copy.triggered.disconnect(self.exc_copy_drills)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.popmenu_delete.triggered.disconnect(self.on_delete_btn)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.popmenu_move.triggered.disconnect(self.exc_move_drills)
except TypeError:
except (TypeError, AttributeError):
pass
self.app.ui.popmenu_copy.triggered.connect(self.app.on_copy_object)
@@ -1840,12 +1840,12 @@ class FlatCAMExcEditor(QtCore.QObject):
# Excellon Editor
try:
self.app.ui.drill.triggered.disconnect(self.exc_add_drill)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.drill_array.triggered.disconnect(self.exc_add_drill_array)
except TypeError:
except (TypeError, AttributeError):
pass
def clear(self):

14
flatcamEditors/FlatCAMGeoEditor.py
View File

@@ -3296,15 +3296,15 @@ class FlatCAMGeoEditor(QtCore.QObject):
try:
self.app.ui.popmenu_copy.triggered.disconnect(lambda: self.select_tool('copy'))
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.popmenu_delete.triggered.disconnect(self.on_delete_btn)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.popmenu_move.triggered.disconnect(lambda: self.select_tool('move'))
except TypeError:
except (TypeError, AttributeError):
pass
self.app.ui.popmenu_copy.triggered.connect(self.app.on_copy_object)
@@ -3314,22 +3314,22 @@ class FlatCAMGeoEditor(QtCore.QObject):
# Geometry Editor
try:
self.app.ui.draw_line.triggered.disconnect(self.draw_tool_path)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.draw_rect.triggered.disconnect(self.draw_tool_rectangle)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.draw_cut.triggered.disconnect(self.cutpath)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.draw_move.triggered.disconnect(self.on_move)
except TypeError:
except (TypeError, AttributeError):
pass
def add_shape(self, shape):

24
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -1693,7 +1693,7 @@ class FCScale(FCShapeTool):
try:
self.draw_app.scale_button.clicked.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
self.draw_app.scale_button.clicked.connect(self.on_scale_click)
@@ -1735,7 +1735,7 @@ class FCBuffer(FCShapeTool):
try:
self.draw_app.buffer_button.clicked.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
self.draw_app.buffer_button.clicked.connect(self.on_buffer_click)
@@ -1777,7 +1777,7 @@ class FCMarkArea(FCShapeTool):
try:
self.draw_app.ma_threshold__button.clicked.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
self.draw_app.ma_threshold__button.clicked.connect(self.on_markarea_click)
@@ -2934,12 +2934,12 @@ class FlatCAMGrbEditor(QtCore.QObject):
try:
# if connected, disconnect the signal from the slot on item_changed as it creates issues
self.apertures_table.itemChanged.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.apertures_table.cellPressed.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
# updated units
@@ -3488,17 +3488,17 @@ class FlatCAMGrbEditor(QtCore.QObject):
try:
self.app.ui.popmenu_copy.triggered.disconnect(self.on_copy_button)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.popmenu_delete.triggered.disconnect(self.on_delete_btn)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.popmenu_move.triggered.disconnect(self.on_move_button)
except TypeError:
except (TypeError, AttributeError):
pass
self.app.ui.popmenu_copy.triggered.connect(self.app.on_copy_object)
@@ -3509,22 +3509,22 @@ class FlatCAMGrbEditor(QtCore.QObject):
try:
self.app.ui.grb_draw_pad.triggered.disconnect(self.on_pad_add)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.grb_draw_pad_array.triggered.disconnect(self.on_pad_add_array)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.grb_draw_track.triggered.disconnect(self.on_track_add)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.app.ui.grb_draw_region.triggered.disconnect(self.on_region_add)
except TypeError:
except (TypeError, AttributeError):
pass
def clear(self):