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

- the application now uses only the default values from the app.options dict, the app.defaults dict holds the definitive default values

Browse Source 
- fixed some outstanding issues from the PyQt6 port
- PEP8 fixes
- minor fixes
- updated the saving of Preferences to update the self.options too: the `Apply` action will update the self.options but the `Save` action will save the updated preferences to the file on disk
This commit is contained in:
Marius Stanciu
2022-02-18 23:06:58 +02:00
committed by Marius
parent 14d9ea5470
commit 65d8dcc0b2
92 changed files with 1881 additions and 1882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appGUI/PlotCanvas3d.py
View File

@@ -151,8 +151,8 @@ class PlotCanvas3d(QtCore.QObject, scene.SceneCanvas):
self.container.addWidget(self.native)
self.line_parent = None
if self.fcapp.defaults["global_cursor_color_enabled"]:
c_color = Color(self.fcapp.defaults["global_cursor_color"]).rgba
if self.fcapp.options["global_cursor_color_enabled"]:
c_color = Color(self.fcapp.options["global_cursor_color"]).rgba
else:
c_color = self.line_color
@@ -253,8 +253,8 @@ class PlotCanvas3d(QtCore.QObject, scene.SceneCanvas):
# key modifiers
modifiers = event.modifiers
pan_delta_x = self.fcapp.defaults["global_gridx"]
pan_delta_y = self.fcapp.defaults["global_gridy"]
pan_delta_x = self.fcapp.options["global_gridx"]
pan_delta_y = self.fcapp.options["global_gridy"]
curr_pos = event.pos
# Controlled pan by mouse wheel
@@ -284,8 +284,8 @@ class PlotCanvas3d(QtCore.QObject, scene.SceneCanvas):
# # Update cursor
# self.fcapp.app_cursor.set_data(np.asarray([(pos[0], pos[1])]),
# symbol='++', edge_color=self.fcapp.cursor_color_3D,
# edge_width=self.fcapp.defaults["global_cursor_width"],
# size=self.fcapp.defaults["global_cursor_size"])
# edge_width=self.fcapp.options["global_cursor_width"],
# size=self.fcapp.options["global_cursor_size"])
def new_text_group(self, collection=None):
if collection: