Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[22561] pkg/trunk
|
From: <jfa...@us...> - 2009-08-21 18:01:12
|
Revision: 22561
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22561&view=rev
Author: jfaustwg
Date: 2009-08-21 18:01:00 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
Merge from rviz_plugins branch, r19318 through r22550
In addition to switching rviz to a plugin model and breaking mapping and motion_planning displays into separate packages:
* Switch to the new urdf parser (#2343)
* Load all data from the "base" urdf -- nothing Ogre specific
* Fix markers to not regenerate pick textures all the time (#2151)
* Add mesh support for Robot Model collision representation, and primitive support for the visual representation (#1702)
* Apply origin to both visual/collision in the robot model (#1658, #1898)
* Removed unused mechanism_state functionality
Modified Paths:
--------------
pkg/trunk/stacks/visualization/rviz/CMakeLists.txt
pkg/trunk/stacks/visualization/rviz/manifest.xml
pkg/trunk/stacks/visualization/rviz/src/image_view/image_view.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/display.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/display.h
pkg/trunk/stacks/visualization/rviz/src/rviz/displays_panel.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/displays_panel.h
pkg/trunk/stacks/visualization/rviz/src/rviz/generated/rviz_generated.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/generated/rviz_generated.h
pkg/trunk/stacks/visualization/rviz/src/rviz/new_display_dialog.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/new_display_dialog.h
pkg/trunk/stacks/visualization/rviz/src/rviz/properties/property.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/properties/property.h
pkg/trunk/stacks/visualization/rviz/src/rviz/properties/property_manager.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/properties/property_manager.h
pkg/trunk/stacks/visualization/rviz/src/rviz/robot/robot.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/robot/robot.h
pkg/trunk/stacks/visualization/rviz/src/rviz/robot/robot_link.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/robot/robot_link.h
pkg/trunk/stacks/visualization/rviz/src/rviz/selection/selection_manager.h
pkg/trunk/stacks/visualization/rviz/src/rviz/tools/pose_tool.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/views_panel.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/views_panel.h
pkg/trunk/stacks/visualization/rviz/src/rviz/visualization_frame.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/visualization_frame.h
pkg/trunk/stacks/visualization/rviz/src/rviz/visualization_manager.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/visualization_manager.h
pkg/trunk/stacks/visualization/rviz/src/rviz/visualization_manager.i
pkg/trunk/stacks/visualization/rviz/src/rviz/visualization_panel.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/visualizer_app.cpp
Added Paths:
-----------
pkg/trunk/motion_planning/motion_planning_rviz_plugin/
pkg/trunk/sandbox/mapping_rviz_plugin/
pkg/trunk/stacks/visualization/rviz/lib/default_plugin.yaml
pkg/trunk/stacks/visualization/rviz/src/CMakeLists.txt
pkg/trunk/stacks/visualization/rviz/src/default_plugin/
pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt
pkg/trunk/stacks/visualization/rviz/src/default_plugin/axes_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/axes_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/camera_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/camera_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/grid_cells_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/grid_cells_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/grid_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/grid_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/init.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/laser_scan_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/laser_scan_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/map_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/map_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/marker_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/marker_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/arrow_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/arrow_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/cube_list_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/cube_list_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/line_list_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/line_list_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/line_strip_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/line_strip_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/marker_base.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/marker_base.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/marker_selection_handler.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/marker_selection_handler.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/points_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/points_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/shape_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/shape_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/sphere_list_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/sphere_list_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/particle_cloud_2d_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/particle_cloud_2d_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/path_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/path_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/point_cloud_base.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/point_cloud_base.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/point_cloud_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/point_cloud_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/polygon_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/polygon_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/robot_base2d_pose_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/robot_base2d_pose_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/robot_model_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/robot_model_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/tf_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/tf_display.h
pkg/trunk/stacks/visualization/rviz/src/image_view/CMakeLists.txt
pkg/trunk/stacks/visualization/rviz/src/rviz/CMakeLists.txt
pkg/trunk/stacks/visualization/rviz/src/rviz/display_wrapper.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/display_wrapper.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/display_creator.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/display_type_info.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin_manager.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin_manager.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/type_registry.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/type_registry.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin_manager_dialog.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin_manager_dialog.h
pkg/trunk/stacks/visualization/rviz/src/rviz/robot/link_updater.h
pkg/trunk/stacks/visualization/rviz/src/rviz/robot/tf_link_updater.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/robot/tf_link_updater.h
pkg/trunk/stacks/visualization/rviz/src/rviz/wx_log_rosout.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/wx_log_rosout.h
pkg/trunk/stacks/visualization/rviz/src/test/CMakeLists.txt
pkg/trunk/stacks/visualization/rviz/ui/
pkg/trunk/stacks/visualization/rviz/ui/rviz.fbp
Removed Paths:
-------------
pkg/trunk/stacks/visualization/rviz/VisualizationPanel.fbp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt
pkg/trunk/stacks/visualization/rviz/src/default_plugin/axes_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/axes_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/camera_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/camera_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/grid_cells_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/grid_cells_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/grid_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/grid_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/init.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/laser_scan_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/laser_scan_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/map_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/map_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/marker_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/marker_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/arrow_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/arrow_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/cube_list_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/cube_list_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/line_list_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/line_list_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/line_strip_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/line_strip_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/marker_base.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/marker_base.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/marker_selection_handler.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/marker_selection_handler.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/points_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/points_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/shape_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/shape_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/sphere_list_marker.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/markers/sphere_list_marker.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/particle_cloud_2d_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/particle_cloud_2d_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/path_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/path_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/point_cloud_base.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/point_cloud_base.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/point_cloud_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/point_cloud_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/polygon_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/polygon_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/robot_base2d_pose_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/robot_base2d_pose_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/robot_model_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/robot_model_display.h
pkg/trunk/stacks/visualization/rviz/src/default_plugin/tf_display.cpp
pkg/trunk/stacks/visualization/rviz/src/default_plugin/tf_display.h
pkg/trunk/stacks/visualization/rviz/src/rviz/displays/
pkg/trunk/stacks/visualization/rviz/src/rviz/factory.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/factory.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/display_creator.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/display_type_info.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin_manager.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin_manager.h
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/type_registry.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/type_registry.h
pkg/trunk/stacks/visualization/rviz/ui/rviz.fbp
Property Changed:
----------------
pkg/trunk/stacks/visualization/rviz/
pkg/trunk/stacks/visualization/rviz/src/rviz/generated/rviz_generated.i
pkg/trunk/stacks/visualization/rviz/src/rviz/properties/forwards.h
pkg/trunk/stacks/visualization/rviz/src/rviz/robot/robot.cpp
pkg/trunk/stacks/visualization/rviz/src/rviz/robot/robot.h
Property changes on: pkg/trunk/stacks/visualization/rviz
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
/pkg/branches/josh/rviz_handles/rviz:18490-18807
/pkg/branches/josh/rviz_selection/rviz:12152-13640
/pkg/branches/josh/visualization_scratch/rviz:14041-14428,16191-17859
+ /pkg/branches/gazebo-branch-merge/visualization/rviz:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
/pkg/branches/josh/rviz_handles/rviz:18490-18807
/pkg/branches/josh/rviz_plugins/rviz:19319-22550
/pkg/branches/josh/rviz_selection/rviz:12152-13640
/pkg/branches/josh/visualization_scratch/rviz:14041-14428,16191-17859
Modified: pkg/trunk/stacks/visualization/rviz/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/visualization/rviz/CMakeLists.txt 2009-08-21 17:49:15 UTC (rev 22560)
+++ pkg/trunk/stacks/visualization/rviz/CMakeLists.txt 2009-08-21 18:01:00 UTC (rev 22561)
@@ -24,136 +24,6 @@
include_directories( ${OGRE_INCLUDE_DIRS} )
link_directories( ${OGRE_LIBRARY_DIRS} )
-include_directories( src/rviz )
+include_directories(src)
-# Find the combined swig flags for this project
-_rospack_invoke(${PROJECT_NAME} ${PROJECT_NAME} SWIG_FLAGS "export" "--lang=swig" "--attrib=flags")
-set(SWIG_FLAGS ${${PROJECT_NAME}_SWIG_FLAGS})
-
-# Find the wxswig executable
-find_ros_package(wxswig)
-set(WXSWIG_EXECUTABLE ${wxswig_PACKAGE_PATH}/bin/swig)
-
-# Add a custom command for generating the swig output files
-set(SWIG_INTERFACE_FILE ${PROJECT_SOURCE_DIR}/src/rviz/rviz.i)
-set(SWIG_OUTPUT_PYTHON_FILE ${PROJECT_SOURCE_DIR}/lib/rviz.py)
-
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4)
- set(SWIG_OUTPUT_CPP_FILE ${PROJECT_SOURCE_DIR}/src/rviz/rviz_swig_generated.cpp)
- set(SWIG_COMMAND ${WXSWIG_EXECUTABLE} ${SWIG_FLAGS} -o ${SWIG_OUTPUT_CPP_FILE} -outdir ../lib -module ${PROJECT_NAME} ${SWIG_INTERFACE_FILE})
-else("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4)
- set(SWIG_OUTPUT_CPP_FILE src/rviz/rviz_swig_generated.cpp)
- set(SWIG_COMMAND ${WXSWIG_EXECUTABLE} ${SWIG_FLAGS} -o ../${SWIG_OUTPUT_CPP_FILE} -outdir ../lib -module ${PROJECT_NAME} ${SWIG_INTERFACE_FILE})
-endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4)
-
-set_source_files_properties(${SWIG_OUTPUT_CPP_FILE} PROPERTIES GENERATED true)
-add_custom_command(OUTPUT ${SWIG_OUTPUT_CPP_FILE}
- ${SWIG_OUTPUT_PYTHON_FILE}
- COMMAND ${SWIG_COMMAND}
- DEPENDS ${SWIG_INTERFACE_FILE}
- src/rviz/display.i
- src/rviz/visualization_manager.i
- src/rviz/visualization_panel.i
- src/rviz/visualization_frame.i
- src/rviz/helpers/color.i
- src/rviz/visualization_manager.h
- src/rviz/visualization_panel.h
- src/rviz/visualization_frame.h
- src/rviz/generated/rviz_generated.h
- src/rviz/display.h
- src/rviz/displays/axes_display.h
- src/rviz/displays/grid_display.h
- src/rviz/displays/laser_scan_display.h
- src/rviz/displays/marker_display.h
- src/rviz/displays/planning_display.h
- src/rviz/displays/point_cloud_base.h
- src/rviz/displays/point_cloud_display.h
- src/rviz/displays/robot_model_display.h
- src/rviz/displays/robot_base2d_pose_display.h
- src/rviz/displays/particle_cloud_2d_display.h
- src/rviz/displays/map_display.h
- src/rviz/displays/tf_display.h
- src/rviz/displays/camera_display.h
- src/rviz/helpers/color.h)
-
-# We create one lib with the C++...
-rospack_add_library(${PROJECT_NAME} src/rviz/properties/property.cpp
- src/rviz/properties/property_manager.cpp
- src/rviz/image/ros_image_texture.cpp
- src/rviz/tools/tool.cpp
- src/rviz/tools/move_tool.cpp
- src/rviz/tools/pose_tool.cpp
- src/rviz/tools/selection_tool.cpp
- src/rviz/render_panel.cpp
- src/rviz/displays_panel.cpp
- src/rviz/views_panel.cpp
- src/rviz/time_panel.cpp
- src/rviz/selection_panel.cpp
- src/rviz/visualization_manager.cpp
- src/rviz/visualization_frame.cpp
- src/rviz/visualization_panel.cpp
- src/rviz/display.cpp
- src/rviz/common.cpp
- src/rviz/factory.cpp
- src/rviz/ros_topic_property.cpp
- src/rviz/new_display_dialog.cpp
- src/rviz/robot/robot_link.cpp
- src/rviz/robot/robot.cpp
- src/rviz/selection/selection_manager.cpp
- src/rviz/displays/markers/marker_selection_handler.cpp
- src/rviz/displays/markers/marker_base.cpp
- src/rviz/displays/markers/shape_marker.cpp
- src/rviz/displays/markers/arrow_marker.cpp
- src/rviz/displays/markers/line_list_marker.cpp
- src/rviz/displays/markers/line_strip_marker.cpp
- src/rviz/displays/markers/sphere_list_marker.cpp
- src/rviz/displays/markers/cube_list_marker.cpp
- src/rviz/displays/markers/points_marker.cpp
- src/rviz/displays/marker_display.cpp
- src/rviz/displays/axes_display.cpp
- src/rviz/displays/grid_display.cpp
- src/rviz/displays/point_cloud_base.cpp
- src/rviz/displays/point_cloud_display.cpp
- src/rviz/displays/laser_scan_display.cpp
- src/rviz/displays/robot_model_display.cpp
- src/rviz/displays/planning_display.cpp
- src/rviz/displays/robot_base2d_pose_display.cpp
- src/rviz/displays/particle_cloud_2d_display.cpp
- src/rviz/displays/path_display.cpp
- src/rviz/displays/polygon_display.cpp
- src/rviz/displays/grid_cells_display.cpp
- src/rviz/displays/polygonal_map_display.cpp
- src/rviz/displays/collision_map_display.cpp
- src/rviz/displays/map_display.cpp
- src/rviz/displays/tf_display.cpp
- src/rviz/displays/camera_display.cpp
- src/rviz/generated/rviz_generated.cpp)
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} ${OGRE_LIBRARIES})
-rospack_link_boost(${PROJECT_NAME} thread signals filesystem system program_options)
-
-find_package(PythonLibs REQUIRED)
-include_directories(${PYTHON_INCLUDE_PATH})
-
-# ...and another with the SWIG code.
-rospack_add_library(python_${PROJECT_NAME} ${SWIG_OUTPUT_CPP_FILE})
-target_link_libraries(python_${PROJECT_NAME} ${PROJECT_NAME} ${PYTHON_LIBRARIES})
-
-# swig python needs a shared library named _<modulename>.[so|dll|...]
-# this renames the output file to conform to that by prepending an underscore and removing the "lib" prefix
-set_target_properties(python_${PROJECT_NAME}
- PROPERTIES OUTPUT_NAME _${PROJECT_NAME}
- PREFIX "")
-
-rospack_add_executable(executable src/rviz/visualizer_app.cpp)
-target_link_libraries(executable ${PROJECT_NAME} ${wxWidgets_LIBRARIES})
-set_target_properties(executable
- PROPERTIES OUTPUT_NAME ${PROJECT_NAME}
- PREFIX "")
-
-rospack_add_executable(image_view src/image_view/image_view.cpp)
-target_link_libraries(image_view ${PROJECT_NAME})
-
-rospack_add_executable(marker_test EXCLUDE_FROM_ALL src/test/marker_test.cpp)
-rospack_declare_test(marker_test)
-rospack_add_executable(cloud_test EXCLUDE_FROM_ALL src/test/cloud_test.cpp)
-rospack_declare_test(cloud_test)
+add_subdirectory(src)
\ No newline at end of file
Deleted: pkg/trunk/stacks/visualization/rviz/VisualizationPanel.fbp
===================================================================
--- pkg/trunk/stacks/visualization/rviz/VisualizationPanel.fbp 2009-08-21 17:49:15 UTC (rev 22560)
+++ pkg/trunk/stacks/visualization/rviz/VisualizationPanel.fbp 2009-08-21 18:01:00 UTC (rev 22561)
@@ -1,1568 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<wxFormBuilder_Project>
- <FileVersion major="1" minor="9" />
- <object class="Project" expanded="1">
- <property name="class_decoration"></property>
- <property name="code_generation">C++</property>
- <property name="disconnect_events">1</property>
- <property name="encoding">UTF-8</property>
- <property name="event_generation">connect</property>
- <property name="file">rviz_generated</property>
- <property name="first_id">1000</property>
- <property name="help_provider">none</property>
- <property name="internationalize">0</property>
- <property name="name">rviz</property>
- <property name="namespace"></property>
- <property name="path">src/rviz/generated</property>
- <property name="precompiled_header"></property>
- <property name="relative_path">1</property>
- <property name="use_enum">0</property>
- <property name="use_microsoft_bom">0</property>
- <object class="Panel" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">DisplaysPanelGenerated</property>
- <property name="pos"></property>
- <property name="size">500,300</property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style">wxTAB_TRAVERSAL</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnInitDialog"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- <object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
- <property name="name">bSizer8</property>
- <property name="orient">wxVERTICAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxEXPAND</property>
- <property name="proportion">1</property>
- <object class="wxPanel" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">properties_panel_</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style">wxTAB_TRAVERSAL</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- <object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
- <property name="name">properties_panel_sizer_</property>
- <property name="orient">wxVERTICAL</property>
- <property name="permission">protected</property>
- </object>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxEXPAND</property>
- <property name="proportion">0</property>
- <object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
- <property name="name">bSizer7</property>
- <property name="orient">wxHORIZONTAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="default">0</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Add</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">new_display_</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="tooltip">Add a new display</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">onNewDisplay</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="default">0</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Remove</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">delete_display_</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="tooltip">Remove the selected display</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">onDeleteDisplay</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL</property>
- <property name="proportion">0</property>
- <object class="wxBitmapButton" expanded="1">
- <property name="bg"></property>
- <property name="bitmap"></property>
- <property name="context_help"></property>
- <property name="default">0</property>
- <property name="disabled"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="focus"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="hover"></property>
- <property name="id">wxID_ANY</property>
- <property name="label">Move Down</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">down_button_</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="selected"></property>
- <property name="size"></property>
- <property name="style">wxBU_AUTODRAW</property>
- <property name="subclass"></property>
- <property name="tooltip">Move a display down in the list</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">onMoveDown</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL</property>
- <property name="proportion">0</property>
- <object class="wxBitmapButton" expanded="1">
- <property name="bg"></property>
- <property name="bitmap"></property>
- <property name="context_help"></property>
- <property name="default">0</property>
- <property name="disabled"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="focus"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="hover"></property>
- <property name="id">wxID_ANY</property>
- <property name="label">Move Up</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">up_button_</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="selected"></property>
- <property name="size"></property>
- <property name="style">wxBU_AUTODRAW</property>
- <property name="subclass"></property>
- <property name="tooltip">Move a display up in the list</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">onMoveUp</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- </object>
- </object>
- </object>
- </object>
- <object class="Dialog" expanded="1">
- <property name="bg"></property>
- <property name="center"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="extra_style"></property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">NewDisplayDialogGenerated</property>
- <property name="pos"></property>
- <property name="size">485,497</property>
- <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
- <property name="subclass"></property>
- <property name="title">New Display</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnActivate"></event>
- <event name="OnActivateApp"></event>
- <event name="OnChar"></event>
- <event name="OnClose"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnHibernate"></event>
- <event name="OnIconize"></event>
- <event name="OnIdle"></event>
- <event name="OnInitDialog"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- <object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
- <property name="name">bSizer8</property>
- <property name="orient">wxVERTICAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxEXPAND</property>
- <property name="proportion">1</property>
- <object class="wxStaticBoxSizer" expanded="1">
- <property name="id">wxID_ANY</property>
- <property name="label">Display Type</property>
- <property name="minimum_size"></property>
- <property name="name">sbSizer1</property>
- <property name="orient">wxVERTICAL</property>
- <property name="permission">none</property>
- <event name="OnUpdateUI"></event>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxEXPAND</property>
- <property name="proportion">1</property>
- <object class="wxListBox" expanded="1">
- <property name="bg"></property>
- <property name="choices"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">types_</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnListBox">onDisplaySelected</event>
- <event name="OnListBoxDClick">onDisplayDClick</event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL</property>
- <property name="proportion">0</property>
- <object class="wxStaticText" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Description:</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">m_staticText2</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <property name="wrap">-1</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxEXPAND</property>
- <property name="proportion">0</property>
- <object class="wxTextCtrl" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
- <property name="maxlength">0</property>
- <property name="minimum_size">-1,100</property>
- <property name="name">type_description_</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="style">wxTE_MULTILINE|wxTE_READONLY|wxTE_WORDWRAP</property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- ...
[truncated message content] |
