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

- added messages in the application window title which show the progress in loading a project (which is not thread-safe therefore keeping the app from fully initialize until finished)

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

+ 8 - 1
FlatCAMApp.py

@@ -323,7 +323,6 @@ class App(QtCore.QObject):
 
         QtCore.QObject.__init__(self)
         self.ui = FlatCAMGUI(self.version, self.beta, self)
-        self.set_ui_title(name=_("New Project - Not saved"))
 
         self.ui.geom_update[int, int, int, int, int].connect(self.save_geometry)
         self.ui.final_save.connect(self.final_save)
@@ -2119,6 +2118,8 @@ class App(QtCore.QObject):
 
         App.log.debug("END of constructor. Releasing control.")
 
+        self.set_ui_title(name=_("New Project - Not saved"))
+
         # accept some type file as command line parameter: FlatCAM project, FlatCAM preferences or scripts
         # the path/file_name must be enclosed in quotes if it contain spaces
         if App.args:
@@ -8267,6 +8268,8 @@ class App(QtCore.QObject):
         """
         App.log.debug("Opening project: " + filename)
 
+        self.set_ui_title(name=_("Loading Project ... Please Wait ..."))
+
         # Open and parse an uncompressed Project file
         try:
             f = open(filename, 'r')
@@ -8313,6 +8316,10 @@ class App(QtCore.QObject):
                 obj_inst.from_dict(obj)
             App.log.debug("Recreating from opened project an %s object: %s" %
                           (obj['kind'].capitalize(), obj['options']['name']))
+
+            self.set_ui_title(name=_("Loading Project ... restoring {}: {}").format(
+                obj['kind'].upper(), obj['options']['name'])
+            )
             self.new_object(obj['kind'], obj['options']['name'], obj_init, active=False, fit=False, plot=True)
 
         # self.plot_all()

+ 1 - 1
ObjectCollection.py

@@ -693,7 +693,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
         :param name: Name of the FlatCAM Object
         :return: None
         """
-        log.debug("ObjectCollection.set_inactive()")
+        # log.debug("ObjectCollection.set_inactive()")
 
         obj = self.get_by_name(name)
         item = obj.item

+ 1 - 0
README.md

@@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing.
 
 - made the exported preferences formatted therefore more easily read
 - projects at startup don't work in another thread so there is no multithreading if I want to double click an project and to load it
+- added messages in the application window title which show the progress in loading a project (which is not thread-safe therefore keeping the app from fully initialize until finished)
 
 17.08.2019