From 9225dfe300756cd9a8138fdda50a3da833bbb672 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Thu, 5 Dec 2024 23:10:21 +0100
Subject: [PATCH] fixing build by adding headers in other libs
---
.../ExampleMemoryClient/ExampleMemoryClient.cpp | 1 +
.../aronTreeWidget/widgets/EditMatrixWidget.h | 1 +
.../aronTreeWidget/widgets/IntEnumWidget.cpp | 1 +
.../aronTreeWidget/widgets/QuaternionWidget.cpp | 2 ++
.../aronTreeWidget/widgets/QuaternionWidget.h | 7 +++++--
.../armem/client/util/MemoryToDebugObserver.cpp | 1 +
.../libraries/armem/server/ltm/EntityInstance.cpp | 3 +--
.../libraries/armem/server/ltm/EntitySnapshot.cpp | 4 ----
.../libraries/armem/server/ltm/detail/MemoryBase.h | 1 +
.../armem/server/ltm/detail/mixins/util/mongodb.cpp | 1 +
.../armem/server/ltm/processors/Processors.cpp | 1 +
.../client/KnownGraspCandidateReader.cpp | 6 ++----
source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp | 1 +
.../libraries/armem_gui/disk/ControlWidget.cpp | 2 ++
.../libraries/armem_locations/client/Reader.cpp | 2 ++
.../articulated_object/ArticulatedObjectWriter.cpp | 1 +
.../client/articulated_object/Reader.cpp | 4 ++--
.../armem_robot_state/server/common/Visu.cpp | 1 +
source/RobotAPI/libraries/aron/common/rw/eigen.h | 6 +++++-
.../aron/converter/opencv/OpenCVConverter.cpp | 6 +++---
source/RobotAPI/libraries/aron/core/Path.cpp | 1 +
source/RobotAPI/libraries/aron/core/data/rw/Writer.h | 2 +-
.../NlohmannJSONReaderWithoutTypeCheck.cpp | 11 +++--------
.../aron/core/data/rw/writer/variant/VariantWriter.h | 4 ----
.../libraries/aron/core/data/variant/Factory.cpp | 1 +
.../aron/core/data/variant/complex/NDArray.cpp | 1 +
.../aron/core/data/variant/container/Dict.cpp | 1 +
.../core/data/variant/detail/SpecializedVariant.h | 3 +--
.../aron/core/data/variant/primitive/Bool.cpp | 1 +
.../aron/core/data/variant/primitive/Double.cpp | 1 +
.../aron/core/data/variant/primitive/Float.cpp | 1 +
.../aron/core/data/variant/primitive/Int.cpp | 1 +
.../aron/core/data/variant/primitive/Long.cpp | 1 +
.../aron/core/data/variant/primitive/String.cpp | 1 +
source/RobotAPI/libraries/aron/core/type/rw/Reader.h | 2 +-
source/RobotAPI/libraries/aron/core/type/rw/Writer.h | 1 +
.../libraries/aron/core/type/variant/Factory.cpp | 1 +
.../core/type/variant/detail/SpecializedVariant.h | 3 +++
.../libraries/aron/filter/data/WhitelistFilter.h | 1 +
source/RobotAPI/libraries/aron/similarity/cosine.cpp | 1 +
.../aron/similarity/data/image/NDArraySimilarity.cpp | 1 +
.../libraries/aron/similarity/data/image/chernoff.cpp | 1 +
.../libraries/aron/similarity/data/image/mse.cpp | 1 +
.../PropertyDefinitionVisitors.cpp | 5 ++++-
.../aron_component_config/VariantHelperFactory.cpp | 5 ++++-
source/RobotAPI/libraries/skills/core/SkillProxy.h | 1 +
.../aron_tree_widget/widgets/EditMatrixWidget.h | 1 +
.../aron_tree_widget/widgets/IntEnumWidget.cpp | 3 ++-
.../aron_tree_widget/widgets/QuaternionWidget.cpp | 2 ++
.../aron_tree_widget/widgets/QuaternionWidget.h | 7 +++++--
.../executions/SkillExecutionTreeWidget.cpp | 1 +
.../skills_gui/memory/SkillManagerWrapper.cpp | 2 ++
52 files changed, 82 insertions(+), 39 deletions(-)
diff --git a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
index 7fea318b5..f4854b20d 100644
--- a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
+++ b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
@@ -31,6 +31,7 @@
#include <opencv2/imgproc.hpp>
#include <opencv2/opencv.hpp>
+#include <SimoxUtility/algorithm/string/string_tools.h>
#include <SimoxUtility/color/cmaps.h>
#include <SimoxUtility/math/pose/pose.h>
diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.h b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.h
index 1fdaaa963..7ba61b702 100644
--- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.h
+++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.h
@@ -6,6 +6,7 @@
#include <QObject>
#include <QTreeWidgetItem>
#include <QVBoxLayout>
+#include <SimoxUtility/algorithm/string/string_conversion.h>
#include "RobotAPI/libraries/aron/core/type/variant/ndarray/Matrix.h"
diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/IntEnumWidget.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/IntEnumWidget.cpp
index bfe1be2bf..768d907b7 100644
--- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/IntEnumWidget.cpp
+++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/IntEnumWidget.cpp
@@ -1,6 +1,7 @@
#include "IntEnumWidget.h"
#include <QHBoxLayout>
+#include <SimoxUtility/algorithm/string/string_conversion.h>
#include "RobotAPI/libraries/aron/core/type/variant/All.h"
diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.cpp
index b1d6fa3b9..7ba00d9da 100644
--- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.cpp
+++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.cpp
@@ -3,6 +3,8 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QLineEdit>
+#include <RobotAPI/interface/aron/Aron.h>
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include "../../ColorPalettes.h"
#include "NDArrayHelper.h"
diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.h b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.h
index d55d2bba3..e1fca223e 100644
--- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.h
+++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.h
@@ -1,11 +1,14 @@
#pragma once
+
+#include <cmath>
#include <vector>
#include <QLineEdit>
#include <QObject>
#include <QVBoxLayout>
-
-#include "RobotAPI/libraries/aron/core/type/variant/ndarray/Matrix.h"
+#include <SimoxUtility/algorithm/string/string_conversion.h>
+#include <SimoxUtility/error/SimoxError.h>
+#include <RobotAPI/interface/aron/Aron.h>
#include "CustomWidget.h"
diff --git a/source/RobotAPI/libraries/armem/client/util/MemoryToDebugObserver.cpp b/source/RobotAPI/libraries/armem/client/util/MemoryToDebugObserver.cpp
index 89e2cf20c..ecad82410 100644
--- a/source/RobotAPI/libraries/armem/client/util/MemoryToDebugObserver.cpp
+++ b/source/RobotAPI/libraries/armem/client/util/MemoryToDebugObserver.cpp
@@ -21,6 +21,7 @@
*/
#include "MemoryToDebugObserver.h"
+#include <SimoxUtility/algorithm/string/string_tools.h>
#include <RobotAPI/libraries/armem/core/error/mns.h>
#include <RobotAPI/libraries/armem/core/json_conversions.h>
diff --git a/source/RobotAPI/libraries/armem/server/ltm/EntityInstance.cpp b/source/RobotAPI/libraries/armem/server/ltm/EntityInstance.cpp
index b0302a5ce..ce8932e54 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/EntityInstance.cpp
+++ b/source/RobotAPI/libraries/armem/server/ltm/EntityInstance.cpp
@@ -2,8 +2,7 @@
#include "EntityInstance.h"
// STD / STL
-#include <fstream>
-#include <iostream>
+#include <SimoxUtility/algorithm/string/string_tools.h>
// ArmarX
#include <ArmarXCore/core/logging/Logging.h>
diff --git a/source/RobotAPI/libraries/armem/server/ltm/EntitySnapshot.cpp b/source/RobotAPI/libraries/armem/server/ltm/EntitySnapshot.cpp
index 2f9746973..175840a0c 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/EntitySnapshot.cpp
+++ b/source/RobotAPI/libraries/armem/server/ltm/EntitySnapshot.cpp
@@ -1,10 +1,6 @@
// Header
#include "EntitySnapshot.h"
-// STD / STL
-#include <fstream>
-#include <iostream>
-
// ArmarX
#include <ArmarXCore/core/logging/Logging.h>
#include <ArmarXCore/core/time/TimeUtil.h>
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/MemoryBase.h b/source/RobotAPI/libraries/armem/server/ltm/detail/MemoryBase.h
index 3450eaaf7..708926591 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/detail/MemoryBase.h
+++ b/source/RobotAPI/libraries/armem/server/ltm/detail/MemoryBase.h
@@ -13,6 +13,7 @@
#include <ArmarXCore/core/Component.h>
#include <ArmarXCore/core/logging/LoggingUtil.h>
#include <ArmarXCore/core/time.h>
+#include <ArmarXCore/interface/core/UserException.h>
#include <RobotAPI/libraries/armem/core/MemoryID.h>
#include <RobotAPI/libraries/armem/core/operations.h>
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/mixins/util/mongodb.cpp b/source/RobotAPI/libraries/armem/server/ltm/detail/mixins/util/mongodb.cpp
index e1024a0f6..08d4b7a51 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/detail/mixins/util/mongodb.cpp
+++ b/source/RobotAPI/libraries/armem/server/ltm/detail/mixins/util/mongodb.cpp
@@ -1,6 +1,7 @@
#include "mongodb.h"
// Simox
+#include <SimoxUtility/algorithm/string/string_tools.h>
#include <SimoxUtility/json.h>
#include <RobotAPI/libraries/armem/core/error.h>
diff --git a/source/RobotAPI/libraries/armem/server/ltm/processors/Processors.cpp b/source/RobotAPI/libraries/armem/server/ltm/processors/Processors.cpp
index 00568c75b..83413578f 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/processors/Processors.cpp
+++ b/source/RobotAPI/libraries/armem/server/ltm/processors/Processors.cpp
@@ -1,6 +1,7 @@
#include "Processors.h"
#include <ArmarXCore/core/logging/Logging.h>
+#include <ArmarXCore/interface/core/UserException.h>
#include "converter/data/image/exr/ExrConverter.h"
#include "converter/data/image/png/PngConverter.h"
diff --git a/source/RobotAPI/libraries/armem_grasping/client/KnownGraspCandidateReader.cpp b/source/RobotAPI/libraries/armem_grasping/client/KnownGraspCandidateReader.cpp
index ab4750e34..9cf9edee2 100644
--- a/source/RobotAPI/libraries/armem_grasping/client/KnownGraspCandidateReader.cpp
+++ b/source/RobotAPI/libraries/armem_grasping/client/KnownGraspCandidateReader.cpp
@@ -1,8 +1,9 @@
#include "KnownGraspCandidateReader.h"
-#include <mutex>
#include <optional>
+#include <SimoxUtility/algorithm/string/string_tools.h>
+
#include <ArmarXCore/core/PackagePath.h>
#include <ArmarXCore/core/logging/Logging.h>
@@ -13,9 +14,6 @@
#include <RobotAPI/libraries/armem/util/util.h>
#include <RobotAPI/libraries/armem_objects/aron/Attachment.aron.generated.h>
#include <RobotAPI/libraries/armem_objects/aron_conversions.h>
-// #include <RobotAPI/libraries/armem_robot_state/aron/Robot.aron.generated.h>
-// #include <RobotAPI/libraries/armem_robot_state/aron_conversions.h>
-// #include <RobotAPI/libraries/armem_robot_state/robot_conversions.h>
#include <RobotAPI/libraries/aron/common/aron_conversions.h>
namespace armarx::armem::grasping::known_grasps
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
index bfa97db1e..fc6c74049 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
@@ -15,6 +15,7 @@
#include <Ice/Exception.h>
#include <SimoxUtility/algorithm/get_map_keys_values.h>
+#include <SimoxUtility/algorithm/string/string_tools.h>
#include <ArmarXCore/core/ManagedIceObject.h>
#include <ArmarXCore/core/ice_conversions/ice_conversions_templates.h>
diff --git a/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp b/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
index 868c315ad..0b7b737f0 100644
--- a/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
+++ b/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
@@ -8,6 +8,8 @@
#include <QPushButton>
#include <QSpacerItem>
+#include <SimoxUtility/algorithm/string/string_tools.h>
+
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <RobotAPI/libraries/armem/server/ltm/Memory.h>
diff --git a/source/RobotAPI/libraries/armem_locations/client/Reader.cpp b/source/RobotAPI/libraries/armem_locations/client/Reader.cpp
index 13cc8ff5a..a9bb3a1b1 100644
--- a/source/RobotAPI/libraries/armem_locations/client/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_locations/client/Reader.cpp
@@ -1,5 +1,7 @@
#include "Reader.h"
+#include <SimoxUtility/algorithm/string/string_tools.h>
+
#include <RobotAPI/libraries/armem/client/query/Builder.h>
#include <RobotAPI/libraries/armem/core/Time.h>
#include <RobotAPI/libraries/armem/core/error.h>
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp
index 0085fd3fa..764cbdcc8 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp
@@ -4,6 +4,7 @@
#include <Eigen/Geometry>
#include <VirtualRobot/Robot.h>
+#include <SimoxUtility/algorithm/string/string_tools.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <ArmarXCore/core/logging/Logging.h>
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
index ac4011124..55a101582 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
@@ -1,15 +1,15 @@
#include "Reader.h"
-#include <mutex>
#include <optional>
#include <Eigen/Geometry>
+#include <SimoxUtility/algorithm/string/string_tools.h>
+
#include <ArmarXCore/core/PackagePath.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <ArmarXCore/core/logging/Logging.h>
-#include "RobotAPI/libraries/armem/core/Commit.h"
#include <RobotAPI/libraries/ArmarXObjects/ObjectInfo.h>
#include <RobotAPI/libraries/ArmarXObjects/ObjectPose.h>
#include <RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.aron.generated.h>
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/common/Visu.cpp b/source/RobotAPI/libraries/armem_robot_state/server/common/Visu.cpp
index 532676cb5..8a6af7701 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/common/Visu.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/server/common/Visu.cpp
@@ -7,6 +7,7 @@
#include <Eigen/Geometry>
#include <SimoxUtility/algorithm/get_map_keys_values.h>
+#include <SimoxUtility/algorithm/string/string_tools.h>
#include <SimoxUtility/math/pose.h>
#include <SimoxUtility/math/rescale.h>
#include <VirtualRobot/XML/RobotIO.h>
diff --git a/source/RobotAPI/libraries/aron/common/rw/eigen.h b/source/RobotAPI/libraries/aron/common/rw/eigen.h
index fee5d0f9f..848c5e36c 100644
--- a/source/RobotAPI/libraries/aron/common/rw/eigen.h
+++ b/source/RobotAPI/libraries/aron/common/rw/eigen.h
@@ -1,12 +1,16 @@
#pragma once
+#include <Eigen/Core>
+#include <Eigen/Geometry> // for Quaternion
+
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+
#include <RobotAPI/libraries/aron/codegeneration_util/TypeName.h>
#include <RobotAPI/libraries/aron/core/Exception.h>
#include <RobotAPI/libraries/aron/core/data/rw/Reader.h>
#include <RobotAPI/libraries/aron/core/data/rw/Writer.h>
#include <RobotAPI/libraries/aron/core/type/rw/Writer.h>
-#include "../aron_conversions/eigen.h"
namespace armarx
{
diff --git a/source/RobotAPI/libraries/aron/converter/opencv/OpenCVConverter.cpp b/source/RobotAPI/libraries/aron/converter/opencv/OpenCVConverter.cpp
index 957003a9e..5ba8c77e0 100644
--- a/source/RobotAPI/libraries/aron/converter/opencv/OpenCVConverter.cpp
+++ b/source/RobotAPI/libraries/aron/converter/opencv/OpenCVConverter.cpp
@@ -21,11 +21,11 @@
* GNU General Public License
*/
-// STD/STL
+#include "OpenCVConverter.h"
+
#include <numeric>
-// Header
-#include "OpenCVConverter.h"
+#include "RobotAPI/libraries/aron/core/data/variant/complex/NDArray.h"
namespace armarx::aron::data::converter
{
diff --git a/source/RobotAPI/libraries/aron/core/Path.cpp b/source/RobotAPI/libraries/aron/core/Path.cpp
index c80e00f53..ac91613dd 100644
--- a/source/RobotAPI/libraries/aron/core/Path.cpp
+++ b/source/RobotAPI/libraries/aron/core/Path.cpp
@@ -23,6 +23,7 @@
// Header
#include "Path.h"
+#include <SimoxUtility/algorithm/string/string_tools.h>
// ArmarX
#include <RobotAPI/libraries/aron/core/Exception.h>
diff --git a/source/RobotAPI/libraries/aron/core/data/rw/Writer.h b/source/RobotAPI/libraries/aron/core/data/rw/Writer.h
index 0195adddd..c5b063f3a 100644
--- a/source/RobotAPI/libraries/aron/core/data/rw/Writer.h
+++ b/source/RobotAPI/libraries/aron/core/data/rw/Writer.h
@@ -21,12 +21,12 @@
#pragma once
// STD/STL
-#include <memory>
#include <string>
#include <optional>
// ArmarX
#include <RobotAPI/interface/aron.h>
+#include <RobotAPI/libraries/aron/core/Descriptor.h>
#include <RobotAPI/libraries/aron/core/Exception.h>
// Known types
diff --git a/source/RobotAPI/libraries/aron/core/data/rw/reader/nlohmannJSON/NlohmannJSONReaderWithoutTypeCheck.cpp b/source/RobotAPI/libraries/aron/core/data/rw/reader/nlohmannJSON/NlohmannJSONReaderWithoutTypeCheck.cpp
index 2e864ad7a..e6289f74d 100644
--- a/source/RobotAPI/libraries/aron/core/data/rw/reader/nlohmannJSON/NlohmannJSONReaderWithoutTypeCheck.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/rw/reader/nlohmannJSON/NlohmannJSONReaderWithoutTypeCheck.cpp
@@ -18,26 +18,21 @@
* GNU General Public License
*/
-// STD/STL
+#include "NlohmannJSONReaderWithoutTypeCheck.h"
+
#include <cmath>
#include <cstdint>
#include <cstring>
-#include <memory>
-#include <numeric>
#include <SimoxUtility/algorithm/get_map_keys_values.h>
#include "ArmarXCore/core/logging/Logging.h"
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
-// Header
-#include "NlohmannJSONReaderWithoutTypeCheck.h"
-
-// ArmarX
#include <RobotAPI/interface/aron/Aron.h>
#include <RobotAPI/libraries/aron/core/Exception.h>
#include <RobotAPI/libraries/aron/core/data/visitor/nlohmannJSON/NlohmannJSONVisitor.h>
-#include "../../json/Data.h"
namespace armarx::aron::data::reader
diff --git a/source/RobotAPI/libraries/aron/core/data/rw/writer/variant/VariantWriter.h b/source/RobotAPI/libraries/aron/core/data/rw/writer/variant/VariantWriter.h
index 0be0b3489..c2ee59680 100644
--- a/source/RobotAPI/libraries/aron/core/data/rw/writer/variant/VariantWriter.h
+++ b/source/RobotAPI/libraries/aron/core/data/rw/writer/variant/VariantWriter.h
@@ -20,10 +20,6 @@
#pragma once
-// STD/STL
-#include <memory>
-#include <stack>
-
// BaseClass
#include <RobotAPI/libraries/aron/core/data/rw/Writer.h>
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp b/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp
index c03b3c37f..5619e10ad 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp
@@ -25,6 +25,7 @@
// Header
#include "Factory.h"
+#include <ArmarXCore/core/logging/Logging.h>
// ArmarX
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/complex/NDArray.cpp b/source/RobotAPI/libraries/aron/core/data/variant/complex/NDArray.cpp
index 38de3e292..8bf1da973 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/complex/NDArray.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/complex/NDArray.cpp
@@ -26,6 +26,7 @@
// Simox
#include <SimoxUtility/algorithm/string.h>
+#include <ArmarXCore/util/CPPUtility/trace.h>
// ArmarX
#include <RobotAPI/libraries/aron/core/data/variant/Factory.h>
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/container/Dict.cpp b/source/RobotAPI/libraries/aron/core/data/variant/container/Dict.cpp
index 19dd673bd..a348570cd 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/container/Dict.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/container/Dict.cpp
@@ -27,6 +27,7 @@
// ArmarX
#include <SimoxUtility/algorithm/string/string_conversion.h>
+#include <ArmarXCore/core/logging/Logging.h>
#include <ArmarXCore/util/CPPUtility/trace.h>
#include <RobotAPI/libraries/aron/core/data/variant/Factory.h>
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/detail/SpecializedVariant.h b/source/RobotAPI/libraries/aron/core/data/variant/detail/SpecializedVariant.h
index 031d58ae1..d2e396559 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/detail/SpecializedVariant.h
+++ b/source/RobotAPI/libraries/aron/core/data/variant/detail/SpecializedVariant.h
@@ -25,13 +25,12 @@
// STD/STL
#include <memory>
-#include <string>
-#include <unordered_map>
// Base class
#include "../Variant.h"
// ArmarX
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
namespace armarx::aron::data::detail
{
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Bool.cpp b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Bool.cpp
index ed29f88c3..618be3850 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Bool.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Bool.cpp
@@ -22,6 +22,7 @@
*/
#include "Bool.h"
+#include <ArmarXCore/util/CPPUtility/trace.h>
namespace armarx::aron::data
{
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Double.cpp b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Double.cpp
index 66b23d4e1..c118ea66d 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Double.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Double.cpp
@@ -23,6 +23,7 @@
// Header
#include "Double.h"
+#include <ArmarXCore/util/CPPUtility/trace.h>
// ArmarX
#include "Float.h"
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Float.cpp b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Float.cpp
index 26d08b4b5..6ebe3a5a4 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Float.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Float.cpp
@@ -22,6 +22,7 @@
*/
#include "Float.h"
+#include <ArmarXCore/util/CPPUtility/trace.h>
namespace armarx::aron::data
{
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Int.cpp b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Int.cpp
index 870cbcd22..18bb4ed52 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Int.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Int.cpp
@@ -22,6 +22,7 @@
*/
#include "Int.h"
+#include <ArmarXCore/util/CPPUtility/trace.h>
#include <RobotAPI/libraries/aron/core/data/variant/Factory.h>
#include <RobotAPI/libraries/aron/core/type/variant/primitive/Int.h>
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Long.cpp b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Long.cpp
index 2f62027e1..4fc08e880 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/primitive/Long.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/primitive/Long.cpp
@@ -23,6 +23,7 @@
// Header
#include "Long.h"
+#include <ArmarXCore/util/CPPUtility/trace.h>
// ArmarX
#include "Int.h"
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/primitive/String.cpp b/source/RobotAPI/libraries/aron/core/data/variant/primitive/String.cpp
index 9f765ed20..675a15cba 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/primitive/String.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/primitive/String.cpp
@@ -22,6 +22,7 @@
*/
#include "String.h"
+#include <ArmarXCore/util/CPPUtility/trace.h>
namespace armarx::aron::data
{
diff --git a/source/RobotAPI/libraries/aron/core/type/rw/Reader.h b/source/RobotAPI/libraries/aron/core/type/rw/Reader.h
index 9b9b5cf97..bde013b6a 100644
--- a/source/RobotAPI/libraries/aron/core/type/rw/Reader.h
+++ b/source/RobotAPI/libraries/aron/core/type/rw/Reader.h
@@ -21,12 +21,12 @@
#pragma once
// STD/STL
-#include <memory>
#include <optional>
#include <string>
// ArmarX
#include <RobotAPI/interface/aron.h>
+#include <RobotAPI/libraries/aron/core/Descriptor.h>
#include <RobotAPI/libraries/aron/core/Exception.h>
namespace armarx::aron::type
diff --git a/source/RobotAPI/libraries/aron/core/type/rw/Writer.h b/source/RobotAPI/libraries/aron/core/type/rw/Writer.h
index 27bcfcd0d..5fef12f11 100644
--- a/source/RobotAPI/libraries/aron/core/type/rw/Writer.h
+++ b/source/RobotAPI/libraries/aron/core/type/rw/Writer.h
@@ -27,6 +27,7 @@
// ArmarX
#include <RobotAPI/interface/aron.h>
+#include <RobotAPI/libraries/aron/core/Descriptor.h>
#include <RobotAPI/libraries/aron/core/Exception.h>
namespace armarx::aron::type
diff --git a/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp b/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp
index 21ba5cd09..3c32ade9f 100644
--- a/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp
+++ b/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp
@@ -25,6 +25,7 @@
// Header
#include "Factory.h"
+#include <ArmarXCore/core/logging/Logging.h>
// ArmarX
#include <RobotAPI/libraries/aron/core/type/variant/All.h>
diff --git a/source/RobotAPI/libraries/aron/core/type/variant/detail/SpecializedVariant.h b/source/RobotAPI/libraries/aron/core/type/variant/detail/SpecializedVariant.h
index ca11b3c25..fdc1bcf17 100644
--- a/source/RobotAPI/libraries/aron/core/type/variant/detail/SpecializedVariant.h
+++ b/source/RobotAPI/libraries/aron/core/type/variant/detail/SpecializedVariant.h
@@ -25,8 +25,11 @@
#include <memory>
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+
#include "../Variant.h"
+
namespace armarx::aron::type::detail
{
template <typename AronTypeT, typename DerivedT>
diff --git a/source/RobotAPI/libraries/aron/filter/data/WhitelistFilter.h b/source/RobotAPI/libraries/aron/filter/data/WhitelistFilter.h
index aa43790e0..88a8c1f3b 100644
--- a/source/RobotAPI/libraries/aron/filter/data/WhitelistFilter.h
+++ b/source/RobotAPI/libraries/aron/filter/data/WhitelistFilter.h
@@ -24,6 +24,7 @@
#include <algorithm>
#include <map>
#include <vector>
+#include <SimoxUtility/algorithm/string/string_tools.h>
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
#include <RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.h>
diff --git a/source/RobotAPI/libraries/aron/similarity/cosine.cpp b/source/RobotAPI/libraries/aron/similarity/cosine.cpp
index 396ea6613..ac9e22cf0 100644
--- a/source/RobotAPI/libraries/aron/similarity/cosine.cpp
+++ b/source/RobotAPI/libraries/aron/similarity/cosine.cpp
@@ -1,6 +1,7 @@
#include "cosine.h"
#include <SimoxUtility/algorithm/string.h>
+#include <ArmarXCore/core/logging/Logging.h>
#include <cmath>
namespace armarx::aron::similarity
diff --git a/source/RobotAPI/libraries/aron/similarity/data/image/NDArraySimilarity.cpp b/source/RobotAPI/libraries/aron/similarity/data/image/NDArraySimilarity.cpp
index 5fb38a7f8..467c9f1da 100644
--- a/source/RobotAPI/libraries/aron/similarity/data/image/NDArraySimilarity.cpp
+++ b/source/RobotAPI/libraries/aron/similarity/data/image/NDArraySimilarity.cpp
@@ -1,6 +1,7 @@
#include "NDArraySimilarity.h"
#include <cmath>
+#include <ArmarXCore/core/logging/Logging.h>
#include "mse.h"
#include "mae.h"
#include "chernoff.h"
diff --git a/source/RobotAPI/libraries/aron/similarity/data/image/chernoff.cpp b/source/RobotAPI/libraries/aron/similarity/data/image/chernoff.cpp
index 0b4d26bc8..f91feb06a 100644
--- a/source/RobotAPI/libraries/aron/similarity/data/image/chernoff.cpp
+++ b/source/RobotAPI/libraries/aron/similarity/data/image/chernoff.cpp
@@ -3,6 +3,7 @@
#include <cmath>
#include <Eigen/Core>
#include <Eigen/Eigenvalues>
+#include <ArmarXCore/core/logging/Logging.h>
namespace armarx::aron::similarity::chernoff
{
diff --git a/source/RobotAPI/libraries/aron/similarity/data/image/mse.cpp b/source/RobotAPI/libraries/aron/similarity/data/image/mse.cpp
index cb9dcf9d3..052cccff3 100644
--- a/source/RobotAPI/libraries/aron/similarity/data/image/mse.cpp
+++ b/source/RobotAPI/libraries/aron/similarity/data/image/mse.cpp
@@ -1,6 +1,7 @@
#include "mse.h"
#include <SimoxUtility/algorithm/string.h>
+#include <ArmarXCore/core/logging/Logging.h>
#include <cmath>
namespace armarx::aron::similarity
diff --git a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
index 9ed625949..7541f1ce6 100644
--- a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
+++ b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
@@ -22,6 +22,9 @@
#include "PropertyDefinitionVisitors.h"
+#include <SimoxUtility/algorithm/string/string_conversion_eigen.h>
+#include <SimoxUtility/algorithm/string/string_tools.h>
+
#include <ArmarXCore/core/application/properties/PropertyDefinition.h>
#include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
#include <ArmarXCore/core/application/properties/PropertyUser.h>
@@ -467,4 +470,4 @@ namespace armarx::aron::component_config
}
} // namespace armarx::aron::component_config
-#undef INPUT_GUARD
\ No newline at end of file
+#undef INPUT_GUARD
diff --git a/source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.cpp b/source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.cpp
index 10e021861..797f755ea 100644
--- a/source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.cpp
+++ b/source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.cpp
@@ -22,8 +22,11 @@
#include "VariantHelperFactory.h"
+#include <SimoxUtility/algorithm/string/string_conversion.h>
+
#include <ArmarXCore/core/application/properties/Property.h>
#include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
+#include <ArmarXCore/interface/core/UserException.h>
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
@@ -222,4 +225,4 @@ namespace armarx::aron::component_config::products
template struct products::VariantHelper<type::Descriptor::FLOAT>;
template struct products::VariantHelper<type::Descriptor::DOUBLE>;
template struct products::VariantHelper<type::Descriptor::INT_ENUM>;
-} // namespace armarx::aron::component_config::products
\ No newline at end of file
+} // namespace armarx::aron::component_config::products
diff --git a/source/RobotAPI/libraries/skills/core/SkillProxy.h b/source/RobotAPI/libraries/skills/core/SkillProxy.h
index e20ca01a0..d91dc2ae6 100644
--- a/source/RobotAPI/libraries/skills/core/SkillProxy.h
+++ b/source/RobotAPI/libraries/skills/core/SkillProxy.h
@@ -1,5 +1,6 @@
#pragma once
+#include <ArmarXCore/core/logging/Logging.h>
#include <RobotAPI/libraries/skills/core/SkillDescription.h>
#include <RobotAPI/libraries/skills/core/SkillStatusUpdate.h>
diff --git a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/EditMatrixWidget.h b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/EditMatrixWidget.h
index 9d0c8cbfb..e179a8593 100644
--- a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/EditMatrixWidget.h
+++ b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/EditMatrixWidget.h
@@ -6,6 +6,7 @@
#include <QObject>
#include <QTreeWidgetItem>
#include <QVBoxLayout>
+#include <SimoxUtility/algorithm/string/string_conversion.h>
#include "RobotAPI/libraries/aron/core/type/variant/ndarray/Matrix.h"
diff --git a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/IntEnumWidget.cpp b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/IntEnumWidget.cpp
index bbbee283d..458aa39b9 100644
--- a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/IntEnumWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/IntEnumWidget.cpp
@@ -2,7 +2,8 @@
#include <QHBoxLayout>
-#include "RobotAPI/libraries/aron/core/type/variant/All.h"
+#include <SimoxUtility/algorithm/string/string_conversion.h>
+#include <SimoxUtility/error/SimoxError.h>
#include "../ColorPalettes.h"
#include "../visitors/AronTreeWidgetConverter.h"
diff --git a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/QuaternionWidget.cpp b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/QuaternionWidget.cpp
index e8a48aa71..f6d123b76 100644
--- a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/QuaternionWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/QuaternionWidget.cpp
@@ -7,6 +7,8 @@
#include "../ColorPalettes.h"
#include "NDArrayHelper.h"
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+
namespace armarx::skills::gui
{
diff --git a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/QuaternionWidget.h b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/QuaternionWidget.h
index f743e3acf..c256f0a22 100644
--- a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/QuaternionWidget.h
+++ b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/widgets/QuaternionWidget.h
@@ -1,11 +1,14 @@
#pragma once
+
+#include <cmath>
#include <vector>
#include <QLineEdit>
#include <QObject>
#include <QVBoxLayout>
-
-#include "RobotAPI/libraries/aron/core/type/variant/ndarray/Matrix.h"
+#include <SimoxUtility/algorithm/string/string_conversion.h>
+#include <SimoxUtility/error/SimoxError.h>
+#include <RobotAPI/interface/aron/Aron.h>
#include "CustomWidget.h"
diff --git a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp
index 780c2bb72..87a254728 100644
--- a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp
@@ -4,6 +4,7 @@
#include <QMenu>
#include <QTreeWidgetItem>
+#include <ArmarXCore/core/logging/Logging.h>
#include "SkillExecutionTreeWidgetItem.h"
diff --git a/source/RobotAPI/libraries/skills_gui/memory/SkillManagerWrapper.cpp b/source/RobotAPI/libraries/skills_gui/memory/SkillManagerWrapper.cpp
index 4ff646277..cc72d4565 100644
--- a/source/RobotAPI/libraries/skills_gui/memory/SkillManagerWrapper.cpp
+++ b/source/RobotAPI/libraries/skills_gui/memory/SkillManagerWrapper.cpp
@@ -1,6 +1,8 @@
#include "SkillManagerWrapper.h"
#include <mutex>
+#include <SimoxUtility/algorithm/string/string_tools.h>
+#include <ArmarXCore/core/logging/Logging.h>
#include "RobotAPI/libraries/skills/core/SkillExecutionRequest.h"
--
GitLab