Skip to content
Snippets Groups Projects
Commit 40c2e9bc authored by David Schiebener's avatar David Schiebener
Browse files

moved kinematic unit proxy to approapriate subclasses

parent 02d3c843
No related tags found
No related merge requests found
......@@ -105,9 +105,6 @@ void HandUnit::onInitComponent()
listenerChannelName = endeffectorName + "State";
offeringTopic(listenerChannelName);
kinematicUnitName = getProperty<std::string>("KinematicUnitName").getValue();
usingProxy(kinematicUnitName);
this->onInitHandUnit();
}
......@@ -117,8 +114,6 @@ void HandUnit::onConnectComponent()
ARMARX_INFO << "setting report topic to " << listenerChannelName << flush;
listenerPrx = getTopic<HandUnitListenerPrx>(listenerChannelName);
kinematicUnitPrx = getProxy<KinematicUnitInterfacePrx>(kinematicUnitName);
this->onStartHandUnit();
}
......
......@@ -57,7 +57,6 @@ namespace armarx
{
defineRequiredProperty<std::string>("RobotFileName", "VirtualRobot XML file in which the endeffector is is stored.");
defineRequiredProperty<std::string>("EndeffectorName", "Name of the endeffector as stored in the XML file (will publish values on EndeffectorName + 'State')");
defineRequiredProperty<std::string>("KinematicUnitName", "Name of the kinematic unit that should be used");
}
};
......@@ -157,8 +156,6 @@ namespace armarx
*/
SingleTypeVariantListPtr shapeNames;
KinematicUnitInterfacePrx kinematicUnitPrx;
std::string kinematicUnitName;
VirtualRobot::RobotPtr robot;
......
......@@ -76,6 +76,7 @@ void HandUnitWidget::configured()
void HandUnitWidget::preshapeHand()
{
ARMARX_INFO << "Setting new hand shape: " << ui.comboPreshapes->currentText().toUtf8().data();
handUnitProxy->setShape(ui.comboPreshapes->currentText().toUtf8().data());
}
......
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