diff --git a/org.fortiss.af3.rcp.application/test-data/SimpleTrafficLights_AF3Tour.af3_23 b/org.fortiss.af3.rcp.application/test-data/SimpleTrafficLights_AF3Tour.af3_23
index 46895bd2c489fd6e4fc3ca5906d14ff56b6be6b2..1595a49ef262cefad2bf82ef7d7a655c23e4c16c 100644
--- a/org.fortiss.af3.rcp.application/test-data/SimpleTrafficLights_AF3Tour.af3_23
+++ b/org.fortiss.af3.rcp.application/test-data/SimpleTrafficLights_AF3Tour.af3_23
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-annotation="http://www.fortiss.org/af3/component/annotation" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" xmlns:org-fortiss-af3-efficientdeployment="http://www.fortiss.org/af3/efficientdeployment" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-mira="http://www.fortiss.org/af3/mira" xmlns:org-fortiss-af3-mira-functional="http://www.fortiss.org/af3/mira/functional" xmlns:org-fortiss-af3-mira-glossary="http://www.fortiss.org/af3/mira/glossary" xmlns:org-fortiss-af3-mira-relations="http://www.fortiss.org/af3/mira/relations" xmlns:org-fortiss-af3-mira-requirementSource="http://www.fortiss.org/af3/mira/requirementSource" xmlns:org-fortiss-af3-mira-verification="http://www.fortiss.org/af3/mira/verification" xmlns:org-fortiss-af3-ocra-contract="http://www.fortiss.org/af3/ocra/contract" xmlns:org-fortiss-af3-ocra-contract-ocraterms="http://www.fortiss.org/af3/ocra/contract/ocraterms" xmlns:org-fortiss-af3-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-af3-testing="http://www.fortiss.org/af3/testing/model" xmlns:org-fortiss-af3-testing-statistic="http://www.fortiss.org/af3/testing/model/statistic" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="0" name="SimpleTrafficLights_AF3Tour">
+<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-annotation="http://www.fortiss.org/af3/component/annotation" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-mira="http://www.fortiss.org/af3/mira" xmlns:org-fortiss-af3-mira-functional="http://www.fortiss.org/af3/mira/functional" xmlns:org-fortiss-af3-mira-glossary="http://www.fortiss.org/af3/mira/glossary" xmlns:org-fortiss-af3-mira-relations="http://www.fortiss.org/af3/mira/relations" xmlns:org-fortiss-af3-mira-requirementSource="http://www.fortiss.org/af3/mira/requirementSource" xmlns:org-fortiss-af3-mira-verification="http://www.fortiss.org/af3/mira/verification" xmlns:org-fortiss-af3-ocra-contract="http://www.fortiss.org/af3/ocra/contract" xmlns:org-fortiss-af3-ocra-contract-ocraterms="http://www.fortiss.org/af3/ocra/contract/ocraterms" xmlns:org-fortiss-af3-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-af3-testing="http://www.fortiss.org/af3/testing/model" xmlns:org-fortiss-af3-testing-statistic="http://www.fortiss.org/af3/testing/model/statistic" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="0" name="SimpleTrafficLights_AF3Tour">
<rootElements xsi:type="org-fortiss-af3-project:ProjectConfiguration" xmi:id="1" id="1">
<configurationElements xsi:type="org-fortiss-af3-project-configuration:TypeSystemConfiguration" xmi:id="2" id="2">
<typesystem xsi:type="org-fortiss-af3-expression:MicroTypeSystem"/>
@@ -726,8 +726,6 @@
<specifications xsi:type="org-fortiss-af3-mira:ExternalRelationSpecification" xmi:id="916" reference="961" id="916" name="Ref: 1.2 - Safety requirement: accidents prevention" comment="" externalRelation="961"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="1223" id="1223"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1353" id="1353"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1354" id="1354"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1355" id="1355"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1356" id="1356"/>
<specifications xsi:type="org-fortiss-af3-ocra-contract:ContractContainer" xmi:id="1411" id="1411">
<contract xmi:id="1412" id="1412" name="neverTrafficAndPedestrianSignal">
@@ -859,8 +857,6 @@
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="999" id="999"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="1224" id="1224"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1357" id="1357"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1358" id="1358"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1359" id="1359"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1360" id="1360"/>
<specifications xsi:type="org-fortiss-af3-ocra-contract:ContractContainer" xmi:id="1423" id="1423">
<contract xmi:id="1424" id="1424" name="neverTrafficAndPedestrianSignal" refinedBy="1412">
@@ -1180,8 +1176,6 @@
</containedElements>
</specifications>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1361" id="1361"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1362" id="1362"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1363" id="1363"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1364" id="1364"/>
<specifications xsi:type="org-fortiss-af3-ocra-contract:ContractContainer" xmi:id="1400" id="1400">
<contract xmi:id="1401" id="1401" name="mergeOnlyWhenSignalPresent">
@@ -1861,8 +1855,6 @@
</testCases>
</specifications>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1365" id="1365"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1366" id="1366"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1367" id="1367"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1368" id="1368"/>
<specifications xsi:type="org-fortiss-af3-ocra-contract:ContractContainer" xmi:id="1446" id="1446">
<contract xmi:id="1447" id="1447" name="neverTrafficAndPedestrianSignal" refinedBy="1424">
@@ -2307,8 +2299,6 @@
</specifications>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="1227" id="1227"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1369" id="1369"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1370" id="1370"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1371" id="1371"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1372" id="1372"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="281" id="281" name="displayInIndicatorSignalB" comment="displayInIndicatorSignalB" incoming="700">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="1015" id="1015">
@@ -2478,8 +2468,6 @@
</specifications>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="1228" id="1228"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1373" id="1373"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1374" id="1374"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1375" id="1375"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1376" id="1376"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="649" id="649" name="Input" comment="" incoming="707">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="1029" id="1029">
@@ -2603,8 +2591,6 @@
</specifications>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="1229" id="1229"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1377" id="1377"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1378" id="1378"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1379" id="1379"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1380" id="1380"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="674" id="674" name="Input" comment="" incoming="706">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="1041" id="1041">
@@ -2728,8 +2714,6 @@
</specifications>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="1230" id="1230"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1381" id="1381"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1382" id="1382"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1383" id="1383"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1384" id="1384"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="686" id="686" name="Input" comment="" incoming="705">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="1053" id="1053">
@@ -2851,8 +2835,6 @@
</specifications>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="1231" id="1231"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1385" id="1385"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1386" id="1386"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1387" id="1387"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1388" id="1388"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="698" id="698" name="Input" comment="" incoming="704">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="1065" id="1065">
@@ -2882,8 +2864,6 @@
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="1069" id="1069"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="1232" id="1232"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1389" id="1389"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1390" id="1390"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1391" id="1391"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1392" id="1392"/>
<connections xsi:type="org-fortiss-af3-component:Channel" xmi:id="354" id="354" name="LHS" comment="" source="335" target="367">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
@@ -2988,8 +2968,6 @@
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="1233" id="1233"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="1265" id="1265"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="1393" id="1393"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:RAM" xmi:id="1394" id="1394"/>
- <specifications xsi:type="org-fortiss-af3-efficientdeployment:Flash" xmi:id="1395" id="1395"/>
<connections xsi:type="org-fortiss-af3-component:Channel" xmi:id="371" id="371" name="" comment="" source="78" target="363">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="744" y="348"/>
diff --git a/org.fortiss.af3.rcp.application/test-data/eCar.af3_23 b/org.fortiss.af3.rcp.application/test-data/eCar.af3_23
index 0f063faac2718fae5354cc13c2cb4ad08fafec31..04aedc1f779aa4079b1cd4681f7791c8d56cf70e 100644
--- a/org.fortiss.af3.rcp.application/test-data/eCar.af3_23
+++ b/org.fortiss.af3.rcp.application/test-data/eCar.af3_23
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-af3-viewpanel="http://www.fortiss.org/af3/viewpanel" xmlns:org-fortiss-af3-viewpanel-node3D="http://www.fortiss.org/af3/viewpanel/node3D" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" name="eCar" comment="Two channels instead of compacted doubles. Dictionary cleaned from unused definitions.">
+<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-af3-operatorpanel-viewpanel="http://www.fortiss.org/af3/operatorpanel/viewpanel" xmlns:org-fortiss-af3-operatorpanel-viewpanel-node3D="http://www.fortiss.org/af3/operatorpanel/viewpanel/node3D" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" name="eCar" comment="Two channels instead of compacted doubles. Dictionary cleaned from unused definitions.">
<rootElements xsi:type="org-fortiss-af3-project:ProjectConfiguration" id="1" name="" comment="">
<configurationElements xsi:type="org-fortiss-af3-project-configuration:TypeSystemConfiguration" id="2" name="" comment="">
<typesystem xsi:type="org-fortiss-af3-expression:MicroTypeSystem"/>
@@ -4871,13 +4871,13 @@
<itemInput xsi:type="org-fortiss-af3-expression-terms:Var" identifier="rearRightVelocity"/>
</reactions>
</containedElements>
- <containedElements xsi:type="org-fortiss-af3-viewpanel:OP3DDisplay" id="2315" name="3D Viewer" comment="" useLighting="true">
+ <containedElements xsi:type="org-fortiss-af3-operatorpanel-viewpanel:OP3DDisplay" id="2315" name="3D Viewer" comment="" useLighting="true">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="433" height="265"/>
<scene id="2316" name="Scene Graph" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="2317" name="FrontLeft" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="2318" name="Rotation" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="4140" name="Wheel" comment="" model="Wheel"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="2317" name="FrontLeft" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:RotationDisplayNode" id="2318" name="Rotation" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="4140" name="Wheel" comment="" model="Wheel"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.0"/>
@@ -4890,9 +4890,9 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="2.0"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="3.0"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="2323" name="FrontRight" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="2324" name="Rotation" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="4139" name="Wheel" comment="" model="Wheel"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="2323" name="FrontRight" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:RotationDisplayNode" id="2324" name="Rotation" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="4139" name="Wheel" comment="" model="Wheel"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.0"/>
@@ -4905,9 +4905,9 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="-2.0"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="3.0"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="2329" name="RearLeft" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="2330" name="Rotation" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="2332" name="Wheel" comment="" model="Wheel"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="2329" name="RearLeft" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:RotationDisplayNode" id="2330" name="Rotation" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="2332" name="Wheel" comment="" model="Wheel"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.0"/>
@@ -4920,9 +4920,9 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="2.0"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="3.0"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="2335" name="RearRight" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="2336" name="Rotation" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="2338" name="Wheel" comment="" model="Wheel"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="2335" name="RearRight" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:RotationDisplayNode" id="2336" name="Rotation" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="2338" name="Wheel" comment="" model="Wheel"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.0"/>
@@ -4935,19 +4935,19 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="-2.0"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="3.0"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:CameraDisplayNode" id="2341" name="RearCamera" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:CameraDisplayNode" id="2341" name="RearCamera" comment="">
<camera id="2342" name="Camera0" comment="Default camera at (5,5,5) looking at (0,0,0)">
<position x="-3.0" z="5.0"/>
<lookAtLocation/>
</camera>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:CameraDisplayNode" id="2343" name="LeftCamera" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:CameraDisplayNode" id="2343" name="LeftCamera" comment="">
<camera id="2344" name="Camera0" comment="Default camera at (5,5,5) looking at (0,0,0)">
<position y="4.0" z="3.0"/>
<lookAtLocation/>
</camera>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:LightDisplayNode" id="1680" name="RedLight" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:LightDisplayNode" id="1680" name="RedLight" comment="">
<light id="1681" name="Light0" comment="Default white light at (0,0,5)">
<ambient/>
<diffuse red="1.0" green="1.0" blue="1.0"/>
@@ -4956,7 +4956,7 @@
<attenuation x="1.0" y="0.01"/>
</light>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:LightDisplayNode" id="1651" name="GreenLight" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:LightDisplayNode" id="1651" name="GreenLight" comment="">
<light id="1652" name="Light0" comment="Default white light at (0,0,5)">
<ambient/>
<diffuse red="1.0" green="1.0" blue="1.0"/>
@@ -4965,19 +4965,19 @@
<attenuation x="1.0" y="0.01"/>
</light>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:CameraDisplayNode" id="1617" name="StaticCamera0" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:CameraDisplayNode" id="1617" name="StaticCamera0" comment="">
<camera id="1618" name="Camera0" comment="Default camera at (5,5,5) looking at (0,0,0)">
<position x="15.0" y="15.0" z="15.0"/>
<lookAtLocation/>
</camera>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="1867" name="Lower" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="1640" name="Floor" comment="" model="Floor"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="1867" name="Lower" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="1640" name="Floor" comment="" model="Floor"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="-0.1"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="4138" name="Grid" comment="" model="Grid"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="4138" name="Grid" comment="" model="Grid"/>
</scene>
<loadedObjects id="1682" name="Grid" comment="">
<position/>
diff --git a/org.fortiss.af3.rcp.application/test-data/operator_panel_tutorial.af3_23 b/org.fortiss.af3.rcp.application/test-data/operator_panel_tutorial.af3_23
index 7ad025a9827ca675bf079487b53d86c260c8d7dd..d8d57f17e03594e8161495b55d23678bb2b3df1f 100644
--- a/org.fortiss.af3.rcp.application/test-data/operator_panel_tutorial.af3_23
+++ b/org.fortiss.af3.rcp.application/test-data/operator_panel_tutorial.af3_23
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-af3-viewpanel="http://www.fortiss.org/af3/viewpanel" xmlns:org-fortiss-af3-viewpanel-node3D="http://www.fortiss.org/af3/viewpanel/node3D" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" name="Operator Panel Tutorial">
+<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-af3-operatorpanel-viewpanel="http://www.fortiss.org/af3/operatorpanel/viewpanel" xmlns:org-fortiss-af3-operatorpanel-viewpanel-node3D="http://www.fortiss.org/af3/operatorpanel/viewpanel/node3D" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" name="Operator Panel Tutorial">
<rootElements xsi:type="org-fortiss-af3-project:ProjectConfiguration" id="1">
<configurationElements xsi:type="org-fortiss-af3-project-configuration:TypeSystemConfiguration" id="2">
<typesystem xsi:type="org-fortiss-af3-expression:MicroTypeSystem"/>
@@ -292,19 +292,19 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" id="37" name="Viewer3D" comment="This component defines the 3D scene with a rotating cylinder, lights, and a rotating camera.">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" id="162" stronglyCausal="true"/>
<specifications xsi:type="org-fortiss-af3-operatorpanel:OperatorPanelSpecification" id="42" name="Operator Panel">
- <containedElements xsi:type="org-fortiss-af3-viewpanel:OP3DDisplay" id="52" name="3D Viewer" comment="" useLighting="true">
+ <containedElements xsi:type="org-fortiss-af3-operatorpanel-viewpanel:OP3DDisplay" id="52" name="3D Viewer" comment="" useLighting="true">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="601" height="397"/>
<scene id="53" name="Scene Graph" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="89" name="EarthRotation" comment="Earth circling the sun.">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="91" name="EarthDistance" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="95" name="EarthSize" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="94" name="Earth" comment="" model="EarthSphere"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:RotationDisplayNode" id="89" name="EarthRotation" comment="Earth circling the sun.">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="91" name="EarthDistance" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ScalingDisplayNode" id="95" name="EarthSize" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="94" name="Earth" comment="" model="EarthSphere"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.5"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.5"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.5"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="135" name="Object" comment="" model=""/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="135" name="Object" comment="" model=""/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.5"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
@@ -314,10 +314,10 @@
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.0"/>
<angle xsi:type="org-fortiss-af3-expression-terms:Var" identifier="angle"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="93" name="Sun" comment="Sun at center location." model="SunSphere"/>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="100" name="LightRotation" comment="Light circling the sun twice.">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="101" name="Translation" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:LightDisplayNode" id="86" name="Light0" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="93" name="Sun" comment="Sun at center location." model="SunSphere"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:RotationDisplayNode" id="100" name="LightRotation" comment="Light circling the sun twice.">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="101" name="Translation" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:LightDisplayNode" id="86" name="Light0" comment="">
<light id="87" name="Light0" comment="Default white light at (0,0,5)">
<ambient/>
<diffuse red="1.5" green="1.5" blue="1.5"/>
@@ -326,8 +326,8 @@
<attenuation x="1.0"/>
</light>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="122" name="Scaling" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="123" name="Object" comment="" model="Cube"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ScalingDisplayNode" id="122" name="Scaling" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="123" name="Object" comment="" model="Cube"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
@@ -345,8 +345,8 @@
<arguments xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="2.0"/>
</angle>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="102" name="CameraRotation" comment="Camera with a small vertical rotation.">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:CameraDisplayNode" id="54" name="Camera0" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:RotationDisplayNode" id="102" name="CameraRotation" comment="Camera with a small vertical rotation.">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:CameraDisplayNode" id="54" name="Camera0" comment="">
<camera id="55" name="Camera0" comment="Default camera at (5,5,5) looking at (0,0,0)">
<position x="5.0"/>
<lookAtLocation/>
@@ -365,9 +365,9 @@
<arguments xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="9.0"/>
</angle>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="104" name="AnchorCube" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="106" name="Scaling" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="105" name="Object" comment="" model="Cube"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="104" name="AnchorCube" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ScalingDisplayNode" id="106" name="Scaling" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="105" name="Object" comment="" model="Cube"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
@@ -376,9 +376,9 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.5"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="107" name="AnchorCube" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="116" name="Scaling" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="117" name="Object" comment="" model="Cube"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="107" name="AnchorCube" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ScalingDisplayNode" id="116" name="Scaling" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="117" name="Object" comment="" model="Cube"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
@@ -387,9 +387,9 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.5"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="110" name="AnchorCube" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="118" name="Scaling" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="119" name="Object" comment="" model="Cube"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="110" name="AnchorCube" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ScalingDisplayNode" id="118" name="Scaling" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="119" name="Object" comment="" model="Cube"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
@@ -398,9 +398,9 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="-1.5"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="113" name="AnchorCube" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="120" name="Scaling" comment="">
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="121" name="Object" comment="" model="Cube"/>
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:TranslationDisplayNode" id="113" name="AnchorCube" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ScalingDisplayNode" id="120" name="Scaling" comment="">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:ObjectDisplayNode" id="121" name="Object" comment="" model="Cube"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.15"/>
@@ -409,7 +409,7 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="-1.5"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
</subNodes>
- <subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:CameraDisplayNode" id="124" name="Camera1" comment="Static camera.">
+ <subNodes xsi:type="org-fortiss-af3-operatorpanel-viewpanel-node3D:CameraDisplayNode" id="124" name="Camera1" comment="Static camera.">
<camera id="125" name="Camera0" comment="Default camera at (5,5,5) looking at (0,0,0)">
<position y="5.0" z="5.0"/>
<lookAtLocation/>
@@ -4177,7 +4177,7 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" id="136" name="Oscilloscope" comment="">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" id="166" stronglyCausal="true"/>
<specifications xsi:type="org-fortiss-af3-operatorpanel:OperatorPanelSpecification" id="139" name="Operator Panel">
- <containedElements xsi:type="org-fortiss-af3-viewpanel:OP2DGraphDisplay" id="140" name="Oscilloscope" comment="" samplesPerGrid="10" levelsPerGrid="45.0" horizontalGrids="10" verticalGrids="4">
+ <containedElements xsi:type="org-fortiss-af3-operatorpanel-viewpanel:OP2DGraphDisplay" id="140" name="Oscilloscope" comment="" samplesPerGrid="10" levelsPerGrid="45.0" horizontalGrids="10" verticalGrids="4">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="481" height="385"/>
<lineColor red="1.0" green="1.0"/>
diff --git a/org.fortiss.af3.rcp.application/test-data/stlc_beagle_java_deployment_example.af3_23 b/org.fortiss.af3.rcp.application/test-data/stlc_beagle_java_deployment_example.af3_23
index dbaa24e46dc64ec75ef5e457f1902ee2bd6b175f..004bf4c4a2270e15bb07c5c4bc8f5dbcb00539f6 100644
--- a/org.fortiss.af3.rcp.application/test-data/stlc_beagle_java_deployment_example.af3_23
+++ b/org.fortiss.af3.rcp.application/test-data/stlc_beagle_java_deployment_example.af3_23
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-bounds="http://www.fortiss.org/af3/bounds" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-mira="http://www.fortiss.org/af3/mira" xmlns:org-fortiss-af3-mira-glossary="http://www.fortiss.org/af3/mira/glossary" xmlns:org-fortiss-af3-mira-relations="http://www.fortiss.org/af3/mira/relations" xmlns:org-fortiss-af3-mira-requirementSource="http://www.fortiss.org/af3/mira/requirementSource" xmlns:org-fortiss-af3-mira-usecase="http://www.fortiss.org/af3/mira/usecase" xmlns:org-fortiss-af3-mira-verification="http://www.fortiss.org/af3/mira/verification" xmlns:org-fortiss-af3-msc="http://www.fortiss.org/af3/msc" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-beagle="http://www.fortiss.org/af3/platform/beagle" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="0" name="STLC Beagle Java Deployment">
+<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-mira="http://www.fortiss.org/af3/mira" xmlns:org-fortiss-af3-mira-glossary="http://www.fortiss.org/af3/mira/glossary" xmlns:org-fortiss-af3-mira-relations="http://www.fortiss.org/af3/mira/relations" xmlns:org-fortiss-af3-mira-requirementSource="http://www.fortiss.org/af3/mira/requirementSource" xmlns:org-fortiss-af3-mira-usecase="http://www.fortiss.org/af3/mira/usecase" xmlns:org-fortiss-af3-mira-verification="http://www.fortiss.org/af3/mira/verification" xmlns:org-fortiss-af3-msc="http://www.fortiss.org/af3/msc" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-beagle="http://www.fortiss.org/af3/platform/beagle" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="0" name="STLC Beagle Java Deployment">
<rootElements xsi:type="org-fortiss-af3-project:ProjectConfiguration" xmi:id="1" id="1">
<configurationElements xsi:type="org-fortiss-af3-project-configuration:TypeSystemConfiguration" xmi:id="2" id="2">
<typesystem xsi:type="org-fortiss-af3-expression:MicroTypeSystem"/>
@@ -923,7 +923,6 @@
<type xsi:type="org-fortiss-af3-expression-types:TDouble"/>
<initialValue xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
</specifications>
- <specifications xsi:type="org-fortiss-af3-bounds:VariableBoundsSpecification" xmi:id="435" id="435" upperBound="254" lowerBound="-255"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="72" y="444"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
@@ -935,7 +934,6 @@
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
<initialValue xsi:type="org-fortiss-af3-expression-terms:IntConst"/>
</specifications>
- <specifications xsi:type="org-fortiss-af3-bounds:VariableBoundsSpecification" xmi:id="437" id="437" upperBound="254" lowerBound="-255"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="504" y="456"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
@@ -947,7 +945,6 @@
<type xsi:type="org-fortiss-af3-expression-types:TBool"/>
<initialValue xsi:type="org-fortiss-af3-expression-terms:BoolConst"/>
</specifications>
- <specifications xsi:type="org-fortiss-af3-bounds:VariableBoundsSpecification" xmi:id="439" id="439" upperBound="254" lowerBound="-255"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="72" y="420"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
@@ -1047,7 +1044,6 @@
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
<initialValue xsi:type="org-fortiss-af3-expression-terms:IntConst"/>
</specifications>
- <specifications xsi:type="org-fortiss-af3-bounds:VariableBoundsSpecification" xmi:id="447" id="447" upperBound="254" lowerBound="-255"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="504" y="456"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
@@ -1059,7 +1055,6 @@
<type xsi:type="org-fortiss-af3-expression-types:TDouble"/>
<initialValue xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
</specifications>
- <specifications xsi:type="org-fortiss-af3-bounds:VariableBoundsSpecification" xmi:id="449" id="449" upperBound="254" lowerBound="-255"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="504" y="432"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
@@ -1071,7 +1066,6 @@
<type xsi:type="org-fortiss-af3-expression-types:TBool"/>
<initialValue xsi:type="org-fortiss-af3-expression-terms:BoolConst"/>
</specifications>
- <specifications xsi:type="org-fortiss-af3-bounds:VariableBoundsSpecification" xmi:id="451" id="451" upperBound="254" lowerBound="-255"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="24" y="444"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
@@ -1134,7 +1128,6 @@
<type xsi:type="org-fortiss-af3-expression-types:TBool"/>
<initialValue xsi:type="org-fortiss-af3-expression-terms:BoolConst"/>
</specifications>
- <specifications xsi:type="org-fortiss-af3-bounds:VariableBoundsSpecification" xmi:id="457" id="457" upperBound="254" lowerBound="-255"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>