Skip to content

Commit

Permalink
Changing the package name from interactive_marker_test to interactive…
Browse files Browse the repository at this point in the history
…_calibration
  • Loading branch information
miguelriemoliveira committed May 21, 2019
1 parent ae22b83 commit d07f214
Show file tree
Hide file tree
Showing 27 changed files with 559 additions and 57 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,29 +53,29 @@ First , add this package to your catkin workspace source.

Run the command:
```
roslaunch interactive_marker_test rviz.launch car_model:=true read_first_guess:=false
roslaunch interactive_calibration rviz.launch car_model:=true read_first_guess:=false
```

Rviz will open, and you will need to set the Fixed Frame as 'ground'.
Now you are able to see the atlas car model with the sensors in their first position.

Then, in a new terminal:
```
rosrun interactive_marker_test create_first_guess.py -w car_center
rosrun interactive_calibration create_first_guess.py -w car_center
```

Now you can move the green markers and save the new sensors configuration.
Kill the booth process in the terminals, and run:

```
roslaunch interactive_marker_test rviz.launch car_model:=true read_first_guess:=true
roslaunch interactive_calibration rviz.launch car_model:=true read_first_guess:=true
```
Now you will see the atlas car model with the sensors in the updated position (don't forget to set Fixed Frame as 'ground').

## For PR2 robot model
For seeing the PR2 model instead of the AtlasCar2, just run the command (it's the same but with the car_model argument set as false)
```
roslaunch interactive_marker_test rviz.launch car_model:=false read_first_guess:=false
roslaunch interactive_calibration rviz.launch car_model:=false read_first_guess:=false
```
You need to set Fixed Frame as 'base_footprint' in order to see the urdf robot model.

Expand All @@ -84,7 +84,7 @@ You need to set Fixed Frame as 'base_footprint' in order to see the urdf robot m
In order to visualize the calibration graphs you may run:

```
rosrun interactive_marker_test draw_calibration_graph.py -w {world_frame}
rosrun interactive_calibration draw_calibration_graph.py -w {world_frame}
```

Annotated tf trees are displayed to better understand the calibration process. Here are some examples for the PR2 robot:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(interactive_marker_test)
project(interactive_calibration)

## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)
Expand All @@ -22,7 +22,7 @@ find_package(catkin REQUIRED COMPONENTS
## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
#catkin_python_setup()
catkin_python_setup()

################################################
## Declare ROS messages, services and actions ##
Expand Down Expand Up @@ -106,7 +106,7 @@ find_package(catkin REQUIRED COMPONENTS
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES interactive_marker_test
# LIBRARIES interactive_calibration
# CATKIN_DEPENDS roscpp rospy std_msgs
# DEPENDS system_lib
)
Expand All @@ -124,7 +124,7 @@ include_directories(

## Declare a C++ library
# add_library(${PROJECT_NAME}
# src/${PROJECT_NAME}/interactive_marker_test.cpp
# src/${PROJECT_NAME}/interactive_calibration.cpp
# )

## Add cmake target dependencies of the library
Expand All @@ -135,7 +135,7 @@ include_directories(
## Declare a C++ executable
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
# add_executable(${PROJECT_NAME}_node src/interactive_marker_test_node.cpp)
# add_executable(${PROJECT_NAME}_node src/interactive_calibration_node.cpp)

## Rename C++ executable without prefix
## The above recommended prefix causes long target names, the following renames the
Expand Down Expand Up @@ -166,6 +166,9 @@ include_directories(
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )




## Mark executables and/or libraries for installation
# install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_node
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
Expand All @@ -192,7 +195,7 @@ include_directories(
#############

## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_interactive_marker_test.cpp)
# catkin_add_gtest(${PROJECT_NAME}-test test/test_interactive_calibration.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()
Expand Down
File renamed without changes.

0 comments on commit d07f214

Please sign in to comment.