Merge branch 'feature/skills-framework-header-cleanup' into 'master'

skills framework: header cleanup

See merge request !506

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>
 

source/RobotAPI/components/skills/SkillProviderExample/Callback.cpp

 
 #include "Callback.h"
+#include "RobotAPI/libraries/aron/core/data/variant/primitive/String.h"
 
 namespace armarx::skills::provider
 {

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"
 

source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/IntEnumWidget.cpp

 #include "IntEnumWidget.h"
 
 #include <QHBoxLayout>
+#include <SimoxUtility/algorithm/string/string_conversion.h>
 
 #include "RobotAPI/libraries/aron/core/type/variant/All.h"
 

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"

source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.h

 #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"
 

source/RobotAPI/libraries/armem/client/Reader.h

@@ -2,7 +2,6 @@
 
 
 // STD/STL
-#include <mutex>
 #include <optional>
 #include <vector>
 

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>

source/RobotAPI/libraries/armem/client/util/SimpleWriterBase.h

@@ -21,8 +21,6 @@
 
 #pragma once
 
-#include <mutex>
-
 #include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
 
 #include <RobotAPI/libraries/armem/client/Writer.h>

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>

source/RobotAPI/libraries/armem/server/ltm/EntitySnapshot.cpp

 // Header
 #include "EntitySnapshot.h"
 
-// STD / STL
-#include <fstream>
-#include <iostream>
-
 // ArmarX
 #include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/time/TimeUtil.h>

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>

source/RobotAPI/libraries/armem/server/ltm/detail/mixins/util/mongodb.cpp

 #include "mongodb.h"
 
 // Simox
+#include <SimoxUtility/algorithm/string/string_tools.h>
 #include <SimoxUtility/json.h>
 
 #include <RobotAPI/libraries/armem/core/error.h>

source/RobotAPI/libraries/armem/server/ltm/processors/Processors.cpp

 #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"

source/RobotAPI/libraries/armem_grasping/client/KnownGraspCandidateReader.cpp

 #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

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>

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>

source/RobotAPI/libraries/armem_locations/client/Reader.cpp

 #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>

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>

source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp

 #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>