Browse Source

Added icon to rerender current visualization

Yentl Van Tendeloo 8 years ago
parent
commit
0a50d31977

+ 4 - 8
classes/toolbar/concretesyntax_toolbar.xml

@@ -12,11 +12,12 @@
         </super>
         </super>
         <body>
         <body>
             self.to_create = ["rerender", "new_rendered", "object_diagrams"]
             self.to_create = ["rerender", "new_rendered", "object_diagrams"]
-            self.button_info = {"rerender": "TODO",
+            self.button_info = {"rerender": "Rerender the current model using the specified mapper and visualized model.",
                                 "new_rendered": "TODO",
                                 "new_rendered": "TODO",
                                 "object_diagrams": "TODO",
                                 "object_diagrams": "TODO",
                                 }
                                 }
             self.buttons = {}
             self.buttons = {}
+            tk.Label(self, text="Visualization").pack(side=tk.LEFT)
         </body>
         </body>
     </constructor>
     </constructor>
 
 
@@ -70,14 +71,9 @@
         </state>
         </state>
 
 
         <state id="root">
         <state id="root">
-            <transition event="button_pressed" cond="event_name == 'new'" target=".">
+            <transition event="button_pressed" cond="event_name == 'rerender'" target=".">
                 <parameter name="event_name"/>
                 <parameter name="event_name"/>
-                <raise event="create_new_model" scope="narrow" target="'parent'"/>
-            </transition>
-
-            <transition event="button_pressed" cond="event_name == 'open'" target=".">
-                <parameter name="event_name"/>
-                <raise event="open_model" scope="narrow" target="'parent'"/>
+                <raise event="rerender_model" scope="narrow" target="'parent'"/>
             </transition>
             </transition>
 
 
             <transition event="close" target="../closing"/>
             <transition event="close" target="../closing"/>

+ 1 - 0
classes/toolbar/dsl_toolbar.xml

@@ -14,6 +14,7 @@
             self.to_create = ["new"]
             self.to_create = ["new"]
             self.button_info = {"new": "REMOVE"}
             self.button_info = {"new": "REMOVE"}
             self.buttons = {}
             self.buttons = {}
+            tk.Label(self, text="Domain-Specific").pack(side=tk.LEFT)
         </body>
         </body>
     </constructor>
     </constructor>
 
 

+ 1 - 0
classes/toolbar/generic_toolbar.xml

@@ -15,6 +15,7 @@
             self.button_info = {"new": "Create a new model",
             self.button_info = {"new": "Create a new model",
                                 "open": "Open an existing model"}
                                 "open": "Open an existing model"}
             self.buttons = {}
             self.buttons = {}
+            tk.Label(self, text="Generic").pack(side=tk.LEFT)
         </body>
         </body>
     </constructor>
     </constructor>
 
 

+ 1 - 0
classes/toolbar/metamodelling_toolbar.xml

@@ -19,6 +19,7 @@
                                 "upload_MVC": "TODO",
                                 "upload_MVC": "TODO",
                                 }
                                 }
             self.buttons = {}
             self.buttons = {}
+            tk.Label(self, text="Management").pack(side=tk.LEFT)
         </body>
         </body>
     </constructor>
     </constructor>
 
 

+ 10 - 19
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:   Fri Sep 29 14:03:15 2017
+Date:   Fri Sep 29 14:38:12 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 
@@ -5534,6 +5534,7 @@ class GenericToolbar(Toolbar):
         self.button_info = {"new": "Create a new model",
         self.button_info = {"new": "Create a new model",
                             "open": "Open an existing model"}
                             "open": "Open an existing model"}
         self.buttons = {}
         self.buttons = {}
+        tk.Label(self, text="Generic").pack(side=tk.LEFT)
     
     
     def user_defined_destructor(self):
     def user_defined_destructor(self):
         # call super class destructors
         # call super class destructors
@@ -5706,6 +5707,7 @@ class DSLToolbar(Toolbar):
         self.to_create = ["new"]
         self.to_create = ["new"]
         self.button_info = {"new": "REMOVE"}
         self.button_info = {"new": "REMOVE"}
         self.buttons = {}
         self.buttons = {}
+        tk.Label(self, text="Domain-Specific").pack(side=tk.LEFT)
     
     
     def user_defined_destructor(self):
     def user_defined_destructor(self):
         # call super class destructors
         # call super class destructors
@@ -5883,6 +5885,7 @@ class MetamodellingToolbar(Toolbar):
                             "upload_MVC": "TODO",
                             "upload_MVC": "TODO",
                             }
                             }
         self.buttons = {}
         self.buttons = {}
+        tk.Label(self, text="Management").pack(side=tk.LEFT)
     
     
     def user_defined_destructor(self):
     def user_defined_destructor(self):
         # call super class destructors
         # call super class destructors
@@ -6040,11 +6043,12 @@ class ConcreteSyntaxToolbar(Toolbar):
     def user_defined_constructor(self, parent):
     def user_defined_constructor(self, parent):
         Toolbar.user_defined_constructor(self, parent)
         Toolbar.user_defined_constructor(self, parent)
         self.to_create = ["rerender", "new_rendered", "object_diagrams"]
         self.to_create = ["rerender", "new_rendered", "object_diagrams"]
-        self.button_info = {"rerender": "TODO",
+        self.button_info = {"rerender": "Rerender the current model using the specified mapper and visualized model.",
                             "new_rendered": "TODO",
                             "new_rendered": "TODO",
                             "object_diagrams": "TODO",
                             "object_diagrams": "TODO",
                             }
                             }
         self.buttons = {}
         self.buttons = {}
+        tk.Label(self, text="Visualization").pack(side=tk.LEFT)
     
     
     def user_defined_destructor(self):
     def user_defined_destructor(self):
         # call super class destructors
         # call super class destructors
@@ -6122,14 +6126,9 @@ class ConcreteSyntaxToolbar(Toolbar):
         _root_0.setTrigger(Event("button_pressed", None))
         _root_0.setTrigger(Event("button_pressed", None))
         _root_0.setGuard(self._root_0_guard)
         _root_0.setGuard(self._root_0_guard)
         self.states["/root"].addTransition(_root_0)
         self.states["/root"].addTransition(_root_0)
-        _root_1 = Transition(self, self.states["/root"], [self.states["/root"]])
-        _root_1.setAction(self._root_1_exec)
-        _root_1.setTrigger(Event("button_pressed", None))
-        _root_1.setGuard(self._root_1_guard)
+        _root_1 = Transition(self, self.states["/root"], [self.states["/closing"]])
+        _root_1.setTrigger(Event("close", None))
         self.states["/root"].addTransition(_root_1)
         self.states["/root"].addTransition(_root_1)
-        _root_2 = Transition(self, self.states["/root"], [self.states["/closing"]])
-        _root_2.setTrigger(Event("close", None))
-        self.states["/root"].addTransition(_root_2)
         
         
         # transition /closing
         # transition /closing
         _closing_0 = Transition(self, self.states["/closing"], [self.states["/closing"]])
         _closing_0 = Transition(self, self.states["/closing"], [self.states["/closing"]])
@@ -6171,19 +6170,11 @@ class ConcreteSyntaxToolbar(Toolbar):
     
     
     def _root_0_exec(self, parameters):
     def _root_0_exec(self, parameters):
         event_name = parameters[0]
         event_name = parameters[0]
-        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'parent', Event("create_new_model", None, [])]))
+        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'parent', Event("rerender_model", None, [])]))
     
     
     def _root_0_guard(self, parameters):
     def _root_0_guard(self, parameters):
         event_name = parameters[0]
         event_name = parameters[0]
-        return event_name == 'new'
-    
-    def _root_1_exec(self, parameters):
-        event_name = parameters[0]
-        self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'parent', Event("open_model", None, [])]))
-    
-    def _root_1_guard(self, parameters):
-        event_name = parameters[0]
-        return event_name == 'open'
+        return event_name == 'rerender'
     
     
     def _closing_0_guard(self, parameters):
     def _closing_0_guard(self, parameters):
         return len(self.buttons) > 0
         return len(self.buttons) > 0

+ 0 - 1
icons/rerender.png


BIN
icons/rerender.png


BIN
icons/todo.png