- In Tool Isolation made sure that the use of ESC key while some processes are active will disconnect the mouse events that may be connected, correctly

This commit is contained in:
Marius Stanciu
2020-05-30 17:15:42 +03:00
committed by Marius
parent 23ee9c8ad1
commit d8bf1a8a4e
3 changed files with 65 additions and 36 deletions

View File

@@ -4257,6 +4257,10 @@ class App(QtCore.QObject):
# and only if the tool is Solder Paste Dispensing Tool
elif tool_widget == self.paste_tool.toolName:
self.paste_tool.on_tool_delete()
# and only if the tool is Isolation Tool
elif tool_widget == self.isolation_tool.toolName:
self.isolation_tool.on_tool_delete()
else:
self.on_delete()
@@ -4312,7 +4316,7 @@ class App(QtCore.QObject):
obj_active.mark_shapes[el].enabled = False
# obj_active.mark_shapes[el] = None
del el
elif isinstance(obj_active, CNCJobObject):
elif obj_active.kind == 'cncjob':
try:
obj_active.text_col.enabled = False
del obj_active.text_col