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

18
appPlugins/ToolMarkers.py
View File

@@ -63,7 +63,7 @@ class ToolMarkers(AppTool):
# Tool properties
self.fid_dia = None
self.grb_steps_per_circle = self.app.defaults["gerber_circle_steps"]
self.grb_steps_per_circle = self.app.options["gerber_circle_steps"]
self.handlers_connected = False
@@ -180,18 +180,18 @@ class ToolMarkers(AppTool):
self.pluginName = self.ui.pluginName
self.connect_signals_at_init()
self.ui.thick_entry.set_value(self.app.defaults["tools_markers_thickness"])
self.ui.l_entry.set_value(float(self.app.defaults["tools_markers_length"]))
self.ui.thick_entry.set_value(self.app.options["tools_markers_thickness"])
self.ui.l_entry.set_value(float(self.app.options["tools_markers_length"]))
self.ui.ref_radio.set_value(self.app.defaults["tools_markers_reference"])
self.ui.offset_x_entry.set_value(float(self.app.defaults["tools_markers_offset_x"]))
self.ui.offset_y_entry.set_value(float(self.app.defaults["tools_markers_offset_y"]))
self.ui.ref_radio.set_value(self.app.options["tools_markers_reference"])
self.ui.offset_x_entry.set_value(float(self.app.options["tools_markers_offset_x"]))
self.ui.offset_y_entry.set_value(float(self.app.options["tools_markers_offset_y"]))
self.ui.offset_link_button.setChecked(True)
self.ui.on_link_checked(True)
self.ui.toggle_all_cb.set_value(False)
self.ui.type_radio.set_value(self.app.defaults["tools_markers_type"])
self.ui.drill_dia_entry.set_value(self.app.defaults["tools_markers_drill_dia"])
self.ui.type_radio.set_value(self.app.options["tools_markers_type"])
self.ui.drill_dia_entry.set_value(self.app.options["tools_markers_drill_dia"])
self.ui.mode_radio.set_value("a")
self.ui.insert_type_radio.set_value(val="grb")
@@ -209,7 +209,7 @@ class ToolMarkers(AppTool):
self.ui.object_combo.setCurrentIndex(0)
# Show/Hide Advanced Options
app_mode = self.app.defaults["global_app_level"]
app_mode = self.app.options["global_app_level"]
self.change_level(app_mode)
def change_level(self, level):