Commit e8da51d3 authored by Jerome Legrand's avatar Jerome Legrand
parents 8f795d49 b7e525e0
tmp tmp
TASTE-linux64/config/TASTE_DV_Properties.aadl
TASTE-linux64/config/TASTE_IV_Properties.aadl
...@@ -12,5 +12,6 @@ property set TASTE_IV_Properties is ...@@ -12,5 +12,6 @@ property set TASTE_IV_Properties is
MSCFiles : aadlstring applies to (Subprogram); MSCFiles : aadlstring applies to (Subprogram);
is_Component_Type : aadlboolean applies to (System); is_Component_Type : aadlboolean applies to (System);
is_instance_of : aadlstring applies to (System); is_instance_of : aadlstring applies to (System);
FPGA_Modes : aadlstring applies to (System);
-- MSCFiles : list of aadlstring applies to (Subprogram); -- MSCFiles : list of aadlstring applies to (Subprogram);
end TASTE_IV_Properties; end TASTE_IV_Properties;
...@@ -80,6 +80,7 @@ namespace eval TasteConfig { ...@@ -80,6 +80,7 @@ namespace eval TasteConfig {
"displayConnectionLabel" "false" \ "displayConnectionLabel" "false" \
"zoomDepth" "2" \ "zoomDepth" "2" \
"svgComponentDepth" "2" \ "svgComponentDepth" "2" \
"svgBBox" {0 0 2970 2100} ] \
} }
variable DVObjectsConfig { \ variable DVObjectsConfig { \
...@@ -123,5 +124,6 @@ namespace eval TasteConfig { ...@@ -123,5 +124,6 @@ namespace eval TasteConfig {
"displayConnectionLabel" "false" \ "displayConnectionLabel" "false" \
"zoomDepth" "4" \ "zoomDepth" "4" \
"svgComponentDepth" "3" \ "svgComponentDepth" "3" \
"svgBBox" {0 0 2970 2100} ] \
} }
} }
-- 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;
-- 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;
...@@ -35,11 +35,11 @@ namespace eval concurrencyview { ...@@ -35,11 +35,11 @@ namespace eval concurrencyview {
lset res 1 [ concat [ list "Deployment view is inconsistent" ] [lindex $res 1 ] ] lset res 1 [ concat [ list "Deployment view is inconsistent" ] [lindex $res 1 ] ]
return $res return $res
} else { } else {
Context::setAttribute "concurrencyview" state "normal" Context::setAttribute "concurrencyview" state "normal"
if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } { if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
return [concurrencyviewWindows_internal ] return [concurrencyviewWindows_internal ]
} else { } else {
return [concurrencyview_internal ] return [concurrencyview_internal ]
} }
} }
} }
......
...@@ -12,5 +12,6 @@ property set TASTE_IV_Properties is ...@@ -12,5 +12,6 @@ property set TASTE_IV_Properties is
MSCFiles : aadlstring applies to (Subprogram); MSCFiles : aadlstring applies to (Subprogram);
is_Component_Type : aadlboolean applies to (System); is_Component_Type : aadlboolean applies to (System);
is_instance_of : aadlstring applies to (System); is_instance_of : aadlstring applies to (System);
FPGA_Modes : aadlstring applies to (System);
-- MSCFiles : list of aadlstring applies to (Subprogram); -- MSCFiles : list of aadlstring applies to (Subprogram);
end TASTE_IV_Properties; end TASTE_IV_Properties;
...@@ -80,6 +80,7 @@ namespace eval TasteConfig { ...@@ -80,6 +80,7 @@ namespace eval TasteConfig {
"displayConnectionLabel" "false" \ "displayConnectionLabel" "false" \
"zoomDepth" "2" \ "zoomDepth" "2" \
"svgComponentDepth" "2" \ "svgComponentDepth" "2" \
"svgBBox" {0 0 2970 2100} ] \
} }
variable DVObjectsConfig { \ variable DVObjectsConfig { \
...@@ -123,5 +124,6 @@ namespace eval TasteConfig { ...@@ -123,5 +124,6 @@ namespace eval TasteConfig {
"displayConnectionLabel" "false" \ "displayConnectionLabel" "false" \
"zoomDepth" "4" \ "zoomDepth" "4" \
"svgComponentDepth" "3" \ "svgComponentDepth" "3" \
"svgBBox" {0 0 2970 2100} ] \
} }
} }
-- 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;
-- 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;
...@@ -35,11 +35,11 @@ namespace eval concurrencyview { ...@@ -35,11 +35,11 @@ namespace eval concurrencyview {
lset res 1 [ concat [ list "Deployment view is inconsistent" ] [lindex $res 1 ] ] lset res 1 [ concat [ list "Deployment view is inconsistent" ] [lindex $res 1 ] ]
return $res return $res
} else { } else {
Context::setAttribute "concurrencyview" state "normal" Context::setAttribute "concurrencyview" state "normal"
if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } { if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
return [concurrencyviewWindows_internal ] return [concurrencyviewWindows_internal ]
} else { } else {
return [concurrencyview_internal ] return [concurrencyview_internal ]
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment