renamed depth_registration package to kinect2_registration.

Thiemo Wiedemeyer · Thiemo Wiedemeyer · commit eac65adedf7a · 2015-06-02T15:39:14.000+02:00
renamed registration_viewer package to kinect2_viewer.
diff --git a/README.md b/README.md
@@ -18,9 +18,9 @@ This is a collection of tools and libraries for a ROS Interface to the Kinect On
 
 It contains:
 - [a calibration tool](kinect2_calibration) for calibrating the IR sensor of the Kinect One to the RGB sensor and the depth measurements
-- [a library](depth_registration) for depth registration with OpenCL support
+- [a library](kinect2_registration) for depth registration with OpenCL support
 - [the bridge](kinect2_bridge) between [libfreenect2](https://github.com/OpenKinect/libfreenect2) and [ROS](http://www.ros.org/)
-- [a viewer](registration_viewer) for the images / point clouds
+- [a viewer](kinect2_viewer) for the images / point clouds
 
 ## FAQ
 
@@ -53,7 +53,7 @@ make & sudo make install
 
 #### rosdep: Cannot locate rosdep definition for [kinect2_bridge] or [depth_registration]
 
-`rosdep` will output errors on not being able to locate `[kinect2_bridge]` and `[depth_registration]`. That is fine because they are all part of the iai_kinect2 package and `rosdep` does not know these packages.
+`rosdep` will output errors on not being able to locate `[kinect2_bridge]` and `[kinect2_registration]`. That is fine because they are all part of the iai_kinect2 package and `rosdep` does not know these packages.
 
 #### Protonect or kinect2_bridge outputs [TransferPool::submit] failed to submit transfer
 
@@ -131,7 +131,7 @@ rosrun kinect2_bridge kinect2_bridge
 ```
 6. Calibrate your sensor using the `kinect2_calibration`. [Further details](kinect2_calibration#calibrating-the-kinect-one)
 7. Add the calibration files to the `kinect2_bridge/data/<serialnumber>` folder. [Further details](kinect2_bridge#first-steps)
-8. Restart `kinect2_bridge` and view the results using `rosrun registration_viewer viewer -kinect2 -cloud`.
+8. Restart `kinect2_bridge` and view the results using `rosrun kinect2_viewer kinect2_viewer kinect2 sd cloud`.
 
 ## Permissions to access the Kinect One
 
diff --git a/iai_kinect2/package.xml b/iai_kinect2/package.xml
@@ -12,9 +12,9 @@
   <buildtool_depend>catkin</buildtool_depend>
 
   <run_depend>kinect2_calibration</run_depend>
-  <run_depend>registration_viewer</run_depend>
+  <run_depend>kinect2_viewer</run_depend>
   <run_depend>kinect2_bridge</run_depend>
-  <run_depend>depth_registration</run_depend>
+  <run_depend>kinect2_registration</run_depend>
 
   <export>
     <metapackage/>
diff --git a/kinect2_bridge/CMakeLists.txt b/kinect2_bridge/CMakeLists.txt
@@ -21,7 +21,7 @@ ENDIF()
 
 find_package(freenect2 REQUIRED)
 
-find_package(catkin REQUIRED COMPONENTS roscpp rostime std_msgs sensor_msgs nodelet cv_bridge compressed_depth_image_transport depth_registration)
+find_package(catkin REQUIRED COMPONENTS roscpp rostime std_msgs sensor_msgs nodelet cv_bridge compressed_depth_image_transport kinect2_registration)
 
 ## System dependencies are found with CMake's conventions
 find_package(OpenCV REQUIRED)
diff --git a/kinect2_bridge/src/kinect2_bridge.cpp b/kinect2_bridge/src/kinect2_bridge.cpp
@@ -48,7 +48,7 @@
 #include <libfreenect2/registration.h>
 
 #include <kinect2_definitions.h>
-#include <depth_registration.h>
+#include <kinect2_registration.h>
 
 class Kinect2Bridge
 {
diff --git a/kinect2_calibration/package.xml b/kinect2_calibration/package.xml
@@ -15,7 +15,6 @@
   <build_depend>std_msgs</build_depend>
   <build_depend>sensor_msgs</build_depend>
   <build_depend>message_filters</build_depend>
-  <build_depend>cv_bridge</build_depend>
   <build_depend>image_transport</build_depend>
   <build_depend>compressed_image_transport</build_depend>
   <build_depend>compressed_depth_image_transport</build_depend>
@@ -28,7 +27,6 @@
   <run_depend>std_msgs</run_depend>
   <run_depend>sensor_msgs</run_depend>
   <run_depend>message_filters</run_depend>
-  <run_depend>cv_bridge</run_depend>
   <run_depend>image_transport</run_depend>
   <run_depend>compressed_image_transport</run_depend>
   <run_depend>compressed_depth_image_transport</run_depend>
diff --git a/kinect2_registration/CMakeLists.txt b/kinect2_registration/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(depth_registration)
+project(kinect2_registration)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBT_USE_DOUBLE_PRECISION -Wall")
 # Unused warnings
@@ -76,10 +76,10 @@ endif()
 ## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
   INCLUDE_DIRS include
-  LIBRARIES depth_registration
+  LIBRARIES kinect2_registration
 #  CATKIN_DEPENDS other_catkin_pkg
 #  DEPENDS system_lib
-  CFG_EXTRAS depth_registration.cmake
+  CFG_EXTRAS kinect2_registration.cmake
 )
 
 ###########
@@ -114,8 +114,8 @@ if(DEPTH_REG_OPENCL)
   set(MODULE_LIBS ${MODULE_LIBS} ${OPENCL_LIBRARIES})
 endif()
 
-add_library(depth_registration SHARED src/depth_registration.cpp ${MODULES})
-target_link_libraries(depth_registration
+add_library(kinect2_registration SHARED src/kinect2_registration.cpp ${MODULES})
+target_link_libraries(kinect2_registration
   ${catkin_LIBRARIES}
   ${OpenCV_LIBRARIES}
   ${MODULE_LIBS}
diff --git a/kinect2_registration/README.md b/kinect2_registration/README.md
@@ -1,4 +1,4 @@
-# Depth Registration
+# Kinect2 Registration
 
 ## Maintainer
 
diff --git a/kinect2_registration/cmake/FindOpenCL.cmake b/kinect2_registration/cmake/FindOpenCL.cmake
diff --git a/kinect2_registration/cmake/kinect2_registration.cmake.in b/kinect2_registration/cmake/kinect2_registration.cmake.in
diff --git a/kinect2_registration/include/kinect2_registration.h b/kinect2_registration/include/kinect2_registration.h
@@ -16,8 +16,8 @@
  */
 
 #pragma once
-#ifndef __DEPTH_REGISTRATION_H__
-#define __DEPTH_REGISTRATION_H__
+#ifndef __KINECT2_REGISTRATION_H__
+#define __KINECT2_REGISTRATION_H__
 
 #include <vector>
 
@@ -54,4 +54,4 @@ class DepthRegistration
   static DepthRegistration *New(Method method = DEFAULT);
 };
 
-#endif //__DEPTH_REGISTRATION_H__
+#endif //__KINECT2_REGISTRATION_H__
diff --git a/kinect2_registration/package.xml b/kinect2_registration/package.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <package>
-  <name>depth_registration</name>
+  <name>kinect2_registration</name>
   <version>0.0.1</version>
-  <description>The depth_registration package</description>
+  <description>The kinect2_registration package</description>
 
   <maintainer email="wiedemeyer@informatik.uni-bremen.de">Thiemo Wiedemeyer</maintainer>
 
diff --git a/kinect2_registration/src/depth_registration.cl b/kinect2_registration/src/depth_registration.cl
diff --git a/kinect2_registration/src/depth_registration_cpu.cpp b/kinect2_registration/src/depth_registration_cpu.cpp
diff --git a/kinect2_registration/src/depth_registration_cpu.h b/kinect2_registration/src/depth_registration_cpu.h
@@ -21,7 +21,7 @@
 
 #include <Eigen/Geometry>
 
-#include <depth_registration.h>
+#include <kinect2_registration.h>
 
 class DepthRegistrationCPU : public DepthRegistration
 {
diff --git a/kinect2_registration/src/depth_registration_opencl.cpp b/kinect2_registration/src/depth_registration_opencl.cpp
diff --git a/kinect2_registration/src/depth_registration_opencl.h b/kinect2_registration/src/depth_registration_opencl.h
@@ -19,7 +19,7 @@
 #ifndef __DEPTH_REGISTRATION_OPENCL_H__
 #define __DEPTH_REGISTRATION_OPENCL_H__
 
-#include <depth_registration.h>
+#include <kinect2_registration.h>
 
 class DepthRegistrationOpenCL : public DepthRegistration
 {
diff --git a/kinect2_registration/src/kinect2_registration.cpp b/kinect2_registration/src/kinect2_registration.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <depth_registration.h>
+#include <kinect2_registration.h>
 
 #ifdef DEPTH_REG_CPU
 #include "depth_registration_cpu.h"
diff --git a/kinect2_viewer/CMakeLists.txt b/kinect2_viewer/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(registration_viewer)
+project(kinect2_viewer)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBT_USE_DOUBLE_PRECISION -Wall")
 # Unused warnings
@@ -68,8 +68,8 @@ include_directories(include
   ${PCL_INCLUDE_DIRS}
 )
 
-add_executable(viewer src/viewer.cpp)
-target_link_libraries(viewer
+add_executable(kinect2_viewer src/viewer.cpp)
+target_link_libraries(kinect2_viewer
   ${catkin_LIBRARIES}
   ${OpenCV_LIBRARIES}
   ${PCL_LIBRARIES}
diff --git a/kinect2_viewer/README.md b/kinect2_viewer/README.md
@@ -1,4 +1,4 @@
-# Registration Viewer
+# Kinect2 Viewer
 
 ## Maintainer
 
@@ -21,7 +21,7 @@ It just listens to two ROS topics and displays a the color with the overlayed co
 ## Usage
 
 ```
-viewer [options]
+kinect2_viewer [options]
   name: 'any string' equals to the kinect2_bridge topic base name
   mode: 'qhd', 'hd', 'sd' or 'ir'
   visualization: 'image', 'cloud' or 'both'
@@ -30,7 +30,7 @@ viewer [options]
     'approx' use approximate time synchronization
 ```
 
-Example: `rosrun registration_viewer viewer kinect2 sd cloud`
+Example: `rosrun kinect2_viewer kinect2_viewer kinect2 sd cloud`
 
 ## Key bindings
 
diff --git a/kinect2_viewer/package.xml b/kinect2_viewer/package.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <package>
-  <name>registration_viewer</name>
+  <name>kinect2_viewer</name>
   <version>0.0.1</version>
-  <description>The registration_viewer package</description>
+  <description>The kinect2_viewer package</description>
 
   <maintainer email="wiedemeyer@informatik.uni-bremen.de">Thiemo Wiedemeyer</maintainer>
 
@@ -15,7 +15,6 @@
   <build_depend>std_msgs</build_depend>
   <build_depend>sensor_msgs</build_depend>
   <build_depend>message_filters</build_depend>
-  <build_depend>cv_bridge</build_depend>
   <build_depend>image_transport</build_depend>
   <build_depend>compressed_image_transport</build_depend>
   <build_depend>compressed_depth_image_transport</build_depend>
@@ -29,7 +28,6 @@
   <run_depend>std_msgs</run_depend>
   <run_depend>sensor_msgs</run_depend>
   <run_depend>message_filters</run_depend>
-  <run_depend>cv_bridge</run_depend>
   <run_depend>image_transport</run_depend>
   <run_depend>compressed_image_transport</run_depend>
   <run_depend>compressed_depth_image_transport</run_depend>
diff --git a/kinect2_viewer/src/viewer.cpp b/kinect2_viewer/src/viewer.cpp
@@ -524,7 +524,7 @@ void help(const std::string &path)
 
 int main(int argc, char **argv)
 {
-  ros::init(argc, argv, "viewer", ros::init_options::AnonymousName);
+  ros::init(argc, argv, "kinect2_viewer", ros::init_options::AnonymousName);
 
   if(!ros::ok())
   {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`#include <libfreenect2/registration.h>`
`49`	`49`
`50`	`50`	`#include <kinect2_definitions.h>`
`51`		`-#include <depth_registration.h>`
	`51`	`+#include <kinect2_registration.h>`
`52`	`52`
`53`	`53`	`class Kinect2Bridge`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Depth Registration`
	`1`	`+# Kinect2 Registration`
`2`	`2`
`3`	`3`	`## Maintainer`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`#include <Eigen/Geometry>`
`23`	`23`
`24`		`-#include <depth_registration.h>`
	`24`	`+#include <kinect2_registration.h>`
`25`	`25`
`26`	`26`	`class DepthRegistrationCPU : public DepthRegistration`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#ifndef __DEPTH_REGISTRATION_OPENCL_H__`
`20`	`20`	`#define __DEPTH_REGISTRATION_OPENCL_H__`
`21`	`21`
`22`		`-#include <depth_registration.h>`
	`22`	`+#include <kinect2_registration.h>`
`23`	`23`
`24`	`24`	`class DepthRegistrationOpenCL : public DepthRegistration`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ void help(const std::string &path)`
`524`	`524`
`525`	`525`	`int main(int argc, char **argv)`
`526`	`526`	`{`
`527`		`- ros::init(argc, argv, "viewer", ros::init_options::AnonymousName);`
	`527`	`+ ros::init(argc, argv, "kinect2_viewer", ros::init_options::AnonymousName);`
`528`	`528`
`529`	`529`	`if(!ros::ok())`
`530`	`530`	`{`