From 5ff29218736c794da0e65e7c17023672ffcace92 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 25 Jul 2023 07:52:47 +0200
Subject: [PATCH] Add "Object*" to mask, use ObjectMemory if empty
---
.../ObjectPoseGuiWidgetController.cpp | 16 ++++++++++------
.../ObjectPoseGuiWidgetController.h | 2 +-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
index 074927063..dbaaf2243 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 7d809412d..714bf1cda 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;
--
GitLab