From 037a72a5943bfb3f4c63315132f3ce6c7f826b41 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 20 May 2022 04:51:28 +0300 Subject: [PATCH] - small fix for a bug that interfere with running the 2D graphic mode --- CHANGELOG.md | 4 ++++ appEditors/AppExcEditor.py | 2 +- appEditors/AppGeoEditor.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 058efe49..f308e16d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ CHANGELOG for FlatCAM Evo beta ================================================= +20.05.2022 + +- small fix for a bug that interfere with running the 2D graphic mode + 19.05.2022 - added a new setting that control the selection shape creation, in the Preferences. If the checkbox Selection Outline is checked then the selection shape is only an outline. diff --git a/appEditors/AppExcEditor.py b/appEditors/AppExcEditor.py index 559b987f..1e430d5f 100644 --- a/appEditors/AppExcEditor.py +++ b/appEditors/AppExcEditor.py @@ -63,7 +63,7 @@ class SelectEditorExc(FCShapeTool): self.sel_storage = AppExcEditor.make_storage() # make sure that the cursor text from the DrillAdd is deleted - if self.draw_app.app.plotcanvas.text_cursor.parent and self.draw_app.app.use_3d_engine: + if self.draw_app.app.use_3d_engine and self.draw_app.app.plotcanvas.text_cursor.parent: self.draw_app.app.plotcanvas.text_cursor.parent = None self.draw_app.app.plotcanvas.view.camera.zoom_callback = lambda *args: None diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py index 8c57add0..d5fd6d60 100644 --- a/appEditors/AppGeoEditor.py +++ b/appEditors/AppGeoEditor.py @@ -1692,7 +1692,7 @@ class FCSelect(DrawTool): # self.selected = self.draw_app.selected # make sure that the cursor text from the FCPath is deleted - if self.draw_app.app.plotcanvas.text_cursor.parent and self.draw_app.app.use_3d_engine: + if self.draw_app.app.use_3d_engine and self.draw_app.app.plotcanvas.text_cursor.parent: self.draw_app.app.plotcanvas.text_cursor.parent = None self.draw_app.app.plotcanvas.view.camera.zoom_callback = lambda *args: None