diff --git a/CMakeLists.txt b/CMakeLists.txt index c01d4022..1c56033d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,17 @@ PROJECT( octomap-distribution ) ENABLE_TESTING() # enable CTest environment of subprojects +option(BUILD_OCTOVIS_SUBPROJECT "Build targets from subproject octovis" ON) +option(BUILD_DYNAMICETD3D_SUBPROJECT "Build targets from subproject dynamicEDT3D" ON) + ADD_SUBDIRECTORY( octomap ) -ADD_SUBDIRECTORY( octovis ) -ADD_SUBDIRECTORY( dynamicEDT3D ) - + +if(BUILD_OCTOVIS_SUBPROJECT) + ADD_SUBDIRECTORY( octovis ) +endif() + +if(BUILD_DYNAMICETD3D_SUBPROJECT) + ADD_SUBDIRECTORY( dynamicEDT3D ) +endif() diff --git a/dynamicEDT3D/CHANGELOG.txt b/dynamicEDT3D/CHANGELOG.txt index e69de29b..965fdcb5 100644 --- a/dynamicEDT3D/CHANGELOG.txt +++ b/dynamicEDT3D/CHANGELOG.txt @@ -0,0 +1,6 @@ +v1.6.7: 2014-08-31 +================== +- Support for SOVERSION in the library for better packaging +- fixing ${DYNAMICEDT3D_LIBRARIES} to have full path +- fixing location of dynamicEDT3DConfig.cmake +- fixing package.xml installation diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt index 48965f3d..b4a233ec 100644 --- a/dynamicEDT3D/CMakeLists.txt +++ b/dynamicEDT3D/CMakeLists.txt @@ -6,7 +6,7 @@ ENABLE_TESTING() # version (e.g. for packaging) set(DYNAMICEDT3D_MAJOR_VERSION 1) set(DYNAMICEDT3D_MINOR_VERSION 6) -set(DYNAMICEDT3D_PATCH_VERSION 6) +set(DYNAMICEDT3D_PATCH_VERSION 7) set(DYNAMICEDT3D_VERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION}.${DYNAMICEDT3D_PATCH_VERSION}) set(DYNAMICEDT3D_SOVERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION}) @@ -51,6 +51,9 @@ ADD_SUBDIRECTORY(src) file(GLOB dynamicEDT3D_HDRS ${PROJECT_SOURCE_DIR}/include/dynamicEDT3D/*.h ${PROJECT_SOURCE_DIR}/include/dynamicEDT3D/*.hxx) install(FILES ${dynamicEDT3D_HDRS} DESTINATION include/dynamicEDT3D) +# Install catkin package.xml +install(FILES package.xml DESTINATION share/dynamicEDT3D) + #TODO: this conflicts with the octomap uninstall #it is not only a target name problem, also both will use the same manifest file #in the same binary directory @@ -94,7 +97,7 @@ configure_file(dynamicEDT3DConfig-version.cmake.in install(FILES "${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig.cmake" "${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig-version.cmake" - DESTINATION lib/cmake/dynamicEDT3D/) + DESTINATION share/dynamicEDT3D/) # Write pkgconfig-file: include(InstallPkgConfigFile) @@ -102,7 +105,7 @@ install_pkg_config_file(dynamicEDT3D CFLAGS LIBS -ldynamicEDT3D REQUIRES - VERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION}.${DYNAMICEDT3D_PATCH_VERSION}) + VERSION ${DYNAMICEDT3D_VERSION}) # Documentation diff --git a/dynamicEDT3D/dynamicEDT3DConfig.cmake.in b/dynamicEDT3D/dynamicEDT3DConfig.cmake.in index c8486b58..b6a7d231 100644 --- a/dynamicEDT3D/dynamicEDT3DConfig.cmake.in +++ b/dynamicEDT3D/dynamicEDT3DConfig.cmake.in @@ -1,9 +1,17 @@ -# - Config file for the OctoMap package +# - Config file for the dynamicEDT3D package # (example from http://www.vtk.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file) +# +# Usage from an external project: +# In your CMakeLists.txt, add these lines: +# +# FIND_PACKAGE(dynamicedt3d REQUIRED ) +# INCLUDE_DIRECTORIES(${DYNAMICEDT3D_INCLUDE_DIRS}) +# TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${DYNAMICEDT3D_LIBRARIES}) +# # It defines the following variables -# OCTOMAP_INCLUDE_DIRS - include directories for OctoMap -# OCTOMAP_LIBRARY_DIRS - library directories for OctoMap (normally not used!) -# OCTOMAP_LIBRARIES - libraries to link against +# DYNAMICEDT3D_INCLUDE_DIRS - include directories for dynamicEDT3D +# DYNAMICEDT3D_LIBRARY_DIRS - library directories for dynamicEDT3D (normally not used!) +# DYNAMICEDT3D_LIBRARIES - libraries to link against # Tell the user project where to find our headers and libraries set(DYNAMICEDT3D_INCLUDE_DIRS "@DYNAMICEDT3D_INCLUDE_DIRS@") @@ -12,4 +20,6 @@ set(DYNAMICEDT3D_LIBRARY_DIRS "@DYNAMICEDT3D_LIB_DIR@") # Our library dependencies (contains definitions for IMPORTED targets) # include("@FOOBAR_CMAKE_DIR@/FooBarLibraryDepends.cmake") -set(DYNAMICEDT3D_LIBRARIES dynamicedt3d) +set(DYNAMICEDT3D_LIBRARIES + "@DYNAMICEDT3D_LIB_DIR@/libdynamicedt3d@CMAKE_SHARED_LIBRARY_SUFFIX@" +) diff --git a/dynamicEDT3D/package.xml b/dynamicEDT3D/package.xml index f0304b4b..7061533a 100644 --- a/dynamicEDT3D/package.xml +++ b/dynamicEDT3D/package.xml @@ -1,6 +1,6 @@ dynamic_edt_3d - 1.6.6 + 1.6.7 The dynamicEDT3D library implements an inrementally updatable Euclidean distance transform (EDT) in 3D. It comes with a wrapper to use the OctoMap 3D representation and hooks into the change detection of the OctoMap library to propagate changes to the EDT. Christoph Sprunk diff --git a/octomap/CHANGELOG.txt b/octomap/CHANGELOG.txt index e2ff3560..6ae9c5e2 100644 --- a/octomap/CHANGELOG.txt +++ b/octomap/CHANGELOG.txt @@ -1,3 +1,8 @@ +v1.6.7: 2014-08-31 +================== +- FSF address in octovis license header for OctoMap package in Fedora +- Separate build options for octovis and dynamicEDT3D. Thanks to C. Reist! + v1.6.6: 2014-05-26 ================== - Support for SOVERSION in the libraries for better packaging diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt index 7dc3b464..d968acf5 100644 --- a/octomap/CMakeLists.txt +++ b/octomap/CMakeLists.txt @@ -6,7 +6,7 @@ ENABLE_TESTING() # version (e.g. for packaging) set(OCTOMAP_MAJOR_VERSION 1) set(OCTOMAP_MINOR_VERSION 6) -set(OCTOMAP_PATCH_VERSION 6) +set(OCTOMAP_PATCH_VERSION 7) set(OCTOMAP_VERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION}.${OCTOMAP_PATCH_VERSION}) set(OCTOMAP_SOVERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION}) if(COMMAND cmake_policy) diff --git a/octomap/package.xml b/octomap/package.xml index 5dc1f0e4..55670e4f 100644 --- a/octomap/package.xml +++ b/octomap/package.xml @@ -1,6 +1,6 @@ octomap - 1.6.6 + 1.6.7 The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++. The map implementation is based on an octree. See http://octomap.github.io for details. diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt index 4e721dd6..6e3888f0 100644 --- a/octovis/CMakeLists.txt +++ b/octovis/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT( octovis ) # # version (e.g. for packaging) set(OCTOVIS_MAJOR_VERSION 1) set(OCTOVIS_MINOR_VERSION 6) -set(OCTOVIS_PATCH_VERSION 6) +set(OCTOVIS_PATCH_VERSION 7) set(OCTOVIS_VERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION}.${OCTOVIS_PATCH_VERSION}) set(OCTOVIS_SOVERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION}) # get rid of a useless warning: diff --git a/octovis/LICENSE.txt b/octovis/LICENSE.txt index 4182c094..3bb86e00 100644 --- a/octovis/LICENSE.txt +++ b/octovis/LICENSE.txt @@ -1,13 +1,13 @@ OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees -http://octomap.github.com/ +http://octomap.github.io -Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg +Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg All rights reserved. License for the "octovis" visualization library: GPL v2. -octovis requires (and link against libQGLViewer (www.libqglviewer.com) +octovis requires (and links against) libQGLViewer (www.libqglviewer.com) diff --git a/octovis/include/octovis/CameraFollowMode.h b/octovis/include/octovis/CameraFollowMode.h index f0637220..cfed94af 100644 --- a/octovis/include/octovis/CameraFollowMode.h +++ b/octovis/include/octovis/CameraFollowMode.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef CAMERAFOLLOWMODE_H_ diff --git a/octovis/include/octovis/ColorOcTreeDrawer.h b/octovis/include/octovis/ColorOcTreeDrawer.h index dbdc21e0..67367305 100644 --- a/octovis/include/octovis/ColorOcTreeDrawer.h +++ b/octovis/include/octovis/ColorOcTreeDrawer.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef OCTOVIS_COLOR_OCTREEDRAWER_H_ diff --git a/octovis/include/octovis/OcTreeDrawer.h b/octovis/include/octovis/OcTreeDrawer.h index 6937f772..a9712c90 100644 --- a/octovis/include/octovis/OcTreeDrawer.h +++ b/octovis/include/octovis/OcTreeDrawer.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef OCTREEDRAWER_H_ diff --git a/octovis/include/octovis/OcTreeRecord.h b/octovis/include/octovis/OcTreeRecord.h index 4ceed3fa..9beccf90 100644 --- a/octovis/include/octovis/OcTreeRecord.h +++ b/octovis/include/octovis/OcTreeRecord.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef OCTOVIS_OC_TREE_RECORD diff --git a/octovis/include/octovis/PointcloudDrawer.h b/octovis/include/octovis/PointcloudDrawer.h index 9425fe96..64014300 100644 --- a/octovis/include/octovis/PointcloudDrawer.h +++ b/octovis/include/octovis/PointcloudDrawer.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef POINTCLOUDDRAWER_H_ diff --git a/octovis/include/octovis/SceneObject.h b/octovis/include/octovis/SceneObject.h index 2f9b5a76..09517ba3 100644 --- a/octovis/include/octovis/SceneObject.h +++ b/octovis/include/octovis/SceneObject.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef SCENEOBJECT_H_ diff --git a/octovis/include/octovis/SelectionBox.h b/octovis/include/octovis/SelectionBox.h index 3cb54b2b..1d93dcab 100644 --- a/octovis/include/octovis/SelectionBox.h +++ b/octovis/include/octovis/SelectionBox.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef SELECTIONBOX_H_ diff --git a/octovis/include/octovis/TrajectoryDrawer.h b/octovis/include/octovis/TrajectoryDrawer.h index 1277afeb..eaa8fefc 100644 --- a/octovis/include/octovis/TrajectoryDrawer.h +++ b/octovis/include/octovis/TrajectoryDrawer.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef TRAJECTORYDRAWER_H_ diff --git a/octovis/include/octovis/ViewerGui.h b/octovis/include/octovis/ViewerGui.h index 364b2ec1..86d8aa75 100644 --- a/octovis/include/octovis/ViewerGui.h +++ b/octovis/include/octovis/ViewerGui.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef VIEWERGUI_H diff --git a/octovis/include/octovis/ViewerSettings.h b/octovis/include/octovis/ViewerSettings.h index 9a04990f..80a6be11 100644 --- a/octovis/include/octovis/ViewerSettings.h +++ b/octovis/include/octovis/ViewerSettings.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef VIEWERSETTINGS_H diff --git a/octovis/include/octovis/ViewerSettingsPanel.h b/octovis/include/octovis/ViewerSettingsPanel.h index 1b40bf58..03c3987d 100644 --- a/octovis/include/octovis/ViewerSettingsPanel.h +++ b/octovis/include/octovis/ViewerSettingsPanel.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef VIEWERSETTINGSPANEL_H diff --git a/octovis/include/octovis/ViewerSettingsPanelCamera.h b/octovis/include/octovis/ViewerSettingsPanelCamera.h index 4968ba08..5c666972 100644 --- a/octovis/include/octovis/ViewerSettingsPanelCamera.h +++ b/octovis/include/octovis/ViewerSettingsPanelCamera.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef VIEWERSETTINGSPANELFLYMODE_H diff --git a/octovis/include/octovis/ViewerWidget.h b/octovis/include/octovis/ViewerWidget.h index c8df1d59..5159689c 100644 --- a/octovis/include/octovis/ViewerWidget.h +++ b/octovis/include/octovis/ViewerWidget.h @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #ifndef VIEWERWIDGET_H_ diff --git a/octovis/package.xml b/octovis/package.xml index d79a2777..45326ec1 100644 --- a/octovis/package.xml +++ b/octovis/package.xml @@ -1,6 +1,6 @@ octovis - 1.6.6 + 1.6.7 octovis is visualization tool for the OctoMap library based on Qt and libQGLViewer. See http://octomap.github.io for details. diff --git a/octovis/src/CameraFollowMode.cpp b/octovis/src/CameraFollowMode.cpp index 4b9f3326..fa3285a7 100644 --- a/octovis/src/CameraFollowMode.cpp +++ b/octovis/src/CameraFollowMode.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/ColorOcTreeDrawer.cpp b/octovis/src/ColorOcTreeDrawer.cpp index b403ca4a..70266b7c 100644 --- a/octovis/src/ColorOcTreeDrawer.cpp +++ b/octovis/src/ColorOcTreeDrawer.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/OcTreeDrawer.cpp b/octovis/src/OcTreeDrawer.cpp index 3c71478b..b825ca9e 100644 --- a/octovis/src/OcTreeDrawer.cpp +++ b/octovis/src/OcTreeDrawer.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/PointcloudDrawer.cpp b/octovis/src/PointcloudDrawer.cpp index 9c7888c5..9756b5b3 100644 --- a/octovis/src/PointcloudDrawer.cpp +++ b/octovis/src/PointcloudDrawer.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/SceneObject.cpp b/octovis/src/SceneObject.cpp index 279a6f96..c6194255 100644 --- a/octovis/src/SceneObject.cpp +++ b/octovis/src/SceneObject.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #define NOMINMAX diff --git a/octovis/src/SelectionBox.cpp b/octovis/src/SelectionBox.cpp index 223217ca..e1691af8 100644 --- a/octovis/src/SelectionBox.cpp +++ b/octovis/src/SelectionBox.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ // workaround for Windows diff --git a/octovis/src/TrajectoryDrawer.cpp b/octovis/src/TrajectoryDrawer.cpp index 9010fd26..c8f17f9e 100644 --- a/octovis/src/TrajectoryDrawer.cpp +++ b/octovis/src/TrajectoryDrawer.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/ViewerGui.cpp b/octovis/src/ViewerGui.cpp index e4ffd0e2..2da221da 100644 --- a/octovis/src/ViewerGui.cpp +++ b/octovis/src/ViewerGui.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/ViewerSettings.cpp b/octovis/src/ViewerSettings.cpp index c3e347e9..aea38475 100644 --- a/octovis/src/ViewerSettings.cpp +++ b/octovis/src/ViewerSettings.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/ViewerSettingsPanel.cpp b/octovis/src/ViewerSettingsPanel.cpp index dadc6d52..aba9028f 100644 --- a/octovis/src/ViewerSettingsPanel.cpp +++ b/octovis/src/ViewerSettingsPanel.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/ViewerSettingsPanelCamera.cpp b/octovis/src/ViewerSettingsPanelCamera.cpp index ea47ad05..e83e9b5f 100644 --- a/octovis/src/ViewerSettingsPanelCamera.cpp +++ b/octovis/src/ViewerSettingsPanelCamera.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/ViewerWidget.cpp b/octovis/src/ViewerWidget.cpp index 311e61b1..2e79fabc 100644 --- a/octovis/src/ViewerWidget.cpp +++ b/octovis/src/ViewerWidget.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include diff --git a/octovis/src/main.cpp b/octovis/src/main.cpp index def0bab8..2113a6b7 100644 --- a/octovis/src/main.cpp +++ b/octovis/src/main.cpp @@ -1,10 +1,10 @@ /* - * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees - * http://octomap.github.com/ + * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping + * Framework Based on Octrees + * http://octomap.github.io * - * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg - * All rights reserved. - * License (octovis): GNU GPL v2 + * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg + * All rights reserved. License for the viewer octovis: GNU GPL v2 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt * * @@ -18,9 +18,8 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ #include