Просмотр исходного кода

- solved issue where after the opening of an object the file path is not saved for further open operations

Marius Stanciu 6 лет назад
Родитель
Сommit
b35ac779bd
2 измененных файлов с 5 добавлено и 4 удалено
  1. 4 4
      FlatCAMApp.py
  2. 1 0
      README.md

+ 4 - 4
FlatCAMApp.py

@@ -7690,8 +7690,9 @@ class App(QtCore.QObject):
 
         try:
             d = json.load(f, object_hook=dict2obj)
-        except:
-            App.log.error("Failed to parse project file, trying to see if it loads as an LZMA archive: %s" % filename)
+        except Exception as e:
+            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()
 
             # 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)
                 return
 
-        self.file_opened.emit("project", filename)
-
         # Clear the current project
         # # NOT THREAD SAFE # ##
         if run_from_arg is True:
@@ -7729,6 +7728,7 @@ class App(QtCore.QObject):
         self.inform.emit(_("[success] Project loaded from: %s") % filename)
 
         self.should_we_save = False
+        self.file_opened.emit("project", filename)
 
         App.log.debug("Project loaded")
 

+ 1 - 0
README.md

@@ -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
 - some PEP8 changes related to comments starting with only one '#' symbol
 - 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