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

8
tclCommands/TclCommandCutout.py
View File

@@ -74,12 +74,12 @@ class TclCommandCutout(TclCommand):
if 'margin' in args:
margin_par = float(args['margin'])
else:
margin_par = float(self.app.defaults["tools_cutout_margin"])
margin_par = float(self.app.options["tools_cutout_margin"])
if 'dia' in args:
dia_par = float(args['dia'])
else:
dia_par = float(self.app.defaults["tools_cutout_tooldia"])
dia_par = float(self.app.options["tools_cutout_tooldia"])
if 'gaps' in args:
if args['gaps'] not in ["tb", "lr", "4", 4]:
@@ -88,12 +88,12 @@ class TclCommandCutout(TclCommand):
return "fail"
gaps_par = str(args['gaps'])
else:
gaps_par = str(self.app.defaults["tools_cutout_gaps_ff"])
gaps_par = str(self.app.options["tools_cutout_gaps_ff"])
if 'gapsize' in args:
gapsize_par = float(args['gapsize'])
else:
gapsize_par = float(self.app.defaults["tools_cutout_gapsize"])
gapsize_par = float(self.app.options["tools_cutout_gapsize"])
if 'outname' in args:
outname = args['outname']