Minor updates to rendering model transformations

interface/graphical/main.py

@@ -277,10 +277,6 @@ class Window(object):
         return create_elem
 
     def render_model(self):
-        try:
-            model_exit()
-        except InvalidMode:
-            pass
         rendered = model_render(self.selected_model.get(), self.selected_mapper.get())
 
         #TODO visualize rendered model
@@ -288,10 +284,6 @@ class Window(object):
         self.visualize(json.loads(rendered))
 
     def open_model(self):
-        try:
-            model_exit()
-        except InvalidMode:
-            pass
         available_mappers = self.read_available_mappers(self.selected_model.get())
         self.reset_optionmenu(self.mapper_options, available_mappers, self.selected_mapper)
 
@@ -306,10 +298,6 @@ class Window(object):
             self.mm_buttons[-1].grid(row=1, column=i)
 
     def instantiate_model(self):
-        try:
-            model_exit()
-        except InvalidMode:
-            pass
         d = PromptDialog(root, ["Name:"])
         if d.result is not None:
             name = str(d.result["Name:"])
@@ -319,12 +307,6 @@ class Window(object):
             self.open_model()
 
     def verify_model(self):
-        try:
-            # Exit if necessary
-            model_exit()
-        except InvalidMode:
-            pass
-
         print(verify(self.selected_model.get()))
 
 class PromptDialog(tkSimpleDialog.Dialog):

models/CBD_mapper.mvc

@@ -7,7 +7,7 @@ Composite schedule {
 
     {Contains} ForAll render_blocks {
         LHS {
-            Pre_CausalBlockDiagrams/Block pre_block_0 {
+            Pre_Abstract/Block pre_block_0 {
                 label = "0"
             }
 
@@ -24,10 +24,10 @@ Composite schedule {
                 $
         }
         RHS {
-            Post_CausalBlockDiagrams/Block post_block_0 {
+            Post_Abstract/Block post_block_0 {
                 label = "0"
             }
-            Post_MM_rendered_graphical/Group post_block_1 {
+            Post_Rendered/Group post_block_1 {
                 label = "1"
                 value___asid = $
                     String function value(model : Element, name : String, mapping : Element):
@@ -42,7 +42,7 @@ Composite schedule {
                         return 0!
                     $
             }
-            Post_MM_rendered_graphical/Rectangle post_block_2 {
+            Post_Rendered/Rectangle post_block_2 {
                 label = "2"
                 value_x = $
                     Integer function value(model : Element, name : String, mapping : Element):
@@ -73,7 +73,7 @@ Composite schedule {
                         return "white"!
                     $
             }
-            Post_MM_rendered_graphical/Text post_block_3 {
+            Post_Rendered/Text post_block_3 {
                 label = "3"
                 value_x = $
                     Integer function value(model : Element, name : String, mapping : Element):
@@ -95,32 +95,32 @@ Composite schedule {
                     String function value(model : Element, name : String, mapping : Element):
                         String type
                         type = read_type(model, mapping["0"])
-                        if (type == "CausalBlockDiagrams/AdditionBlock"):
+                        if (type == "Abstract/AdditionBlock"):
                             return "+"!
-                        elif (type == "CausalBlockDiagrams/NegatorBlock"):
+                        elif (type == "Abstract/NegatorBlock"):
                             return "-"!
-                        elif (type == "CausalBlockDiagrams/ConstantBlock"):
+                        elif (type == "Abstract/ConstantBlock"):
                             return "c"!
-                        elif (type == "CausalBlockDiagrams/MultiplyBlock"):
+                        elif (type == "Abstract/MultiplyBlock"):
                             return "*"!
-                        elif (type == "CausalBlockDiagrams/InverseBlock"):
+                        elif (type == "Abstract/InverseBlock"):
                             return "/"!
-                        elif (type == "CausalBlockDiagrams/DerivatorBlock"):
+                        elif (type == "Abstract/DerivatorBlock"):
                             return "d/dx"!
-                        elif (type == "CausalBlockDiagrams/IntegratorBlock"):
+                        elif (type == "Abstract/IntegratorBlock"):
                             return "1/s"!
-                        elif (type == "CausalBlockDiagrams/DelayBlock"):
+                        elif (type == "Abstract/DelayBlock"):
                             return "DELAY"!
-                        elif (type == "CausalBlockDiagrams/ProbeBlock"):
+                        elif (type == "Abstract/ProbeBlock"):
                             return "PROBE"!
                         else:
                             return ("Unknown type: " + type)!
                     $
             }
-            Post_MM_rendered_graphical/contains (post_block_1, post_block_2) {
+            Post_Rendered/contains (post_block_1, post_block_2) {
                 label = "4"
             }
-            Post_MM_rendered_graphical/contains (post_block_1, post_block_3) {
+            Post_Rendered/contains (post_block_1, post_block_3) {
                 label = "5"
             }
 
@@ -132,23 +132,23 @@ Composite schedule {
 
     {Contains} ForAll render_connections {
         LHS {
-            Pre_CausalBlockDiagrams/Block pre_conn_0 {
+            Pre_Abstract/Block pre_conn_0 {
                 label = "0"
             }
 
-            Pre_CausalBlockDiagrams/Block pre_conn_1 {
+            Pre_Abstract/Block pre_conn_1 {
                 label = "1"
             }
 
-            Pre_CausalBlockDiagrams/Link (pre_conn_0, pre_conn_1){
+            Pre_Abstract/Link (pre_conn_0, pre_conn_1){
                 label = "2"
             }
 
-            Pre_MM_rendered_graphical/Group pre_conn_3 {
+            Pre_Rendered/Group pre_conn_3 {
                 label = "3"
             }
 
-            Pre_MM_rendered_graphical/Group pre_conn_4 {
+            Pre_Rendered/Group pre_conn_4 {
                 label = "4"
             }
 
@@ -171,23 +171,23 @@ Composite schedule {
                 $
         }
         RHS {
-            Post_CausalBlockDiagrams/Block post_conn_0 {
+            Post_Abstract/Block post_conn_0 {
                 label = "0"
             }
 
-            Post_CausalBlockDiagrams/Block post_conn_1 {
+            Post_Abstract/Block post_conn_1 {
                 label = "1"
             }
 
-            Post_CausalBlockDiagrams/Link (post_conn_0, post_conn_1){
+            Post_Abstract/Link (post_conn_0, post_conn_1){
                 label = "2"
             }
 
-            Post_MM_rendered_graphical/Group post_conn_3 {
+            Post_Rendered/Group post_conn_3 {
                 label = "3"
             }
 
-            Post_MM_rendered_graphical/Group post_conn_4 {
+            Post_Rendered/Group post_conn_4 {
                 label = "4"
             }
 
@@ -198,7 +198,7 @@ Composite schedule {
                 label = "6"
             }
 
-            Post_MM_rendered_graphical/Line {
+            Post_Rendered/Line {
                 label = "7"
                 value___asid = $
                     String function value(model : Element, name : String, mapping : Element):

models/trace_mapper.mvc

@@ -7,15 +7,15 @@ Composite schedule {
 
     {Contains} ForAll render_dataset {
         LHS {
-            Pre_Trace/Signal {
+            Pre_Abstract/Signal {
                 label = "0"
             }
         }
         RHS {
-            Post_Trace/Signal post_ds_0 {
+            Post_Abstract/Signal post_ds_0 {
                 label = "0"
             }
-            Post_MM_rendered_plot/Plot post_ds_1 {
+            Post_Rendered/Plot post_ds_1 {
                 label = "1"
                 value_title = $
                     String function value(model : Element, name : String, mapping : Element):
@@ -26,7 +26,7 @@ Composite schedule {
                         return False!
                     $
             }
-            Post_MM_rendered_plot/Dataset post_ds_2 {
+            Post_Rendered/Dataset post_ds_2 {
                 label = "2"
                 value_legend = $
                     String function value(model : Element, name : String, mapping : Element):
@@ -44,7 +44,7 @@ Composite schedule {
             Post_TracabilityPlot (post_ds_0, post_ds_2) {
                 label = "3"
             }
-            Post_MM_rendered_plot/XAxis post_ds_4 {
+            Post_Rendered/XAxis post_ds_4 {
                 label = "4"
                 value_name = $
                     String function value(model : Element, name : String, mapping : Element):
@@ -55,7 +55,7 @@ Composite schedule {
                         return "seconds"!
                     $
             }
-            Post_MM_rendered_plot/YAxis post_ds_5 {
+            Post_Rendered/YAxis post_ds_5 {
                 label = "5"
                 value_name = $
                     String function value(model : Element, name : String, mapping : Element):
@@ -66,13 +66,13 @@ Composite schedule {
                         return "power"!
                     $
             }
-            Post_MM_rendered_plot/x (post_ds_1, post_ds_4) {
+            Post_Rendered/x (post_ds_1, post_ds_4) {
                 label = "6"
             }
-            Post_MM_rendered_plot/y (post_ds_1, post_ds_5) {
+            Post_Rendered/y (post_ds_1, post_ds_5) {
                 label = "7"
             }
-            Post_MM_rendered_plot/data (post_ds_1, post_ds_2) {
+            Post_Rendered/data (post_ds_1, post_ds_2) {
                 label = "8"
             }
         }
@@ -80,39 +80,39 @@ Composite schedule {
 
     {Contains} ForAll render_points {
         LHS {
-            Pre_Trace/Signal pre_p_0 {
+            Pre_Abstract/Signal pre_p_0 {
                 label = "0"
             }
-            Pre_Trace/Point pre_p_1 {
+            Pre_Abstract/Point pre_p_1 {
                 label = "1"
             }
-            Pre_MM_rendered_plot/Dataset pre_p_2 {
+            Pre_Rendered/Dataset pre_p_2 {
                 label = "2"
             }
             Pre_TracabilityPlot (pre_p_0, pre_p_2) {
                 label = "3"
             }
-            Pre_Trace/contains (pre_p_0, pre_p_1) {
+            Pre_Abstract/contains (pre_p_0, pre_p_1) {
                 label = "4"
             }
         }
         RHS {
-            Post_Trace/Signal post_p_0 {
+            Post_Abstract/Signal post_p_0 {
                 label = "0"
             }
-            Post_Trace/Point post_p_1 {
+            Post_Abstract/Point post_p_1 {
                 label = "1"
             }
-            Post_MM_rendered_plot/Dataset post_p_2 {
+            Post_Rendered/Dataset post_p_2 {
                 label = "2"
             }
             Post_TracabilityPlot (post_p_0, post_p_2) {
                 label = "3"
             }
-            Post_Trace/contains (post_p_0, post_p_1) {
+            Post_Abstract/contains (post_p_0, post_p_1) {
                 label = "4"
             }
-            Post_MM_rendered_plot/Datapoint post_p_5 {
+            Post_Rendered/Datapoint post_p_5 {
                 label = "5"
                 value_x = $
                     Float function value(model : Element, name : String, mapping : Element):
@@ -123,7 +123,7 @@ Composite schedule {
                         return read_attribute(model, mapping["1"], "y")!
                     $
             }
-            Post_MM_rendered_plot/point (post_p_2, post_p_5) {
+            Post_Rendered/point (post_p_2, post_p_5) {
                 label = "6"
             }
         }