Browse Source

Pull out context from the wrapper, left in the SCCD

Yentl Van Tendeloo 7 years ago
parent
commit
009177bbc9
3 changed files with 8 additions and 10 deletions
  1. 1 2
      wrappers/classes/modelverse.xml
  2. 5 5
      wrappers/modelverse.py
  3. 2 3
      wrappers/modelverse_SCCD.py

+ 1 - 2
wrappers/classes/modelverse.xml

@@ -2150,9 +2150,8 @@
 
                     <transition event="data_input" target=".">
                         <parameter name="value"/>
-                        <parameter name="context_ID"/>
                         <script>
-                            self.inputs.setdefault(context_ID, []).append({"name": "data_input", "parameters": value})
+                            self.inputs.setdefault(None, []).append({"name": "data_input", "parameters": value})
                         </script>
                     </transition>
                 </state>

+ 5 - 5
wrappers/modelverse.py

@@ -103,7 +103,7 @@ def __run_new_modelverse_activity(address, username, password, taskname, pipe, c
         model = OUTPUT()
         if callback is not None:
             __invoke(callback, model)
-        controller.addInput(Event("data_input", "action_in", [None, None]))
+        controller.addInput(Event("data_input", "action_in", [None]))
         time.sleep(2)
     elif t == "SC":
         while 1:
@@ -131,7 +131,7 @@ def __run_new_modelverse_activity(address, username, password, taskname, pipe, c
                 response = pipe.recv()
 
                 if response.name == "output":
-                    controller.addInput(Event("data_input", "action_in", [response.parameters, None]))
+                    controller.addInput(Event("data_input", "action_in", [response.parameters]))
                 else:
                     raise Exception("Unknown data from SC to MV: " + str(response))
                 empty = False
@@ -273,7 +273,7 @@ def transformation_add_MT(source_metamodels, target_metamodels, operation_name,
 
     if callback is not None:
         __invoke(callback, model)
-    controller.addInput(Event("data_input", "action_in", [None, None]))
+    controller.addInput(Event("data_input", "action_in", [None]))
 
     return OUTPUT()
 
@@ -286,7 +286,7 @@ def transformation_add_AL(source_metamodels, target_metamodels, operation_name,
 
         if callback is not None:
             __invoke(callback, model)
-        controller.addInput(Event("data_input", "action_in", [None, None]))
+        controller.addInput(Event("data_input", "action_in", [None]))
 
     return OUTPUT()
 
@@ -296,7 +296,7 @@ def transformation_add_MANUAL(source_metamodels, target_metamodels, operation_na
 
     if callback is not None:
         __invoke(callback, model)
-    controller.addInput(Event("data_input", "action_in", [None, None]))
+    controller.addInput(Event("data_input", "action_in", [None]))
 
     return OUTPUT()
 

+ 2 - 3
wrappers/modelverse_SCCD.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 May 23 11:08:24 2018
+Date:   Wed May 23 11:24:03 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
@@ -3425,8 +3425,7 @@ class Modelverse(RuntimeClassBase):
     
     def _initialized_queue_queue_5_exec(self, parameters):
         value = parameters[0]
-        context_ID = parameters[1]
-        self.inputs.setdefault(context_ID, []).append({"name": "data_input", "parameters": value})
+        self.inputs.setdefault(None, []).append({"name": "data_input", "parameters": value})
     
     def initializeStatechart(self):
         # enter default state