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

- trying to fix reported bugs

Browse Source
This commit is contained in:
Marius Stanciu
2019-08-11 02:18:32 +03:00
parent 377a811810
commit cf8a277825
9 changed files with 36 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flatcamEditors/FlatCAMExcEditor.py
View File

@@ -2169,7 +2169,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.pos = self.canvas.vispy_canvas.translate_coords(event.pos)
if self.app.grid_status():
if self.app.grid_status() == True:
self.pos = self.app.geo_editor.snap(self.pos[0], self.pos[1])
self.app.app_cursor.enabled = True
# Update cursor
@@ -2300,7 +2300,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.modifiers = QtWidgets.QApplication.keyboardModifiers()
pos_canvas = self.canvas.vispy_canvas.translate_coords(event.pos)
if self.app.grid_status():
if self.app.grid_status() == True:
pos = self.app.geo_editor.snap(pos_canvas[0], pos_canvas[1])
else:
pos = (pos_canvas[0], pos_canvas[1])
@@ -2432,7 +2432,7 @@ class FlatCAMExcEditor(QtCore.QObject):
return
# ## Snap coordinates
if self.app.grid_status():
if self.app.grid_status() == True:
x, y = self.app.geo_editor.snap(x, y)
self.app.app_cursor.enabled = True
# Update cursor

21
flatcamEditors/FlatCAMGeoEditor.py
View File

@@ -3497,7 +3497,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
self.pos = self.canvas.vispy_canvas.translate_coords(event.pos)
if self.app.grid_status():
if self.app.grid_status() == True:
self.pos = self.app.geo_editor.snap(self.pos[0], self.pos[1])
self.app.app_cursor.enabled = True
# Update cursor
@@ -3507,7 +3507,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
self.pos = (self.pos[0], self.pos[1])
self.app.app_cursor.enabled = False
if event.button is 1:
if event.button == 1:
self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f&nbsp;&nbsp; <b>Dy</b>: "
"%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (0, 0))
@@ -3573,7 +3573,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
return
# # ## Snap coordinates
if self.app.grid_status():
if self.app.grid_status() == True:
x, y = self.snap(x, y)
self.app.app_cursor.enabled = True
# Update cursor
@@ -3625,7 +3625,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
def on_geo_click_release(self, event):
pos_canvas = self.canvas.vispy_canvas.translate_coords(event.pos)
if self.app.grid_status():
if self.app.grid_status() == True:
pos = self.snap(pos_canvas[0], pos_canvas[1])
else:
pos = (pos_canvas[0], pos_canvas[1])
@@ -3662,19 +3662,6 @@ class FlatCAMGeoEditor(QtCore.QObject):
self.app.inform.emit(_("[success] Done."))
self.select_tool(self.active_tool.name)
# MS: always return to the Select Tool if modifier key is not pressed
# else return to the current tool
# key_modifier = QtWidgets.QApplication.keyboardModifiers()
# if self.app.defaults["global_mselect_key"] == 'Control':
# modifier_to_use = Qt.ControlModifier
# else:
# modifier_to_use = Qt.ShiftModifier
#
# if key_modifier == modifier_to_use:
# self.select_tool(self.active_tool.name)
# else:
# self.select_tool("select")
except Exception as e:
log.warning("Error: %s" % str(e))
return

6
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -3986,7 +3986,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.pos = self.canvas.vispy_canvas.translate_coords(event.pos)
if self.app.grid_status():
if self.app.grid_status() == True:
self.pos = self.app.geo_editor.snap(self.pos[0], self.pos[1])
self.app.app_cursor.enabled = True
# Update cursor
@@ -4048,7 +4048,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.modifiers = QtWidgets.QApplication.keyboardModifiers()
pos_canvas = self.canvas.vispy_canvas.translate_coords(event.pos)
if self.app.grid_status():
if self.app.grid_status() == True:
pos = self.app.geo_editor.snap(pos_canvas[0], pos_canvas[1])
else:
pos = (pos_canvas[0], pos_canvas[1])
@@ -4201,7 +4201,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
return
# # ## Snap coordinates
if self.app.grid_status():
if self.app.grid_status() == True:
x, y = self.app.geo_editor.snap(x, y)
self.app.app_cursor.enabled = True
# Update cursor