Rebase from 'debian/kinetic/homer_mapping'

CHANGELOG.rst

@@ -2,6 +2,20 @@
 Changelog for package homer_mapping
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.4 (2016-11-03)
+------------------
+* updated changelog
+* fixes
+* Contributors: Niklas Yann Wettengel
+
+* fixes
+* Contributors: Niklas Yann Wettengel
+
+0.1.3 (2016-11-03)
+------------------
+* more fixes
+* Contributors: Niklas Yann Wettengel
+
 0.1.2 (2016-11-03)
 ------------------
 * install launch files

CMakeLists.txt

@@ -17,6 +17,11 @@ if (OPENMP_FOUND)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif()
 find_package(tf REQUIRED)
+find_package(Eigen3 REQUIRED)
+
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
+
 
 set(CMAKE_BUILD_TYPE Release)
 
@@ -24,6 +29,9 @@ set(CMAKE_BUILD_TYPE Release)
 include_directories(
 	include
 	${catkin_INCLUDE_DIRS}
+	${EIGEN3_INCLUDE_DIRS}
+	${Qt5Core_INCLUDE_DIRS}
+	${Qt5Widgets_INCLUDE_DIRS}
 )
 
 catkin_package(
@@ -35,7 +43,7 @@ catkin_package(
 		nav_msgs
 		tf
 		roslib
-		LIBRARIES homerOccupancyMap homerParticleFilter
+	LIBRARIES homerOccupancyMap homerParticleFilter
 )
 
 add_library(homerOccupancyMap
@@ -47,6 +55,8 @@ target_link_libraries(
 	homerOccupancyMap
 		${catkin_LIBRARIES}
 		${tf_LIBRARIES}
+		${Qt5Core_LIBRARIES}
+		${Qt5Widgets_LIBRARIES}
 )
 set(
 	ParticleFilter_SRC

debian/changelog

-ros-kinetic-homer-mapping (0.1.2-0xenial) xenial; urgency=high
-
-  * install launch files
-  * Contributors: Niklas Yann Wettengel
-
- -- Viktor Seib <vseib@uni-koblenz.de>  Wed, 02 Nov 2016 23:00:00 -0000
-
-ros-kinetic-homer-mapping (0.1.1-0xenial) xenial; urgency=high
-
-  * fixes
-  * initial commit
-  * Contributors: Niklas Yann Wettengel
-
- -- Viktor Seib <vseib@uni-koblenz.de>  Wed, 02 Nov 2016 23:00:00 -0000
-
-

debian/changelog.em

+@[for change_version, change_date, changelog, main_name, main_email in changelogs]@(Package) (@(change_version)-@(DebianInc)@(Distribution)) @(Distribution); urgency=high
+
+@(changelog)
+
+ -- @(main_name) <@(main_email)>  @(change_date)
+
+@[end for]

debian/compat

-9
\ No newline at end of file

debian/compat.em

+@(debhelper_version)
\ No newline at end of file

debian/control

-Source: ros-kinetic-homer-mapping
-Section: misc
-Priority: extra
-Maintainer: Viktor Seib <vseib@uni-koblenz.de>
-Build-Depends: debhelper (>= 9.0.0), ros-kinetic-catkin, ros-kinetic-cmake-modules, ros-kinetic-homer-mapnav-msgs, ros-kinetic-homer-nav-libs, ros-kinetic-nav-msgs, ros-kinetic-roscpp, ros-kinetic-roslib, ros-kinetic-sensor-msgs, ros-kinetic-tf
-Homepage: 
-Standards-Version: 3.9.2
-
-Package: ros-kinetic-homer-mapping
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ros-kinetic-homer-mapnav-msgs, ros-kinetic-homer-nav-libs, ros-kinetic-nav-msgs, ros-kinetic-roscpp, ros-kinetic-roslib, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs, ros-kinetic-tf
-Description: homer_mapping

debian/control.em

+Source: @(Package)
+Section: misc
+Priority: extra
+Maintainer: @(Maintainer)
+Build-Depends: debhelper (>= @(debhelper_version).0.0), @(', '.join(BuildDepends))
+Homepage: @(Homepage)
+Standards-Version: 3.9.2
+
+Package: @(Package)
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends))
+@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@
+@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@
+Description: @(Description)

debian/gbp.conf → debian/gbp.conf.em

 [git-buildpackage]
-upstream-tag=release/kinetic/homer_mapping/0.1.2-0
+upstream-tag=@(release_tag)
 upstream-tree=tag

debian/rules → debian/rules.em

@@ -14,29 +14,29 @@ export DH_OPTIONS=-v --buildsystem=cmake
 #  https://code.ros.org/trac/ros/ticket/2977
 #  https://code.ros.org/trac/ros/ticket/3842
 export LDFLAGS=
-export PKG_CONFIG_PATH=/opt/ros/kinetic/lib/pkgconfig
+export PKG_CONFIG_PATH=@(InstallationPrefix)/lib/pkgconfig
 # Explicitly enable -DNDEBUG, see:
 # 	https://github.com/ros-infrastructure/bloom/issues/327
 export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG
 
 %:
-	dh  $@
+	dh  $@@
 
 override_dh_auto_configure:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_configure -- \
 		-DCATKIN_BUILD_BINARY_PACKAGE="1" \
-		-DCMAKE_INSTALL_PREFIX="/opt/ros/kinetic" \
-		-DCMAKE_PREFIX_PATH="/opt/ros/kinetic"
+		-DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \
+		-DCMAKE_PREFIX_PATH="@(InstallationPrefix)"
 
 override_dh_auto_build:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_build
 
 override_dh_auto_test:
@@ -44,19 +44,19 @@ override_dh_auto_test:
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
 	echo -- Running tests. Even if one of them fails the build is not canceled.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_test || true
 
 override_dh_shlibdeps:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
-	dh_shlibdeps -l$(CURDIR)/debian/ros-kinetic-homer-mapping//opt/ros/kinetic/lib/
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
+	dh_shlibdeps -l$(CURDIR)/debian/@(Package)/@(InstallationPrefix)/lib/
 
 override_dh_auto_install:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_install

package.xml

 <package>
   <name>homer_mapping</name>
-  <version>0.1.2</version>
+  <version>0.1.4</version>
   <description>
 
      homer_mapping
@@ -20,6 +20,10 @@
   <build_depend>homer_nav_libs</build_depend>
   <build_depend>homer_mapnav_msgs</build_depend>
   <build_depend>cmake_modules</build_depend>
+  <build_depend>eigen</build_depend>
+  <build_depend>libqt5-core</build_depend>
+  <build_depend>libqt5-gui</build_depend>
+  <build_depend>libqt5-widgets</build_depend>
  
 
   <run_depend>std_msgs</run_depend>
@@ -30,5 +34,9 @@
   <run_depend>roslib</run_depend>  
   <run_depend>homer_nav_libs</run_depend>
   <run_depend>homer_mapnav_msgs</run_depend>
+  <run_depend>eigen</run_depend>
+  <run_depend>libqt5-core</run_depend>
+  <run_depend>libqt5-gui</run_depend>
+  <run_depend>libqt5-widgets</run_depend>
 
 </package>

src/OccupancyMap/OccupancyMap.cpp

@@ -6,7 +6,7 @@
 #include <vector>
 #include <fstream>
 #include <sstream>
-#include <QImage>
+#include <QtGui/QImage>
 
 #include <Eigen/Geometry>