From 916b6f0d7d1de10da98fe26f0f678a1d855c3502 Mon Sep 17 00:00:00 2001 From: Simon Ottenhaus <simon.ottenhaus@kit.edu> Date: Tue, 21 Jul 2015 17:59:08 +0200 Subject: [PATCH] Updated statechart format --- .../StatechartProfilesTestGroup/TestState.xml | 24 +++++++++---------- .../WeissHapticSensorTest.xml | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.xml b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.xml index 008b5f6f0..459acc3c2 100644 --- a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.xml +++ b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <State version="1.2" name="TestState" uuid="84AE0A5A-9F6A-4CD7-B185-2173009CB87C" width="800" height="600" type="Normal State"> <InputParameters> - <Parameter name="EmptyStringTest" type="::armarx::StringVariantData" optional="no"> - <DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":""}}'/> + <Parameter name="EmptyStringTest" type="::armarx::StringVariantData" docType="string" optional="no"> + <DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":""}}' docValue=""/> </Parameter> - <Parameter name="TestParam1" type="::armarx::StringVariantData" optional="no"> - <DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"OnlyRootSet"}}'/> + <Parameter name="TestParam1" type="::armarx::StringVariantData" docType="string" optional="no"> + <DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"OnlyRootSet"}}' docValue="OnlyRootSet"/> </Parameter> - <Parameter name="TestParam2" type="::armarx::StringVariantData" optional="no"> - <DefaultValue profile="Armar3Base" value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"Armar3BaseSet"}}'/> - <DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"RootSet"}}'/> + <Parameter name="TestParam2" type="::armarx::StringVariantData" docType="string" optional="no"> + <DefaultValue profile="Armar3Base" value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"Armar3BaseSet"}}' docValue="Armar3BaseSet"/> + <DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"RootSet"}}' docValue="RootSet"/> </Parameter> - <Parameter name="TestParam3" type="::armarx::StringVariantData" optional="no"> - <DefaultValue profile="Armar3Simulation" value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"Armar3SimulationSet"}}'/> - <DefaultValue profile="Armar3a" value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"Armar3aSet"}}'/> - <DefaultValue profile="Armar3b" value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"Armar3bSet"}}'/> - <DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"RootSet"}}'/> + <Parameter name="TestParam3" type="::armarx::StringVariantData" docType="string" optional="no"> + <DefaultValue profile="Armar3Simulation" value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"Armar3SimulationSet"}}' docValue="Armar3SimulationSet"/> + <DefaultValue profile="Armar3a" value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"Armar3aSet"}}' docValue="Armar3aSet"/> + <DefaultValue profile="Armar3b" value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"Armar3bSet"}}' docValue="Armar3bSet"/> + <DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"RootSet"}}' docValue="RootSet"/> </Parameter> </InputParameters> <OutputParameters/> diff --git a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.xml b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.xml index d44dc26ac..cb8448c7c 100644 --- a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.xml +++ b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<State version="1.0" name="WeissHapticSensorTest" uuid="B8841E3D-97C6-468F-86D9-6370D5F89BB4" width="800" height="600"> +<State version="1.2" name="WeissHapticSensorTest" uuid="B8841E3D-97C6-468F-86D9-6370D5F89BB4" width="800" height="600" type="Normal State"> <InputParameters/> <OutputParameters/> <LocalParameters> - <Parameter name="TactileDatafields_MaximumValue" type="::armarx::StringValueMapBase(::armarx::DatafieldRefBase)" optional="no"/> + <Parameter name="TactileDatafields_MaximumValue" type="::armarx::StringValueMapBase(::armarx::DatafieldRefBase)" docType="Map(DatafieldRef)" optional="no"/> </LocalParameters> <Substates/> <Events/> -- GitLab