- made the exported preferences formatted therefore more easily read
This commit is contained in:
parent
b20203eace
commit
b297e15eee
|
@ -98,8 +98,8 @@ class App(QtCore.QObject):
|
||||||
# ####################################
|
# ####################################
|
||||||
# Version and VERSION DATE ###########
|
# Version and VERSION DATE ###########
|
||||||
# ####################################
|
# ####################################
|
||||||
version = 8.95
|
version = 8.96
|
||||||
version_date = "2019/08/17"
|
version_date = "2019/08/31"
|
||||||
beta = True
|
beta = True
|
||||||
|
|
||||||
# current date now
|
# current date now
|
||||||
|
@ -3006,7 +3006,7 @@ class App(QtCore.QObject):
|
||||||
# Save update options
|
# Save update options
|
||||||
try:
|
try:
|
||||||
f = open(filename, "w")
|
f = open(filename, "w")
|
||||||
json.dump(defaults_from_file, f)
|
json.dump(defaults_from_file, f, default=to_dict, indent=2, sort_keys=True)
|
||||||
f.close()
|
f.close()
|
||||||
except:
|
except:
|
||||||
self.inform.emit(_("[ERROR_NOTCL] Failed to write defaults to file."))
|
self.inform.emit(_("[ERROR_NOTCL] Failed to write defaults to file."))
|
||||||
|
@ -8293,12 +8293,15 @@ class App(QtCore.QObject):
|
||||||
self.set_screen_units(self.options["units"])
|
self.set_screen_units(self.options["units"])
|
||||||
|
|
||||||
# Re create objects
|
# Re create objects
|
||||||
App.log.debug("Re-creating objects...")
|
App.log.debug("Started Project loading...")
|
||||||
|
|
||||||
for obj in d['objs']:
|
for obj in d['objs']:
|
||||||
def obj_init(obj_inst, app_inst):
|
def obj_init(obj_inst, app_inst):
|
||||||
obj_inst.from_dict(obj)
|
obj_inst.from_dict(obj)
|
||||||
App.log.debug(obj['kind'] + ": " + obj['options']['name'])
|
App.log.debug("Recreating from opened project an %s object: %s" %
|
||||||
|
(obj['kind'].capitalize(), obj['options']['name']))
|
||||||
self.new_object(obj['kind'], obj['options']['name'], obj_init, active=False, fit=False, plot=True)
|
self.new_object(obj['kind'], obj['options']['name'], obj_init, active=False, fit=False, plot=True)
|
||||||
|
|
||||||
self.plot_all()
|
self.plot_all()
|
||||||
self.inform.emit(_("[success] Project loaded from: %s") % filename)
|
self.inform.emit(_("[success] Project loaded from: %s") % filename)
|
||||||
|
|
||||||
|
@ -8306,7 +8309,7 @@ class App(QtCore.QObject):
|
||||||
self.file_opened.emit("project", filename)
|
self.file_opened.emit("project", filename)
|
||||||
self.set_ui_title(name=self.project_filename)
|
self.set_ui_title(name=self.project_filename)
|
||||||
|
|
||||||
App.log.debug("Project loaded")
|
App.log.debug("Finished Project loading...")
|
||||||
|
|
||||||
def propagate_defaults(self, silent=False):
|
def propagate_defaults(self, silent=False):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
|
|
||||||
=================================================
|
=================================================
|
||||||
|
|
||||||
|
18.08.2019
|
||||||
|
|
||||||
|
- made the exported preferences formatted therefore more easily read
|
||||||
|
|
||||||
17.08.2019
|
17.08.2019
|
||||||
|
|
||||||
- added estimated time of routing for the CNCJob and added travelled distance parameter for geometry, too
|
- added estimated time of routing for the CNCJob and added travelled distance parameter for geometry, too
|
||||||
|
|
Loading…
Reference in New Issue