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

42
appPlugins/ToolPanelize.py
View File

@@ -151,40 +151,40 @@ class Panelize(AppTool):
self.ui.object_combo.set_value(obj_name)
sp_c = self.app.defaults["tools_panelize_spacing_columns"] if \
self.app.defaults["tools_panelize_spacing_columns"] else 0.0
sp_c = self.app.options["tools_panelize_spacing_columns"] if \
self.app.options["tools_panelize_spacing_columns"] else 0.0
self.ui.spacing_columns.set_value(float(sp_c))
sp_r = self.app.defaults["tools_panelize_spacing_rows"] if \
self.app.defaults["tools_panelize_spacing_rows"] else 0.0
sp_r = self.app.options["tools_panelize_spacing_rows"] if \
self.app.options["tools_panelize_spacing_rows"] else 0.0
self.ui.spacing_rows.set_value(float(sp_r))
rr = self.app.defaults["tools_panelize_rows"] if \
self.app.defaults["tools_panelize_rows"] else 0.0
rr = self.app.options["tools_panelize_rows"] if \
self.app.options["tools_panelize_rows"] else 0.0
self.ui.rows.set_value(int(rr))
cc = self.app.defaults["tools_panelize_columns"] if \
self.app.defaults["tools_panelize_columns"] else 0.0
cc = self.app.options["tools_panelize_columns"] if \
self.app.options["tools_panelize_columns"] else 0.0
self.ui.columns.set_value(int(cc))
optimized_path_cb = self.app.defaults["tools_panelize_optimization"] if \
self.app.defaults["tools_panelize_optimization"] else True
optimized_path_cb = self.app.options["tools_panelize_optimization"] if \
self.app.options["tools_panelize_optimization"] else True
self.ui.optimization_cb.set_value(optimized_path_cb)
c_cb = self.app.defaults["tools_panelize_constrain"] if \
self.app.defaults["tools_panelize_constrain"] else False
c_cb = self.app.options["tools_panelize_constrain"] if \
self.app.options["tools_panelize_constrain"] else False
self.ui.constrain_cb.set_value(c_cb)
x_w = self.app.defaults["tools_panelize_constrainx"] if \
self.app.defaults["tools_panelize_constrainx"] else 0.0
x_w = self.app.options["tools_panelize_constrainx"] if \
self.app.options["tools_panelize_constrainx"] else 0.0
self.ui.x_width_entry.set_value(float(x_w))
y_w = self.app.defaults["tools_panelize_constrainy"] if \
self.app.defaults["tools_panelize_constrainy"] else 0.0
y_w = self.app.options["tools_panelize_constrainy"] if \
self.app.options["tools_panelize_constrainy"] else 0.0
self.ui.y_height_entry.set_value(float(y_w))
panel_type = self.app.defaults["tools_panelize_panel_type"] if \
self.app.defaults["tools_panelize_panel_type"] else 'gerber'
panel_type = self.app.options["tools_panelize_panel_type"] if \
self.app.options["tools_panelize_panel_type"] else 'gerber'
self.ui.panel_type_radio.set_value(panel_type)
self.ui.on_panel_type(val=panel_type)
@@ -197,7 +197,7 @@ class Panelize(AppTool):
self.connect_signals_at_init()
# 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 on_type_obj_index_changed(self):
@@ -793,7 +793,7 @@ class Panelize(AppTool):
new_sgeo = [g['solid'] for g in new_obj.tools[apid]['geometry'] if 'solid' in g]
new_sgeo = unary_union(new_sgeo)
new_obj.tools[new_tid] = {
'tooldia': self.app.defaults["tools_mill_tooldia"],
'tooldia': self.app.options["tools_mill_tooldia"],
'offset': 'Path',
'offset_value': 0.0,
'type': 'Rough',
@@ -803,7 +803,7 @@ class Panelize(AppTool):
}
new_tid += 1
new_obj.tools[new_tid] = {
'tooldia': self.app.defaults["tools_mill_tooldia"],
'tooldia': self.app.options["tools_mill_tooldia"],
'offset': 'Path',
'offset_value': 0.0,
'type': 'Rough',