From f62fc0c32bea7f8b58d2fe27a0291adfec264004 Mon Sep 17 00:00:00 2001 From: Fabian Paus <fabian.paus@kit.edu> Date: Fri, 11 Oct 2019 14:33:52 +0200 Subject: [PATCH] Rename files --- .../RobotAPI/components/ArViz/CMakeLists.txt | 28 ++++++++-------- .../ArViz/Coin/RegisterVisualizationTypes.cpp | 33 +++++++++++++++++++ ...VisualizerArrow.h => VisualizationArrow.h} | 0 ...rowCircle.h => VisualizationArrowCircle.h} | 0 .../{VisualizerBox.h => VisualizationBox.h} | 0 ...izerCylinder.h => VisualizationCylinder.h} | 0 .../{VisualizerLine.h => VisualizationLine.h} | 0 .../{VisualizerMesh.h => VisualizationMesh.h} | 0 ...PointCloud.h => VisualizationPointCloud.h} | 0 ...alizerPolygon.h => VisualizationPolygon.h} | 0 .../{VisualizerPose.h => VisualizationPose.h} | 0 ...alizerRobot.cpp => VisualizationRobot.cpp} | 0 ...VisualizerRobot.h => VisualizationRobot.h} | 0 ...sualizerSphere.h => VisualizationSphere.h} | 0 .../{VisualizerText.h => VisualizationText.h} | 0 .../components/ArViz/Coin/Visualizer.cpp | 30 ++--------------- .../components/ArViz/Coin/Visualizer.h | 2 ++ 17 files changed, 52 insertions(+), 41 deletions(-) create mode 100644 source/RobotAPI/components/ArViz/Coin/RegisterVisualizationTypes.cpp rename source/RobotAPI/components/ArViz/Coin/{VisualizerArrow.h => VisualizationArrow.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerArrowCircle.h => VisualizationArrowCircle.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerBox.h => VisualizationBox.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerCylinder.h => VisualizationCylinder.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerLine.h => VisualizationLine.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerMesh.h => VisualizationMesh.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerPointCloud.h => VisualizationPointCloud.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerPolygon.h => VisualizationPolygon.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerPose.h => VisualizationPose.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerRobot.cpp => VisualizationRobot.cpp} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerRobot.h => VisualizationRobot.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerSphere.h => VisualizationSphere.h} (100%) rename source/RobotAPI/components/ArViz/Coin/{VisualizerText.h => VisualizationText.h} (100%) diff --git a/source/RobotAPI/components/ArViz/CMakeLists.txt b/source/RobotAPI/components/ArViz/CMakeLists.txt index 3bcce2987..37751b994 100644 --- a/source/RobotAPI/components/ArViz/CMakeLists.txt +++ b/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 ) diff --git a/source/RobotAPI/components/ArViz/Coin/RegisterVisualizationTypes.cpp b/source/RobotAPI/components/ArViz/Coin/RegisterVisualizationTypes.cpp new file mode 100644 index 000000000..74c9afb20 --- /dev/null +++ b/source/RobotAPI/components/ArViz/Coin/RegisterVisualizationTypes.cpp @@ -0,0 +1,33 @@ +#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>(); +} diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerArrow.h b/source/RobotAPI/components/ArViz/Coin/VisualizationArrow.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerArrow.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationArrow.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerArrowCircle.h b/source/RobotAPI/components/ArViz/Coin/VisualizationArrowCircle.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerArrowCircle.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationArrowCircle.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerBox.h b/source/RobotAPI/components/ArViz/Coin/VisualizationBox.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerBox.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationBox.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerCylinder.h b/source/RobotAPI/components/ArViz/Coin/VisualizationCylinder.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerCylinder.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationCylinder.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerLine.h b/source/RobotAPI/components/ArViz/Coin/VisualizationLine.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerLine.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationLine.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerMesh.h b/source/RobotAPI/components/ArViz/Coin/VisualizationMesh.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerMesh.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationMesh.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerPointCloud.h b/source/RobotAPI/components/ArViz/Coin/VisualizationPointCloud.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerPointCloud.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationPointCloud.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerPolygon.h b/source/RobotAPI/components/ArViz/Coin/VisualizationPolygon.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerPolygon.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationPolygon.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerPose.h b/source/RobotAPI/components/ArViz/Coin/VisualizationPose.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerPose.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationPose.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerRobot.cpp b/source/RobotAPI/components/ArViz/Coin/VisualizationRobot.cpp similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerRobot.cpp rename to source/RobotAPI/components/ArViz/Coin/VisualizationRobot.cpp diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerRobot.h b/source/RobotAPI/components/ArViz/Coin/VisualizationRobot.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerRobot.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationRobot.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerSphere.h b/source/RobotAPI/components/ArViz/Coin/VisualizationSphere.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerSphere.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationSphere.h diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizerText.h b/source/RobotAPI/components/ArViz/Coin/VisualizationText.h similarity index 100% rename from source/RobotAPI/components/ArViz/Coin/VisualizerText.h rename to source/RobotAPI/components/ArViz/Coin/VisualizationText.h diff --git a/source/RobotAPI/components/ArViz/Coin/Visualizer.cpp b/source/RobotAPI/components/ArViz/Coin/Visualizer.cpp index 0830be447..31d2a20cf 100644 --- a/source/RobotAPI/components/ArViz/Coin/Visualizer.cpp +++ b/source/RobotAPI/components/ArViz/Coin/Visualizer.cpp @@ -1,18 +1,5 @@ #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); diff --git a/source/RobotAPI/components/ArViz/Coin/Visualizer.h b/source/RobotAPI/components/ArViz/Coin/Visualizer.h index d035ad828..02007e14a 100644 --- a/source/RobotAPI/components/ArViz/Coin/Visualizer.h +++ b/source/RobotAPI/components/ArViz/Coin/Visualizer.h @@ -37,6 +37,8 @@ namespace armarx::viz ~CoinVisualizer(); + void registerVisualizationTypes(); + void startAsync(StorageInterfacePrx const& storage); void stop(); -- GitLab