- solved issue where after the opening of an object the file path is not saved for further open operations
This commit is contained in:
@@ -7690,8 +7690,9 @@ class App(QtCore.QObject):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
d = json.load(f, object_hook=dict2obj)
|
d = json.load(f, object_hook=dict2obj)
|
||||||
except:
|
except Exception as e:
|
||||||
App.log.error("Failed to parse project file, trying to see if it loads as an LZMA archive: %s" % filename)
|
App.log.error("Failed to parse project file, trying to see if it loads as an LZMA archive: %s because %s" %
|
||||||
|
(filename, str(e)))
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
# Open and parse a compressed Project file
|
# Open and parse a compressed Project file
|
||||||
@@ -7704,8 +7705,6 @@ class App(QtCore.QObject):
|
|||||||
self.inform.emit(_("[ERROR_NOTCL] Failed to open project file: %s") % filename)
|
self.inform.emit(_("[ERROR_NOTCL] Failed to open project file: %s") % filename)
|
||||||
return
|
return
|
||||||
|
|
||||||
self.file_opened.emit("project", filename)
|
|
||||||
|
|
||||||
# Clear the current project
|
# Clear the current project
|
||||||
# # NOT THREAD SAFE # ##
|
# # NOT THREAD SAFE # ##
|
||||||
if run_from_arg is True:
|
if run_from_arg is True:
|
||||||
@@ -7729,6 +7728,7 @@ class App(QtCore.QObject):
|
|||||||
self.inform.emit(_("[success] Project loaded from: %s") % filename)
|
self.inform.emit(_("[success] Project loaded from: %s") % filename)
|
||||||
|
|
||||||
self.should_we_save = False
|
self.should_we_save = False
|
||||||
|
self.file_opened.emit("project", filename)
|
||||||
|
|
||||||
App.log.debug("Project loaded")
|
App.log.debug("Project loaded")
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ CAD program, and create G-Code for Isolation routing.
|
|||||||
- the name for the saved projects are updated to the current time and not to the time of the app startup
|
- the name for the saved projects are updated to the current time and not to the time of the app startup
|
||||||
- some PEP8 changes related to comments starting with only one '#' symbol
|
- some PEP8 changes related to comments starting with only one '#' symbol
|
||||||
- more PEP8 cleanup
|
- more PEP8 cleanup
|
||||||
|
- solved issue where after the opening of an object the file path is not saved for further open operations
|
||||||
|
|
||||||
24.05.2019
|
24.05.2019
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user