- updated all the translations files
- fixed the big mouse cursor in OpenGL(3D) graphic mode to get the set color - fixed the cursor to have the set color and set cursor width in the Legacy(2D) graphic engine - in Legacy(2D) graphic mode fixed the cursor toggle when the big cursor is activated - in Legacy(2D) fixed big mouse cursor to snap to the grid - RELEASE 8.991
This commit is contained in:
Marius Stanciu
Marius
parent
c74814cb00
commit
3c991e1c2d
|
|
@ -142,7 +142,7 @@ class App(QtCore.QObject):
|
|||
# ################## Version and VERSION DATE ##############################
|
||||
# ##########################################################################
|
||||
version = 8.991
|
||||
version_date = "2019/12/30"
|
||||
version_date = "2019/12/27"
|
||||
beta = True
|
||||
engine = '3D'
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,15 @@ CAD program, and create G-Code for Isolation routing.
|
|||
|
||||
=================================================
|
||||
|
||||
28.12.2019
|
||||
|
||||
- updated all the translations files
|
||||
- fixed the big mouse cursor in OpenGL(3D) graphic mode to get the set color
|
||||
- fixed the cursor to have the set color and set cursor width in the Legacy(2D) graphic engine
|
||||
- in Legacy(2D) graphic mode fixed the cursor toggle when the big cursor is activated
|
||||
- in Legacy(2D) fixed big mouse cursor to snap to the grid
|
||||
- RELEASE 8.991
|
||||
|
||||
27.12.2019
|
||||
|
||||
- updated the POT file and the translation files for German, Spanish and French languages
|
||||
|
|
|
|||
|
|
@ -133,10 +133,14 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
|
|||
self.draw_workspace(workspace_size=self.fcapp.defaults["global_workspaceT"])
|
||||
|
||||
self.line_parent = None
|
||||
self.cursor_v_line = InfiniteLine(pos=None, color=self.line_color, vertical=True,
|
||||
if self.fcapp.defaults["global_cursor_color_enabled"]:
|
||||
c_color = Color(self.fcapp.defaults["global_cursor_color"]).rgba
|
||||
else:
|
||||
c_color = self.line_color
|
||||
self.cursor_v_line = InfiniteLine(pos=None, color=c_color, vertical=True,
|
||||
parent=self.line_parent)
|
||||
|
||||
self.cursor_h_line = InfiniteLine(pos=None, color=self.line_color, vertical=False,
|
||||
self.cursor_h_line = InfiniteLine(pos=None, color=c_color, vertical=False,
|
||||
parent=self.line_parent)
|
||||
|
||||
# if self.app.defaults['global_workspace'] is True:
|
||||
|
|
@ -270,10 +274,14 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
|
|||
self.cursor_v_line.parent = None
|
||||
|
||||
def on_mouse_position(self, pos):
|
||||
# self.line_color = color
|
||||
|
||||
self.cursor_h_line.set_data(pos=pos[1], color=self.line_color)
|
||||
self.cursor_v_line.set_data(pos=pos[0], color=self.line_color)
|
||||
if self.fcapp.defaults['global_cursor_color_enabled']:
|
||||
color = Color(self.fcapp.defaults['global_cursor_color']).rgba
|
||||
else:
|
||||
color = self.line_color
|
||||
|
||||
self.cursor_h_line.set_data(pos=pos[1], color=color)
|
||||
self.cursor_v_line.set_data(pos=pos[0], color=color)
|
||||
self.view.scene.update()
|
||||
|
||||
def on_mouse_scroll(self, event):
|
||||
|
|
|
|||
|
|
@ -292,6 +292,7 @@ class PlotCanvasLegacy(QtCore.QObject):
|
|||
self.panning = False
|
||||
self.mouse = [0, 0]
|
||||
self.big_cursor = False
|
||||
self.big_cursor_isdisabled = None
|
||||
|
||||
# signal is the mouse is dragging
|
||||
self.is_dragging = False
|
||||
|
|
@ -375,14 +376,14 @@ class PlotCanvasLegacy(QtCore.QObject):
|
|||
pass
|
||||
# log.debug("Cache updated the screen!")
|
||||
|
||||
def new_cursor(self, axes=None, big=None, color=None):
|
||||
def new_cursor(self, axes=None, big=None):
|
||||
# if axes is None:
|
||||
# c = MplCursor(axes=self.axes, color='black', linewidth=1)
|
||||
# else:
|
||||
# c = MplCursor(axes=axes, color='black', linewidth=1)
|
||||
|
||||
if color:
|
||||
color = color
|
||||
if self.app.defaults["global_cursor_color_enabled"]:
|
||||
color = self.app.defaults["global_cursor_color"]
|
||||
else:
|
||||
if self.app.defaults['global_theme'] == 'white':
|
||||
color = '#000000'
|
||||
|
|
@ -391,8 +392,9 @@ class PlotCanvasLegacy(QtCore.QObject):
|
|||
|
||||
if big is True:
|
||||
self.big_cursor = True
|
||||
self.ch_line = self.axes.axhline(color=color, linewidth=1)
|
||||
self.cv_line = self.axes.axvline(color=color, linewidth=1)
|
||||
self.ch_line = self.axes.axhline(color=color, linewidth=self.app.defaults["global_cursor_width"])
|
||||
self.cv_line = self.axes.axvline(color=color, linewidth=self.app.defaults["global_cursor_width"])
|
||||
self.big_cursor_isdisabled = False
|
||||
else:
|
||||
self.big_cursor = False
|
||||
|
||||
|
|
@ -433,31 +435,58 @@ class PlotCanvasLegacy(QtCore.QObject):
|
|||
mew=self.app.defaults["global_cursor_width"], animated=True)
|
||||
for el in elements:
|
||||
self.axes.draw_artist(el)
|
||||
except Exception as e:
|
||||
# this happen at app initialization since self.app.geo_editor does not exist yet
|
||||
# I could reshuffle the object instantiating order but what's the point?
|
||||
# I could crash something else and that's pythonic, too
|
||||
log.debug("PlotCanvasLegacy.draw_cursor() big_cursor is False --> %s" % str(e))
|
||||
else:
|
||||
try:
|
||||
self.ch_line.set_markeredgewidth(self.app.defaults["global_cursor_width"])
|
||||
self.cv_line.set_markeredgewidth(self.app.defaults["global_cursor_width"])
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
try:
|
||||
x, y = self.app.geo_editor.snap(x_pos, y_pos)
|
||||
self.ch_line.set_ydata(y)
|
||||
self.cv_line.set_xdata(x)
|
||||
except Exception:
|
||||
# this happen at app initialization since self.app.geo_editor does not exist yet
|
||||
# I could reshuffle the object instantiating order but what's the point?
|
||||
# I could crash something else and that's pythonic, too
|
||||
pass
|
||||
else:
|
||||
self.ch_line.set_ydata(y_pos)
|
||||
self.cv_line.set_xdata(x_pos)
|
||||
self.canvas.draw_idle()
|
||||
|
||||
self.canvas.blit(self.axes.bbox)
|
||||
|
||||
def clear_cursor(self, state):
|
||||
|
||||
if state is True:
|
||||
if self.big_cursor is True and self.big_cursor_isdisabled is True:
|
||||
if self.app.defaults["global_cursor_color_enabled"]:
|
||||
color = self.app.defaults["global_cursor_color"]
|
||||
else:
|
||||
if self.app.defaults['global_theme'] == 'white':
|
||||
color = '#000000'
|
||||
else:
|
||||
color = '#FFFFFF'
|
||||
|
||||
self.ch_line = self.axes.axhline(color=color, linewidth=self.app.defaults["global_cursor_width"])
|
||||
self.cv_line = self.axes.axvline(color=color, linewidth=self.app.defaults["global_cursor_width"])
|
||||
self.big_cursor_isdisabled = False
|
||||
if self.app.defaults["global_cursor_color_enabled"] is True:
|
||||
self.draw_cursor(x_pos=self.mouse[0], y_pos=self.mouse[1], color=self.app.cursor_color_3D)
|
||||
else:
|
||||
self.draw_cursor(x_pos=self.mouse[0], y_pos=self.mouse[1])
|
||||
else:
|
||||
if self.big_cursor is True:
|
||||
self.ch_line.remove()
|
||||
self.cv_line.remove()
|
||||
self.canvas.draw_idle()
|
||||
|
||||
self.big_cursor_isdisabled = True
|
||||
try:
|
||||
self.ch_line.remove()
|
||||
self.cv_line.remove()
|
||||
self.canvas.draw_idle()
|
||||
except Exception as e:
|
||||
log.debug("PlotCanvasLegacy.clear_cursor() big_cursor is True --> %s" % str(e))
|
||||
self.canvas.restore_region(self.background)
|
||||
self.canvas.blit(self.axes.bbox)
|
||||
|
||||
|
|
|
|||
|
|
@ -177,6 +177,8 @@ class CutOut(FlatCAMTool):
|
|||
|
||||
# Margin
|
||||
self.margin = FCDoubleSpinner()
|
||||
self.margin.set_range(-9999.9999, 9999.9999)
|
||||
self.margin.setSingleStep(0.1)
|
||||
self.margin.set_precision(self.decimals)
|
||||
|
||||
self.margin_label = QtWidgets.QLabel('%s:' % _("Margin"))
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,8 +1,8 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: 2019-12-27 03:21+0200\n"
|
||||
"PO-Revision-Date: 2019-12-27 03:34+0200\n"
|
||||
"POT-Creation-Date: 2019-12-27 21:55+0200\n"
|
||||
"PO-Revision-Date: 2019-12-27 21:55+0200\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: de\n"
|
||||
|
|
@ -7121,7 +7121,6 @@ msgid "Abs"
|
|||
msgstr "Abs"
|
||||
|
||||
#: flatcamGUI/GUIElements.py:2269
|
||||
#| msgid "Negative"
|
||||
msgid "Relative"
|
||||
msgstr "Relativ"
|
||||
|
||||
|
|
@ -10743,7 +10742,7 @@ msgstr ""
|
|||
msgid "Travel Line Color"
|
||||
msgstr "Reiselinienfarbe"
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4536 flatcamGUI/PreferencesUI.py:4602
|
||||
#: flatcamGUI/PreferencesUI.py:4536
|
||||
msgid "Set the travel line color for plotted objects."
|
||||
msgstr "Legen Sie die Reiselinienfarbe für geplottete Objekte fest."
|
||||
|
||||
|
|
@ -10751,6 +10750,10 @@ msgstr "Legen Sie die Reiselinienfarbe für geplottete Objekte fest."
|
|||
msgid "CNCJob Object Color"
|
||||
msgstr "CNCJob-Objektfarbe"
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4602
|
||||
msgid "Set the color for plotted objects."
|
||||
msgstr "Legen Sie die Farbe für geplottete Objekte fest."
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4762
|
||||
msgid "CNC Job Options"
|
||||
msgstr "CNC-Auftragsoptionen"
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -5,8 +5,8 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: 2019-12-27 03:34+0200\n"
|
||||
"PO-Revision-Date: 2019-12-27 03:34+0200\n"
|
||||
"POT-Creation-Date: 2019-12-27 21:55+0200\n"
|
||||
"PO-Revision-Date: 2019-12-27 21:55+0200\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: en\n"
|
||||
|
|
@ -10497,7 +10497,7 @@ msgstr ""
|
|||
msgid "Travel Line Color"
|
||||
msgstr "Travel Line Color"
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4536 flatcamGUI/PreferencesUI.py:4602
|
||||
#: flatcamGUI/PreferencesUI.py:4536
|
||||
msgid "Set the travel line color for plotted objects."
|
||||
msgstr "Set the travel line color for plotted objects."
|
||||
|
||||
|
|
@ -10505,6 +10505,11 @@ msgstr "Set the travel line color for plotted objects."
|
|||
msgid "CNCJob Object Color"
|
||||
msgstr "CNCJob Object Color"
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4602
|
||||
#| msgid "Set the line color for plotted objects."
|
||||
msgid "Set the color for plotted objects."
|
||||
msgstr "Set the color for plotted objects."
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4762
|
||||
msgid "CNC Job Options"
|
||||
msgstr "CNC Job Options"
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -5,8 +5,8 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: 2019-12-27 03:35+0200\n"
|
||||
"PO-Revision-Date: 2019-12-27 03:50+0200\n"
|
||||
"POT-Creation-Date: 2019-12-27 21:54+0200\n"
|
||||
"PO-Revision-Date: 2019-12-27 21:54+0200\n"
|
||||
"Last-Translator: Marius Stanciu - Google Translate\n"
|
||||
"Language-Team: \n"
|
||||
"Language: es\n"
|
||||
|
|
@ -10668,7 +10668,7 @@ msgstr ""
|
|||
msgid "Travel Line Color"
|
||||
msgstr "Color de Línea de Viaje"
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4536 flatcamGUI/PreferencesUI.py:4602
|
||||
#: flatcamGUI/PreferencesUI.py:4536
|
||||
msgid "Set the travel line color for plotted objects."
|
||||
msgstr "Establezca el color de la línea de viaje para los objetos trazados."
|
||||
|
||||
|
|
@ -10676,6 +10676,10 @@ msgstr "Establezca el color de la línea de viaje para los objetos trazados."
|
|||
msgid "CNCJob Object Color"
|
||||
msgstr "Color de objeto CNCJob"
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4602
|
||||
msgid "Set the color for plotted objects."
|
||||
msgstr "Establecer el color para los objetos trazados."
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4762
|
||||
msgid "CNC Job Options"
|
||||
msgstr "Opciones de trabajo CNC"
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -5,8 +5,8 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: 2019-12-27 04:15+0200\n"
|
||||
"PO-Revision-Date: 2019-12-27 04:33+0200\n"
|
||||
"POT-Creation-Date: 2019-12-27 21:53+0200\n"
|
||||
"PO-Revision-Date: 2019-12-27 21:54+0200\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: fr\n"
|
||||
|
|
@ -8903,7 +8903,6 @@ msgstr ""
|
|||
#: flatcamGUI/PreferencesUI.py:485 flatcamGUI/PreferencesUI.py:552
|
||||
#: flatcamGUI/PreferencesUI.py:1920 flatcamGUI/PreferencesUI.py:2933
|
||||
#: flatcamGUI/PreferencesUI.py:4570
|
||||
#| msgid "Alpha Level"
|
||||
msgid "Alpha"
|
||||
msgstr "Alpha"
|
||||
|
||||
|
|
@ -10684,7 +10683,7 @@ msgstr ""
|
|||
msgid "Travel Line Color"
|
||||
msgstr "Couleur de la ligne de voyage"
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4536 flatcamGUI/PreferencesUI.py:4602
|
||||
#: flatcamGUI/PreferencesUI.py:4536
|
||||
msgid "Set the travel line color for plotted objects."
|
||||
msgstr ""
|
||||
"Définissez la couleur de la ligne de déplacement pour les objets tracés."
|
||||
|
|
@ -10693,6 +10692,10 @@ msgstr ""
|
|||
msgid "CNCJob Object Color"
|
||||
msgstr "Couleur d'objet CNCJob"
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4602
|
||||
msgid "Set the color for plotted objects."
|
||||
msgstr "Définissez la couleur des objets tracés."
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4762
|
||||
msgid "CNC Job Options"
|
||||
msgstr "Options CNCjob"
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: 2019-12-27 03:34+0200\n"
|
||||
"POT-Creation-Date: 2019-12-27 23:01+0200\n"
|
||||
"PO-Revision-Date: 2019-03-25 15:08+0200\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
|
@ -9149,7 +9149,7 @@ msgstr ""
|
|||
msgid "Travel Line Color"
|
||||
msgstr ""
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4536 flatcamGUI/PreferencesUI.py:4602
|
||||
#: flatcamGUI/PreferencesUI.py:4536
|
||||
msgid "Set the travel line color for plotted objects."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9157,6 +9157,10 @@ msgstr ""
|
|||
msgid "CNCJob Object Color"
|
||||
msgstr ""
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4602
|
||||
msgid "Set the color for plotted objects."
|
||||
msgstr ""
|
||||
|
||||
#: flatcamGUI/PreferencesUI.py:4762
|
||||
msgid "CNC Job Options"
|
||||
msgstr ""
|
||||
|
|
|
|||
Loading…
Reference in New Issue