Rename files

source/RobotAPI/components/ArViz/CMakeLists.txt

@@ -10,8 +10,10 @@ set(SOURCES
 
 Coin/ElementVisualizer.cpp
 
+Coin/VisualizationRobot.cpp
+
 Coin/Visualizer.cpp
-Coin/VisualizerRobot.cpp
+Coin/RegisterVisualizationTypes.cpp
 )
 
 set(HEADERS
@@ -21,19 +23,19 @@ IceConversions.h
 Coin/ElementVisualizer.h
 
 # Inventor
-Coin/VisualizerBox.h
-Coin/VisualizerCylinder.h
-Coin/VisualizerSphere.h
-Coin/VisualizerPose.h
-Coin/VisualizerLine.h
-Coin/VisualizerText.h
-Coin/VisualizerArrow.h
-Coin/VisualizerArrowCircle.h
-Coin/VisualizerPointCloud.h
-Coin/VisualizerPolygon.h
-Coin/VisualizerMesh.h
+Coin/VisualizationBox.h
+Coin/VisualizationCylinder.h
+Coin/VisualizationSphere.h
+Coin/VisualizationPose.h
+Coin/VisualizationLine.h
+Coin/VisualizationText.h
+Coin/VisualizationArrow.h
+Coin/VisualizationArrowCircle.h
+Coin/VisualizationPointCloud.h
+Coin/VisualizationPolygon.h
+Coin/VisualizationMesh.h
 # Simox
-Coin/VisualizerRobot.h
+Coin/VisualizationRobot.h
 
 Coin/Visualizer.h
 )

source/RobotAPI/components/ArViz/Coin/RegisterVisualizationTypes.cpp

+#include "Visualizer.h"
+
+#include "VisualizationBox.h"
+#include "VisualizationCylinder.h"
+#include "VisualizationSphere.h"
+#include "VisualizationPose.h"
+#include "VisualizationLine.h"
+#include "VisualizationText.h"
+#include "VisualizationArrow.h"
+#include "VisualizationArrowCircle.h"
+#include "VisualizationPointCloud.h"
+#include "VisualizationPolygon.h"
+#include "VisualizationMesh.h"
+#include "VisualizationRobot.h"
+
+
+void armarx::viz::CoinVisualizer::registerVisualizationTypes()
+{
+    using namespace armarx::viz::coin;
+
+    registerVisualizerFor<VisualizationBox>();
+    registerVisualizerFor<VisualizationCylinder>();
+    registerVisualizerFor<VisualizationSphere>();
+    registerVisualizerFor<VisualizationPose>();
+    registerVisualizerFor<VisualizationLine>();
+    registerVisualizerFor<VisualizationText>();
+    registerVisualizerFor<VisualizationArrow>();
+    registerVisualizerFor<VisualizationArrowCircle>();
+    registerVisualizerFor<VisualizationPointCloud>();
+    registerVisualizerFor<VisualizationPolygon>();
+    registerVisualizerFor<VisualizationMesh>();
+    registerVisualizerFor<VisualizationRobot>();
+}

source/RobotAPI/components/ArViz/Coin/Visualizer.cpp

 #include "Visualizer.h"
 
-#include "VisualizerBox.h"
-#include "VisualizerCylinder.h"
-#include "VisualizerSphere.h"
-#include "VisualizerPose.h"
-#include "VisualizerLine.h"
-#include "VisualizerText.h"
-#include "VisualizerArrow.h"
-#include "VisualizerArrowCircle.h"
-#include "VisualizerPointCloud.h"
-#include "VisualizerPolygon.h"
-#include "VisualizerMesh.h"
-#include "VisualizerRobot.h"
-
 #include <ArmarXCore/core/logging/Logging.h>
 
 #include <Inventor/sensors/SoTimerSensor.h>
@@ -49,21 +36,7 @@ namespace armarx
 
         CoinVisualizer::CoinVisualizer()
         {
-            // Register all available draw types
-            using namespace armarx::viz::coin;
-
-            registerVisualizerFor<VisualizationBox>();
-            registerVisualizerFor<VisualizationCylinder>();
-            registerVisualizerFor<VisualizationSphere>();
-            registerVisualizerFor<VisualizationPose>();
-            registerVisualizerFor<VisualizationLine>();
-            registerVisualizerFor<VisualizationText>();
-            registerVisualizerFor<VisualizationArrow>();
-            registerVisualizerFor<VisualizationArrowCircle>();
-            registerVisualizerFor<VisualizationPointCloud>();
-            registerVisualizerFor<VisualizationPolygon>();
-            registerVisualizerFor<VisualizationMesh>();
-            registerVisualizerFor<VisualizationRobot>();
+            registerVisualizationTypes();
 
             root = new SoSeparator;
 
@@ -77,6 +50,7 @@ namespace armarx
         {
         }
 
+
         void CoinVisualizer::startAsync(StorageInterfacePrx const& storage)
         {
             std::unique_lock<std::mutex> lock(stateMutex);

source/RobotAPI/components/ArViz/Coin/Visualizer.h

@@ -37,6 +37,8 @@ namespace armarx::viz
 
         ~CoinVisualizer();
 
+        void registerVisualizationTypes();
+
         void startAsync(StorageInterfacePrx const& storage);
 
         void stop();