Added example rendered model and wrapper around Bart's wrapper

core/core_algorithm.alc

@@ -54,7 +54,13 @@ String function JSON_print(model : Element):
 				if (element_eq(attr_value, read_root())):
 					result = (((result + ", \"") + attr_key) + "\": null")
 				else:
-					result = ((((result + ", \"") + attr_key) + "\": ") + cast_v2s(attr_value))
+					if (is_physical_boolean(attr_value)):
+						if (attr_value):
+							result = ((result + ", \"") + attr_key) + "\": true"
+						else:
+							result = ((result + ", \"") + attr_key) + "\": false"
+					else:
+						result = ((((result + ", \"") + attr_key) + "\": ") + cast_v2s(attr_value))
 
 			result = result + "}"
 

interface/graphical/upload_mappers.py

@@ -28,27 +28,45 @@ commands = [ "root", "root", "root",
                     "SimpleClassDiagrams",
                     "CausalBlockDiagrams",
                     ] + get_model_constructor(open("integration/code/cbd_design.mvc", "r").read()) + [
+                "model_add",
+                    "SimpleClassDiagrams",
+                    "Trace",
+                    ] + get_model_constructor(open("models/trace.mvc", "r").read()) + [
                 "model_add",
                     "SimpleClassDiagrams",
                     "MM_rendered_graphical",
                     ] + get_model_constructor(open("models/MM_rendered_graphical.mvc", "r").read()) + [
+                "model_add",
+                    "SimpleClassDiagrams",
+                    "MM_rendered_plot",
+                    ] + get_model_constructor(open("models/MM_rendered_plot.mvc", "r").read()) + [
                 "model_add",
                     "CausalBlockDiagrams",
                     "my_CBD",
                     ] + get_model_constructor(open("integration/code/my_cbd.mvc", "r").read()) + [
-                "model_list",
+                "model_add",
+                    "Trace",
+                    "trace_example",
+                    ] + get_model_constructor(open("models/trace_example.mvc", "r").read()) + [
                 "transformation_add_MT_language",
                 "CausalBlockDiagrams",
+                "Trace",
                 "MM_rendered_graphical",
+                "MM_rendered_plot",
                 "",
                 "CBD_RAM",
                 "model_modify",
                     "__merged_CBD_RAM",
                         "instantiate",
                             "Association",
-                            "TracabilityLink",
+                            "TracabilityGraphical",
                             "CausalBlockDiagrams/Block",
                             "MM_rendered_graphical/Group",
+                        "instantiate",
+                            "Association",
+                            "TracabilityPlot",
+                            "Trace/Signal",
+                            "MM_rendered_plot/Dataset",
                         "exit",
                 "transformation_RAMify",
                     "__merged_CBD_RAM",
@@ -63,6 +81,16 @@ commands = [ "root", "root", "root",
                     "",
                     "render_graphical_CBD",
                     ] + get_model_constructor(open("models/CBD_mapper.mvc", "r").read()) + [
+                "transformation_add_MT",
+                    "CBD_RAM",
+                    "Trace",
+                    "MM_rendered_plot",
+                    "",
+                    "Trace",
+                    "MM_rendered_plot",
+                    "",
+                    "render_plot_trace",
+                    ] + get_model_constructor(open("models/trace_mapper.mvc", "r").read()) + [
             ]
 
 import urllib2

models/CBD_mapper.mvc

@@ -15,7 +15,7 @@ A B {
                 constraint = $
                     Boolean function constraint(model : Element, mapping : Element):
                         Element trace_links
-                        trace_links = allOutgoingAssociationInstances(model, mapping["0"], "TracabilityLink")
+                        trace_links = allOutgoingAssociationInstances(model, mapping["0"], "TracabilityGraphical")
                         log("Found tracability links: " + cast_v2s(read_nr_out(trace_links)))
                         if (read_nr_out(trace_links) > 0):
                             log("Block already connected; ignoring!")
@@ -125,7 +125,7 @@ A B {
                     label = "5"
                 }
 
-                Post_TracabilityLink (post_block_0, post_block_1) {
+                Post_TracabilityGraphical (post_block_0, post_block_1) {
                     label = "6"
                 }
             }
@@ -153,17 +153,17 @@ A B {
                     label = "4"
                 }
 
-                Pre_TracabilityLink (pre_conn_0, pre_conn_3) {
+                Pre_TracabilityGraphical (pre_conn_0, pre_conn_3) {
                     label = "5"
                 }
-                Pre_TracabilityLink (pre_conn_1, pre_conn_4) {
+                Pre_TracabilityGraphical (pre_conn_1, pre_conn_4) {
                     label = "6"
                 }
 
                 constraint = $
                     Boolean function constraint(model : Element, mapping : Element):
                         Element trace_links
-                        trace_links = allOutgoingAssociationInstances(model, mapping["2"], "TracabilityLink")
+                        trace_links = allOutgoingAssociationInstances(model, mapping["2"], "TracabilityGraphical")
                         if (read_nr_out(trace_links) > 0):
                             log("Block already connected; ignoring!")
                             return False!
@@ -192,10 +192,10 @@ A B {
                     label = "4"
                 }
 
-                Post_TracabilityLink (post_conn_0, post_conn_3) {
+                Post_TracabilityGraphical (post_conn_0, post_conn_3) {
                     label = "5"
                 }
-                Post_TracabilityLink (post_conn_1, post_conn_4) {
+                Post_TracabilityGraphical (post_conn_1, post_conn_4) {
                     label = "6"
                 }
 

models/MM_rendered_plot.mvc

@@ -22,8 +22,8 @@ SCD MM_Rendered_Plot{
     Class Axis {
         name : String
         unit : String
-        lim_low : Float
-        lim_high : Float
+        lim_low? : Float
+        lim_high? : Float
     }
 
     Class XAxis : Axis {}