diff --git a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp index 0749270633ee8fa9c8994e04d660f6278ae1b5a5..dbaaf22433508ea18140e636ff8f85b46fa11fbf 100644 --- a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp +++ b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp @@ -112,7 +112,7 @@ namespace armarx { configDialog = new SimpleConfigDialog(parent); configDialog->addProxyFinder<armarx::objpose::ObjectPoseStorageInterfacePrx>( - {CONFIG_KEY_OBJECT_POSE_OBSERVER, "Object pose observer.", "*"}); + {CONFIG_KEY_OBJECT_POSE_OBSERVER, "Object pose observer.", "Object*"}); } return qobject_cast<QDialog*>(configDialog); } @@ -122,25 +122,29 @@ namespace armarx { if (configDialog) { - ObjectPoseStorageName = configDialog->getProxyName(CONFIG_KEY_OBJECT_POSE_OBSERVER); + objectPoseStorageName = configDialog->getProxyName(CONFIG_KEY_OBJECT_POSE_OBSERVER); + if (objectPoseStorageName.empty()) + { + objectPoseStorageName = "ObjectMemory"; + } } } void ObjectPoseGuiWidgetController::onInitComponent() { - if (!ObjectPoseStorageName.empty()) + if (!objectPoseStorageName.empty()) { - usingProxy(ObjectPoseStorageName); + usingProxy(objectPoseStorageName); } } void ObjectPoseGuiWidgetController::onConnectComponent() { - if (!ObjectPoseStorageName.empty()) + if (!objectPoseStorageName.empty()) { - getProxy(ObjectPoseStorage, ObjectPoseStorageName); + getProxy(ObjectPoseStorage, objectPoseStorageName); } this->attachableFrames = ObjectPoseStorage->getAttachableFrames(); diff --git a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h index 7d809412dacd90a533b4ae4082467da4f53c8eb3..714bf1cdae5cb591a232ab7872f2ac229b6ec0c1 100644 --- a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h +++ b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h @@ -113,7 +113,7 @@ namespace armarx QPointer<SimpleConfigDialog> configDialog; - std::string ObjectPoseStorageName; + std::string objectPoseStorageName; armarx::objpose::ObjectPoseStorageInterfacePrx ObjectPoseStorage; objpose::AgentFramesSeq attachableFrames;