Bläddra i källkod

Make everything work with newer version of the Modelverse

Yentl Van Tendeloo 8 år sedan
förälder
incheckning
79aed0f6fb
4 ändrade filer med 38 tillägg och 25 borttagningar
  1. 2 2
      classes/main_app.xml
  2. 0 1
      classes/toolbar/dsl_toolbar.xml
  3. 2 2
      classes/window/main_window.xml
  4. 34 20
      frontend.py

+ 2 - 2
classes/main_app.xml

@@ -241,9 +241,9 @@
 
                                 <transition event="mv_exception" target="../../../wait_close_splash"/>
                                 <transition event="mv_response" target="../modify_render_SCD">
-                                    <parameter name="context"/>
+                                    <parameter name="result"/>
                                     <script>
-                                        self.context = context
+                                        self.context, model = result
                                     </script>
                                 </transition>
                             </state>

+ 0 - 1
classes/toolbar/dsl_toolbar.xml

@@ -12,7 +12,6 @@
             <parameter expr="parent"/>
         </super>
         <body>
-            print("Got elements: " + str(elements))
             self.to_create = [i[0] for i in elements if i[1] == "Class"]
             self.buttons = {}
             tk.Label(self, text="Domain-Specific").pack(side=tk.LEFT)

+ 2 - 2
classes/window/main_window.xml

@@ -315,13 +315,13 @@
                             </onentry>
 
                             <transition event="mv_response" target="../modify_render_OD">
-                                <parameter name="context"/>
+                                <parameter name="result"/>
                                 <raise event="update_status" scope="narrow" target="'progress_bar'">
                                     <parameter expr="25"/>
                                     <parameter expr="'Switching contexts...'"/>
                                 </raise>
                                 <script>
-                                    self.context = context
+                                    self.context, model = result
                                 </script>
                             </transition>
 

+ 34 - 20
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 Nov  8 14:22:48 2017
+Date:   Wed Nov  8 16:39:40 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   Modelverse Visual Editor - Tkinter Version 
@@ -462,8 +462,8 @@ class MainApp(RuntimeClassBase):
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, self.splash_window, Event("update_status", None, [40, 'Incorrect username or password'])]))
     
     def _parallel_behaviour_init_modelverse_logging_in_modelverse_upload_models_upload_render_SCD_1_exec(self, parameters):
-        context = parameters[0]
-        self.context = context
+        result = parameters[0]
+        self.context, model = result
     
     def _parallel_behaviour_init_modelverse_closing_splash_0_exec(self, parameters):
         self.big_step.outputEventOM(Event("delete_instance", None, [self, self.splash_window]))
@@ -1463,12 +1463,13 @@ class Modelverse(RuntimeClassBase):
         
         # transition /initialized/behaviour/operations/store_on_scripted/transformation_add_MT/send_metadata
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_metadata_0 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MT/send_metadata"], [self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MT/edit_metamodel"]])
+        _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_metadata_0.setAction(self._initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_metadata_0_exec)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_metadata_0.setTrigger(None)
+        _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_metadata_0.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_metadata_0_guard)
         self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MT/send_metadata"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_metadata_0)
         
         # transition /initialized/behaviour/operations/store_on_scripted/transformation_add_MT/edit_metamodel
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_edit_metamodel_0 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MT/edit_metamodel"], [self.states["/initialized/behaviour/going_scripted"]])
-        _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_edit_metamodel_0.setAction(self._initialized_behaviour_operations_store_on_scripted_transformation_add_MT_edit_metamodel_0_exec)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_edit_metamodel_0.setTrigger(None)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_edit_metamodel_0.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_MT_edit_metamodel_0_guard)
         self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MT/edit_metamodel"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_MT_edit_metamodel_0)
@@ -1486,12 +1487,13 @@ class Modelverse(RuntimeClassBase):
         
         # transition /initialized/behaviour/operations/store_on_scripted/transformation_add_AL/send_metadata
         _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_metadata_0 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/send_metadata"], [self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/edit_metamodel"]])
+        _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_metadata_0.setAction(self._initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_metadata_0_exec)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_metadata_0.setTrigger(None)
+        _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_metadata_0.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_metadata_0_guard)
         self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/send_metadata"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_metadata_0)
         
         # transition /initialized/behaviour/operations/store_on_scripted/transformation_add_AL/edit_metamodel
         _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/edit_metamodel"], [self.states["/initialized/behaviour/going_scripted"]])
-        _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0.setAction(self._initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0_exec)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0.setTrigger(None)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0_guard)
         self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_AL/edit_metamodel"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0)
@@ -1509,12 +1511,13 @@ class Modelverse(RuntimeClassBase):
         
         # transition /initialized/behaviour/operations/store_on_scripted/transformation_add_MANUAL/send_metadata
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_send_metadata_0 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MANUAL/send_metadata"], [self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MANUAL/edit_metamodel"]])
+        _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_send_metadata_0.setAction(self._initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_send_metadata_0_exec)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_send_metadata_0.setTrigger(None)
+        _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_send_metadata_0.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_send_metadata_0_guard)
         self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MANUAL/send_metadata"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_send_metadata_0)
         
         # transition /initialized/behaviour/operations/store_on_scripted/transformation_add_MANUAL/edit_metamodel
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_edit_metamodel_0 = Transition(self, self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MANUAL/edit_metamodel"], [self.states["/initialized/behaviour/going_scripted"]])
-        _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_edit_metamodel_0.setAction(self._initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_edit_metamodel_0_exec)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_edit_metamodel_0.setTrigger(None)
         _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_edit_metamodel_0.setGuard(self._initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_edit_metamodel_0_guard)
         self.states["/initialized/behaviour/operations/store_on_scripted/transformation_add_MANUAL/edit_metamodel"].addTransition(_initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_edit_metamodel_0)
@@ -3093,8 +3096,12 @@ class Modelverse(RuntimeClassBase):
     def _initialized_behaviour_operations_process_signature_0_guard(self, parameters):
         return self.expect_response_partial('Success: ', pop=False)
     
-    def _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_edit_metamodel_0_exec(self, parameters):
-        self.raiseInternalEvent(Event("result", None, [self.context]))
+    def _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_metadata_0_exec(self, parameters):
+        print("Operating on received")
+        self.raiseInternalEvent(Event("result", None, [[self.context, self.responses.pop(0).split(': ', 1)[1]]]))
+    
+    def _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_metadata_0_guard(self, parameters):
+        return self.expect_response_partial('Operating on: ')
     
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_edit_metamodel_0_guard(self, parameters):
         return self.expect_response('Model loaded, ready for commands!')
@@ -3108,8 +3115,12 @@ class Modelverse(RuntimeClassBase):
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_MT_send_model_0_guard(self, parameters):
         return self.expect_response('Success')
     
-    def _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0_exec(self, parameters):
-        self.raiseInternalEvent(Event("result", None, [self.context]))
+    def _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_metadata_0_exec(self, parameters):
+        print("Got model we are operating on!")
+        self.raiseInternalEvent(Event("result", None, [[self.context, self.responses.pop(0).split(': ', 1)[1]]]))
+    
+    def _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_metadata_0_guard(self, parameters):
+        return self.expect_response_partial('Operating on: ')
     
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_edit_metamodel_0_guard(self, parameters):
         return self.expect_response('Model loaded, ready for commands!')
@@ -3123,8 +3134,12 @@ class Modelverse(RuntimeClassBase):
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_AL_send_model_0_guard(self, parameters):
         return self.expect_response('Success')
     
-    def _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_edit_metamodel_0_exec(self, parameters):
-        self.raiseInternalEvent(Event("result", None, [self.context]))
+    def _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_send_metadata_0_exec(self, parameters):
+        print("Operating on received")
+        self.raiseInternalEvent(Event("result", None, [[self.context, self.responses.pop(0).split(': ', 1)[1]]]))
+    
+    def _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_send_metadata_0_guard(self, parameters):
+        return self.expect_response_partial('Operating on: ')
     
     def _initialized_behaviour_operations_store_on_scripted_transformation_add_MANUAL_edit_metamodel_0_guard(self, parameters):
         return self.expect_response('Model loaded, ready for commands!')
@@ -6196,9 +6211,9 @@ class MainWindow(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         self.big_step.outputEventOM(Event("delete_instance", None, [self, self.process_enactor]))
     
     def _init_init_running_add_object_diagrams_init_0_exec(self, parameters):
-        context = parameters[0]
+        result = parameters[0]
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, 'progress_bar', Event("update_status", None, [25, 'Switching contexts...'])]))
-        self.context = context
+        self.context, model = result
     
     def _init_init_running_add_object_diagrams_modify_render_OD_exit_0_exec(self, parameters):
         global current_mapper
@@ -9093,13 +9108,13 @@ class ProcessEnactor(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         self.counter = -1
     
     def _all_all_create_activity_browse_label_create_enter(self):
-        self.big_step.outputEventOM(Event("create_instance", None, [self, 'activity_browse', 'Label', {'parent': self.activity_frame, 'text': 'Activity'}]))
+        self.big_step.outputEventOM(Event("create_instance", None, [self, 'activity_browse', 'Label', {'parent': self.activity_frame, 'text': 'Process'}]))
     
     def _all_all_create_activity_browse_entry_create_enter(self):
         self.big_step.outputEventOM(Event("create_instance", None, [self, 'activity_browse', 'Entry', {'parent': self.activity_frame, 'name': 'activity_entry', 'value': '(none)', 'readonly': True}]))
     
     def _all_all_create_activity_browse_button_create_enter(self):
-        self.big_step.outputEventOM(Event("create_instance", None, [self, 'activity_browse', 'Button', {'parent': self.activity_frame, 'event_parameters': 'browse_activity', 'visual': TextVisual('...'), 'tooltip_text': 'Browse for a activity'}]))
+        self.big_step.outputEventOM(Event("create_instance", None, [self, 'activity_browse', 'Button', {'parent': self.activity_frame, 'event_parameters': 'browse_activity', 'visual': TextVisual('...'), 'tooltip_text': 'Browse for a process'}]))
     
     def _all_all_create_exec_create_enter(self):
         self.big_step.outputEventOM(Event("create_instance", None, [self, 'activity_browse', 'Button', {'parent': self.exec_frame, 'event_parameters': 'execute', 'visual': TextVisual('START'), 'tooltip_text': 'Enact the process'}]))
@@ -9133,7 +9148,7 @@ class ProcessEnactor(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         self.big_step.outputEventOM(Event("broad_cast", None, [self, Event("mv_request", None, ['alter_context', [model, metamodel]])]))
     
     def _all_all_browse_activity_create_browser_enter(self):
-        self.big_step.outputEventOM(Event("create_instance", None, [self, 'browsers', 'Browser', 'Select activity to execute.', None]))
+        self.big_step.outputEventOM(Event("create_instance", None, [self, 'browsers', 'Browser', 'Select process to enact.', None]))
     
     def _all_all_redraw_signature_read_signature_enter(self):
         self.big_step.outputEventOM(Event("broad_cast", None, [self, Event("mv_request", None, ['process_signature', [self.activity]])]))
@@ -10447,9 +10462,9 @@ class ActivityCreator(RuntimeClassBase, tk.Toplevel, SCCDWidget):
         return evt == 'confirm'
     
     def _creating_0_exec(self, parameters):
-        context = parameters[0]
+        result = parameters[0]
+        context, model_to_modify = result
         self.context = context
-        model_to_modify = "merged/%s" % self.activity_name
         self.subprocess = subprocess.Popen([sys.executable, sys.argv[0], "--address", data['mv_address'], "--username", data['username'], "--password", data['password'], "--model", model_to_modify, "--limited"])
     
     def _modifying_mm_0_guard(self, parameters):
@@ -11022,7 +11037,6 @@ class DSLToolbar(Toolbar):
     
     def user_defined_constructor(self, parent, elements):
         Toolbar.user_defined_constructor(self, parent)
-        print("Got elements: " + str(elements))
         self.to_create = [i[0] for i in elements if i[1] == "Class"]
         self.buttons = {}
         tk.Label(self, text="Domain-Specific").pack(side=tk.LEFT)