Skip to content
Snippets Groups Projects
Commit 2ac8e427 authored by Mirko Wächter's avatar Mirko Wächter
Browse files

fixed statechart profile prefix

parent cbc23875
No related branches found
Tags v0.8.3
No related merge requests found
...@@ -112,6 +112,6 @@ ArmarX.RobotControlStateOfferer.proxyName = "StatechartProfilesTestGroupRemoteSt ...@@ -112,6 +112,6 @@ ArmarX.RobotControlStateOfferer.proxyName = "StatechartProfilesTestGroupRemoteSt
# - Case sensitivity: no # - Case sensitivity: no
# - Required: no # - Required: no
# ArmarX.RobotControlStateOfferer.ObjectName = "" # ArmarX.RobotControlStateOfferer.ObjectName = ""
ArmarX.RobotControlStateOfferer.XMLStatechartProfile = "Armar3Simulation"
...@@ -113,5 +113,5 @@ ArmarX.RobotControlStateOfferer.proxyName = "StatechartProfilesTestGroupRemoteSt ...@@ -113,5 +113,5 @@ ArmarX.RobotControlStateOfferer.proxyName = "StatechartProfilesTestGroupRemoteSt
# - Required: no # - Required: no
# ArmarX.RobotControlStateOfferer.ObjectName = "" # ArmarX.RobotControlStateOfferer.ObjectName = ""
ArmarX.XMLStateComponent.XMLStatechartProfile = "Armar3a"
...@@ -80,7 +80,7 @@ namespace armarx ...@@ -80,7 +80,7 @@ namespace armarx
robotFunctionalState = stateList.begin()->second; robotFunctionalState = stateList.begin()->second;
callRemoteState(stateId, StringVariantContainerBaseMap()); callRemoteState(stateId, StringVariantContainerBaseMap());
const std::string proxyName = getProperty<std::string>("proxyName").getValue(); const std::string proxyName = getProperty<std::string>("XMLStatechartProfile").getValue() + getProperty<std::string>("proxyName").getValue();
const std::string stateName = getProperty<std::string>("stateName").getValue(); const std::string stateName = getProperty<std::string>("stateName").getValue();
ARMARX_IMPORTANT << VAROUT(proxyName) << VAROUT(stateName); ARMARX_IMPORTANT << VAROUT(proxyName) << VAROUT(stateName);
......
...@@ -38,6 +38,8 @@ namespace armarx ...@@ -38,6 +38,8 @@ namespace armarx
RobotControlContextProperties(std::string prefix): RobotControlContextProperties(std::string prefix):
StatechartContextPropertyDefinitions(prefix) StatechartContextPropertyDefinitions(prefix)
{ {
defineOptionalProperty<std::string>("XMLStatechartProfile", "", "Name of the statechart profile to be used. This is used as prefix to the proxyName. So GraspGroupRemoteStateOfferer will be Armar3aGraspGroupRemoteStateOfferer");
defineOptionalProperty<std::string>("proxyName", "", "name of the proxy to load"); defineOptionalProperty<std::string>("proxyName", "", "name of the proxy to load");
defineOptionalProperty<std::string>("stateName", "", "name of the state to load"); defineOptionalProperty<std::string>("stateName", "", "name of the state to load");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment