Skip to content

Commit

Permalink
Added grid_map_cv from grid_map@1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
esteve committed Mar 5, 2019
1 parent 7162edd commit 26c4e8a
Show file tree
Hide file tree
Showing 13 changed files with 939 additions and 0 deletions.
61 changes: 61 additions & 0 deletions ros/src/vendor/grid_map/grid_map_cv/CHANGELOG.rst
@@ -0,0 +1,61 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package grid_map_cv
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.6.0 (2017-11-24)
------------------
* Fixed compatibility issue with OpenCV 3 (`#140 <https://github.com/ethz-asl/grid_map/issues/140>`_).
* Makes the OpenCV include a bit more specific and adds in a dependency into the catkin_package call.
* Moved inpaint filter to grid_map_cv, extended filter demo, cleanups.
* Fixed problem where clamp changes were disregarded (`#115 <https://github.com/ethz-asl/grid_map/issues/115>`_ from Le-Fix/fix/toImageClamp).
* Contributors: Péter Fankhauser, Perry Franklin, Le-Fix

1.5.2 (2017-07-25)
------------------

1.5.1 (2017-07-25)
------------------

1.5.0 (2017-07-18)
------------------
* Fixed bug for change resolution function in OpenCV processing class (including unit tests). (`#91 <https://github.com/ethz-asl/grid_map/issues/91>`_).
* Extend grid_map_cv unit test for transparent pixels/nan-values.
* Remove constructor and destructor declaration in GridMapCvConverter.
* Contributors: Peter Fankhauser, Marco Camurri, Sascha

1.4.2 (2017-01-24)
------------------
* Fixed conversion to/from images in float&double format.
* Contributors: Peter Fankhauser

1.4.1 (2016-10-23)
------------------
* Improved transformation of images to color grid map layers.
* Contributors: Peter Fankhauser

1.4.0 (2016-08-22)
------------------

1.3.3 (2016-05-10)
------------------
* Release for ROS Kinetic.
* Contributors: Peter Fankhauser

1.3.2 (2016-05-10)
------------------
* Updated dependency to OpenCV for compatibility with ROS Kinetic and OpenCV 2/3.
* Contributors: Peter Fankhauser

1.3.1 (2016-05-10)
------------------

1.3.0 (2016-04-26)
------------------
* Separated OpenCV to grid map conversions to grid_map_cv package. The new methods
are more generalized, faster, and can be used without ROS message types.
* Added new convenience function to change the resolution of grid maps with help of the OpenCV interpolation methods.
* Added `initializeFromImage()` to GridMapCvConverter.
* Added unit tests for grid_map_cv. Updated documentation.
* Resolving build errors for OpenCV.
* Fixed typo and added documentation.
* Contributors: Peter Fankhauser, Dominic Jud,
107 changes: 107 additions & 0 deletions ros/src/vendor/grid_map/grid_map_cv/CMakeLists.txt
@@ -0,0 +1,107 @@
cmake_minimum_required(VERSION 2.8.3)
project(grid_map_cv)

set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")

## Find catkin macros and libraries
find_package(catkin REQUIRED COMPONENTS
grid_map_core
cv_bridge
filters
)

find_package(OpenCV REQUIRED
COMPONENTS
opencv_photo
)

###################################
## catkin specific configuration ##
###################################
## The catkin_package macro generates cmake config files for your package
## Declare things to be passed to dependent projects
## INCLUDE_DIRS: uncomment this if you package contains header files
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
INCLUDE_DIRS
include
LIBRARIES
${PROJECT_NAME}
CATKIN_DEPENDS
grid_map_core
cv_bridge
filters
DEPENDS
OpenCV
)

###########
## Build ##
###########

## Specify additional locations of header files
include_directories(
include
${catkin_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
)

## Declare a cpp library
add_library(${PROJECT_NAME}
src/GridMapCvProcessing.cpp
src/InpaintFilter.cpp
)

target_link_libraries(${PROJECT_NAME}
${catkin_LIBRARIES}
${OpenCV_LIBRARIES}
)

add_dependencies(${PROJECT_NAME}
${catkin_EXPORTED_TARGETS}
)

#############
## Install ##
#############

# Mark executables and/or libraries for installation
install(
TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

# Mark cpp header files for installation
install(
DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.hpp"
)

# Mark other files for installation.
install(
FILES filter_plugins.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

#############
## Testing ##
#############

if(CATKIN_ENABLE_TESTING)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
## Add gtest based cpp test target and link libraries
catkin_add_gtest(${PROJECT_NAME}-test
test/test_grid_map_cv.cpp
test/GridMapCvTest.cpp
test/GridMapCvProcessingTest.cpp)
endif()

if(TARGET ${PROJECT_NAME}-test)
target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
endif()

9 changes: 9 additions & 0 deletions ros/src/vendor/grid_map/grid_map_cv/filter_plugins.xml
@@ -0,0 +1,9 @@
<class_libraries>
<library path="lib/libgrid_map_cv">
<class name="gridMapCv/InpaintFilter" type="grid_map::InpaintFilter<grid_map::GridMap>" base_class_type="filters::FilterBase<grid_map::GridMap>" >
<description>
Use OpenCV to inpaint/fill holes in a layer.
</description>
</class>
</library>
</class_libraries>

0 comments on commit 26c4e8a

Please sign in to comment.