From 92057622af856559a8d78f7cd5318e5da0b8ad6d Mon Sep 17 00:00:00 2001
From: Fabian Peller-Konrad <fabian.peller-konrad@kit.edu>
Date: Tue, 22 Mar 2022 08:50:01 +0100
Subject: [PATCH] renamed trajectory and color.xml
---
source/RobotAPI/libraries/armem_mps/aron_conversions.h | 2 +-
.../libraries/armem_mps/server/MotionPrimitives/Segment.h | 2 +-
.../armem_mps/server/MotionPrimitives/motionprimitives.cpp | 2 --
.../armem_mps/server/MotionPrimitives/motionprimitives.h | 2 +-
source/RobotAPI/libraries/aron/common/CMakeLists.txt | 4 ++--
.../libraries/aron/common/aron/{Color.xml => color.xml} | 0
.../aron/common/aron/{Trajectory.xml => trajectory.xml} | 0
7 files changed, 5 insertions(+), 7 deletions(-)
rename source/RobotAPI/libraries/aron/common/aron/{Color.xml => color.xml} (100%)
rename source/RobotAPI/libraries/aron/common/aron/{Trajectory.xml => trajectory.xml} (100%)
diff --git a/source/RobotAPI/libraries/armem_mps/aron_conversions.h b/source/RobotAPI/libraries/armem_mps/aron_conversions.h
index 8de8754f9..343975886 100644
--- a/source/RobotAPI/libraries/armem_mps/aron_conversions.h
+++ b/source/RobotAPI/libraries/armem_mps/aron_conversions.h
@@ -3,7 +3,7 @@
#include <ArmarXCore/interface/core/Profiler.h>
#include <ArmarXCore/observers/ObserverObjectFactories.h>
-#include <RobotAPI/libraries/aron/common/aron/Trajectory.aron.generated.h>
+#include <RobotAPI/libraries/aron/common/aron/trajectory.aron.generated.h>
#include <dmp/representation/trajectory.h>
//#include <dmp
diff --git a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/Segment.h b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/Segment.h
index ab14043ea..f38c3c114 100644
--- a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/Segment.h
+++ b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/Segment.h
@@ -8,7 +8,7 @@
#include <RobotAPI/libraries/armem/server/segment/SpecializedSegment.h>
// ArmarX
-#include <RobotAPI/libraries/aron/common/aron/Trajectory.aron.generated.h>
+#include <RobotAPI/libraries/aron/common/aron/trajectory.aron.generated.h>
namespace armarx::armem::server::motions::mps::segment
{
diff --git a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.cpp b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.cpp
index 080766eaf..32f0302a2 100644
--- a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.cpp
+++ b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.cpp
@@ -8,8 +8,6 @@
#include <RobotAPI/libraries/armem/core/error.h>
#include <RobotAPI/libraries/armem/server/MemoryRemoteGui.h>
-#include <RobotAPI/libraries/aron/common/aron/Trajectory.aron.generated.h>
-
#include <dmp/representation/trajectory.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
diff --git a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.h b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.h
index 186074ce0..72372ca2f 100644
--- a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.h
+++ b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.h
@@ -7,7 +7,7 @@
#include <optional>
// ArmarX
-#include <RobotAPI/libraries/aron/common/aron/Trajectory.aron.generated.h>
+#include <RobotAPI/libraries/aron/common/aron/trajectory.aron.generated.h>
namespace armarx::armem::server::motions::mps::segment::util
{
diff --git a/source/RobotAPI/libraries/aron/common/CMakeLists.txt b/source/RobotAPI/libraries/aron/common/CMakeLists.txt
index 8c844b040..463f59dd1 100644
--- a/source/RobotAPI/libraries/aron/common/CMakeLists.txt
+++ b/source/RobotAPI/libraries/aron/common/CMakeLists.txt
@@ -32,8 +32,8 @@ armarx_enable_aron_file_generation_for_target(
TARGET_NAME
"${LIB_NAME}"
ARON_FILES
- aron/Trajectory.xml
- aron/Color.xml
+ aron/trajectory.xml
+ aron/color.xml
aron/PackagePath.xml
aron/AxisAlignedBoundingBox.xml
aron/OrientedBox.xml
diff --git a/source/RobotAPI/libraries/aron/common/aron/Color.xml b/source/RobotAPI/libraries/aron/common/aron/color.xml
similarity index 100%
rename from source/RobotAPI/libraries/aron/common/aron/Color.xml
rename to source/RobotAPI/libraries/aron/common/aron/color.xml
diff --git a/source/RobotAPI/libraries/aron/common/aron/Trajectory.xml b/source/RobotAPI/libraries/aron/common/aron/trajectory.xml
similarity index 100%
rename from source/RobotAPI/libraries/aron/common/aron/Trajectory.xml
rename to source/RobotAPI/libraries/aron/common/aron/trajectory.xml
--
GitLab