From 1a9f3d7da92756b0a3d60fa1a8f6b8d78d589619 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Tue, 15 Apr 2014 13:38:52 +0200 Subject: [PATCH 1/3] Catkinization of perception_blort --- CMakeLists.txt | 17 ------ Makefile | 1 - blort/CMakeLists.txt | 62 +++++++++---------- blort/manifest.xml | 21 ------- blort/package.xml | 39 ++++++++++++ blort_ros/CMakeLists.txt | 102 ++++++++++++++++++-------------- blort_ros/cfg/Detector.cfg | 3 +- blort_ros/cfg/Tracker.cfg | 3 +- blort_ros/cfg/detector.cfg | 11 ---- blort_ros/cfg/tracker.cfg | 26 -------- blort_ros/manifest.xml | 22 ------- blort_ros/package.xml | 38 ++++++++++++ perception_blort/CMakeLists.txt | 4 ++ perception_blort/package.xml | 15 +++++ siftgpu/CMakeLists.txt | 68 ++++++++++----------- siftgpu/manifest.xml | 17 ------ siftgpu/package.xml | 20 +++++++ stack.xml | 7 --- 18 files changed, 239 insertions(+), 237 deletions(-) delete mode 100644 CMakeLists.txt delete mode 100644 Makefile delete mode 100644 blort/manifest.xml create mode 100644 blort/package.xml delete mode 100755 blort_ros/cfg/detector.cfg delete mode 100755 blort_ros/cfg/tracker.cfg delete mode 100644 blort_ros/manifest.xml create mode 100644 blort_ros/package.xml create mode 100644 perception_blort/CMakeLists.txt create mode 100644 perception_blort/package.xml delete mode 100644 siftgpu/manifest.xml create mode 100644 siftgpu/package.xml delete mode 100644 stack.xml diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 28105dd..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.4.6) -include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) - -# Append to CPACK_SOURCE_IGNORE_FILES a semicolon-separated list of -# directories (or patterns, but directories should suffice) that should -# be excluded from the distro. This is not the place to put things that -# should be ignored everywhere, like "build" directories; that happens in -# rosbuild/rosbuild.cmake. Here should be listed packages that aren't -# ready for inclusion in a distro. -# -# This list is combined with the list in rosbuild/rosbuild.cmake. Note -# that CMake 2.6 may be required to ensure that the two lists are combined -# properly. CMake 2.4 seems to have unpredictable scoping rules for such -# variables. -#list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental) - -rosbuild_make_distribution(0.1.0) diff --git a/Makefile b/Makefile deleted file mode 100644 index a818cca..0000000 --- a/Makefile +++ /dev/null @@ -1 +0,0 @@ -include $(shell rospack find mk)/cmake_stack.mk \ No newline at end of file diff --git a/blort/CMakeLists.txt b/blort/CMakeLists.txt index c2b7d5e..aab089b 100644 --- a/blort/CMakeLists.txt +++ b/blort/CMakeLists.txt @@ -1,42 +1,37 @@ -cmake_minimum_required(VERSION 2.4.6) -include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) +cmake_minimum_required(VERSION 2.8.3) +project(blort) -# Set the build type. Options are: -# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage -# Debug : w/ debug symbols, w/o optimization -# Release : w/o debug symbols, w/ optimization -# RelWithDebInfo : w/ debug symbols, w/ optimization -# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries -set(ROS_BUILD_TYPE Release) - -rosbuild_init() - -#set the default path for built executables to the "bin" directory -set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) -#set the default path for built libraries to the "lib" directory -set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) +find_package(catkin REQUIRED COMPONENTS + roscpp + geometry_msgs + tf + sensor_msgs + siftgpu +) -#uncomment if you have defined messages -#rosbuild_genmsg() -#uncomment if you have defined services -#rosbuild_gensrv() +find_package(OpenCV REQUIRED) set(SIFTGPU_INC /usr/local/include/SiftGPU CACHE PATH "Path to SiftGPU header files") set(SIFTGPU_LIB /usr/local/lib CACHE PATH "Path to SiftGPU library") -include_directories(${SIFTGPU_INC}) -include_directories("${PROJECT_SOURCE_DIR}/src") + +include_directories(${catkin_INCLUDE_DIRS} ${SIFTGPU_INC} + "${PROJECT_SOURCE_DIR}/src" "include/blort" include) + +catkin_package( + INCLUDE_DIRS include "${PROJECT_SOURCE_DIR}/src" "include/blort" ${catkin_INCLUDE_DIRS} +) -rosbuild_add_library(module_glwindow +add_definitions(-DLINUX) + +add_library(module_glwindow src/GLWindow/GLXWindowGetEvent.cpp src/GLWindow/GLXWindow.cpp src/GLWindow/glxhidingwindow.cpp ) -rosbuild_add_compile_flags(module_glwindow -DLINUX) - target_link_libraries(module_glwindow GLU GL glut X11 rt) -rosbuild_add_library(module_tomgine +add_library(module_tomgine src/TomGine/tgVector3.cpp src/TomGine/tgTimer.cpp src/TomGine/tgTexture.cpp @@ -63,11 +58,11 @@ rosbuild_add_library(module_tomgine src/TomGine/tgCamera.cpp src/TomGine/ply.c ) -rosbuild_add_compile_flags(module_tomgine -DLINUX) -rosbuild_add_compile_flags(module_tomgine -DGL_GLEXT_PROTOTYPES) -target_link_libraries(module_tomgine GLU GL) +set_target_properties(module_tomgine PROPERTIES COMPILE_FLAGS -DLINUX) +set_target_properties(module_tomgine PROPERTIES COMPILE_FLAGS -DGL_GLEXT_PROTOTYPES) +target_link_libraries(module_tomgine GLU GL ${OpenCV_LIBS}) -rosbuild_add_library(module_threadobject +add_library(module_threadobject src/ThreadObject/TomGineThread.cpp src/ThreadObject/Thread.cpp src/ThreadObject/RecognizerThread.cpp @@ -77,7 +72,7 @@ rosbuild_add_library(module_threadobject ) target_link_libraries(module_threadobject module_tomgine module_recognizer3d) -rosbuild_add_library(module_tracker +add_library(module_tracker src/Tracker/TrackerThread.cpp src/Tracker/TrackerModel.cpp src/Tracker/Tracker.cpp @@ -101,10 +96,10 @@ rosbuild_add_library(module_tracker src/Tracker/CameraThread.cpp src/blort/pal_util.cpp ) -rosbuild_add_compile_flags(module_tracker -DGL_GLEXT_PROTOTYPES) +set_target_properties(module_tracker PROPERTIES COMPILE_FLAGS -DGL_GLEXT_PROTOTYPES) target_link_libraries(module_tracker module_tomgine module_threadobject module_glwindow) -rosbuild_add_library(module_recognizer3d +add_library(module_recognizer3d src/Recognizer3D/Vector2.cc src/Recognizer3D/SPolygon.cc src/Recognizer3D/SDraw.cc @@ -125,4 +120,5 @@ rosbuild_add_library(module_recognizer3d src/Recognizer3D/Config.cc src/Recognizer3D/CodebookEntry.cc ) +target_link_libraries(module_recognizer3d ${catkin_LIBRARIES}) diff --git a/blort/manifest.xml b/blort/manifest.xml deleted file mode 100644 index 72e34b5..0000000 --- a/blort/manifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - BLORT - The Blocks World Robotic Vision Toolbox
- Ported and refactored version of the library. - - Michael Zillich et al., maintained by Bence Magyar - BSD - - http://ros.org/wiki/pal_blort - - - - - - - - - - - - diff --git a/blort/package.xml b/blort/package.xml new file mode 100644 index 0000000..38171ea --- /dev/null +++ b/blort/package.xml @@ -0,0 +1,39 @@ + + blort + 0.0.1 + + BLORT - The Blocks World Robotic Vision Toolbox. Ported and refactored version of the library. + Mörwald, T.; Prankl, J.; Richtsfeld, A.; Zillich, M.; Vincze, M. BLORT - The Blocks World Robotic Vision Toolbox Best Practice in 3D Perception and Modeling for Mobile Manipulation (in conjunction with ICRA 2010), 2010. + + Bence Magyar + BSD + http://ros.org/wiki/perception_blort + http://www.acin.tuwien.ac.at/?id=290 + Thomas Mörwald + Michael Zillich + Andreas Richtsfeld + Johann Prankl + Markus Vincze + Bence Magyar + catkin + roscpp + opencv2 + geometry_msgs + sensor_msgs + tf + siftgpu + libglew + libglew-dev + roscpp + opencv2 + geometry_msgs + sensor_msgs + tf + siftgpu + libglew + libglew-dev + + diff --git a/blort_ros/CMakeLists.txt b/blort_ros/CMakeLists.txt index 52d4ce4..68c6278 100644 --- a/blort_ros/CMakeLists.txt +++ b/blort_ros/CMakeLists.txt @@ -1,66 +1,80 @@ -cmake_minimum_required(VERSION 2.4.6) -include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) +cmake_minimum_required(VERSION 2.8.3) +project(blort_ros) -# Set the build type. Options are: -# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage -# Debug : w/ debug symbols, w/o optimization -# Release : w/o debug symbols, w/ optimization -# RelWithDebInfo : w/ debug symbols, w/ optimization -# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries -set(ROS_BUILD_TYPE RelWithDebInfo) +find_package(catkin REQUIRED COMPONENTS + blort + roscpp + geometry_msgs + tf + sensor_msgs + dynamic_reconfigure + image_transport + cv_bridge + message_generation +) -rosbuild_init() +find_package(OpenCV REQUIRED) -#set the default path for built executables to the "bin" directory -set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) -#set the default path for built libraries to the "lib" directory -set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) +add_message_files( + FILES + NameTypeValue.msg + ObjectPoseList.msg + ObjectPose.msg + TrackerConfidences.msg + TrackerResults.msg +) -#uncomment if you have defined messages -rosbuild_genmsg() -#uncomment if you have defined services -rosbuild_gensrv() -#add dynamic reconfigure api +add_service_files( + FILES + EstimatePose.srv + RecoveryCall.srv + SetCameraInfo.srv + TrackerCommand.srv +) -rosbuild_find_ros_package(dynamic_reconfigure) -include(${dynamic_reconfigure_PACKAGE_PATH}/cmake/cfgbuild.cmake) -gencfg() +generate_messages( + DEPENDENCIES geometry_msgs sensor_msgs +) -rosbuild_add_executable(learnsifts src/nodes/learnsifts.cpp) -target_link_libraries(learnsifts siftgpu ${OpenCV_INCLUDE_DIRS}) +generate_dynamic_reconfigure_options( + cfg/Tracker.cfg + cfg/Detector.cfg +) + +include_directories(include ${catkin_INCLUDE_DIRS}) + +catkin_package( +) + +add_executable(learnsifts src/nodes/learnsifts.cpp) +target_link_libraries(learnsifts siftgpu ${OpenCV_INCLUDE_DIRS} ${catkin_LIBRARIES}) target_link_libraries(learnsifts module_tomgine module_glwindow module_tracker module_threadobject module_recognizer3d) -rosbuild_add_executable(gltracker_node src/nodes/tracker_node.cpp - src/trackerinterface.hpp - src/gltracker.cpp) +add_executable(gltracker_node src/nodes/tracker_node.cpp + src/trackerinterface.hpp + src/gltracker.cpp) target_link_libraries(gltracker_node ${OpenCV_INCLUDE_DIRS} module_tomgine module_tracker module_glwindow + ${catkin_LIBRARIES} GLU GL glut X11 rt) -rosbuild_add_executable(gldetector_node src/nodes/detector_node.cpp - src/gldetector.cpp) +add_executable(gldetector_node src/nodes/detector_node.cpp + src/gldetector.cpp) target_link_libraries(gldetector_node ${OpenCV_INCLUDE_DIRS} + ${catkin_LIBRARIES} module_tracker module_tomgine siftgpu module_recognizer3d) +add_library(${PROJECT_NAME} src/pose_util.cpp) -rosbuild_add_library(${PROJECT_NAME} src/pose_util.cpp) - -rosbuild_add_executable(pose2Tf src/nodes/pose2Tf.cpp) -target_link_libraries(pose2Tf ${PROJECT_NAME}) - -rosbuild_add_executable(pose2Tf_repeat src/nodes/pose2Tf_repeat.cpp) -target_link_libraries(pose2Tf_repeat ${PROJECT_NAME}) - +add_executable(pose2Tf src/nodes/pose2Tf.cpp) +target_link_libraries(pose2Tf ${PROJECT_NAME} + ${catkin_LIBRARIES}) -#common commands for building c++ executables and libraries -#rosbuild_add_library(${PROJECT_NAME} src/example.cpp) -#target_link_libraries(${PROJECT_NAME} another_library) -rosbuild_add_boost_directories() -rosbuild_link_boost(gltracker_node signals) -#rosbuild_add_executable(example examples/example.cpp) -#target_link_libraries(example ${PROJECT_NAME}) +add_executable(pose2Tf_repeat src/nodes/pose2Tf_repeat.cpp) +target_link_libraries(pose2Tf_repeat ${PROJECT_NAME} + ${catkin_LIBRARIES}) diff --git a/blort_ros/cfg/Detector.cfg b/blort_ros/cfg/Detector.cfg index d36fe0d..f1f54ea 100755 --- a/blort_ros/cfg/Detector.cfg +++ b/blort_ros/cfg/Detector.cfg @@ -1,8 +1,7 @@ #!/usr/bin/env python PACKAGE = "blort_ros" -import roslib;roslib.load_manifest(PACKAGE) -from dynamic_reconfigure.parameter_generator import * +from dynamic_reconfigure.parameter_generator_catkin import * gen = ParameterGenerator() diff --git a/blort_ros/cfg/Tracker.cfg b/blort_ros/cfg/Tracker.cfg index 58533e1..adb5cba 100755 --- a/blort_ros/cfg/Tracker.cfg +++ b/blort_ros/cfg/Tracker.cfg @@ -1,8 +1,7 @@ #!/usr/bin/env python PACKAGE = "blort_ros" -import roslib;roslib.load_manifest(PACKAGE) -from dynamic_reconfigure.parameter_generator import * +from dynamic_reconfigure.parameter_generator_catkin import * gen = ParameterGenerator() diff --git a/blort_ros/cfg/detector.cfg b/blort_ros/cfg/detector.cfg deleted file mode 100755 index 5b4ad0a..0000000 --- a/blort_ros/cfg/detector.cfg +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python -PACKAGE = "blort_ros" -import roslib;roslib.load_manifest(PACKAGE) - -from dynamic_reconfigure.parameter_generator import * - -gen = ParameterGenerator() - -gen.add("recovery_conf_threshold", double_t, 0, "Threshold for recovery confidence", 0.05, 0, 0.5) -gen.add("visualize", bool_t, 0, "Visualize object pose", False) -exit(gen.generate(PACKAGE, "gldetector_node", "detector")) diff --git a/blort_ros/cfg/tracker.cfg b/blort_ros/cfg/tracker.cfg deleted file mode 100755 index 6edc52a..0000000 --- a/blort_ros/cfg/tracker.cfg +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -PACKAGE = "blort_ros" -import roslib;roslib.load_manifest(PACKAGE) - -from dynamic_reconfigure.parameter_generator import * - -gen = ParameterGenerator() - -gen.add("lock", bool_t, 0, "Lock", False) -gen.add("edge", bool_t, 0, "Visualize edges", False) -gen.add("reset", bool_t, 0, "Reset tracker", False) -publish_mode_enum = gen.enum([ gen.const("Good", int_t, 0,""), - gen.const("Good_and_fair", int_t, 1,""), - gen.const("All", int_t, 2,"") - ], "Publish modes") -gen.add("publish_mode", int_t, 1, "Publish mode", 1, 0, 2, edit_method=publish_mode_enum) - -vis_mode_enum = gen.enum([ gen.const("Textured", int_t, 0,""), - gen.const("Frame", int_t, 1,""), - gen.const("Particles", int_t, 2,""), - gen.const("Nothing",int_t, 3,"") - ], "Render modes") -gen.add("render_mode", int_t, 1, "Render mode", 0, 0, 3, edit_method=vis_mode_enum) -gen.add("visualize_obj_pose", bool_t, 0, "Visualize object pose", False) -gen.add("time_to_run_singleshot", double_t, 0, "Time to run singleshot mode", 10.0, 1.0, 100.0) -exit(gen.generate(PACKAGE, "gltracker_node", "tracker")) diff --git a/blort_ros/manifest.xml b/blort_ros/manifest.xml deleted file mode 100644 index 14b12bc..0000000 --- a/blort_ros/manifest.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - BLORT - The Blocks World Robotic Vision Toolbox
- ROS interface classes and nodes for the BLORT library. - - - Bence Magyar - BSD - - http://ros.org/wiki/blort_ros - - - - - - - - - - - diff --git a/blort_ros/package.xml b/blort_ros/package.xml new file mode 100644 index 0000000..2f9e8e6 --- /dev/null +++ b/blort_ros/package.xml @@ -0,0 +1,38 @@ + + blort_ros + 0.0.1 + + BLORT - The Blocks World Robotic Vision Toolbox
+ ROS interface classes and nodes for the BLORT library. + + Bence Magyar + BSD + Bence Magyar0 + http://ros.org/wiki/blort_ros + + catkin + + roscpp + opencv2 + geometry_msgs + sensor_msgs + tf + dynamic_reconfigure + blort + cv_bridge + image_transport + std_msgs + + roscpp + rospy + opencv2 + geometry_msgs + sensor_msgs + tf + dynamic_reconfigure + blort + cv_bridge + image_transport + std_msgs + + diff --git a/perception_blort/CMakeLists.txt b/perception_blort/CMakeLists.txt new file mode 100644 index 0000000..9084993 --- /dev/null +++ b/perception_blort/CMakeLists.txt @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 2.8.3) +project(perception_blort) +find_package(catkin REQUIRED) +catkin_metapackage() diff --git a/perception_blort/package.xml b/perception_blort/package.xml new file mode 100644 index 0000000..1d13ba2 --- /dev/null +++ b/perception_blort/package.xml @@ -0,0 +1,15 @@ + + + perception_blort + 0.0.1 + The perception_blort package + Bence Magyar + BSD + catkin + blort + blort_ros + siftgpu + + + + diff --git a/siftgpu/CMakeLists.txt b/siftgpu/CMakeLists.txt index 7a1d4a9..7594374 100644 --- a/siftgpu/CMakeLists.txt +++ b/siftgpu/CMakeLists.txt @@ -1,41 +1,41 @@ -cmake_minimum_required(VERSION 2.4.6) -include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) +cmake_minimum_required(VERSION 2.8.3) +project(siftgpu) -# Set the build type. Options are: -# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage -# Debug : w/ debug symbols, w/o optimization -# Release : w/o debug symbols, w/ optimization -# RelWithDebInfo : w/ debug symbols, w/ optimization -# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries -#set(ROS_BUILD_TYPE RelWithDebInfo) - -rosbuild_init() - -INCLUDE(FindPkgConfig) +find_package(catkin REQUIRED COMPONENTS +# libglew +# libglew-dev +# libdevil-dev +) +find_package(PkgConfig) pkg_check_modules(GLEW REQUIRED glew) -#set the default path for built libraries to the "lib" directory -set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) - -rosbuild_add_library(${PROJECT_NAME} src/CLTexImage.cpp - src/CuTexImage.cpp - src/FrameBufferObject.cpp - src/GlobalUtil.cpp - src/GLTexImage.cpp - src/ProgramCG.cpp - src/ProgramCL.cpp - src/ProgramGLSL.cpp - src/ProgramGPU.cpp - src/PyramidCL.cpp - src/PyramidCU.cpp - src/PyramidGL.cpp - src/ShaderMan.cpp - src/SiftGPU.cpp - src/SiftMatch.cpp - src/SiftMatchCU.cpp - src/SiftPyramid.cpp) - +include_directories(include) + +catkin_package( + INCLUDE_DIRS include + LIBRARIES ${PROJECT_NAME} + DEPENDS libglew +) + + +add_library(${PROJECT_NAME} src/CLTexImage.cpp + src/CuTexImage.cpp + src/FrameBufferObject.cpp + src/GlobalUtil.cpp + src/GLTexImage.cpp + src/ProgramCG.cpp + src/ProgramCL.cpp + src/ProgramGLSL.cpp + src/ProgramGPU.cpp + src/PyramidCL.cpp + src/PyramidCU.cpp + src/PyramidGL.cpp + src/ShaderMan.cpp + src/SiftGPU.cpp + src/SiftMatch.cpp + src/SiftMatchCU.cpp + src/SiftPyramid.cpp) target_link_libraries(${PROJECT_NAME} ${GLEW_LIBRARIES} IL) diff --git a/siftgpu/manifest.xml b/siftgpu/manifest.xml deleted file mode 100644 index 51ed8c9..0000000 --- a/siftgpu/manifest.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - The SiftGPU library is an implementation of SIFT for GPU. - - - Changchang Wu, maintained by Bence Magyar - non-profit license from University of North Carolina - - http://ros.org/wiki/siftgpu - - - - - - - diff --git a/siftgpu/package.xml b/siftgpu/package.xml new file mode 100644 index 0000000..85bac33 --- /dev/null +++ b/siftgpu/package.xml @@ -0,0 +1,20 @@ + + siftgpu + 0.0.1 + + The SiftGPU library is an implementation of SIFT for GPU. + + Bence Magyar + non-profit license from University of North Carolina + Changchang Wu + http://cs.unc.edu/~ccwu/siftgpu/ + http://ros.org/wiki/siftgpu + + catkin + libglew + libglew-dev + libdevil-dev + libglew + libglew-dev + libdevil-dev + diff --git a/stack.xml b/stack.xml deleted file mode 100644 index f13c978..0000000 --- a/stack.xml +++ /dev/null @@ -1,7 +0,0 @@ - - perception_blort - Created by Bence Magyar, Maintained by Jordi Pages - BSD, Modified BSD, non-profit license from University of North Carolina - - http://ros.org/wiki/perception_blort - From f20541dcec09602a09c488b038a098f3c4ee32fc Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Tue, 22 Apr 2014 10:12:57 +0200 Subject: [PATCH 2/3] Fix python imports for catkin --- blort_ros/src/nodes/call_SingleShot.py | 3 +-- blort_ros/src/nodes/pose_utils.py | 2 +- blort_ros/src/nodes/testSingleShot.py | 2 +- blort_ros/src/nodes/testSingleShot2.py | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/blort_ros/src/nodes/call_SingleShot.py b/blort_ros/src/nodes/call_SingleShot.py index a9eb79d..878b267 100644 --- a/blort_ros/src/nodes/call_SingleShot.py +++ b/blort_ros/src/nodes/call_SingleShot.py @@ -33,12 +33,11 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -import roslib; roslib.load_manifest('pal_blort') import sys import rospy -from pal_blort.srv import * +from blort_ros.srv import * from geometry_msgs.msg import Pose service='blort_tracker/singleshot_service' diff --git a/blort_ros/src/nodes/pose_utils.py b/blort_ros/src/nodes/pose_utils.py index 9ce2350..59fed51 100755 --- a/blort_ros/src/nodes/pose_utils.py +++ b/blort_ros/src/nodes/pose_utils.py @@ -34,7 +34,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -import roslib; roslib.load_manifest('pal_blort') +import rospy import re import subprocess from multiprocessing import Process diff --git a/blort_ros/src/nodes/testSingleShot.py b/blort_ros/src/nodes/testSingleShot.py index a91a01f..6148664 100755 --- a/blort_ros/src/nodes/testSingleShot.py +++ b/blort_ros/src/nodes/testSingleShot.py @@ -34,7 +34,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -import roslib; roslib.load_manifest('pal_blort') +import rospy import re import subprocess from multiprocessing import Process diff --git a/blort_ros/src/nodes/testSingleShot2.py b/blort_ros/src/nodes/testSingleShot2.py index 0c89c86..ebf6305 100755 --- a/blort_ros/src/nodes/testSingleShot2.py +++ b/blort_ros/src/nodes/testSingleShot2.py @@ -34,7 +34,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -import roslib; roslib.load_manifest('pal_blort') +import rospy import re import subprocess from multiprocessing import Process From b556230a63548af2ed6416d66cd9769bb6957981 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Tue, 22 Apr 2014 12:24:47 +0200 Subject: [PATCH 3/3] Adding pringles template and launch file for histogram_segment. --- blort_ros/Resources/img/pringles_template.png | Bin 0 -> 6356 bytes blort_ros/launch/histogram_segment.launch | 9 +++++++++ 2 files changed, 9 insertions(+) create mode 100644 blort_ros/Resources/img/pringles_template.png create mode 100644 blort_ros/launch/histogram_segment.launch diff --git a/blort_ros/Resources/img/pringles_template.png b/blort_ros/Resources/img/pringles_template.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb8180ad20831700585716641dbdfa00b1c63df GIT binary patch literal 6356 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 Wr>Ova6OmZ}0000 + + + + + + + +