From 92eee438a22264beec00a431eb3d5fb359d9b073 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 22 Jan 2021 14:38:17 +0200 Subject: [PATCH] - in Gerber Editor fixed the canvas context menu not showing --- CHANGELOG.md | 1 + appEditors/AppGerberEditor.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0d1b843..df9d4582 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ CHANGELOG for FlatCAM beta - added ability to see the verbose log when importing SVG's (if set in preferences) - added some more logs to the SVG import - fixed minor issue with not having the Cancel option on exiting the GCode Editor through the Toolbar button +- in Gerber Editor fixed the canvas context menu not showing 19.01.2021 diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py index b80d140c..6bf333a1 100644 --- a/appEditors/AppGerberEditor.py +++ b/appEditors/AppGerberEditor.py @@ -2598,6 +2598,8 @@ class SelectEditorGrb(QtCore.QObject, DrawTool): if self.draw_app.visible is False: self.draw_app.visible = True + self.complete = True + def set_origin(self, origin): self.origin = origin @@ -4354,6 +4356,7 @@ class AppGerberEditor(QtCore.QObject): self.app.collection.view.clicked.disconnect() + # Canvas context Menu self.app.ui.popmenu_copy.triggered.disconnect() self.app.ui.popmenu_delete.triggered.disconnect() self.app.ui.popmenu_move.triggered.disconnect() @@ -4397,6 +4400,7 @@ class AppGerberEditor(QtCore.QObject): self.canvas.graph_event_disconnect(self.mm) self.canvas.graph_event_disconnect(self.mr) + # Canvas context Mneu try: self.app.ui.popmenu_copy.triggered.disconnect(self.on_copy_button) except (TypeError, AttributeError): @@ -4417,7 +4421,6 @@ class AppGerberEditor(QtCore.QObject): self.app.ui.popmenu_move.triggered.connect(self.app.obj_move) # Gerber Editor - try: self.app.ui.grb_draw_pad.triggered.disconnect(self.on_pad_add) except (TypeError, AttributeError): @@ -4471,6 +4474,7 @@ class AppGerberEditor(QtCore.QObject): except (TypeError, AttributeError): pass + # disconnect the Jump signal try: self.app.jump_signal.disconnect() except (TypeError, AttributeError):