Merge branch 'master' of https://gitrepos.estec.esa.int/taste/ellidiss-release

.gitignore

 tmp
+TASTE-linux64/config/TASTE_DV_Properties.aadl
+TASTE-linux64/config/TASTE_IV_Properties.aadl

TASTE-linux/config/TASTE_IV_Properties.aadl

@@ -12,5 +12,6 @@ property set TASTE_IV_Properties is
     MSCFiles : aadlstring applies to (Subprogram);
     is_Component_Type : aadlboolean applies to (System);
     is_instance_of    : aadlstring applies to (System);
+    FPGA_Modes : aadlstring applies to (System);
 --    MSCFiles : list of aadlstring applies to (Subprogram);
 end TASTE_IV_Properties;

TASTE-linux/config/TasteConfig.ini

@@ -80,6 +80,7 @@ namespace eval TasteConfig {
 		"displayConnectionLabel" "false" \
 		"zoomDepth" "2" \
 		"svgComponentDepth" "2" \
+        "svgBBox" {0 0 2970 2100} ] \
 	}
 
 	variable DVObjectsConfig { \
@@ -123,5 +124,6 @@ namespace eval TasteConfig {
 		"displayConnectionLabel" "false" \
 		"zoomDepth" "4" \
 		"svgComponentDepth" "3" \
+        "svgBBox" {0 0 2970 2100} ] \
 	}
 }

TASTE-linux/config/defaults/TASTE_DV_Properties.aadl

+-- mapping TASTE : AADL
+-- Node : System
+-- Processor : Processor
+-- Process : Function
+-- Bus : Bus
+-- Device : Device
+-- Driver : Driver
+property set TASTE_DV_Properties is
+--  MyBoolean: aadlboolean applies to (System, Processor, Process);
+    CoverageEnabled: aadlboolean applies to (Process);
+    Comment: aadlstring applies to (Device, Bus);
+--  MyInt: aadlinteger applies to (System);
+--  MyReal: aadlreal applies to (Bus);
+--  MyEnum: enumeration  (val1, val2, val3, val4) applies to (Device);
+end TASTE_DV_Properties;

TASTE-linux/config/defaults/TASTE_IV_Properties.aadl

+-- mapping TASTE : AADL
+-- Container : Package
+-- Function : System
+-- Interface : Subprogram
+property set TASTE_IV_Properties is
+--  MyBoolean: aadlboolean applies to (System, Package);
+--  MyString: aadlstring applies to (System, Subprogram);
+    Version: aadlstring applies to (System);
+--  MyInt: aadlinteger applies to (System);
+--  MyReal: aadlreal applies to (System);
+--  MyEnum: enumeration  (val1, val2, val3, val4) applies to (System);
+    MSCFiles : aadlstring applies to (Subprogram);
+    is_Component_Type : aadlboolean applies to (System);
+    is_instance_of    : aadlstring applies to (System);
+--    MSCFiles : list of aadlstring applies to (Subprogram);
+end TASTE_IV_Properties;

TASTE-linux/config/externalTools/concurrencyview.tcl

@@ -35,11 +35,11 @@ namespace eval concurrencyview {
 				lset res 1 [ concat [ list "Deployment view is inconsistent" ] [lindex $res 1 ] ]
 				return $res
 			} else {
-			Context::setAttribute "concurrencyview" state "normal"
-			if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
-				return [concurrencyviewWindows_internal ]
-			} else {
-				return [concurrencyview_internal ]
+				Context::setAttribute "concurrencyview" state "normal"
+				if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
+					return [concurrencyviewWindows_internal ]
+				} else {
+					return [concurrencyview_internal ]
 				}
 			}
 		}

TASTE-linux64/config/TASTE_IV_Properties.aadl

@@ -12,5 +12,6 @@ property set TASTE_IV_Properties is
     MSCFiles : aadlstring applies to (Subprogram);
     is_Component_Type : aadlboolean applies to (System);
     is_instance_of    : aadlstring applies to (System);
+    FPGA_Modes : aadlstring applies to (System);
 --    MSCFiles : list of aadlstring applies to (Subprogram);
 end TASTE_IV_Properties;

TASTE-linux64/config/TasteConfig.ini

@@ -80,6 +80,7 @@ namespace eval TasteConfig {
 		"displayConnectionLabel" "false" \
 		"zoomDepth" "2" \
 		"svgComponentDepth" "2" \
+        "svgBBox" {0 0 2970 2100} ] \
 	}
 
 	variable DVObjectsConfig { \
@@ -123,5 +124,6 @@ namespace eval TasteConfig {
 		"displayConnectionLabel" "false" \
 		"zoomDepth" "4" \
 		"svgComponentDepth" "3" \
+        "svgBBox" {0 0 2970 2100} ] \
 	}
 }

TASTE-linux64/config/defaults/TASTE_DV_Properties.aadl

+-- mapping TASTE : AADL
+-- Node : System
+-- Processor : Processor
+-- Process : Function
+-- Bus : Bus
+-- Device : Device
+-- Driver : Driver
+property set TASTE_DV_Properties is
+--  MyBoolean: aadlboolean applies to (System, Processor, Process);
+    CoverageEnabled: aadlboolean applies to (Process);
+    Comment: aadlstring applies to (Device, Bus);
+--  MyInt: aadlinteger applies to (System);
+--  MyReal: aadlreal applies to (Bus);
+--  MyEnum: enumeration  (val1, val2, val3, val4) applies to (Device);
+end TASTE_DV_Properties;

TASTE-linux64/config/defaults/TASTE_IV_Properties.aadl

+-- mapping TASTE : AADL
+-- Container : Package
+-- Function : System
+-- Interface : Subprogram
+property set TASTE_IV_Properties is
+--  MyBoolean: aadlboolean applies to (System, Package);
+--  MyString: aadlstring applies to (System, Subprogram);
+    Version: aadlstring applies to (System);
+--  MyInt: aadlinteger applies to (System);
+--  MyReal: aadlreal applies to (System);
+--  MyEnum: enumeration  (val1, val2, val3, val4) applies to (System);
+    MSCFiles : aadlstring applies to (Subprogram);
+    is_Component_Type : aadlboolean applies to (System);
+    is_instance_of    : aadlstring applies to (System);
+--    MSCFiles : list of aadlstring applies to (Subprogram);
+end TASTE_IV_Properties;

TASTE-linux64/config/externalTools/concurrencyview.tcl

@@ -35,11 +35,11 @@ namespace eval concurrencyview {
 				lset res 1 [ concat [ list "Deployment view is inconsistent" ] [lindex $res 1 ] ]
 				return $res
 			} else {
-			Context::setAttribute "concurrencyview" state "normal"
-			if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
-				return [concurrencyviewWindows_internal ]
-			} else {
-				return [concurrencyview_internal ]
+				Context::setAttribute "concurrencyview" state "normal"
+				if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
+					return [concurrencyviewWindows_internal ]
+				} else {
+					return [concurrencyview_internal ]
 				}
 			}
 		}