浏览代码

Generate a new rendered model when switching the mapper for the first time

Yentl Van Tendeloo 8 年之前
父节点
当前提交
563ba53e9c
共有 2 个文件被更改,包括 11 次插入3 次删除
  1. 5 1
      classes/window/main_window.xml
  2. 6 2
      frontend.py

+ 5 - 1
classes/window/main_window.xml

@@ -124,6 +124,7 @@
                     <script>
                     <script>
                         global current_mapper
                         global current_mapper
                         current_mapper = new_mapper
                         current_mapper = new_mapper
+                        print("Switch mapper to " + str(new_mapper))
                     </script>
                     </script>
                 </transition>
                 </transition>
                 <transition event="change_rendered" target="../change_rendered">
                 <transition event="change_rendered" target="../change_rendered">
@@ -336,7 +337,7 @@
             </state>
             </state>
 
 
             <state id="change_mapper">
             <state id="change_mapper">
-                <transition target="../rerender_model"/>
+                <transition target="../open_model/search_CS_mappers"/>
             </state>
             </state>
 
 
             <state id="change_rendered">
             <state id="change_rendered">
@@ -493,8 +494,10 @@
                             if len(result) > 0:
                             if len(result) > 0:
                                 if current_mapper not in result:
                                 if current_mapper not in result:
                                     current_mapper = next(iter(result))
                                     current_mapper = next(iter(result))
+                                    print("CHANGING MAPPER TO " + str(current_mapper))
                             else:
                             else:
                                 current_mapper = None
                                 current_mapper = None
+                                print("REMOVING MAPPER")
                         </script>
                         </script>
                     </transition>
                     </transition>
                 </state>
                 </state>
@@ -523,6 +526,7 @@
                         <parameter name="result"/>
                         <parameter name="result"/>
                         <script>
                         <script>
                             print("Allowed rendered: " + str(result))
                             print("Allowed rendered: " + str(result))
+                            print("Current mapper: " + str(current_mapper))
                             self.allowed_rendered = list(result)
                             self.allowed_rendered = list(result)
                             global current_rendered_model
                             global current_rendered_model
 
 

+ 6 - 2
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)
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
 
-Date:   Thu Oct  5 09:29:40 2017
+Date:   Thu Oct  5 10:31:58 2017
 
 
 Model author: Yentl Van Tendeloo
 Model author: Yentl Van Tendeloo
 Model name:   Modelverse Visual Editor - Tkinter Version 
 Model name:   Modelverse Visual Editor - Tkinter Version 
@@ -4454,7 +4454,7 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         self.states["/running/custom_MM/wait_for_metamodel/mv_processing"].addTransition(_running_custom_MM_wait_for_metamodel_mv_processing_0)
         self.states["/running/custom_MM/wait_for_metamodel/mv_processing"].addTransition(_running_custom_MM_wait_for_metamodel_mv_processing_0)
         
         
         # transition /running/change_mapper
         # transition /running/change_mapper
-        _running_change_mapper_0 = Transition(self, self.states["/running/change_mapper"], [self.states["/running/rerender_model"]])
+        _running_change_mapper_0 = Transition(self, self.states["/running/change_mapper"], [self.states["/running/open_model/search_CS_mappers"]])
         _running_change_mapper_0.setTrigger(None)
         _running_change_mapper_0.setTrigger(None)
         self.states["/running/change_mapper"].addTransition(_running_change_mapper_0)
         self.states["/running/change_mapper"].addTransition(_running_change_mapper_0)
         
         
@@ -4874,6 +4874,7 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         new_mapper = parameters[0]
         new_mapper = parameters[0]
         global current_mapper
         global current_mapper
         current_mapper = new_mapper
         current_mapper = new_mapper
+        print("Switch mapper to " + str(new_mapper))
     
     
     def _running_idle_11_exec(self, parameters):
     def _running_idle_11_exec(self, parameters):
         new_rendered = parameters[0]
         new_rendered = parameters[0]
@@ -4977,8 +4978,10 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         if len(result) > 0:
         if len(result) > 0:
             if current_mapper not in result:
             if current_mapper not in result:
                 current_mapper = next(iter(result))
                 current_mapper = next(iter(result))
+                print("CHANGING MAPPER TO " + str(current_mapper))
         else:
         else:
             current_mapper = None
             current_mapper = None
+            print("REMOVING MAPPER")
     
     
     def _running_open_model_check_CS_mapper_0_exec(self, parameters):
     def _running_open_model_check_CS_mapper_0_exec(self, parameters):
         global current_rendered_model
         global current_rendered_model
@@ -4995,6 +4998,7 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
     def _running_open_model_search_CS_rendered_0_exec(self, parameters):
     def _running_open_model_search_CS_rendered_0_exec(self, parameters):
         result = parameters[0]
         result = parameters[0]
         print("Allowed rendered: " + str(result))
         print("Allowed rendered: " + str(result))
+        print("Current mapper: " + str(current_mapper))
         self.allowed_rendered = list(result)
         self.allowed_rendered = list(result)
         global current_rendered_model
         global current_rendered_model