From ff954c4f62e561c102c1af1b38b764d1e53df3a1 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Thu, 14 Apr 2022 03:20:54 +0300 Subject: [PATCH] - in Geometry Editor for the Path tool fixed an issue with path projection when changing the grid size while the Path tool is active --- CHANGELOG.md | 1 + appEditors/AppGeoEditor.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e0a5679..f925ca41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ CHANGELOG for FlatCAM Evo beta - in Geometry Editor added a new feature. While drawing a 'Path' now the user can project a direction by moving the mouse cursor in a certain direction and after that by typing a number or an arithmetic simple expression, a line segment will be drawn in that direction with the specified length from the last point - in Geometry Editor for the Path tool but only when using the 3D engine graphic mode, the mouse cursor is followed by position data +- in Geometry Editor for the Path tool fixed an issue with path projection when changing the grid size while the Path tool is active 13.04.2022 diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py index 90ef6949..4a25ae82 100644 --- a/appEditors/AppGeoEditor.py +++ b/appEditors/AppGeoEditor.py @@ -1048,9 +1048,14 @@ class FCPath(FCPolygon): QtCore.Qt.Key.Key_7, QtCore.Qt.Key.Key_8, QtCore.Qt.Key.Key_9, QtCore.Qt.Key.Key_Minus, QtCore.Qt.Key.Key_Plus, QtCore.Qt.Key.Key_Comma, QtCore.Qt.Key.Key_Period, QtCore.Qt.Key.Key_Slash, QtCore.Qt.Key.Key_Asterisk]: - self.interpolate_length += str(key.name) + try: + # VisPy keys + self.interpolate_length += str(key.name) + except AttributeError: + # Qt keys + self.interpolate_length += chr(key) - if key == 'Enter' or key == QtCore.Qt.Key.Key_Return: + if key == 'Enter' or key == QtCore.Qt.Key.Key_Return or key == QtCore.Qt.Key.Key_Enter: if self.interpolate_length != '': target_length = self.interpolate_length.replace(',', '.') try: