Fix visibility of xy_orbit_view_controller

ros2 · Jun 13, 2018 · 91f701a · 91f701a
1 parent 5c8115e
commit 91f701a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/rviz_default_plugins/CMakeLists.txt b/rviz_default_plugins/CMakeLists.txt
@@ -82,6 +82,7 @@ set(rviz_default_plugins_headers_to_moc
   include/rviz_default_plugins/tools/point/point_tool.hpp
   include/rviz_default_plugins/view_controllers/orbit/orbit_view_controller.hpp
   include/rviz_default_plugins/view_controllers/ortho/fixed_orientation_ortho_view_controller.hpp
+  include/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.hpp
 )
 
 set(rviz_default_plugins_source_files

diff --git a/...ers/xy_orbit/xy_orbit_view_controller.hpp → ...ers/xy_orbit/xy_orbit_view_controller.hpp b/...ers/xy_orbit/xy_orbit_view_controller.hpp → ...ers/xy_orbit/xy_orbit_view_controller.hpp
@@ -46,6 +46,7 @@
 #endif
 
 #include "rviz_default_plugins/view_controllers/orbit/orbit_view_controller.hpp"
+#include "rviz_default_plugins/visibility_control.hpp"
 
 namespace Ogre
 {
@@ -59,7 +60,7 @@ namespace view_controllers
 /**
  * \brief Like the orbit view controller, but focal point moves only in the x-y plane.
  */
-class XYOrbitViewController : public OrbitViewController
+class RVIZ_DEFAULT_PLUGINS_PUBLIC XYOrbitViewController : public OrbitViewController
 {
   Q_OBJECT
 

diff --git a/...t_plugins/src/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.cpp b/...t_plugins/src/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./xy_orbit_view_controller.hpp"
+#include "rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.hpp"
 
 #include <cstdint>
 #include <utility>

diff --git a/...t_plugins/test/rviz_default_plugins/view_controllers/orbit/orbit_view_controller_test.cpp b/...t_plugins/test/rviz_default_plugins/view_controllers/orbit/orbit_view_controller_test.cpp
@@ -43,8 +43,7 @@
 #include "rviz_common/render_panel.hpp"
 #include "rviz_common/viewport_mouse_event.hpp"
 
-#include \
-  "../../../../src/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.hpp"  // NOLINT
+#include "rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.hpp"
 #include "rviz_default_plugins/view_controllers/orbit/orbit_view_controller.hpp"
 #include "rviz_default_plugins/view_controllers/ortho/fixed_orientation_ortho_view_controller.hpp"
 

diff --git a/...ins/test/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller_test.cpp b/...ins/test/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller_test.cpp
@@ -43,8 +43,7 @@
 #include "rviz_common/render_panel.hpp"
 #include "rviz_common/viewport_mouse_event.hpp"
 
-#include \
-  "../../../../src/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.hpp"  // NOLINT
+#include "rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.hpp"
 #include "rviz_default_plugins/view_controllers/ortho/fixed_orientation_ortho_view_controller.hpp"
 
 #include "../../displays/display_test_fixture.hpp"