Updated progress bar

classes/window/main_window.xml

@@ -148,13 +148,22 @@
                             <parameter expr="'model_overwrite'"/>
                             <parameter expr="[current_model, open(self.filename, 'r').read()]"/>
                         </raise>
+                        <raise event="update_status" scope="narrow" target="'progress_bar'">
+                            <parameter expr="10"/>
+                            <parameter expr="'Uploading model...'"/>
+                        </raise>
                     </transition>
 
                     <transition cond="self.filename is None" target="../../idle"/>
                 </state>
 
                 <state id="overwriting_model">
-                    <transition event="mv_response" target="../../rerender_model"/>
+                    <transition event="mv_response" target="../../rerender_model">
+                        <raise event="update_status" scope="narrow" target="'progress_bar'">
+                            <parameter expr="50"/>
+                            <parameter expr="'Rerendering model...'"/>
+                        </raise>
+                    </transition>
                 </state>
             </state>
 
@@ -516,7 +525,7 @@
                             <parameter expr="['formalisms/SimpleClassDiagrams']"/>
                         </raise>
                         <raise event="update_status" scope="narrow" target="'progress_bar'">
-                            <parameter expr="0"/>
+                            <parameter expr="5"/>
                             <parameter expr="'Browsing for metamodel...'"/>
                         </raise>
                     </onentry>
@@ -553,10 +562,6 @@
                         <raise event="delete_instance" scope="cd">
                             <parameter expr="self.subwindow"/>
                         </raise>
-                        <raise event="update_status" scope="narrow" target="'progress_bar'">
-                            <parameter expr="10"/>
-                            <parameter expr="'Browsing for metamodel... OK'"/>
-                        </raise>
                     </transition>
                 </state>
 
@@ -569,7 +574,7 @@
                             <parameter expr="{}"/>
                         </raise>
                         <raise event="update_status" scope="narrow" target="'progress_bar'">
-                            <parameter expr="10"/>
+                            <parameter expr="15"/>
                             <parameter expr="'Prompt model name...'"/>
                         </raise>
                     </onentry>
@@ -600,10 +605,6 @@
                         <raise event="delete_instance" scope="cd">
                             <parameter expr="self.subwindow"/>
                         </raise>
-                        <raise event="update_status" scope="narrow" target="'progress_bar'">
-                            <parameter expr="20"/>
-                            <parameter expr="'Prompt model name... OK'"/>
-                        </raise>
                     </transition>
 
                     <transition event="close_window" cond="current_model == ''" target="../../idle">
@@ -627,7 +628,7 @@
 
                     <transition event="mv_response" target="../../open_model/search_metamodels">
                         <raise event="update_status" scope="narrow" target="'progress_bar'">
-                            <parameter expr="40"/>
+                            <parameter expr="50"/>
                             <parameter expr="'Creating empty model... OK'"/>
                         </raise>
                     </transition>

frontend.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Wed Oct  4 11:30:36 2017
+Date:   Wed Oct  4 11:40:53 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   Modelverse Visual Editor - Tkinter Version 
@@ -4366,6 +4366,7 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         
         # transition /running/upload_MVC/overwriting_model
         _running_upload_MVC_overwriting_model_0 = Transition(self, self.states["/running/upload_MVC/overwriting_model"], [self.states["/running/rerender_model"]])
+        _running_upload_MVC_overwriting_model_0.setAction(self._running_upload_MVC_overwriting_model_0_exec)
         _running_upload_MVC_overwriting_model_0.setTrigger(Event("mv_response", None))
         self.states["/running/upload_MVC/overwriting_model"].addTransition(_running_upload_MVC_overwriting_model_0)
         
@@ -4766,11 +4767,11 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
     
     def _running_create_new_model_query_metamodel_enter(self):
         self.big_step.outputEventOM(Event("create_instance", None, [self, 'subwindow', 'Browser', 'Select metamodel to instantiate', ['formalisms/SimpleClassDiagrams']]))
-        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [0, 'Browsing for metamodel...'])]))
+        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [5, 'Browsing for metamodel...'])]))
     
     def _running_create_new_model_prompt_model_name_enter(self):
         self.big_step.outputEventOM(Event("create_instance", None, [self, 'subwindow', 'PromptWindow', {'Model name': ''}, {}]))
-        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [10, 'Prompt model name...'])]))
+        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [15, 'Prompt model name...'])]))
     
     def _running_create_new_model_creating_model_enter(self):
         self.big_step.outputEventOM(Event("broad_cast", None, [self, Event("mv_request", None, ['model_add', [current_model, current_metamodel, '']])]))
@@ -4835,6 +4836,7 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
     
     def _running_upload_MVC_load_code_0_exec(self, parameters):
         self.big_step.outputEventOM(Event("broad_cast", None, [self, Event("mv_request", None, ['model_overwrite', [current_model, open(self.filename, 'r').read()]])]))
+        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [10, 'Uploading model...'])]))
     
     def _running_upload_MVC_load_code_0_guard(self, parameters):
         return self.filename is not None
@@ -4842,6 +4844,9 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
     def _running_upload_MVC_load_code_1_guard(self, parameters):
         return self.filename is None
     
+    def _running_upload_MVC_overwriting_model_0_exec(self, parameters):
+        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [50, 'Rerendering model...'])]))
+    
     def _running_conf_bottom_check_if_exists_0_guard(self, parameters):
         return 'formalisms/Bottom' in self.allowed_metamodels
     
@@ -4966,7 +4971,6 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
     
     def _running_create_new_model_got_mm_0_exec(self, parameters):
         self.big_step.outputEventOM(Event("delete_instance", None, [self, self.subwindow]))
-        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [10, 'Browsing for metamodel... OK'])]))
     
     def _running_create_new_model_prompt_model_name_0_exec(self, parameters):
         association_name = parameters[0]
@@ -4982,7 +4986,6 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
     
     def _running_create_new_model_waiting_for_model_name_1_exec(self, parameters):
         self.big_step.outputEventOM(Event("delete_instance", None, [self, self.subwindow]))
-        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [20, 'Prompt model name... OK'])]))
     
     def _running_create_new_model_waiting_for_model_name_1_guard(self, parameters):
         return current_model != ''
@@ -4994,7 +4997,7 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         return current_model == ''
     
     def _running_create_new_model_creating_model_0_exec(self, parameters):
-        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [40, 'Creating empty model... OK'])]))
+        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [50, 'Creating empty model... OK'])]))
     
     def _running_rerender_model_initial_render_0_guard(self, parameters):
         return self.model_loaded