Rename to ObjectMemoryEditor

source/RobotAPI/components/CMakeLists.txt

@@ -33,4 +33,4 @@ add_subdirectory(StatechartExecutorExample)
 add_subdirectory(TopicTimingTest)
 add_subdirectory(ViewSelection)
 
-add_subdirectory(InteractiveMemoryEditor)
+add_subdirectory(ObjectMemoryEditor)

source/RobotAPI/components/InteractiveMemoryEditor/CMakeLists.txt → source/RobotAPI/components/ObjectMemoryEditor/CMakeLists.txt

-armarx_component_set_name("InteractiveMemoryEditor")
+armarx_component_set_name("ObjectMemoryEditor")
 
 
 set(COMPONENT_LIBS
@@ -11,12 +11,12 @@ set(COMPONENT_LIBS
 )
 
 set(SOURCES
-    InteractiveMemoryEditor.cpp
+        ObjectMemoryEditor.cpp
     InteractionObserver.cpp
     Editor.cpp
 )
 set(HEADERS
-    InteractiveMemoryEditor.h
+    ObjectMemoryEditor.h
     InteractionObserver.h
     Editor.h
 )

source/RobotAPI/components/InteractiveMemoryEditor/Editor.cpp → source/RobotAPI/components/ObjectMemoryEditor/Editor.cpp

 #include "Editor.h"
 
-#include <RobotAPI/components/InteractiveMemoryEditor/InteractionObserver.h>
 #include <RobotAPI/libraries/ArmarXObjects/ProvidedObjectPose.h>
 #include <RobotAPI/libraries/ArmarXObjects/ice_conversions.h>
 

source/RobotAPI/components/InteractiveMemoryEditor/Editor.h → source/RobotAPI/components/ObjectMemoryEditor/Editor.h

@@ -6,8 +6,7 @@
 #include <RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.h>
 #include <RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseProviderPlugin.h>
 #include <RobotAPI/libraries/ArmarXObjects/ObjectFinder.h>
-
-#include "InteractionObserver.h"
+#include <RobotAPI/components/ObjectMemoryEditor/InteractionObserver.h>
 
 namespace armarx
 {

source/RobotAPI/components/InteractiveMemoryEditor/InteractiveMemoryEditor.cpp → source/RobotAPI/components/ObjectMemoryEditor/ObjectMemoryEditor.cpp

-#include "InteractiveMemoryEditor.h"
+#include "ObjectMemoryEditor.h"
 
 #include <ArmarXCore/core/time/Metronome.h>
 
@@ -9,7 +9,7 @@
 
 namespace armarx
 {
-    armarx::PropertyDefinitionsPtr InteractiveMemoryEditor::createPropertyDefinitions()
+    armarx::PropertyDefinitionsPtr ObjectMemoryEditor::createPropertyDefinitions()
     {
         armarx::PropertyDefinitionsPtr defs = new ComponentPropertyDefinitions(getConfigIdentifier());
 
@@ -22,12 +22,12 @@ namespace armarx
         return defs;
     }
 
-    std::string InteractiveMemoryEditor::getDefaultName() const
+    std::string ObjectMemoryEditor::getDefaultName() const
     {
         return "InteractiveMemoryEditor";
     }
 
-    void InteractiveMemoryEditor::onInitComponent()
+    void ObjectMemoryEditor::onInitComponent()
     {
         {
             providerInfo.objectType = objpose::ObjectType::KnownObject;
@@ -44,7 +44,7 @@ namespace armarx
         }
     }
 
-    void InteractiveMemoryEditor::onConnectComponent()
+    void ObjectMemoryEditor::onConnectComponent()
     {
         setDebugObserverBatchModeEnabled(true);
 
@@ -55,16 +55,16 @@ namespace armarx
         objectVizTask->start();
     }
 
-    void InteractiveMemoryEditor::onDisconnectComponent()
+    void ObjectMemoryEditor::onDisconnectComponent()
     {
     }
 
-    void InteractiveMemoryEditor::onExitComponent()
+    void ObjectMemoryEditor::onExitComponent()
     {
     }
 
 
-    void InteractiveMemoryEditor::run()
+    void ObjectMemoryEditor::run()
     {
         objpose::ObjectPoseClient client = getClient();
 
@@ -95,12 +95,12 @@ namespace armarx
         }
     }
 
-    objpose::ProviderInfo InteractiveMemoryEditor::getProviderInfo(const Ice::Current & /*unused*/)
+    objpose::ProviderInfo ObjectMemoryEditor::getProviderInfo(const Ice::Current & /*unused*/)
     {
         return providerInfo;
     }
 
-    objpose::provider::RequestObjectsOutput InteractiveMemoryEditor::requestObjects(
+    objpose::provider::RequestObjectsOutput ObjectMemoryEditor::requestObjects(
             const objpose::provider::RequestObjectsInput &input, const Ice::Current & /*unused*/)
     {
         objpose::provider::RequestObjectsOutput output;

source/RobotAPI/components/InteractiveMemoryEditor/InteractiveMemoryEditor.h → source/RobotAPI/components/ObjectMemoryEditor/ObjectMemoryEditor.h

@@ -13,7 +13,7 @@
 
 namespace armarx
 {
-    class InteractiveMemoryEditor :
+    class ObjectMemoryEditor :
             virtual public armarx::Component,
             virtual public armarx::DebugObserverComponentPluginUser,
             virtual public armarx::ArVizComponentPluginUser,