Add and use constants for core segment names

source/Navigation/components/NavigationMemory/CMakeLists.txt

@@ -31,6 +31,8 @@ armarx_add_component(
         ## ${PROJECT_NAME}Interfaces  # For ice interfaces from this package.
         # This component
         ## NavigationMemoryInterfaces  # If you defined a component ice interface above.
+        Navigation::Graph
+        Navigation::Location
 
     SOURCES
         NavigationMemory.cpp

source/Navigation/components/NavigationMemory/NavigationMemory.cpp

@@ -24,6 +24,10 @@
 
 #include <Navigation/libraries/core/aron/Trajectory.aron.generated.h>
 #include <Navigation/libraries/core/aron/Twist.aron.generated.h>
+#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/location/constants.h>
+#include <armarx/navigation/graph/aron/Graph.aron.generated.h>
+#include <armarx/navigation/graph/constants.h>
 
 // Include headers you only need in function definitions in the .cpp.
 
@@ -88,6 +92,12 @@ namespace armarx
 
         workingMemory.addCoreSegment("Events"); //, armem::example::ExampleData::toAronType());
         // workingMemory.addCoreSegment("Exceptions"); //, armem::example::ExampleData::toAronType());
+
+
+        workingMemory.addCoreSegment(nav::loc::coreSegmentName,
+                                     nav::loc::arondto::Location::toAronType());
+        workingMemory.addCoreSegment(nav::graph::coreSegmentName,
+                                     nav::graph::arondto::Graph::toAronType());
     }
 
 

source/armarx/navigation/graph/aron/Graph.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <AronTypeDefinition>
     <CodeIncludes>
-      <!--Include include="armarx/navigation/locations/aron/Location.aron.generated.h" /-->
+      <!--Include include="armarx/navigation/location/aron/Location.aron.generated.h" /-->
     </CodeIncludes>
     <AronIncludes>
-      <!-- <Include include="<armarx/navigation/locations/aron/Location.xml>" /> -->
+      <!-- <Include include="<armarx/navigation/location/aron/Location.xml>" /> -->
     </AronIncludes>
 
     <GenerateTypes>
 
-        <Object name='armarx::nav::graphs::arondto::Graph'>
+        <Object name='armarx::nav::graph::arondto::Graph'>
 
             <!--ObjectChild key='location'>
-                <armarx::nav::locs::arondto::Location />
+                <armarx::nav::loc::arondto::Location />
             </ObjectChild-->
 
         </Object>

source/armarx/navigation/graph/constants.cpp

-#include "aron_conversions.h"
+#include "constants.h"
 
 
 namespace armarx::nav
 {
 
-    void core::test()
-    {
+    const std::string graph::coreSegmentName = "Graph";
 
-    }
 }

source/armarx/navigation/graph/constants.h

@@ -21,10 +21,12 @@
 
 #pragma once
 
+#include <string>
 
-namespace armarx::nav::core
+
+namespace armarx::nav::graph
 {
 
-    void test();
+    extern const std::string coreSegmentName;
 
 }

source/armarx/navigation/location/aron/Location.xml

@@ -15,7 +15,7 @@
         -->
 
 
-        <Object name='armarx::nav::locs::arondto::ObjectRelativeLocation'>
+        <Object name='armarx::nav::loc::arondto::ObjectRelativeLocation'>
 
             <ObjectChild key='objectInstanceID'>
                 <armarx::armem::arondto::MemoryID />
@@ -28,14 +28,14 @@
         </Object>
 
 
-        <Object name='armarx::nav::locs::arondto::Location'>
+        <Object name='armarx::nav::loc::arondto::Location'>
 
             <ObjectChild key='globalRobotPose'>
                 <Pose />
             </ObjectChild>
 
             <ObjectChild key='relativeToObject'>
-                <armarx::nav::locs::arondto::ObjectRelativeLocation optional="true" />
+                <armarx::nav::loc::arondto::ObjectRelativeLocation optional="true" />
             </ObjectChild>
 
         </Object>

source/armarx/navigation/location/constants.cpp

-#include "aron_conversions.h"
+#include "constants.h"
 
 
 namespace armarx::nav
 {
 
-    void coree::test()
-    {
+    const std::string loc::coreSegmentName = "Location";
 
-    }
 }

source/armarx/navigation/location/constants.h

@@ -21,10 +21,12 @@
 
 #pragma once
 
+#include <string>
 
-namespace armarx::nav::coree
+
+namespace armarx::nav::loc
 {
 
-void test();
+    extern const std::string coreSegmentName;
 
 }