- made sure there are no issues when plotting the Excellon object in one thread and trying to build the UI in another by using a signal
This commit is contained in:
@@ -21,6 +21,7 @@ CHANGELOG for FlatCAM beta
|
|||||||
- fixed issues with detecting older Preferences files
|
- fixed issues with detecting older Preferences files
|
||||||
- fixed some issues in Excellon Editor due of recent changes
|
- fixed some issues in Excellon Editor due of recent changes
|
||||||
- moved the Gerber colors fill in the AppObject.on_object_created() slot and fixed some minor issues here
|
- moved the Gerber colors fill in the AppObject.on_object_created() slot and fixed some minor issues here
|
||||||
|
- made sure there are no issues when plotting the Excellon object in one thread and trying to build the UI in another by using a signal
|
||||||
|
|
||||||
20.07.2020
|
20.07.2020
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
|
|||||||
|
|
||||||
ui_type = ExcellonObjectUI
|
ui_type = ExcellonObjectUI
|
||||||
optionChanged = QtCore.pyqtSignal(str)
|
optionChanged = QtCore.pyqtSignal(str)
|
||||||
|
multicolored_build_sig = QtCore.pyqtSignal()
|
||||||
|
|
||||||
def __init__(self, name):
|
def __init__(self, name):
|
||||||
self.decimals = self.app.decimals
|
self.decimals = self.app.decimals
|
||||||
@@ -185,6 +186,8 @@ class ExcellonObject(FlatCAMObj, Excellon):
|
|||||||
self.ui.tools_table.horizontalHeader().sectionClicked.connect(self.on_toggle_rows)
|
self.ui.tools_table.horizontalHeader().sectionClicked.connect(self.on_toggle_rows)
|
||||||
self.ui.table_visibility_cb.stateChanged.connect(self.on_table_visibility_toggle)
|
self.ui.table_visibility_cb.stateChanged.connect(self.on_table_visibility_toggle)
|
||||||
|
|
||||||
|
self.multicolored_build_sig.connect(self.on_multicolored_build)
|
||||||
|
|
||||||
self.units_found = self.app.defaults['units']
|
self.units_found = self.app.defaults['units']
|
||||||
|
|
||||||
def build_ui(self):
|
def build_ui(self):
|
||||||
@@ -1194,7 +1197,10 @@ class ExcellonObject(FlatCAMObj, Excellon):
|
|||||||
self.shapes.clear(update=True)
|
self.shapes.clear(update=True)
|
||||||
|
|
||||||
if multicolored:
|
if multicolored:
|
||||||
self.build_ui()
|
self.multicolored_build_sig.emit()
|
||||||
|
|
||||||
|
def on_multicolored_build(self):
|
||||||
|
self.build_ui()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def merge(exc_list, exc_final, decimals=None, fuse_tools=True):
|
def merge(exc_list, exc_final, decimals=None, fuse_tools=True):
|
||||||
|
|||||||
Reference in New Issue
Block a user