- the application now uses only the default values from the app.options dict, the app.defaults dict holds the definitive default values
- 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:
@@ -146,22 +146,22 @@ class TclCommandGeoCutout(TclCommandSignaled):
|
||||
if 'margin' in args:
|
||||
margin = float(args['margin'])
|
||||
else:
|
||||
margin = float(self.app.defaults["tools_cutout_margin"])
|
||||
margin = float(self.app.options["tools_cutout_margin"])
|
||||
|
||||
if 'dia' in args:
|
||||
dia = float(args['dia'])
|
||||
else:
|
||||
dia = float(self.app.defaults["tools_cutout_tooldia"])
|
||||
dia = float(self.app.options["tools_cutout_tooldia"])
|
||||
|
||||
if 'gaps' in args:
|
||||
gaps = args['gaps']
|
||||
else:
|
||||
gaps = str(self.app.defaults["tools_cutout_gaps_ff"])
|
||||
gaps = str(self.app.options["tools_cutout_gaps_ff"])
|
||||
|
||||
if 'gapsize' in args:
|
||||
gapsize = float(args['gapsize'])
|
||||
else:
|
||||
gapsize = float(self.app.defaults["tools_cutout_gapsize"])
|
||||
gapsize = float(self.app.options["tools_cutout_gapsize"])
|
||||
|
||||
if 'outname' in args:
|
||||
outname = args['outname']
|
||||
|
||||
Reference in New Issue
Block a user