diff --git a/README.md b/README.md index c63dfebb..f68f9f20 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ CAD program, and create G-Code for Isolation routing. - Gerber and Geometry Editors: fixed some issues with the Add Arc/Add Semidisc; in mode 132, the norm() function was not the one from numpy but from a FlatCAM Class. Also fixed some of the texts and made sure that when changing the mode, the current points are reset to prepare for the newly selected mode. - Fixed Measurement Tool to show the mouse coordinates on the status bar (it was broken at some point) - updated the translation files +- added more custom mouse cursors in Geometry and Gerber Editors +- RELEASE 8.914 22.04.2019 diff --git a/flatcamEditors/FlatCAMGeoEditor.py b/flatcamEditors/FlatCAMGeoEditor.py index f5973f5e..33cb6312 100644 --- a/flatcamEditors/FlatCAMGeoEditor.py +++ b/flatcamEditors/FlatCAMGeoEditor.py @@ -1936,7 +1936,7 @@ class FCCircle(FCShapeTool): QtGui.QGuiApplication.restoreOverrideCursor() except: pass - self.cursor = QtGui.QCursor(QtGui.QPixmap('share/aero_circle.png')) + self.cursor = QtGui.QCursor(QtGui.QPixmap('share/aero_circle_geo.png')) QtGui.QGuiApplication.setOverrideCursor(self.cursor) self.start_msg = _("Click on Center point ...") @@ -1984,6 +1984,13 @@ class FCArc(FCShapeTool): DrawTool.__init__(self, draw_app) self.name = 'arc' + try: + QtGui.QGuiApplication.restoreOverrideCursor() + except: + pass + self.cursor = QtGui.QCursor(QtGui.QPixmap('share/aero_arc.png')) + QtGui.QGuiApplication.setOverrideCursor(self.cursor) + self.start_msg = _("Click on Center point ...") self.draw_app.app.inform.emit(_("Click on Center point ...")) @@ -2314,7 +2321,7 @@ class FCPath(FCPolygon): QtGui.QGuiApplication.restoreOverrideCursor() except: pass - self.cursor = QtGui.QCursor(QtGui.QPixmap('share/aero_path.png')) + self.cursor = QtGui.QCursor(QtGui.QPixmap('share/aero_path5.png')) QtGui.QGuiApplication.setOverrideCursor(self.cursor) def make(self): @@ -2531,6 +2538,14 @@ class FCText(FCShapeTool): FCShapeTool.__init__(self, draw_app) self.name = 'text' + try: + QtGui.QGuiApplication.restoreOverrideCursor() + except: + pass + self.cursor = QtGui.QCursor(QtGui.QPixmap('share/aero_text.png')) + QtGui.QGuiApplication.setOverrideCursor(self.cursor) + + # self.shape_buffer = self.draw_app.shape_buffer self.draw_app = draw_app self.app = draw_app.app diff --git a/flatcamEditors/FlatCAMGrbEditor.py b/flatcamEditors/FlatCAMGrbEditor.py index 6fe396f7..136b8bdc 100644 --- a/flatcamEditors/FlatCAMGrbEditor.py +++ b/flatcamEditors/FlatCAMGrbEditor.py @@ -1070,7 +1070,7 @@ class FCDisc(FCShapeTool): QtGui.QGuiApplication.restoreOverrideCursor() except: pass - self.cursor = QtGui.QCursor(QtGui.QPixmap('share/aero_circle.png')) + self.cursor = QtGui.QCursor(QtGui.QPixmap('share/aero_disc.png')) QtGui.QGuiApplication.setOverrideCursor(self.cursor) size_ap = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['size']) @@ -1132,6 +1132,13 @@ class FCSemiDisc(FCShapeTool): DrawTool.__init__(self, draw_app) self.name = 'semidisc' + try: + QtGui.QGuiApplication.restoreOverrideCursor() + except: + pass + self.cursor = QtGui.QCursor(QtGui.QPixmap('share/aero_semidisc.png')) + QtGui.QGuiApplication.setOverrideCursor(self.cursor) + self.start_msg = _("Click on Center point ...") self.draw_app.app.inform.emit(_("Click on Center point ...")) diff --git a/share/aero_arc.png b/share/aero_arc.png new file mode 100644 index 00000000..b953d43d Binary files /dev/null and b/share/aero_arc.png differ diff --git a/share/aero_circle_geo.png b/share/aero_circle_geo.png new file mode 100644 index 00000000..899d4c17 Binary files /dev/null and b/share/aero_circle_geo.png differ diff --git a/share/aero_disc.png b/share/aero_disc.png new file mode 100644 index 00000000..8ee99e23 Binary files /dev/null and b/share/aero_disc.png differ diff --git a/share/aero_semidisc.png b/share/aero_semidisc.png new file mode 100644 index 00000000..38abb926 Binary files /dev/null and b/share/aero_semidisc.png differ diff --git a/share/aero_text.png b/share/aero_text.png new file mode 100644 index 00000000..19d47f9d Binary files /dev/null and b/share/aero_text.png differ