From 394154455886b7249810dd23952d73ac806d10a7 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Wed, 25 Sep 2019 17:25:46 +0300 Subject: [PATCH] - in legacy graphic engine fixed the axis toggle - French Google-translation at 48% --- FlatCAMApp.py | 23 +- README.md | 4 +- flatcamGUI/FlatCAMGUI.py | 23 +- locale/fr/LC_MESSAGES/strings.mo | Bin 88522 -> 114145 bytes locale/fr/LC_MESSAGES/strings.po | 701 +++++++++++++++++-------------- 5 files changed, 412 insertions(+), 339 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 04327aa1..cb2e7c9f 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -5628,15 +5628,24 @@ class App(QtCore.QObject): self.report_usage("on_toggle_axis()") if self.toggle_axis is False: - self.plotcanvas.v_line.set_data(color=(0.70, 0.3, 0.3, 1.0)) - self.plotcanvas.h_line.set_data(color=(0.70, 0.3, 0.3, 1.0)) - self.plotcanvas.redraw() + if self.is_legacy is False: + self.plotcanvas.v_line.set_data(color=(0.70, 0.3, 0.3, 1.0)) + self.plotcanvas.h_line.set_data(color=(0.70, 0.3, 0.3, 1.0)) + self.plotcanvas.redraw() + else: + self.plotcanvas.axes.axhline(color=(0.70, 0.3, 0.3), linewidth=2) + self.plotcanvas.axes.axvline(color=(0.70, 0.3, 0.3), linewidth=2) + self.plotcanvas.canvas.draw() + pass self.toggle_axis = True else: - self.plotcanvas.v_line.set_data(color=(0.0, 0.0, 0.0, 0.0)) - - self.plotcanvas.h_line.set_data(color=(0.0, 0.0, 0.0, 0.0)) - self.plotcanvas.redraw() + if self.is_legacy is False: + self.plotcanvas.v_line.set_data(color=(0.0, 0.0, 0.0, 0.0)) + self.plotcanvas.h_line.set_data(color=(0.0, 0.0, 0.0, 0.0)) + self.plotcanvas.redraw() + else: + self.plotcanvas.axes.lines[:] = [] + self.plotcanvas.canvas.draw() self.toggle_axis = False def on_toggle_grid(self): diff --git a/README.md b/README.md index 78b58059..8c617a86 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ CAD program, and create G-Code for Isolation routing. - French translation at 33% - fixed the 'Jump To' function to work in legacy graphic engine - in legacy graphic engine fixed the mouse cursor shape when grid snapping is ON, such that it fits with the shape from the OpenGL graphic engine +- in legacy graphic engine fixed the axis toggle +- French Google-translation at 48% 24.09.2019 @@ -24,7 +26,7 @@ CAD program, and create G-Code for Isolation routing. - in legacy graphic engine, fixed issue where immediately after panning finished the mouse cursor shape was not updated - unfortunately the fix for issue where while zooming the mouse cursor shape was not updated braked something in way that Matplotlib work with PyQt5, therefore I removed it - fixed a bug in legacy graphic engine: when doing the self.app.collection.delete_all() in new_project an app crash occurred -- implemented the Annotation change in CNCJob Selected Tab +- implemented the Annotation change in CNCJob Selected Tab for the legacy graphic engine 23.09.2019 diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index e4b84b91..e9f63392 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -2347,15 +2347,24 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # Toggle axis if key == QtCore.Qt.Key_G: if self.app.toggle_axis is False: - self.app.plotcanvas.v_line.set_data(color=(0.70, 0.3, 0.3, 1.0)) - self.app.plotcanvas.h_line.set_data(color=(0.70, 0.3, 0.3, 1.0)) - self.app.plotcanvas.redraw() + if self.app.is_legacy is False: + self.app.plotcanvas.v_line.set_data(color=(0.70, 0.3, 0.3, 1.0)) + self.app.plotcanvas.h_line.set_data(color=(0.70, 0.3, 0.3, 1.0)) + self.app.plotcanvas.redraw() + else: + self.app.plotcanvas.axes.axhline(color=(0.70, 0.3, 0.3), linewidth=2) + self.app.plotcanvas.axes.axvline(color=(0.70, 0.3, 0.3), linewidth=2) + self.app.plotcanvas.canvas.draw() + self.app.toggle_axis = True else: - self.app.plotcanvas.v_line.set_data(color=(0.0, 0.0, 0.0, 0.0)) - - self.app.plotcanvas.h_line.set_data(color=(0.0, 0.0, 0.0, 0.0)) - self.app.plotcanvas.redraw() + if self.app.is_legacy is False: + self.app.plotcanvas.v_line.set_data(color=(0.0, 0.0, 0.0, 0.0)) + self.app.plotcanvas.h_line.set_data(color=(0.0, 0.0, 0.0, 0.0)) + self.app.plotcanvas.redraw() + else: + self.app.plotcanvas.axes.lines[:] = [] + self.app.plotcanvas.canvas.draw() self.app.toggle_axis = False # Open Preferences Window diff --git a/locale/fr/LC_MESSAGES/strings.mo b/locale/fr/LC_MESSAGES/strings.mo index ff71b314b1db51d7b5b1788b0d256b2c6dbf19d3..847175481b317012cbdedd4cc54dd77995bf87b0 100644 GIT binary patch delta 42088 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 Ij{6h-4=vZ-{r~^~ delta 18584 zcmZA82YgP~|G@EkGKfe7i4j2_GiF4rSWU$iwP($cAVw0AAT=JVR_%*RwRVl7#-k0@ zs+KBRyGE&MYqVWyMXWZvezy9((*Ab7e`=^3Fi!2U* zZ_6rp19M?a$7^F1d(txwJcwZGS)UWz#`=1&=21<`ToXa%;JVqu@>z&T3Qy* zV1>7`tVoQ(YB&(9ql3|S7$