bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add HUD rectangle auto size for 2D Graphic Engine

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-30 18:28:35 +03:00
parent 9637908b55
commit 2b40ba1c5f
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@ CHANGELOG for FlatCAM beta
- removed patch to fix scaling on HIDPI displays since now the fix is implemented in VisPy v0.8.1 - removed patch to fix scaling on HIDPI displays since now the fix is implemented in VisPy v0.8.1
- modified a patch for VisPy Infinite Line Visual that set the line width, in order to make it compliant with newer versions of OpenGL - modified a patch for VisPy Infinite Line Visual that set the line width, in order to make it compliant with newer versions of OpenGL
- add HUD rectangle auto size for 3D Graphic Engine - add HUD rectangle auto size for 3D Graphic Engine
- add HUD rectangle auto size for 2D Graphic Engine
29.08.2021 29.08.2021

31
appGUI/PlotCanvasLegacy.py
View File

@@ -352,7 +352,6 @@ class PlotCanvasLegacy(QtCore.QObject):
# self.container.attach(self.canvas, 0, 0, 600, 400) # self.container.attach(self.canvas, 0, 0, 600, 400)
# self.container.addWidget(self.canvas) # Qt # self.container.addWidget(self.canvas) # Qt
@staticmethod @staticmethod
def color_hex2tuple(hex_color): def color_hex2tuple(hex_color):
# strip the # from the beginning # strip the # from the beginning
@@ -443,8 +442,9 @@ class PlotCanvasLegacy(QtCore.QObject):
self.p = plotcanvas self.p = plotcanvas
units = self.p.app.defaults['units'] units = self.p.app.defaults['units']
self._text = 'Dx: %s [%s]\nDy: %s [%s]\n\nX: %s [%s]\nY: %s [%s]' % \ # self._text = 'Dx: %s [%s]\nDy: %s [%s]\n\nX: %s [%s]\nY: %s [%s]' % \
('0.0000', units, '0.0000', units, '0.0000', units, '0.0000', units) # ('0.0000', units, '0.0000', units, '0.0000', units, '0.0000', units)
self.on_update_text_hud()
# set font size # set font size
qsettings = QtCore.QSettings("Open Source", "FlatCAM") qsettings = QtCore.QSettings("Open Source", "FlatCAM")
@@ -466,7 +466,7 @@ class PlotCanvasLegacy(QtCore.QObject):
self.hud_holder.patch.set_alpha(fc_alpha) self.hud_holder.patch.set_alpha(fc_alpha)
self.hud_holder.patch.set_edgecolor((0, 0, 0, 0)) self.hud_holder.patch.set_edgecolor((0, 0, 0, 0))
self. hud_holder.txt._text.set_color(color=text_color) self.hud_holder.txt._text.set_color(color=text_color)
self.text_changed.connect(self.on_text_changed) self.text_changed.connect(self.on_text_changed)
@property @property
@@ -494,6 +494,29 @@ class PlotCanvasLegacy(QtCore.QObject):
if self.hud_holder in self.p.axes.artists: if self.hud_holder in self.p.axes.artists:
self.p.axes.artists.remove(self.hud_holder) self.p.axes.artists.remove(self.hud_holder)
def on_update_text_hud(self, dx=None, dy=None, x=None, y=None):
"""
:param dx:
:param dy:
:param x:
:param y:
:return:
"""
# units
units = self.p.app.defaults['units'].lower()
dx_dec = str(self.p.app.dec_format(dx, self.p.app.decimals)) if dx else '0.0'
dy_dec = str(self.p.app.dec_format(dy, self.p.app.decimals)) if dy else '0.0'
x_dec = str(self.p.app.dec_format(x, self.p.app.decimals)) if x else '0.0'
y_dec = str(self.p.app.dec_format(y, self.p.app.decimals)) if y else '0.0'
l1_hud_text = 'Dx:\t%s [%s]' % (dx_dec, units)
l2_hud_text = 'Dy:\t%s [%s]' % (dy_dec, units)
l3_hud_text = 'X: \t%s [%s]' % (x_dec, units)
l4_hud_text = 'Y: \t%s [%s]' % (y_dec, units)
hud_text = '%s\n%s\n\n%s\n%s' % (l1_hud_text, l2_hud_text, l3_hud_text, l4_hud_text)
self.text = hud_text
def on_toggle_grid_lines(self, signal=None, silent=None): def on_toggle_grid_lines(self, signal=None, silent=None):
state = not self.grid_lines_enabled state = not self.grid_lines_enabled