Jelajahi Sumber

Fixed bugs with empty numer of defined attributes

Yentl Van Tendeloo 8 tahun lalu
induk
melakukan
8b1daaf40d
2 mengubah file dengan 9 tambahan dan 15 penghapusan
  1. 4 7
      classes/modelverse/modelverse.xml
  2. 5 8
      frontend.py

+ 4 - 7
classes/modelverse/modelverse.xml

@@ -1127,8 +1127,7 @@
 
                         <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
                             <script>
-                                response = self.responses.pop(0).strip()
-                                _, response = response.split(": ", 1)
+                                response = self.responses.pop(0).split(": ", 1)[1].strip()
                                 values = {line.split(": ", 1)[0]: line.split(": ", 1)[1] for line in response.split("\n", 2)}
                                 if "Source" in values:
                                     result = (values["Type"], (values["Source"], values["Destination"]))
@@ -1150,8 +1149,7 @@
 
                         <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
                             <script>
-                                response = self.responses.pop(0).strip()
-                                _, response = response.split(": ", 1)
+                                response = self.responses.pop(0).split(": ", 1)[1].strip()
                                 values = {line.split(" : ", 1)[0]: line.split(" : ", 1)[1] for line in response.split("\n")}
                                 values = {key: values[key].split(" = ", 1)[1] for key in values}
                             </script>
@@ -1170,9 +1168,8 @@
 
                         <transition cond="self.expect_response_partial('Success: ', pop=False)" target="../../wait_for_action/history">
                             <script>
-                                response = self.responses.pop(0).strip()
-                                _, response = response.split(": ", 1)
-                                value_mandatory = {line.split(" : ", 1)[0]: line.split(" : ", 1)[1] for line in response.split("\n") if " ?: " not in line}
+                                response = self.responses.pop(0).split(": ", 1)[1].strip()
+                                value_mandatory = {line.split(" : ", 1)[0]: line.split(" : ", 1)[1] for line in response.split("\n") if " : " in line}
                                 value_optional = {line.split(" ?: ", 1)[0]: line.split(" ?: ", 1)[1] for line in response.split("\n") if " ?: " in line}
                             </script>
                             <raise event="result">

+ 5 - 8
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:   Fri Oct 13 18:44:26 2017
+Date:   Mon Oct 16 08:36:37 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   Modelverse Visual Editor - Tkinter Version 
@@ -3195,8 +3195,7 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response_partial('Success: ', pop=False)
     
     def _initialized_behaviour_operations_read_info_0_exec(self, parameters):
-        response = self.responses.pop(0).strip()
-        _, response = response.split(": ", 1)
+        response = self.responses.pop(0).split(": ", 1)[1].strip()
         values = {line.split(": ", 1)[0]: line.split(": ", 1)[1] for line in response.split("\n", 2)}
         if "Source" in values:
             result = (values["Type"], (values["Source"], values["Destination"]))
@@ -3208,8 +3207,7 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response_partial('Success: ', pop=False)
     
     def _initialized_behaviour_operations_read_attrs_0_exec(self, parameters):
-        response = self.responses.pop(0).strip()
-        _, response = response.split(": ", 1)
+        response = self.responses.pop(0).split(": ", 1)[1].strip()
         values = {line.split(" : ", 1)[0]: line.split(" : ", 1)[1] for line in response.split("\n")}
         values = {key: values[key].split(" = ", 1)[1] for key in values}
         self.raiseInternalEvent(Event("result", None, [values]))
@@ -3218,9 +3216,8 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response_partial('Success: ', pop=False)
     
     def _initialized_behaviour_operations_read_defined_attrs_0_exec(self, parameters):
-        response = self.responses.pop(0).strip()
-        _, response = response.split(": ", 1)
-        value_mandatory = {line.split(" : ", 1)[0]: line.split(" : ", 1)[1] for line in response.split("\n") if " ?: " not in line}
+        response = self.responses.pop(0).split(": ", 1)[1].strip()
+        value_mandatory = {line.split(" : ", 1)[0]: line.split(" : ", 1)[1] for line in response.split("\n") if " : " in line}
         value_optional = {line.split(" ?: ", 1)[0]: line.split(" ?: ", 1)[1] for line in response.split("\n") if " ?: " in line}
         self.raiseInternalEvent(Event("result", None, [(value_mandatory, value_optional)]))