Fix namespace and pkg name of nodelets

CMakeLists.txt

@@ -113,9 +113,9 @@ if(OPENCV_HAVE_OPTFLOW)
 endif()
 
 ## Macro to add nodelets
-macro(opencv_apps_add_nodelet node_name nodelet_name nodelet_cppfile)
+macro(opencv_apps_add_nodelet node_name nodelet_cppfile)
   set(NODE_NAME ${node_name})
-  set(NODELET_NAME ${nodelet_name})
+  set(NODELET_NAME opencv_apps/${node_name})
   configure_file(src/node/standalone_nodelet_exec.cpp.in ${node_name}.cpp @ONLY)
   add_executable(${node_name}_exe ${node_name}.cpp)
   SET_TARGET_PROPERTIES(${node_name}_exe PROPERTIES OUTPUT_NAME ${node_name})
@@ -133,8 +133,8 @@ endmacro()
   # ./tutorial_code/calib3d/stereoBM/SBM_Sample.cpp
 
 # core
-opencv_apps_add_nodelet(adding_images adding_images/adding_images src/nodelet/adding_images_nodelet.cpp) # ./tutorial_code/core/AddingImages/AddingImages.cpp
-opencv_apps_add_nodelet(discrete_fourier_transform discrete_fourier_transform/discrete_fourier_transform src/nodelet/discrete_fourier_transform_nodelet.cpp)  # ./tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp
+opencv_apps_add_nodelet(adding_images src/nodelet/adding_images_nodelet.cpp) # ./tutorial_code/core/AddingImages/AddingImages.cpp
+opencv_apps_add_nodelet(discrete_fourier_transform src/nodelet/discrete_fourier_transform_nodelet.cpp)  # ./tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp
   # ./tutorial_code/core/file_input_output/file_input_output.cpp
   # ./tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp
   # ./tutorial_code/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.cpp
@@ -169,19 +169,19 @@ opencv_apps_add_nodelet(discrete_fourier_transform discrete_fourier_transform/di
   # ./tutorial_code/ImgProc/Morphology_1.cpp
   # ./tutorial_code/ImgProc/Morphology_2.cpp
   # ./tutorial_code/ImgProc/Morphology_3.cpp
-opencv_apps_add_nodelet(pyramids pyramids/pyramids src/nodelet/pyramids_nodelet.cpp)  # ./tutorial_code/ImgProc/Pyramids.cpp
-opencv_apps_add_nodelet(smoothing smoothing/smoothing src/nodelet/smoothing_nodelet.cpp)  # ./tutorial_code/ImgProc/Smoothing.cpp
-opencv_apps_add_nodelet(threshold threshold/threshold src/nodelet/threshold_nodelet.cpp)  # ./tutorial_code/ImgProc/Threshold.cpp
-opencv_apps_add_nodelet(rgb_color_filter rgb_color_filter/rgb_color_filter src/nodelet/color_filter_nodelet.cpp)  # ./tutorial_code/ImgProc/Threshold_inRange.cpp
-opencv_apps_add_nodelet(hls_color_filter hls_color_filter/hls_color_filter src/nodelet/color_filter_nodelet.cpp)  # ./tutorial_code/ImgProc/Threshold_inRange.cpp
-opencv_apps_add_nodelet(hsv_color_filter hsv_color_filter/hsv_color_filter src/nodelet/color_filter_nodelet.cpp)  # ./tutorial_code/ImgProc/Threshold_inRange.cpp
+opencv_apps_add_nodelet(pyramids src/nodelet/pyramids_nodelet.cpp)  # ./tutorial_code/ImgProc/Pyramids.cpp
+opencv_apps_add_nodelet(smoothing src/nodelet/smoothing_nodelet.cpp)  # ./tutorial_code/ImgProc/Smoothing.cpp
+opencv_apps_add_nodelet(threshold src/nodelet/threshold_nodelet.cpp)  # ./tutorial_code/ImgProc/Threshold.cpp
+opencv_apps_add_nodelet(rgb_color_filter src/nodelet/color_filter_nodelet.cpp)  # ./tutorial_code/ImgProc/Threshold_inRange.cpp
+opencv_apps_add_nodelet(hls_color_filter src/nodelet/color_filter_nodelet.cpp)  # ./tutorial_code/ImgProc/Threshold_inRange.cpp
+opencv_apps_add_nodelet(hsv_color_filter src/nodelet/color_filter_nodelet.cpp)  # ./tutorial_code/ImgProc/Threshold_inRange.cpp
 
 # ImgTrans
-opencv_apps_add_nodelet(edge_detection edge_detection/edge_detection src/nodelet/edge_detection_nodelet.cpp) # ./tutorial_code/ImgTrans/CannyDetector_Demo.cpp
+opencv_apps_add_nodelet(edge_detection src/nodelet/edge_detection_nodelet.cpp) # ./tutorial_code/ImgTrans/CannyDetector_Demo.cpp
                                                                                                              # ./tutorial_code/ImgTrans/Laplace_Demo.cpp
                                                                                                              # ./tutorial_code/ImgTrans/Sobel_Demo.cpp
-opencv_apps_add_nodelet(hough_lines hough_lines/hough_lines src/nodelet/hough_lines_nodelet.cpp) # ./tutorial_code/ImgTrans/HoughLines_Demo.cpp
-opencv_apps_add_nodelet(hough_circles hough_circles/hough_circles src/nodelet/hough_circles_nodelet.cpp) # ./tutorial_code/ImgTrans/HoughCircle_Demo.cpp
+opencv_apps_add_nodelet(hough_lines src/nodelet/hough_lines_nodelet.cpp) # ./tutorial_code/ImgTrans/HoughLines_Demo.cpp
+opencv_apps_add_nodelet(hough_circles src/nodelet/hough_circles_nodelet.cpp) # ./tutorial_code/ImgTrans/HoughCircle_Demo.cpp
  # ./tutorial_code/ImgTrans/copyMakeBorder_demo.cpp
  # ./tutorial_code/ImgTrans/filter2D_demo.cpp
  # ./tutorial_code/ImgTrans/Geometric_Transforms_Demo.cpp
@@ -209,17 +209,17 @@ opencv_apps_add_nodelet(hough_circles hough_circles/hough_circles src/nodelet/ho
  # ./tutorial_code/photo/seamless_cloning/cloning_gui.cpp
 
 # ShapeDescriptors
-opencv_apps_add_nodelet(find_contours find_contours/find_contours src/nodelet/find_contours_nodelet.cpp) # ./tutorial_code/ShapeDescriptors/findContours_demo.cpp
-opencv_apps_add_nodelet(convex_hull convex_hull/convex_hull src/nodelet/convex_hull_nodelet.cpp) # ./tutorial_code/ShapeDescriptors/hull_demo.cpp
-opencv_apps_add_nodelet(general_contours general_contours/general_contours src/nodelet/general_contours_nodelet.cpp) # ./tutorial_code/ShapeDescriptors/generalContours_demo2.cpp
-opencv_apps_add_nodelet(contour_moments contour_moments/contour_moments src/nodelet/contour_moments_nodelet.cpp) # ./tutorial_code/ShapeDescriptors/moments_demo.cpp
+opencv_apps_add_nodelet(find_contours src/nodelet/find_contours_nodelet.cpp) # ./tutorial_code/ShapeDescriptors/findContours_demo.cpp
+opencv_apps_add_nodelet(convex_hull src/nodelet/convex_hull_nodelet.cpp) # ./tutorial_code/ShapeDescriptors/hull_demo.cpp
+opencv_apps_add_nodelet(general_contours src/nodelet/general_contours_nodelet.cpp) # ./tutorial_code/ShapeDescriptors/generalContours_demo2.cpp
+opencv_apps_add_nodelet(contour_moments src/nodelet/contour_moments_nodelet.cpp) # ./tutorial_code/ShapeDescriptors/moments_demo.cpp
   # ./tutorial_code/ShapeDescriptors/generalContours_demo1.cpp
   # ./tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp
 
 # TrackingMotion
-opencv_apps_add_nodelet(goodfeature_track goodfeature_track/goodfeature_track src/nodelet/goodfeature_track_nodelet.cpp) # ./tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp
+opencv_apps_add_nodelet(goodfeature_track src/nodelet/goodfeature_track_nodelet.cpp) # ./tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp
   # ./tutorial_code/TrackingMotion/cornerDetector_Demo.cpp
-opencv_apps_add_nodelet(corner_harris corner_harris/corner_harris src/nodelet/corner_harris_nodelet.cpp)  # ./tutorial_code/TrackingMotion/cornerHarris_Demo.cpp
+opencv_apps_add_nodelet(corner_harris src/nodelet/corner_harris_nodelet.cpp)  # ./tutorial_code/TrackingMotion/cornerHarris_Demo.cpp
   # ./tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp
 
 # videoio
@@ -240,7 +240,7 @@ opencv_apps_add_nodelet(corner_harris corner_harris/corner_harris src/nodelet/co
 # ./autofocus.cpp
 # ./bgfg_segm.cpp
 # ./calibration.cpp
-opencv_apps_add_nodelet(camshift camshift/camshift src/nodelet/camshift_nodelet.cpp) # ./camshiftdemo.cpp
+opencv_apps_add_nodelet(camshift src/nodelet/camshift_nodelet.cpp) # ./camshiftdemo.cpp
 # ./cloning_demo.cpp
 # ./cloning_gui.cpp
 # ./connected_components.cpp
@@ -259,10 +259,10 @@ opencv_apps_add_nodelet(camshift camshift/camshift src/nodelet/camshift_nodelet.
 # ./edge.cpp
 # ./em.cpp
 # ./example_cmake/example.cpp
-opencv_apps_add_nodelet(face_detection face_detection/face_detection src/nodelet/face_detection_nodelet.cpp) # ./facedetect.cpp
-opencv_apps_add_nodelet(face_recognition face_recognition/face_recognition src/nodelet/face_recognition_nodelet.cpp)
+opencv_apps_add_nodelet(face_detection src/nodelet/face_detection_nodelet.cpp) # ./facedetect.cpp
+opencv_apps_add_nodelet(face_recognition src/nodelet/face_recognition_nodelet.cpp)
 # ./facial_features.cpp
-opencv_apps_add_nodelet(fback_flow fback_flow/fback_flow src/nodelet/fback_flow_nodelet.cpp) # ./fback.cpp
+opencv_apps_add_nodelet(fback_flow src/nodelet/fback_flow_nodelet.cpp) # ./fback.cpp
 # ./ffilldemo.cpp
 # ./filestorage_base64.cpp
 # ./filestorage.cpp
@@ -280,7 +280,7 @@ opencv_apps_add_nodelet(fback_flow fback_flow/fback_flow src/nodelet/fback_flow_
 # ./kmeans.cpp
 # ./laplace.cpp
 # ./letter_recog.cpp
-opencv_apps_add_nodelet(lk_flow lk_flow/lk_flow src/nodelet/lk_flow_nodelet.cpp) # ./lkdemo.cpp
+opencv_apps_add_nodelet(lk_flow src/nodelet/lk_flow_nodelet.cpp) # ./lkdemo.cpp
 # ./logistic_regression.cpp
 # ./lsd_lines.cpp
 # ./mask_tmpl.cpp
@@ -292,11 +292,11 @@ opencv_apps_add_nodelet(lk_flow lk_flow/lk_flow src/nodelet/lk_flow_nodelet.cpp)
 # ./opencv_version.cpp
 # ./openni_capture.cpp
 # ./pca.cpp
-opencv_apps_add_nodelet(people_detect people_detect/people_detect src/nodelet/people_detect_nodelet.cpp) # ./peopledetect.cpp
-opencv_apps_add_nodelet(phase_corr phase_corr/phase_corr src/nodelet/phase_corr_nodelet.cpp) # ./phase_corr.cpp
+opencv_apps_add_nodelet(people_detect src/nodelet/people_detect_nodelet.cpp) # ./peopledetect.cpp
+opencv_apps_add_nodelet(phase_corr src/nodelet/phase_corr_nodelet.cpp) # ./phase_corr.cpp
 # ./points_classifier.cpp
 # ./polar_transforms.cpp
-opencv_apps_add_nodelet(segment_objects segment_objects/segment_objects src/nodelet/segment_objects_nodelet.cpp) # ./segment_objects.cpp
+opencv_apps_add_nodelet(segment_objects src/nodelet/segment_objects_nodelet.cpp) # ./segment_objects.cpp
 # ./select3dobj.cpp
 # ./shape_example.cpp
 # ./smiledetect.cpp
@@ -312,16 +312,16 @@ opencv_apps_add_nodelet(segment_objects segment_objects/segment_objects src/node
 # ./tree_engine.cpp
 # ./tvl1_optical_flow.cpp
 # ./videostab.cpp
-opencv_apps_add_nodelet(watershed_segmentation watershed_segmentation/watershed_segmentation src/nodelet/watershed_segmentation_nodelet.cpp) # ./watershed.cpp
+opencv_apps_add_nodelet(watershed_segmentation src/nodelet/watershed_segmentation_nodelet.cpp) # ./watershed.cpp
 
 # ros examples
-opencv_apps_add_nodelet(simple_example simple_example/simple_example src/nodelet/simple_example_nodelet.cpp)
-opencv_apps_add_nodelet(simple_compressed_example simple_compressed_example/simple_compressed_example src/nodelet/simple_compressed_example_nodelet.cpp)
+opencv_apps_add_nodelet(simple_example src/nodelet/simple_example_nodelet.cpp)
+opencv_apps_add_nodelet(simple_compressed_example src/nodelet/simple_compressed_example_nodelet.cpp)
 
 # https://github.com/Itseez/opencv/blob/2.4/samples/cpp/simpleflow_demo.cpp
 # simple flow requires opencv-contrib https://github.com/ros-perception/vision_opencv/issues/108
 if(OPENCV_HAVE_OPTFLOW)
-  opencv_apps_add_nodelet(simple_flow simple_flow/simple_flow src/nodelet/simple_flow_nodelet.cpp)
+  opencv_apps_add_nodelet(simple_flow src/nodelet/simple_flow_nodelet.cpp)
 endif()
 # https://github.com/opencv/opencv/blob/2.4/samples/cpp/bgfg_gmg.cpp
 # https://github.com/opencv/opencv/blob/2.4/samples/cpp/hybridtrackingsample.cpp

cfg/AddingImages.cfg

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-PACKAGE='adding_images'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/CamShift.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='camshift'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/ContourMoments.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='contour_moments'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/ConvexHull.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='convex_hull'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/CornerHarris.cfg

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-PACKAGE='corner_harris'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/DiscreteFourierTransform.cfg

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-PACKAGE='discrete_fourier_transform'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/EdgeDetection.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='edge_detection'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/FBackFlow.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='fback_flow'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/FaceDetection.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='face_detection'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/FaceRecognition.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='face_recognition'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/FindContours.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='find_contours'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/GeneralContours.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='general_contours'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/GoodfeatureTrack.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='goodfeature_track'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/HLSColorFilter.cfg

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-PACKAGE='color_filter'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/HSIColorFilter.cfg

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-PACKAGE='color_filter'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/HSVColorFilter.cfg

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-PACKAGE='color_filter'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/HoughCircles.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='hough_circles'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/HoughLines.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='hough_lines'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/LKFlow.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='lk_flow'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/PeopleDetect.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='people_detect'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/PhaseCorr.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='phase_corr'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/Pyramids.cfg

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-PACKAGE='pyramids'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/RGBColorFilter.cfg

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-PACKAGE='color_filter'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/SegmentObjects.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='segment_objects'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/SimpleFlow.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='simple_flow'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/Smoothing.cfg

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-PACKAGE = 'smoothing'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *;
 

cfg/Threshold.cfg

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-PACKAGE='threshold'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 

cfg/WatershedSegmentation.cfg

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-PACKAGE='watershed_segmentation'
+PACKAGE = "opencv_apps"
 
 from dynamic_reconfigure.parameter_generator_catkin import *