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

- added ability to use line width when adding shapes for both Legacy and OpenGL graphic engines

Browse Source 
- added the linewidth=2 parameter for the Tool Distance utility geometry
- fixed a selection issue in Legacy graphic mode for single click
This commit is contained in:
Marius Stanciu
2020-04-20 04:18:12 +03:00
committed by Marius
parent 26ec98d64b
commit dc1a198235
11 changed files with 178 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flatcamEditors/FlatCAMExcEditor.py
View File

@@ -3807,12 +3807,12 @@ class FlatCAMExcEditor(QtCore.QObject):
if self.pos is None:
self.pos = (0, 0)
dx = x - self.pos[0]
dy = y - self.pos[1]
self.app.dx = x - self.pos[0]
self.app.dy = y - self.pos[1]
# update the reference position label in the infobar since the APP mouse event handlers are disconnected
self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f&nbsp;&nbsp; <b>Dy</b>: "
"%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (dx, dy))
"%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (self.app.dx, self.app.dy))
# ## Utility geometry (animated)
self.update_utility_geometry(data=(x, y))

6
flatcamEditors/FlatCAMGeoEditor.py
View File

@@ -4267,12 +4267,12 @@ class FlatCAMGeoEditor(QtCore.QObject):
if self.pos is None:
self.pos = (0, 0)
dx = x - self.pos[0]
dy = y - self.pos[1]
self.app.dx = x - self.pos[0]
self.app.dy = y - self.pos[1]
# update the reference position label in the infobar since the APP mouse event handlers are disconnected
self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f&nbsp;&nbsp; <b>Dy</b>: "
"%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (dx, dy))
"%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (self.app.dx, self.app.dy))
if event.button == 1 and event_is_dragging and isinstance(self.active_tool, FCEraser):
pass

6
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -4648,12 +4648,12 @@ class FlatCAMGrbEditor(QtCore.QObject):
if self.pos is None:
self.pos = (0, 0)
dx = x - self.pos[0]
dy = y - self.pos[1]
self.app.dx = x - self.pos[0]
self.app.dy = y - self.pos[1]
# update the reference position label in the infobar since the APP mouse event handlers are disconnected
self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f&nbsp;&nbsp; <b>Dy</b>: "
"%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (dx, dy))
"%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (self.app.dx, self.app.dy))
self.update_utility_geometry(data=(x, y))