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

Solved bug preventing from changing more than one application/project option at a time.

Browse Source
This commit is contained in:
Juan Pablo Caram
2014-10-30 12:29:39 -04:00
parent 84bd8d14c6
commit 277a1f03a4
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
FlatCAMApp.py
View File

@@ -141,7 +141,7 @@ class App(QtCore.QObject):
} }
self.defaults = LoudDict() self.defaults = LoudDict()
self.defaults.set_change_callback(lambda key: self.defaults_write_form()) # When the dictionary changes. self.defaults.set_change_callback(lambda field: self.defaults_write_form_field(field)) # When the dictionary changes.
self.defaults.update({ self.defaults.update({
"serial": 0, "serial": 0,
"stats": {}, "stats": {},
@@ -228,7 +228,7 @@ class App(QtCore.QObject):
} }
self.options = LoudDict() self.options = LoudDict()
self.options.set_change_callback(lambda key: self.options_write_form()) self.options.set_change_callback(lambda field: self.options_write_form_field(field))
self.options.update({ self.options.update({
"units": "IN", "units": "IN",
"gerber_plot": True, "gerber_plot": True,
@@ -385,12 +385,21 @@ class App(QtCore.QObject):
def defaults_write_form(self): def defaults_write_form(self):
for option in self.defaults: for option in self.defaults:
try: self.defaults_write_form_field(option)
self.defaults_form_fields[option].set_value(self.defaults[option]) # try:
except KeyError: # self.defaults_form_fields[option].set_value(self.defaults[option])
#self.log.debug("defaults_write_form(): No field for: %s" % option) # except KeyError:
# TODO: Rethink this? # #self.log.debug("defaults_write_form(): No field for: %s" % option)
pass # # TODO: Rethink this?
# pass
def defaults_write_form_field(self, field):
try:
self.defaults_form_fields[field].set_value(self.defaults[field])
except KeyError:
#self.log.debug("defaults_write_form(): No field for: %s" % option)
# TODO: Rethink this?
pass
def disable_plots(self, except_current=False): def disable_plots(self, except_current=False):
""" """
@@ -667,12 +676,15 @@ class App(QtCore.QObject):
def options_write_form(self): def options_write_form(self):
for option in self.options: for option in self.options:
try: self.options_write_form_field(option)
self.options_form_fields[option].set_value(self.options[option])
except KeyError: def options_write_form_field(self, field):
# Changed from error to debug. This allows to have data stored try:
# which is not user-editable. self.options_form_fields[field].set_value(self.options[field])
self.log.debug("options_write_form(): No field for: %s" % option) except KeyError:
# Changed from error to debug. This allows to have data stored
# which is not user-editable.
self.log.debug("options_write_form_field(): No field for: %s" % field)
def on_about(self): def on_about(self):
""" """
@@ -742,7 +754,7 @@ class App(QtCore.QObject):
self.report_usage("save_defaults") self.report_usage("save_defaults")
# Read options from file ## Read options from file ##
try: try:
f = open(self.path + "/defaults.json") f = open(self.path + "/defaults.json")
options = f.read() options = f.read()