Skip to content

Commit

Permalink
Modified compilation files and plugin description
Browse files Browse the repository at this point in the history
  • Loading branch information
roberto-martinmartin committed Feb 19, 2015
1 parent 8ded13a commit 83c9633
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
13 changes: 8 additions & 5 deletions rviz-plugin-selected-points-topic/CMakeLists.txt
Expand Up @@ -3,30 +3,33 @@
##
## First start with some standard catkin stuff.
cmake_minimum_required(VERSION 2.8.3)
project(selected_points_topic)
project(selected_points_publisher)
find_package(catkin REQUIRED COMPONENTS rviz)
catkin_package()
include_directories(${catkin_INCLUDE_DIRS})
find_package(PCL REQUIRED)
include_directories(include ${catkin_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS})
link_directories(${catkin_LIBRARY_DIRS})

## This plugin includes Qt widgets, so we must include Qt like so:
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE})



## I prefer the Qt signals and slots to avoid defining "emit", "slots",
## etc because they can conflict with boost signals, so define QT_NO_KEYWORDS here.
add_definitions(-DQT_NO_KEYWORDS)

## Here we specify which header files need to be run through "moc",
## Qt's meta-object compiler.
qt4_wrap_cpp(MOC_FILES
src/selected_points_topic.h
include/selected_points_publisher/SelectedPointsPublisher.h
)

## Here we specify the list of source files, including the output of
## the previous command which is stored in ``${MOC_FILES}``.
set(SOURCE_FILES
src/selected_points_topic.cpp
src/SelectedPointsPublisher.cpp
${MOC_FILES}
)

Expand All @@ -46,7 +49,7 @@ add_library(${PROJECT_NAME} ${SOURCE_FILES})
## library and names the actual file something like
## "librviz_plugin_tutorials.so", or whatever is appropriate for your
## particular OS.
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${catkin_LIBRARIES})
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${catkin_LIBRARIES} ${PCL_LIBRARIES})
## END_TUTORIAL


Expand Down
13 changes: 10 additions & 3 deletions rviz-plugin-selected-points-topic/package.xml
@@ -1,19 +1,26 @@
<package>
<name>selected_points_topic</name>
<name>selected_points_publisher</name>
<version>1.0.0</version>
<description>
Publishes selected points on /selected_points topic.
RVIZ plugin to select points and publish them in a new topic.
It finds the real set of selected points using pcl and a bounding box and publish them in another topic.
</description>
<maintainer email="mail@pBartels.net">Philipp Bartels</maintainer>
<maintainer email="roberto.martinmartin@tu-berlin.de">Roberto Martin-Martin</maintainer>
<license>MIT</license>

<author>Philipp Bartels</author>

<buildtool_depend>catkin</buildtool_depend>

<build_depend>rviz</build_depend>
<build_depend>pcl</build_depend>
<build_depend>pcl_ros</build_depend>
<build_depend>pcl_conversions</build_depend>

<run_depend>rviz</run_depend>
<run_depend>pcl</run_depend>
<run_depend>pcl_ros</run_depend>
<run_depend>pcl_conversions</run_depend>

<export>
<rosdoc config="${prefix}/rosdoc.yaml"/>
Expand Down
6 changes: 3 additions & 3 deletions rviz-plugin-selected-points-topic/plugin_description.xml
@@ -1,6 +1,6 @@
<library path="libselected_points_topic">
<class name="rviz_plugin_selected_points_topic/SelectedPointsTopic"
type="rviz_plugin_selected_points_topic::SelectedPointsTopic"
<library path="libselected_points_publisher">
<class name="rviz_plugin_selected_points_publisher/SelectedPointsPublisher"
type="rviz_plugin_selected_points_publisher::SelectedPointsPublisher"
base_class_type="rviz::Tool">
<description>
Fork of the rviz::SelectionTool:
Expand Down

0 comments on commit 83c9633

Please sign in to comment.