Expose VisualizationManager and YamlConfigReader to the public API (r…

…os-visualization#649) In order to create a standalone Qt application that contains an embedded RViz2 RenderPanel, the header for the VisualizationManager class must be moved to the public API to allow instantiating a VisualizationManager independently from the context of the RViz2 application. The YamlConfigReader class also needs to be moved to the public API to allow runtime configuration of the VisualizationManager, for example to add a Grid plugin. Signed-off-by: Joe Schornak <joe.schornak@gmail.com>
ipa-fez · Mar 5, 2021 · 3ca50ac · 3ca50ac
1 parent f9bdf00
commit 3ca50ac
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 14 deletions.
diff --git a/rviz_common/CMakeLists.txt b/rviz_common/CMakeLists.txt
@@ -108,6 +108,7 @@ set(rviz_common_headers_to_moc
   include/rviz_common/properties/tf_frame_property.hpp
   include/rviz_common/properties/vector_property.hpp
   include/rviz_common/render_panel.hpp
+  include/rviz_common/visualization_manager.hpp
   src/rviz_common/scaled_image_widget.hpp
   src/rviz_common/screenshot_dialog.hpp
   include/rviz_common/interaction/selection_manager.hpp
@@ -123,7 +124,6 @@ set(rviz_common_headers_to_moc
   include/rviz_common/view_manager.hpp
   src/rviz_common/views_panel.hpp
   src/rviz_common/visualization_frame.hpp
-  src/rviz_common/visualization_manager.hpp
   src/rviz_common/widget_geometry_change_detector.hpp
   include/rviz_common/ros_topic_display.hpp
 )

diff --git a/...src/rviz_common/visualization_manager.hpp → ...ude/rviz_common/visualization_manager.hpp b/...src/rviz_common/visualization_manager.hpp → ...ude/rviz_common/visualization_manager.hpp
diff --git a/...on/src/rviz_common/yaml_config_reader.hpp → ...nclude/rviz_common/yaml_config_reader.hpp b/...on/src/rviz_common/yaml_config_reader.hpp → ...nclude/rviz_common/yaml_config_reader.hpp
diff --git a/rviz_common/src/rviz_common/displays_panel.cpp b/rviz_common/src/rviz_common/displays_panel.cpp
@@ -47,7 +47,7 @@
 #include "rviz_common/properties/property_tree_widget.hpp"
 #include "rviz_common/properties/property_tree_with_help.hpp"
 #include "rviz_common/ros_integration/ros_node_abstraction_iface.hpp"
-#include "./visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 
 namespace rviz_common
 {

diff --git a/rviz_common/src/rviz_common/interaction/selection_handler.cpp b/rviz_common/src/rviz_common/interaction/selection_handler.cpp
@@ -47,7 +47,7 @@
 #include "rviz_common/properties/property.hpp"
 #include "rviz_common/interaction/selection_manager.hpp"
 #include "rviz_common/interaction/handler_manager_iface.hpp"
-#include "../visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 
 namespace rviz_common
 {

diff --git a/rviz_common/src/rviz_common/panel_factory.cpp b/rviz_common/src/rviz_common/panel_factory.cpp
@@ -40,7 +40,7 @@
 #include "./tool_properties_panel.hpp"
 #include "./transformation_panel.hpp"
 #include "./views_panel.hpp"
-#include "./visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 #include "rviz_common/ros_integration/ros_node_abstraction_iface.hpp"
 
 namespace rviz_common

diff --git a/rviz_common/src/rviz_common/selection_panel.cpp b/rviz_common/src/rviz_common/selection_panel.cpp
@@ -33,7 +33,7 @@
 
 #include "rviz_common/properties/property_tree_widget.hpp"
 #include "rviz_common/interaction/selection_manager.hpp"
-#include "visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 
 namespace rviz_common
 {

diff --git a/rviz_common/src/rviz_common/time_panel.cpp b/rviz_common/src/rviz_common/time_panel.cpp
@@ -36,7 +36,7 @@
 #include <QSlider>
 #include <QComboBox>
 
-#include "./visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 #include "frame_manager.hpp"
 
 #include "rviz_common/display_group.hpp"

diff --git a/rviz_common/src/rviz_common/tool_properties_panel.cpp b/rviz_common/src/rviz_common/tool_properties_panel.cpp
@@ -34,7 +34,7 @@
 
 #include "rviz_common/properties/property_tree_widget.hpp"
 #include "tool_manager.hpp"
-#include "visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 
 namespace rviz_common
 {

diff --git a/rviz_common/src/rviz_common/views_panel.cpp b/rviz_common/src/rviz_common/views_panel.cpp
@@ -38,7 +38,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "./visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 #include "rviz_common/properties/property_tree_widget.hpp"
 #include "rviz_common/view_controller.hpp"
 #include "rviz_common/view_manager.hpp"

diff --git a/rviz_common/src/rviz_common/visualization_frame.cpp b/rviz_common/src/rviz_common/visualization_frame.cpp
@@ -68,6 +68,7 @@
 #include "rviz_common/panel_dock_widget.hpp"
 #include "rviz_common/render_panel.hpp"
 #include "rviz_common/tool.hpp"
+#include "rviz_common/yaml_config_reader.hpp"
 #include "rviz_rendering/render_window.hpp"
 
 #include "./env_config.hpp"
@@ -78,9 +79,8 @@
 #include "./screenshot_dialog.hpp"
 #include "./splash_screen.hpp"
 #include "./tool_manager.hpp"
-#include "./visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 #include "./widget_geometry_change_detector.hpp"
-#include "./yaml_config_reader.hpp"
 #include "./yaml_config_writer.hpp"
 
 // #include "./displays_panel.hpp"

diff --git a/rviz_common/src/rviz_common/visualization_manager.cpp b/rviz_common/src/rviz_common/visualization_manager.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 
 #include <algorithm>
 #include <chrono>

diff --git a/rviz_common/src/rviz_common/visualizer_app.cpp b/rviz_common/src/rviz_common/visualizer_app.cpp
@@ -48,7 +48,7 @@
 #include "rviz_rendering/ogre_logging.hpp"
 
 #include "./visualization_frame.hpp"
-#include "./visualization_manager.hpp"
+#include "rviz_common/visualization_manager.hpp"
 
 // TODO(wjwwood): figure out a non-depricated way to do this
 #if 0

diff --git a/rviz_common/src/rviz_common/yaml_config_reader.cpp b/rviz_common/src/rviz_common/yaml_config_reader.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./yaml_config_reader.hpp"
+#include "rviz_common/yaml_config_reader.hpp"
 
 #include <fstream>
 #include <sstream>

diff --git a/rviz_common/test/display_test.cpp b/rviz_common/test/display_test.cpp
@@ -37,7 +37,7 @@
 #include "rviz_common/properties/vector_property.hpp"
 #include "rviz_common/properties/color_property.hpp"
 #include "rviz_common/config.hpp"
-#include "../src/rviz_common/yaml_config_reader.hpp"
+#include "rviz_common/yaml_config_reader.hpp"
 #include "../src/rviz_common/yaml_config_writer.hpp"
 
 #include "mock_display.hpp"