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

- 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

View File

@@ -461,7 +461,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
try:
# if connected, disconnect the signal from the slot on item_changed as it creates issues
self.tools_table.itemChanged.disconnect(self.on_tool_edit)
except TypeError:
except (TypeError, AttributeError):
pass
def on_tool_add(self, dia=None, muted=None):

View File

@@ -366,7 +366,7 @@ class ToolPDF(FlatCAMTool):
self.check_thread.setInterval(check_period)
try:
self.check_thread.timeout.disconnect(self.periodic_check_handler)
except TypeError:
except (TypeError, AttributeError):
pass
self.check_thread.timeout.connect(self.periodic_check_handler)

View File

@@ -437,7 +437,7 @@ class ToolPaint(FlatCAMTool, Gerber):
try:
# if connected, disconnect the signal from the slot on item_changed as it creates issues
self.tools_table.itemChanged.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
# updated units

View File

@@ -646,22 +646,22 @@ class SolderPaste(FlatCAMTool):
if isinstance(self.gcode_form_layout.itemAt(i).widget(), FCComboBox):
try:
self.gcode_form_layout.itemAt(i).widget().currentIndexChanged.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
if isinstance(self.gcode_form_layout.itemAt(i).widget(), FCEntry):
try:
self.gcode_form_layout.itemAt(i).widget().editingFinished.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.tools_table.itemChanged.disconnect(self.on_tool_edit)
except TypeError:
except (TypeError, AttributeError):
pass
try:
self.tools_table.currentItemChanged.disconnect(self.on_row_selection_change)
except TypeError:
except (TypeError, AttributeError):
pass
def update_comboboxes(self, obj, status):

View File

@@ -175,13 +175,13 @@ class ToolSub(FlatCAMTool):
try:
self.intersect_btn.clicked.disconnect(self.on_grb_intersection_click)
except TypeError:
except (TypeError, AttributeError):
pass
self.intersect_btn.clicked.connect(self.on_grb_intersection_click)
try:
self.intersect_geo_btn.clicked.disconnect()
except TypeError:
except (TypeError, AttributeError):
pass
self.intersect_geo_btn.clicked.connect(self.on_geo_intersection_click)
@@ -569,14 +569,14 @@ class ToolSub(FlatCAMTool):
try:
self.check_thread.stop()
except TypeError:
except (TypeError, AttributeError):
pass
if reset:
self.check_thread.setInterval(check_period)
try:
self.check_thread.timeout.disconnect(self.periodic_check_handler)
except TypeError:
except (TypeError, AttributeError):
pass
self.check_thread.timeout.connect(self.periodic_check_handler)