diff -Nru ros-rviz-1.13.5+dfsg/CHANGELOG.rst ros-rviz-1.13.7+dfsg/CHANGELOG.rst --- ros-rviz-1.13.5+dfsg/CHANGELOG.rst 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/CHANGELOG.rst 2019-12-18 16:38:13.000000000 +0000 @@ -2,6 +2,35 @@ Changelog for package rviz ^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.13.7 (2019-12-18) +------------------- +* [fix] Fix segfault when removing displays on presence of DisplayGroupVisibilityProperty +* [fix] CameraDisplay: don't call getCameraInfoTopic() for empty topic +* [fix] MarkerDisplay: clear old markers on topic change (`#1455 `_) +* [maintanence] Fix various warnings +* [maintanence] Support python3 for python bindings (`#1454 `_) +* Contributors: Mike Purvis, Robert Haschke + +1.13.6 (2019-11-25) +------------------- +* [fix] Memory leak in rviz::Robot +* [fix] assimp importer: repair invalid normals (`#1452 `_) +* [fix] Fixup cmake file issues + * Remove redundant include_directories() + * Generate export headers in devel space + * Use cmake find_package(yaml-cpp) (`#1445 `_) +* [fix] Gracefully ignore invalid floats (nans) in: + * LineStripMarker (`#1440 `_) + * EffortDisplay (`#1437 `_) +* [fix] MovableText: correctly rotate AABB +* [fix] Correctly delete old marker if its type changed +* [maintanence] MovableText: + * Simplify scaling (there was a scaling by factor 0.5 in getWorldTransforms(), requiring a scaling of 2.0 in _setupGeometry()) + * Simplify _setupGeometry() +* [maintanence] ignore catkin_lint errors/warnings +* [maintanence] Properties: inform model about changed data +* Contributors: Antoine Hoarau, Michael Görner, Robert Haschke + 1.13.5 (2019-09-29) ------------------- * [fix] ImageDisplay/CameraDisplay: fix status reporting / report frame issues (`#1425 `_) diff -Nru ros-rviz-1.13.5+dfsg/CMakeLists.txt ros-rviz-1.13.7+dfsg/CMakeLists.txt --- ros-rviz-1.13.5+dfsg/CMakeLists.txt 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/CMakeLists.txt 2019-12-18 16:38:13.000000000 +0000 @@ -35,6 +35,7 @@ message(STATUS "Assimp version does not have unified headers") endif() include_directories(${ASSIMP_INCLUDE_DIRS}) + #catkin_lint: ignore_once link_directory link_directories(${ASSIMP_LIBRARY_DIRS}) else() message(STATUS "could not find assimp (perhaps available thorugh ROS package?), so assimping assimp v2") @@ -173,11 +174,16 @@ # There is a matching instance of this in the plugin_description.xml. set(rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME rviz_default_plugin) +set(EXPORT_HEADER_DIR "${CATKIN_DEVEL_PREFIX}/include") +file(MAKE_DIRECTORY "${EXPORT_HEADER_DIR}") + +#catkin_lint: ignore_once external_include_path catkin_package( CFG_EXTRAS rviz-extras.cmake INCLUDE_DIRS src + ${EXPORT_HEADER_DIR} ${EIGEN3_INCLUDE_DIRS} ${OGRE_OV_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} @@ -213,7 +219,8 @@ ${TinyXML2_INCLUDE_DIRS} ${urdfdom_headers_INCLUDE_DIRS} ) -include_directories(src ${catkin_INCLUDE_DIRS}) +#catkin_lint: ignore_once external_directory +include_directories(src ${EXPORT_HEADER_DIR} ${catkin_INCLUDE_DIRS}) #### If gtk ends up being the best way to get the correct window #### position under X11, this is how to compile it in. @@ -242,3 +249,4 @@ install(FILES help/help.html DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/help ) +#catkin_lint: ignore uninstalled_target diff -Nru ros-rviz-1.13.5+dfsg/debian/changelog ros-rviz-1.13.7+dfsg/debian/changelog --- ros-rviz-1.13.5+dfsg/debian/changelog 2019-10-27 10:12:41.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/debian/changelog 2020-02-03 21:36:24.000000000 +0000 @@ -1,3 +1,29 @@ +ros-rviz (1.13.7+dfsg-1build2) focal; urgency=medium + + * No change rebuild against new boost1.71 ABI + + -- Dimitri John Ledkov Mon, 03 Feb 2020 21:36:24 +0000 + +ros-rviz (1.13.7+dfsg-1build1) focal; urgency=medium + + * No-change rebuild to build with python3.8. + + -- Matthias Klose Sat, 25 Jan 2020 06:18:20 +0000 + +ros-rviz (1.13.7+dfsg-1) unstable; urgency=medium + + * New upstream version 1.13.7+dfsg + * Drop Python 3 patch (upstreamed) + + -- Jochen Sprickerhof Sat, 21 Dec 2019 16:40:13 +0100 + +ros-rviz (1.13.6+dfsg-1) unstable; urgency=medium + + * New upstream version 1.13.6+dfsg + * Rebase patches + + -- Jochen Sprickerhof Thu, 28 Nov 2019 23:26:19 +0100 + ros-rviz (1.13.5+dfsg-1) unstable; urgency=medium * Simplify d/rules diff -Nru ros-rviz-1.13.5+dfsg/debian/control ros-rviz-1.13.7+dfsg/debian/control --- ros-rviz-1.13.5+dfsg/debian/control 2019-10-26 07:22:05.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/debian/control 2020-02-03 21:36:24.000000000 +0000 @@ -1,6 +1,7 @@ Source: ros-rviz Priority: optional -Maintainer: Debian Science Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Maintainers Uploaders: Thomas Moulard , Jochen Sprickerhof , Leopold Palomo-Avellaneda diff -Nru ros-rviz-1.13.5+dfsg/debian/patches/0001-Add-Debian-specific-SOVERSION.patch ros-rviz-1.13.7+dfsg/debian/patches/0001-Add-Debian-specific-SOVERSION.patch --- ros-rviz-1.13.5+dfsg/debian/patches/0001-Add-Debian-specific-SOVERSION.patch 2019-10-26 07:21:19.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/debian/patches/0001-Add-Debian-specific-SOVERSION.patch 2019-12-21 15:39:12.000000000 +0000 @@ -7,11 +7,11 @@ 1 file changed, 1 insertion(+) diff --git a/src/rviz/CMakeLists.txt b/src/rviz/CMakeLists.txt -index 9c562dd..80e6d47 100644 +index df726b5..be53b86 100644 --- a/src/rviz/CMakeLists.txt +++ b/src/rviz/CMakeLists.txt -@@ -147,6 +147,7 @@ target_link_libraries(${PROJECT_NAME} - ${YAMLCPP_LIBRARIES} +@@ -144,6 +144,7 @@ target_link_libraries(${PROJECT_NAME} + ${YAML_CPP_LIBRARIES} ) +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${rviz_VERSION} SOVERSION "4d") diff -Nru ros-rviz-1.13.5+dfsg/debian/patches/0003-Import-librviz_sip-.so-from-the-same-directory.patch ros-rviz-1.13.7+dfsg/debian/patches/0003-Import-librviz_sip-.so-from-the-same-directory.patch --- ros-rviz-1.13.5+dfsg/debian/patches/0003-Import-librviz_sip-.so-from-the-same-directory.patch 2019-10-26 07:21:19.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/debian/patches/0003-Import-librviz_sip-.so-from-the-same-directory.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From: Jochen Sprickerhof -Date: Sun, 25 Aug 2019 18:24:09 +0200 -Subject: Import librviz_sip*.so from the same directory - ---- - src/python_bindings/rviz/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/python_bindings/rviz/__init__.py b/src/python_bindings/rviz/__init__.py -index eb4367b..1454c71 100644 ---- a/src/python_bindings/rviz/__init__.py -+++ b/src/python_bindings/rviz/__init__.py -@@ -24,7 +24,7 @@ elif QT_BINDING == 'pyqt': - - # Import the shared library generated by the sip binding-generator. - # This depends on rviz/manifest.xml listing ${prefix}/lib in the python path. -- import librviz_sip -+ from . import librviz_sip - - # Expose the contained rviz namespace directly - sys.modules['rviz'] = librviz_sip.rviz diff -Nru ros-rviz-1.13.5+dfsg/debian/patches/0003-Remove-rpath.patch ros-rviz-1.13.7+dfsg/debian/patches/0003-Remove-rpath.patch --- ros-rviz-1.13.5+dfsg/debian/patches/0003-Remove-rpath.patch 2019-10-26 07:21:41.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/debian/patches/0003-Remove-rpath.patch 2019-12-21 15:39:12.000000000 +0000 @@ -7,7 +7,7 @@ 1 file changed, 2 deletions(-) diff --git a/src/python_bindings/sip/CMakeLists.txt b/src/python_bindings/sip/CMakeLists.txt -index 5f03a04..17d162d 100644 +index 6034f4a..bf5e93b 100644 --- a/src/python_bindings/sip/CMakeLists.txt +++ b/src/python_bindings/sip/CMakeLists.txt @@ -47,8 +47,6 @@ set(rviz_sip_LIBRARIES ${rviz_LIBRARIES} ${PROJECT_NAME}) diff -Nru ros-rviz-1.13.5+dfsg/debian/patches/series ros-rviz-1.13.7+dfsg/debian/patches/series --- ros-rviz-1.13.5+dfsg/debian/patches/series 2019-10-26 07:21:19.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/debian/patches/series 2019-12-21 15:39:12.000000000 +0000 @@ -1,3 +1,2 @@ 0001-Add-Debian-specific-SOVERSION.patch 0003-Remove-rpath.patch -0003-Import-librviz_sip-.so-from-the-same-directory.patch diff -Nru ros-rviz-1.13.5+dfsg/package.xml ros-rviz-1.13.7+dfsg/package.xml --- ros-rviz-1.13.5+dfsg/package.xml 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/package.xml 2019-12-18 16:38:13.000000000 +0000 @@ -1,6 +1,6 @@ rviz - 1.13.5 + 1.13.7 3D visualization tool for ROS. diff -Nru ros-rviz-1.13.5+dfsg/README.md ros-rviz-1.13.7+dfsg/README.md --- ros-rviz-1.13.5+dfsg/README.md 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/README.md 2019-12-18 16:38:13.000000000 +0000 @@ -2,9 +2,6 @@ [![Build Status](http://build.ros.org/buildStatus/icon?job=Mdev__rviz__ubuntu_bionic_amd64)](http://build.ros.org/view/Mdev/job/Mdev__rviz__ubuntu_bionic_amd64/) -[![Waffle.io - Columns and their card count](https://badge.waffle.io/ros-visualization/rviz.svg?columns=all)](https://waffle.io/ros-visualization/rviz) - - rviz is a 3D visualizer for the Robot Operating System (ROS) framework. For more information, please see the wiki: http://wiki.ros.org/rviz @@ -26,7 +23,7 @@ Other icons and graphics contained in this package are released into the Public Domain as well. -Authors (2012-2018): +Authors (2012-2019): - David Gossow - Chad Rockey @@ -34,6 +31,7 @@ - Julius Kammerl - Acorn Pooley - Rein Appeldoorn +- Robert Haschke Copyright notice for all icons and graphics in this package: diff -Nru ros-rviz-1.13.5+dfsg/src/python_bindings/rviz/__init__.py ros-rviz-1.13.7+dfsg/src/python_bindings/rviz/__init__.py --- ros-rviz-1.13.5+dfsg/src/python_bindings/rviz/__init__.py 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/python_bindings/rviz/__init__.py 2019-12-18 16:38:13.000000000 +0000 @@ -14,8 +14,7 @@ if QT_BINDING == 'pyside': # Import the shared library generated by the shiboken binding-generator. - # This depends on rviz/manifest.xml listing ${prefix}/lib in the python path. - import librviz_shiboken + from . import librviz_shiboken # Expose the contained rviz namespace directly sys.modules['rviz'] = librviz_shiboken.rviz @@ -23,8 +22,7 @@ elif QT_BINDING == 'pyqt': # Import the shared library generated by the sip binding-generator. - # This depends on rviz/manifest.xml listing ${prefix}/lib in the python path. - import librviz_sip + from . import librviz_sip # Expose the contained rviz namespace directly sys.modules['rviz'] = librviz_sip.rviz diff -Nru ros-rviz-1.13.5+dfsg/src/python_bindings/sip/CMakeLists.txt ros-rviz-1.13.7+dfsg/src/python_bindings/sip/CMakeLists.txt --- ros-rviz-1.13.5+dfsg/src/python_bindings/sip/CMakeLists.txt 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/python_bindings/sip/CMakeLists.txt 2019-12-18 16:38:13.000000000 +0000 @@ -42,7 +42,7 @@ include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake) # maintain context for different named target -set(rviz_sip_INCLUDE_DIRS ${rviz_INCLUDE_DIRS} "${PROJECT_SOURCE_DIR}/src" ${catkin_INCLUDE_DIRS} $) +set(rviz_sip_INCLUDE_DIRS ${rviz_INCLUDE_DIRS} "${PROJECT_SOURCE_DIR}/src" ${catkin_INCLUDE_DIRS} ${EXPORT_HEADER_DIR}) set(rviz_sip_LIBRARIES ${rviz_LIBRARIES} ${PROJECT_NAME}) set(rviz_sip_LIBRARY_DIRS ${rviz_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}) if (MSVC) diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/add_display_dialog.cpp ros-rviz-1.13.7+dfsg/src/rviz/add_display_dialog.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/add_display_dialog.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/add_display_dialog.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -165,7 +165,7 @@ // Dialog implementation AddDisplayDialog::AddDisplayDialog( DisplayFactory* factory, - const QString& object_type, + const QString& /*object_type*/, const QStringList& disallowed_display_names, const QStringList& disallowed_class_lookup_names, QString* lookup_name_output, @@ -210,7 +210,7 @@ type_box->setLayout( type_layout ); // Display Name group - QGroupBox* name_box; + QGroupBox* name_box = nullptr; if( display_name_output_ ) { name_box = new QGroupBox( "Display Name" ); @@ -263,7 +263,7 @@ return( QSize(500,660) ); } -void AddDisplayDialog::onTabChanged( int index ) +void AddDisplayDialog::onTabChanged( int /*index*/ ) { updateDisplay(); } @@ -369,7 +369,7 @@ } void DisplayTypeTree::onCurrentItemChanged(QTreeWidgetItem *curr, - QTreeWidgetItem *prev) + QTreeWidgetItem * /*prev*/) { // If display is selected, populate selection data. Otherwise, clear data. SelectionData sd; diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/add_display_dialog.h ros-rviz-1.13.7+dfsg/src/rviz/add_display_dialog.h --- ros-rviz-1.13.5+dfsg/src/rviz/add_display_dialog.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/add_display_dialog.h 2019-12-18 16:38:13.000000000 +0000 @@ -218,7 +218,7 @@ void itemClicked( QTreeWidgetItem *item, int column ); private Q_SLOTS: - void onActivated( int index ) + void onActivated( int /*index*/ ) { Q_EMIT itemClicked( parent_, column_ ); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/CMakeLists.txt ros-rviz-1.13.7+dfsg/src/rviz/CMakeLists.txt --- ros-rviz-1.13.5+dfsg/src/rviz/CMakeLists.txt 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/CMakeLists.txt 2019-12-18 16:38:13.000000000 +0000 @@ -1,4 +1,4 @@ -pkg_check_modules(YAMLCPP REQUIRED yaml-cpp>=0.5) +find_package(yaml-cpp REQUIRED) if(UNIX AND NOT APPLE) find_package(X11 REQUIRED) @@ -6,8 +6,6 @@ add_subdirectory(default_plugin) -include_directories(.) - # Build the version number and other build-time constants into the # source for access at run-time. set(ENV_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/env_config.cpp) @@ -127,9 +125,8 @@ ) include(GenerateExportHeader) -generate_export_header(${PROJECT_NAME} EXPORT_FILE_NAME rviz/${PROJECT_NAME}_export.h) -target_include_directories(${PROJECT_NAME} INTERFACE "$") -set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_HEADER_DIR "${CMAKE_CURRENT_BINARY_DIR}") +set(EXPORT_FILE_NAME ${EXPORT_HEADER_DIR}/rviz/${PROJECT_NAME}_export.h) +generate_export_header(${PROJECT_NAME} EXPORT_FILE_NAME ${EXPORT_FILE_NAME}) if(NOT WIN32) set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-std=c++11") endif() @@ -144,7 +141,7 @@ ${TinyXML2_LIBRARIES} ${X11_X11_LIB} ${ASSIMP_LIBRARIES} - ${YAMLCPP_LIBRARIES} + ${YAML_CPP_LIBRARIES} ) @@ -178,8 +175,9 @@ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} FILES_MATCHING PATTERN "*.h") +#catkin_lint: ignore_once external_file install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/rviz/${PROJECT_NAME}_export.h + ${EXPORT_FILE_NAME} DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) install(TARGETS executable diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/config.cpp ros-rviz-1.13.7+dfsg/src/rviz/config.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/config.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/config.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -150,6 +150,7 @@ { listAppendNew().copy( source.listChildAt( i )); } + break; } case Value: setValue( source.getValue() ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/axes_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/axes_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/axes_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/axes_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -102,7 +102,7 @@ context_->queueRender(); } -void AxesDisplay::update( float dt, float ros_dt ) +void AxesDisplay::update( float /*dt*/, float /*ros_dt*/ ) { QString qframe = frame_property_->getFrame(); std::string frame = qframe.toStdString(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/camera_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/camera_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/camera_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/camera_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -221,7 +221,7 @@ this->addChild( visibility_property_, 0 ); } -void CameraDisplay::preRenderTargetUpdate(const Ogre::RenderTargetEvent& evt) +void CameraDisplay::preRenderTargetUpdate(const Ogre::RenderTargetEvent& /*evt*/) { QString image_position = image_position_property_->getString(); bg_scene_node_->setVisible( caminfo_ok_ && (image_position == BACKGROUND || image_position == BOTH) ); @@ -231,7 +231,7 @@ visibility_property_->update(); } -void CameraDisplay::postRenderTargetUpdate(const Ogre::RenderTargetEvent& evt) +void CameraDisplay::postRenderTargetUpdate(const Ogre::RenderTargetEvent& /*evt*/) { bg_scene_node_->setVisible( false ); fg_scene_node_->setVisible( false ); @@ -321,7 +321,7 @@ render_panel_->getCamera()->setPosition( Ogre::Vector3( 999999, 999999, 999999 )); } -void CameraDisplay::update( float wall_dt, float ros_dt ) +void CameraDisplay::update( float /*wall_dt*/, float /*ros_dt*/ ) { try { @@ -539,12 +539,16 @@ // we will not receive another message after reset, i.e. the caminfo could not be recovered. // Thus, we reset caminfo only if unsubscribing. - const std::string caminfo_topic = image_transport::getCameraInfoTopic(topic_property_->getTopicStd()); - boost::mutex::scoped_lock lock( caminfo_mutex_ ); - if (!current_caminfo_) - setStatus( StatusProperty::Warn, "Camera Info", - "No CameraInfo received on [" + QString::fromStdString( caminfo_topic ) + "].\n" - "Topic may not exist."); + const std::string topic = topic_property_->getTopicStd(); + if (!topic.empty()) + { + const std::string caminfo_topic = image_transport::getCameraInfoTopic(topic); + boost::mutex::scoped_lock lock( caminfo_mutex_ ); + if (!current_caminfo_) + setStatus( StatusProperty::Warn, "Camera Info", + "No CameraInfo received on [" + QString::fromStdString( caminfo_topic ) + "].\n" + "Topic may not exist."); + } } } // namespace rviz diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/CMakeLists.txt ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/CMakeLists.txt --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/CMakeLists.txt 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/CMakeLists.txt 2019-12-18 16:38:13.000000000 +0000 @@ -1,5 +1,3 @@ -include_directories(.) - set(SOURCE_FILES axes_display.cpp camera_display.cpp @@ -72,8 +70,8 @@ add_library(${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME} ${SOURCE_FILES}) include(GenerateExportHeader) -generate_export_header(${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME} EXPORT_FILE_NAME rviz/default_plugin/${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME}_export.h) -target_include_directories(${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME} INTERFACE "$") +set(EXPORT_FILE_NAME ${EXPORT_HEADER_DIR}/rviz/default_plugin/${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME}_export.h) +generate_export_header(${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME} EXPORT_FILE_NAME ${EXPORT_FILE_NAME}) if(NOT WIN32) set_target_properties(${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME} PROPERTIES COMPILE_FLAGS "-std=c++11") @@ -86,8 +84,9 @@ ${QT_LIBRARIES} ) +#catkin_lint: ignore_once external_file install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/rviz/default_plugin/${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME}_export.h + ${EXPORT_FILE_NAME} DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}/default_plugin/) install(TARGETS ${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME} diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/covariance_visual.h ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/covariance_visual.h --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/covariance_visual.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/covariance_visual.h 2019-12-18 16:38:13.000000000 +0000 @@ -224,8 +224,8 @@ private: // Hide Object methods we don't want to expose // NOTE: Apparently we still need to define them... - virtual void setScale( const Ogre::Vector3& scale ) {}; - virtual void setColor( float r, float g, float b, float a ) {}; + virtual void setScale( const Ogre::Vector3& ) {} + virtual void setColor( float, float, float, float ) {} virtual const Ogre::Vector3& getPosition(); virtual const Ogre::Quaternion& getOrientation(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/effort_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/effort_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/effort_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/effort_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -38,7 +38,6 @@ } void JointInfo::updateVisibility() { - bool enabled = getEnabled(); } void JointInfo::setEffort(double e) { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/effort_visual.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/effort_visual.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/effort_visual.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/effort_visual.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -4,6 +4,7 @@ #include #include +#include #include @@ -80,6 +81,10 @@ { std::string joint_name = msg->name[i]; double effort = msg->effort[i]; + if (!validateFloats(effort)) { + ROS_WARN_STREAM("Invalid effort for joint '" << joint_name << "': " << effort); + continue; + } const urdf::Joint* joint = urdf_model_->getJoint(joint_name).get(); int joint_type = joint->type; if ( joint_type == urdf::Joint::REVOLUTE ) diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/grid_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/grid_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/grid_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/grid_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -127,7 +127,7 @@ updatePlane(); } -void GridDisplay::update(float dt, float ros_dt) +void GridDisplay::update(float /*dt*/, float /*ros_dt*/) { QString qframe = frame_property_->getFrame(); std::string frame = qframe.toStdString(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/interactive_marker_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/interactive_marker_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/interactive_marker_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/interactive_marker_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -129,7 +129,7 @@ onEnable(); } -void InteractiveMarkerDisplay::setTopic( const QString &topic, const QString &datatype ) +void InteractiveMarkerDisplay::setTopic( const QString &topic, const QString & /*datatype*/ ) { marker_update_topic_property_->setString( topic ); } @@ -195,7 +195,7 @@ Display::reset(); } -void InteractiveMarkerDisplay::update(float wall_dt, float ros_dt) +void InteractiveMarkerDisplay::update(float wall_dt, float /*ros_dt*/) { im_client_->update(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -258,8 +258,8 @@ // This is an Ogre::SceneManager::Listener function, and is configured // to be called only if this is a VIEW_FACING control. void InteractiveMarkerControl::preFindVisibleObjects( - Ogre::SceneManager *source, - Ogre::SceneManager::IlluminationRenderStage irs, Ogre::Viewport *v ) + Ogre::SceneManager * /*source*/, + Ogre::SceneManager::IlluminationRenderStage /*irs*/, Ogre::Viewport *v ) { updateControlOrientationForViewFacing( v ); } @@ -664,7 +664,7 @@ return true; } -void InteractiveMarkerControl::moveAxis( const Ogre::Ray& mouse_ray, const ViewportMouseEvent& event ) +void InteractiveMarkerControl::moveAxis( const Ogre::Ray& /*mouse_ray*/, const ViewportMouseEvent& event ) { // compute control-axis ray based on grab_point_, etc. Ogre::Ray control_ray; @@ -881,7 +881,7 @@ parent_->getOrientation(), name_ ); } -void InteractiveMarkerControl::rotate3D( const Ogre::Vector3& cursor_position_in_reference_frame, +void InteractiveMarkerControl::rotate3D( const Ogre::Vector3& /*cursor_position_in_reference_frame*/, const Ogre::Quaternion& cursor_orientation_in_reference_frame ) { if( orientation_mode_ == visualization_msgs::InteractiveMarkerControl::VIEW_FACING && @@ -894,14 +894,14 @@ //rotation_cursor_to_parent_at_grab_ = cursor_3D_orientation.Inverse()*parent->getOrientation(); - Ogre::Vector3 world_to_cursor_in_world_frame = reference_node_->convertLocalToWorldPosition(cursor_position_in_reference_frame); + //Ogre::Vector3 world_to_cursor_in_world_frame = reference_node_->convertLocalToWorldPosition(cursor_position_in_reference_frame); Ogre::Quaternion rotation_world_to_cursor = reference_node_->convertLocalToWorldOrientation(cursor_orientation_in_reference_frame); //Ogre::Vector3 marker_to_cursor_in_cursor_frame = orientation_world_to_cursor.Inverse()*reference_node_->getOrientation()*grab_point_in_reference_frame_; - Ogre::Vector3 world_to_cursor_in_cursor_frame = rotation_world_to_cursor.Inverse()*world_to_cursor_in_world_frame; - Ogre::Vector3 world_to_marker_in_world_frame = rotation_world_to_cursor*(world_to_cursor_in_cursor_frame - parent_to_cursor_in_cursor_frame_at_grab_); - Ogre::Vector3 marker_position_in_reference_frame = reference_node_->convertWorldToLocalPosition(world_to_marker_in_world_frame); + //Ogre::Vector3 world_to_cursor_in_cursor_frame = rotation_world_to_cursor.Inverse()*world_to_cursor_in_world_frame; + //Ogre::Vector3 world_to_marker_in_world_frame = rotation_world_to_cursor*(world_to_cursor_in_cursor_frame - parent_to_cursor_in_cursor_frame_at_grab_); + //Ogre::Vector3 marker_position_in_reference_frame = reference_node_->convertWorldToLocalPosition(world_to_marker_in_world_frame); Ogre::Quaternion marker_orientation_in_reference_frame = reference_node_->convertWorldToLocalOrientation(rotation_world_to_cursor*rotation_cursor_to_parent_at_grab_); parent_->setPose( parent_->getPosition(), diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -498,7 +498,7 @@ } } -bool InteractiveMarker::handle3DCursorEvent(ViewportMouseEvent& event, const Ogre::Vector3& cursor_pos, const Ogre::Quaternion& cursor_rot, const std::string &control_name) +bool InteractiveMarker::handle3DCursorEvent(ViewportMouseEvent& event, const Ogre::Vector3& cursor_pos, const Ogre::Quaternion& /*cursor_rot*/, const std::string &control_name) { boost::recursive_mutex::scoped_lock lock(mutex_); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/map_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/map_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/map_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/map_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -66,7 +66,7 @@ : alpha_vec_( alpha, alpha, alpha, alpha ) {} - void visit( Ogre::Renderable *rend, ushort lodIndex, bool isDebug, Ogre::Any *pAny=0) + void visit( Ogre::Renderable *rend, ushort /*lodIndex*/, bool /*isDebug*/, Ogre::Any * /*pAny*/=0) { rend->setCustomParameter( ALPHA_PARAMETER, alpha_vec_ ); } @@ -817,12 +817,12 @@ updateTopic(); } -void MapDisplay::setTopic( const QString &topic, const QString &datatype ) +void MapDisplay::setTopic( const QString &topic, const QString & /*datatype*/ ) { topic_property_->setString( topic ); } -void MapDisplay::update( float wall_dt, float ros_dt ) { +void MapDisplay::update( float /*wall_dt*/, float /*ros_dt*/ ) { transformMap(); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/marker_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/marker_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/marker_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/marker_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -52,6 +52,7 @@ MarkerDisplay::MarkerDisplay() : Display() + , tf_filter_(nullptr) { marker_topic_property_ = new RosTopicProperty( "Marker Topic", "visualization_marker", QString::fromStdString( ros::message_traits::datatype() ), @@ -124,7 +125,8 @@ markers_.clear(); markers_with_expiration_.clear(); frame_locked_markers_.clear(); - tf_filter_->clear(); + if (tf_filter_) // also clear messages in pipeline + tf_filter_->clear(); namespaces_category_->removeChildren(); namespaces_.clear(); } @@ -137,9 +139,7 @@ void MarkerDisplay::onDisable() { unsubscribe(); - tf_filter_->clear(); - clearStatuses(); - clearMarkers(); + reset(); } void MarkerDisplay::updateQueueSize() @@ -150,8 +150,8 @@ void MarkerDisplay::updateTopic() { - unsubscribe(); - subscribe(); + onDisable(); + onEnable(); } void MarkerDisplay::subscribe() @@ -361,7 +361,7 @@ } else { - markers_.erase( it ); + deleteMarkerInternal( it->first ); } } @@ -399,7 +399,7 @@ context_->queueRender(); } -void MarkerDisplay::update(float wall_dt, float ros_dt) +void MarkerDisplay::update(float /*wall_dt*/, float /*ros_dt*/) { V_MarkerMessage local_queue; @@ -463,7 +463,7 @@ clearMarkers(); } -void MarkerDisplay::setTopic( const QString &topic, const QString &datatype ) +void MarkerDisplay::setTopic( const QString &topic, const QString & /*datatype*/ ) { marker_topic_property_->setString( topic ); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/arrow_marker.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/arrow_marker.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/arrow_marker.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/arrow_marker.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -63,7 +63,7 @@ arrow_->set(0.77, 1.0, 0.23, 2.0); } -void ArrowMarker::onNewMessage(const MarkerConstPtr& old_message, const MarkerConstPtr& new_message) +void ArrowMarker::onNewMessage(const MarkerConstPtr& /*old_message*/, const MarkerConstPtr& new_message) { ROS_ASSERT(new_message->type == visualization_msgs::Marker::ARROW); ROS_ASSERT(new_message->points.empty() || new_message->points.size() >= 2); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/line_list_marker.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/line_list_marker.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/line_list_marker.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/line_list_marker.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -52,7 +52,7 @@ delete lines_; } -void LineListMarker::onNewMessage(const MarkerConstPtr& old_message, const MarkerConstPtr& new_message) +void LineListMarker::onNewMessage(const MarkerConstPtr& /*old_message*/, const MarkerConstPtr& new_message) { ROS_ASSERT(new_message->type == visualization_msgs::Marker::LINE_LIST); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/line_strip_marker.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/line_strip_marker.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/line_strip_marker.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/line_strip_marker.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -32,6 +32,7 @@ #include "marker_selection_handler.h" #include "rviz/default_plugin/marker_display.h" #include "rviz/display_context.h" +#include #include @@ -53,7 +54,7 @@ delete lines_; } -void LineStripMarker::onNewMessage(const MarkerConstPtr& old_message, const MarkerConstPtr& new_message) +void LineStripMarker::onNewMessage(const MarkerConstPtr& /*old_message*/, const MarkerConstPtr& new_message) { ROS_ASSERT(new_message->type == visualization_msgs::Marker::LINE_STRIP); @@ -90,11 +91,23 @@ const geometry_msgs::Point& p = *it; Ogre::Vector3 v( p.x, p.y, p.z ); + if (!validateFloats(p)) + { + ROS_WARN("Marker '%s/%d': invalid point[%zu] (%.2f, %.2f, %.2f)", + new_message->ns.c_str(), new_message->id, i, p.x, p.y, p.z); + continue; + } Ogre::ColourValue c; if (has_per_point_color) { const std_msgs::ColorRGBA& color = new_message->colors[i]; + if (!validateFloats(color)) + { + ROS_WARN("Marker '%s/%d': invalid color[%zu] (%.2f, %.2f, %.2f, %.2f)", + new_message->ns.c_str(), new_message->id, i, color.r, color.g, color.b, color.a); + continue; + } c.r = color.r; c.g = color.g; c.b = color.b; diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/marker_selection_handler.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/marker_selection_handler.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/marker_selection_handler.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/marker_selection_handler.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -68,7 +68,7 @@ marker_->getMessage()->pose.orientation.z ); } -void MarkerSelectionHandler::createProperties( const Picked& obj, Property* parent_property ) +void MarkerSelectionHandler::createProperties( const Picked& /*obj*/, Property* parent_property ) { Property* group = new Property( "Marker " + marker_id_, QVariant(), "", parent_property ); properties_.push_back( group ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/points_marker.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/points_marker.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/points_marker.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/points_marker.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -54,7 +54,7 @@ delete points_; } -void PointsMarker::onNewMessage(const MarkerConstPtr& old_message, const MarkerConstPtr& new_message) +void PointsMarker::onNewMessage(const MarkerConstPtr& /*old_message*/, const MarkerConstPtr& new_message) { ROS_ASSERT(new_message->type == visualization_msgs::Marker::POINTS || new_message->type == visualization_msgs::Marker::CUBE_LIST || diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/text_view_facing_marker.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/text_view_facing_marker.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/text_view_facing_marker.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/text_view_facing_marker.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -53,7 +53,7 @@ delete text_; } -void TextViewFacingMarker::onNewMessage(const MarkerConstPtr& old_message, const MarkerConstPtr& new_message) +void TextViewFacingMarker::onNewMessage(const MarkerConstPtr& /*old_message*/, const MarkerConstPtr& new_message) { ROS_ASSERT(new_message->type == visualization_msgs::Marker::TEXT_VIEW_FACING); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/text_view_facing_marker.h ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/text_view_facing_marker.h --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/markers/text_view_facing_marker.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/markers/text_view_facing_marker.h 2019-12-18 16:38:13.000000000 +0000 @@ -51,7 +51,7 @@ TextViewFacingMarker(MarkerDisplay* owner, DisplayContext* context, Ogre::SceneNode* parent_node); ~TextViewFacingMarker(); - virtual void setOrientation( const Ogre::Quaternion& orientation ) {} + virtual void setOrientation( const Ogre::Quaternion& /*orientation*/ ) {} virtual S_MaterialPtr getMaterials(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/marker_utils.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/marker_utils.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/marker_utils.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/marker_utils.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -427,6 +427,7 @@ checkPointsEmpty(marker, ss, level); checkColorsEmpty(marker, ss, level); checkTextEmpty(marker, ss, level); + checkMesh(marker, ss, level); break; default: diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/odometry_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/odometry_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/odometry_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/odometry_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -343,7 +343,7 @@ context_->queueRender(); } -void OdometryDisplay::update( float wall_dt, float ros_dt ) +void OdometryDisplay::update( float /*wall_dt*/, float /*ros_dt*/ ) { size_t keep = keep_property_->getInt(); if( keep > 0 ) diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/point_cloud_common.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/point_cloud_common.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/point_cloud_common.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/point_cloud_common.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -211,7 +211,7 @@ } } -void PointCloudSelectionHandler::destroyProperties( const Picked& obj, Property* parent_property ) +void PointCloudSelectionHandler::destroyProperties( const Picked& obj, Property* /*parent_property*/ ) { typedef std::set S_int; S_int indices; @@ -310,8 +310,8 @@ } PointCloudCommon::PointCloudCommon( Display* display ) -: spinner_(1, &cbqueue_) -, auto_size_(false) +: auto_size_(false) +, spinner_(1, &cbqueue_) , new_xyz_transformer_(false) , new_color_transformer_(false) , needs_retransform_(false) @@ -517,7 +517,7 @@ needs_retransform_ = true; } -void PointCloudCommon::update(float wall_dt, float ros_dt) +void PointCloudCommon::update(float /*wall_dt*/, float /*ros_dt*/) { PointCloud::RenderMode mode = (PointCloud::RenderMode) style_property_->getOptionInt(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/point_cloud_transformer.h ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/point_cloud_transformer.h --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/point_cloud_transformer.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/point_cloud_transformer.h 2019-12-18 16:38:13.000000000 +0000 @@ -91,16 +91,16 @@ * return a score of 0 here since it should not be preferred over others that explicitly support fields in the message. This allows that * "flat color" transformer to still be selectable, but generally not chosen automatically. */ - virtual uint8_t score(const sensor_msgs::PointCloud2ConstPtr& cloud) { return 0; } + virtual uint8_t score(const sensor_msgs::PointCloud2ConstPtr& /*cloud*/) { return 0; } /** * \brief Create any properties necessary for this transformer. * Will be called once when the transformer is loaded. All * properties must be added to the out_props vector. */ - virtual void createProperties( Property* parent_property, - uint32_t mask, - QList& out_props ) {} + virtual void createProperties( Property* /*parent_property*/, + uint32_t /*mask*/, + QList& /*out_props*/ ) {} Q_SIGNALS: /** @brief Subclasses should emit this signal whenever they think the points should be re-transformed. */ diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/point_cloud_transformers.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/point_cloud_transformers.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/point_cloud_transformers.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/point_cloud_transformers.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -69,14 +69,14 @@ return Support_Color; } -uint8_t IntensityPCTransformer::score(const sensor_msgs::PointCloud2ConstPtr& cloud) +uint8_t IntensityPCTransformer::score(const sensor_msgs::PointCloud2ConstPtr& /*cloud*/) { return 255; } bool IntensityPCTransformer::transform( const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, - const Ogre::Matrix4& transform, + const Ogre::Matrix4& /*transform*/, V_PointCloudPoint& points_out ) { if( !( mask & Support_Color )) @@ -290,7 +290,7 @@ return Support_None; } -bool XYZPCTransformer::transform(const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, const Ogre::Matrix4& transform, V_PointCloudPoint& points_out) +bool XYZPCTransformer::transform(const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, const Ogre::Matrix4& /*transform*/, V_PointCloudPoint& points_out) { if (!(mask & Support_XYZ)) { @@ -337,7 +337,7 @@ return Support_None; } -bool RGB8PCTransformer::transform(const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, const Ogre::Matrix4& transform, V_PointCloudPoint& points_out) +bool RGB8PCTransformer::transform(const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, const Ogre::Matrix4& /*transform*/, V_PointCloudPoint& points_out) { if (!(mask & Support_Color)) { @@ -384,7 +384,7 @@ return true; } -bool MONO8PCTransformer::transform(const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, const Ogre::Matrix4& transform, V_PointCloudPoint& points_out) +bool MONO8PCTransformer::transform(const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, const Ogre::Matrix4& /*transform*/, V_PointCloudPoint& points_out) { if (!(mask & Support_Color)) { @@ -453,7 +453,7 @@ return Support_None; } -bool RGBF32PCTransformer::transform(const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, const Ogre::Matrix4& transform, V_PointCloudPoint& points_out) +bool RGBF32PCTransformer::transform(const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, const Ogre::Matrix4& /*transform*/, V_PointCloudPoint& points_out) { if (!(mask & Support_Color)) { @@ -481,19 +481,19 @@ return true; } -uint8_t FlatColorPCTransformer::supports(const sensor_msgs::PointCloud2ConstPtr& cloud) +uint8_t FlatColorPCTransformer::supports(const sensor_msgs::PointCloud2ConstPtr& /*cloud*/) { return Support_Color; } -uint8_t FlatColorPCTransformer::score(const sensor_msgs::PointCloud2ConstPtr& cloud) +uint8_t FlatColorPCTransformer::score(const sensor_msgs::PointCloud2ConstPtr& /*cloud*/) { return 0; } bool FlatColorPCTransformer::transform( const sensor_msgs::PointCloud2ConstPtr& cloud, uint32_t mask, - const Ogre::Matrix4& transform, + const Ogre::Matrix4& /*transform*/, V_PointCloudPoint& points_out ) { if( !( mask & Support_Color )) @@ -523,12 +523,12 @@ } } -uint8_t AxisColorPCTransformer::supports(const sensor_msgs::PointCloud2ConstPtr& cloud) +uint8_t AxisColorPCTransformer::supports(const sensor_msgs::PointCloud2ConstPtr& /*cloud*/) { return Support_Color; } -uint8_t AxisColorPCTransformer::score(const sensor_msgs::PointCloud2ConstPtr& cloud) +uint8_t AxisColorPCTransformer::score(const sensor_msgs::PointCloud2ConstPtr& /*cloud*/) { return 255; } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/pose_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/pose_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/pose_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/pose_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -58,7 +58,7 @@ , display_( display ) {} - void createProperties( const Picked& obj, Property* parent_property ) + void createProperties( const Picked& /*obj*/, Property* parent_property ) { Property* cat = new Property( "Pose " + display_->getName(), QVariant(), "", parent_property ); properties_.push_back( cat ); @@ -73,7 +73,7 @@ orientation_property_->setReadOnly( true ); } - void getAABBs( const Picked& obj, V_AABB& aabbs ) + void getAABBs( const Picked& /*obj*/, V_AABB& aabbs ) { if( display_->pose_valid_ ) { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/pose_with_covariance_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/pose_with_covariance_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/pose_with_covariance_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/pose_with_covariance_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -63,7 +63,7 @@ , display_( display ) {} - void createProperties( const Picked& obj, Property* parent_property ) + void createProperties( const Picked& /*obj*/, Property* parent_property ) { Property* cat = new Property( "Pose " + display_->getName(), QVariant(), "", parent_property ); properties_.push_back( cat ); @@ -84,7 +84,7 @@ covariance_orientation_property_->setReadOnly( true ); } - void getAABBs( const Picked& obj, V_AABB& aabbs ) + void getAABBs( const Picked& /*obj*/, V_AABB& aabbs ) { if( display_->pose_valid_ ) { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/robot_model_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/robot_model_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/robot_model_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/robot_model_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -201,7 +201,7 @@ clear(); } -void RobotModelDisplay::update( float wall_dt, float ros_dt ) +void RobotModelDisplay::update( float wall_dt, float /*ros_dt*/ ) { time_since_last_transform_ += wall_dt; float rate = update_rate_property_->getFloat(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/tf_display.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/tf_display.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/tf_display.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/tf_display.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -89,7 +89,7 @@ { } -void FrameSelectionHandler::createProperties( const Picked& obj, Property* parent_property ) +void FrameSelectionHandler::createProperties( const Picked& /*obj*/, Property* parent_property ) { category_property_ = new Property( "Frame " + QString::fromStdString( frame_->name_ ), QVariant(), "", parent_property ); @@ -105,7 +105,7 @@ orientation_property_->setReadOnly( true ); } -void FrameSelectionHandler::destroyProperties( const Picked& obj, Property* parent_property ) +void FrameSelectionHandler::destroyProperties( const Picked& /*obj*/, Property* /*parent_property*/ ) { delete category_property_; // This deletes its children as well. category_property_ = NULL; @@ -329,7 +329,7 @@ } } -void TFDisplay::update(float wall_dt, float ros_dt) +void TFDisplay::update(float wall_dt, float /*ros_dt*/) { update_timer_ += wall_dt; float update_rate = update_rate_property_->getFloat(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/tools/selection_tool.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/tools/selection_tool.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/tools/selection_tool.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/tools/selection_tool.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -94,7 +94,7 @@ context_->getSelectionManager()->removeHighlight(); } -void SelectionTool::update(float wall_dt, float ros_dt) +void SelectionTool::update(float /*wall_dt*/, float /*ros_dt*/) { SelectionManager* sel_manager = context_->getSelectionManager(); @@ -173,7 +173,7 @@ return flags; } -int SelectionTool::processKeyEvent( QKeyEvent* event, RenderPanel* panel ) +int SelectionTool::processKeyEvent( QKeyEvent* event, RenderPanel* /*panel*/ ) { SelectionManager* sel_manager = context_->getSelectionManager(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/view_controllers/fixed_orientation_ortho_view_controller.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -178,7 +178,7 @@ setPosition( point - target_scene_node_->getPosition() ); } -void FixedOrientationOrthoViewController::onTargetFrameChanged(const Ogre::Vector3& old_reference_position, const Ogre::Quaternion& old_reference_orientation) +void FixedOrientationOrthoViewController::onTargetFrameChanged(const Ogre::Vector3& old_reference_position, const Ogre::Quaternion& /*old_reference_orientation*/) { move( old_reference_position.x - reference_position_.x, old_reference_position.y - reference_position_.y ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -196,7 +196,7 @@ setPropertiesFromCamera( camera_ ); } -void FPSViewController::onTargetFrameChanged(const Ogre::Vector3& old_reference_position, const Ogre::Quaternion& old_reference_orientation) +void FPSViewController::onTargetFrameChanged(const Ogre::Vector3& old_reference_position, const Ogre::Quaternion& /*old_reference_orientation*/) { position_property_->add( old_reference_position - reference_position_ ); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/view_controllers/orbit_view_controller.cpp ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/view_controllers/orbit_view_controller.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/default_plugin/view_controllers/orbit_view_controller.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/default_plugin/view_controllers/orbit_view_controller.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -252,7 +252,7 @@ calculatePitchYawFromPosition(camera_position); } -void OrbitViewController::onTargetFrameChanged(const Ogre::Vector3& old_reference_position, const Ogre::Quaternion& old_reference_orientation) +void OrbitViewController::onTargetFrameChanged(const Ogre::Vector3& old_reference_position, const Ogre::Quaternion& /*old_reference_orientation*/) { focal_point_property_->add( old_reference_position - reference_position_ ); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/displays_panel.cpp ros-rviz-1.13.7+dfsg/src/rviz/displays_panel.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/displays_panel.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/displays_panel.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -179,6 +179,8 @@ // Displays can emit signals from other threads with self pointers. We're // freeing the display now, so ensure no one is listening to those signals. displays_to_delete[ i ]->disconnect(); + // Remove dipslay from property tree to avoid memory access after deletion + displays_to_delete[ i ]->getParent()->takeChild(displays_to_delete[ i ]); // Delete display later in case there are pending signals to it. displays_to_delete[ i ]->deleteLater(); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/failed_tool.h ros-rviz-1.13.7+dfsg/src/rviz/failed_tool.h --- ros-rviz-1.13.5+dfsg/src/rviz/failed_tool.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/failed_tool.h 2019-12-18 16:38:13.000000000 +0000 @@ -54,7 +54,7 @@ virtual void activate(); virtual void deactivate() {} - virtual int processMouseEvent( ViewportMouseEvent& event ) { return 0; } + virtual int processMouseEvent( ViewportMouseEvent& /*event*/ ) { return 0; } /** @brief Store the given config data for later, so we can return it * with save() when someone writes this back to a file. */ diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/failed_view_controller.h ros-rviz-1.13.7+dfsg/src/rviz/failed_view_controller.h --- ros-rviz-1.13.5+dfsg/src/rviz/failed_view_controller.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/failed_view_controller.h 2019-12-18 16:38:13.000000000 +0000 @@ -53,7 +53,7 @@ virtual void onActivate(); - virtual int processMouseEvent( ViewportMouseEvent& event ) { return 0; } + virtual int processMouseEvent( ViewportMouseEvent& /*event*/ ) { return 0; } /** @brief Store the given Config data for later, so we can return it * with save() when someone writes this back to a file. */ @@ -62,7 +62,7 @@ /** @brief Write into config data equivalent to the last config sent to load(). */ virtual void save( Config config ) const; - virtual void lookAt( const Ogre::Vector3& point ) {} + virtual void lookAt( const Ogre::Vector3& /*point*/ ) {} virtual void reset() {} private: diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/frame_manager.cpp ros-rviz-1.13.7+dfsg/src/rviz/frame_manager.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/frame_manager.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/frame_manager.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -280,7 +280,7 @@ return true; } -bool FrameManager::frameHasProblems(const std::string& frame, ros::Time time, std::string& error) +bool FrameManager::frameHasProblems(const std::string& frame, ros::Time /*time*/, std::string& error) { if (!tf_->frameExists(frame)) { @@ -341,7 +341,7 @@ FrameManager::discoverFailureReason( const std::string& frame_id, const ros::Time& stamp, - const std::string& caller_id, + const std::string& /*caller_id*/, tf::FilterFailureReason reason) { if (reason == tf::filter_failure_reasons::OutTheBack) @@ -366,7 +366,7 @@ FrameManager::discoverFailureReason( const std::string& frame_id, const ros::Time& stamp, - const std::string& caller_id, + const std::string& /*caller_id*/, tf2_ros::FilterFailureReason reason) { if (reason == tf2_ros::filter_failure_reasons::OutTheBack) @@ -387,7 +387,7 @@ return "Unknown reason for transform failure"; } -void FrameManager::messageArrived( const std::string& frame_id, const ros::Time& stamp, +void FrameManager::messageArrived( const std::string& /*frame_id*/, const ros::Time& /*stamp*/, const std::string& caller_id, Display* display ) { display->setStatusStd( StatusProperty::Ok, getTransformStatusName( caller_id ), "Transform OK" ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/frame_position_tracking_view_controller.cpp ros-rviz-1.13.7+dfsg/src/rviz/frame_position_tracking_view_controller.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/frame_position_tracking_view_controller.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/frame_position_tracking_view_controller.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -77,7 +77,7 @@ connect( target_frame_property_, SIGNAL( changed() ), this, SLOT( updateTargetFrame() )); } -void FramePositionTrackingViewController::update(float dt, float ros_dt) +void FramePositionTrackingViewController::update(float /*dt*/, float /*ros_dt*/) { updateTargetSceneNode(); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/frame_position_tracking_view_controller.h ros-rviz-1.13.7+dfsg/src/rviz/frame_position_tracking_view_controller.h --- ros-rviz-1.13.5+dfsg/src/rviz/frame_position_tracking_view_controller.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/frame_position_tracking_view_controller.h 2019-12-18 16:38:13.000000000 +0000 @@ -85,7 +85,7 @@ /** @brief Override to implement the change in properties which * nullifies the change in target frame. * @see updateTargetFrame() */ - virtual void onTargetFrameChanged( const Ogre::Vector3& old_reference_position, const Ogre::Quaternion& old_reference_orientation ) {} + virtual void onTargetFrameChanged( const Ogre::Vector3& /*old_reference_position*/, const Ogre::Quaternion& /*old_reference_orientation*/ ) {} bool getNewTransform(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/load_resource.cpp ros-rviz-1.13.7+dfsg/src/rviz/load_resource.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/load_resource.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/load_resource.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -94,7 +94,7 @@ return pixmap; } -QCursor getDefaultCursor( bool fill_cache ) +QCursor getDefaultCursor( bool /*fill_cache*/ ) { return QCursor(Qt::ArrowCursor); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/mesh_loader.cpp ros-rviz-1.13.7+dfsg/src/rviz/mesh_loader.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/mesh_loader.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/mesh_loader.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -95,7 +95,7 @@ return to_read; } - size_t Write( const void* buffer, size_t size, size_t count) { ROS_BREAK(); return 0; } + size_t Write( const void* /*buffer*/, size_t /*size*/, size_t /*count*/) { ROS_BREAK(); return 0; } aiReturn Seek( size_t offset, aiOrigin origin) { @@ -706,7 +706,7 @@ { Assimp::Importer importer; importer.SetIOHandler(new ResourceIOSystem()); - const aiScene* scene = importer.ReadFile(resource_path, aiProcess_SortByPType|aiProcess_GenNormals|aiProcess_Triangulate|aiProcess_GenUVCoords|aiProcess_FlipUVs); + const aiScene* scene = importer.ReadFile(resource_path, aiProcess_SortByPType|aiProcess_FindInvalidData|aiProcess_GenNormals|aiProcess_Triangulate|aiProcess_GenUVCoords|aiProcess_FlipUVs); if (!scene) { ROS_ERROR("Could not load resource [%s]: %s", resource_path.c_str(), importer.GetErrorString()); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/message_filter_display.h ros-rviz-1.13.7+dfsg/src/rviz/message_filter_display.h --- ros-rviz-1.13.5+dfsg/src/rviz/message_filter_display.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/message_filter_display.h 2019-12-18 16:38:13.000000000 +0000 @@ -127,7 +127,7 @@ messages_received_ = 0; } - virtual void setTopic( const QString &topic, const QString &datatype ) + virtual void setTopic( const QString &topic, const QString &/*datatype*/ ) { topic_property_->setString( topic ); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/new_object_dialog.cpp ros-rviz-1.13.7+dfsg/src/rviz/new_object_dialog.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/new_object_dialog.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/new_object_dialog.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -85,7 +85,7 @@ type_box->setLayout( type_layout ); // Display Name group - QGroupBox* name_box; + QGroupBox* name_box = nullptr; if( display_name_output_ ) { name_box = new QGroupBox( object_type + " Name" ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/axes.cpp ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/axes.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/axes.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/axes.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -96,10 +96,9 @@ scene_node_->setScale( scale ); } -void Axes::setColor( float r, float g, float b, float a ) +void Axes::setColor( float, float, float, float ) { - // for now, do nothing - /// \todo should anything be done here? + // cannot change color globally, use set[XYZ]Color() instead } const Ogre::Vector3& Axes::getPosition() diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/axes.h ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/axes.h --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/axes.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/axes.h 2019-12-18 16:38:13.000000000 +0000 @@ -110,8 +110,8 @@ private: // prohibit copying - Axes( const Axes &other ): Object(0) {} - Axes& operator=( const Axes &other ) { return *this; } + Axes( const Axes & ) = delete; + Axes& operator=( const Axes & ) = delete; Ogre::SceneNode* scene_node_; diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/billboard_line.cpp ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/billboard_line.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/billboard_line.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/billboard_line.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -249,7 +249,7 @@ scene_node_->setOrientation( orientation ); } -void BillboardLine::setScale( const Ogre::Vector3& scale ) +void BillboardLine::setScale( const Ogre::Vector3& /*scale*/ ) { // Setting scale doesn't really make sense here } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/billboard_line.h ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/billboard_line.h --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/billboard_line.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/billboard_line.h 2019-12-18 16:38:13.000000000 +0000 @@ -94,7 +94,7 @@ /** * \brief We have no objects that we can set user data on */ - void setUserData( const Ogre::Any& data ) {} + void setUserData( const Ogre::Any& /*data*/ ) {} Ogre::MaterialPtr getMaterial() { return material_; } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/camera_base.h ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/camera_base.h --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/camera_base.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/camera_base.h 2019-12-18 16:38:13.000000000 +0000 @@ -169,12 +169,12 @@ */ virtual void move( float x, float y, float z ) = 0; - virtual void mouseLeftDown( int x, int y ) {} - virtual void mouseMiddleDown( int x, int y ) {} - virtual void mouseRightDown( int x, int y ) {} - virtual void mouseLeftUp( int x, int y ) {} - virtual void mouseMiddleUp( int x, int y ) {} - virtual void mouseRightUp( int x, int y ) {} + virtual void mouseLeftDown( int /*x*/, int /*y*/ ) {} + virtual void mouseMiddleDown( int /*x*/, int /*y*/ ) {} + virtual void mouseRightDown( int /*x*/, int /*y*/ ) {} + virtual void mouseLeftUp( int /*x*/, int /*y*/ ) {} + virtual void mouseMiddleUp( int /*x*/, int /*y*/ ) {} + virtual void mouseRightUp( int /*x*/, int /*y*/ ) {} /** * \brief Handle a left mouse button drag diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/movable_text.cpp ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/movable_text.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/movable_text.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/movable_text.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -296,7 +296,7 @@ Real spaceWidth = mSpaceWidth; // Derive space width from a capital A if (spaceWidth == 0) - spaceWidth = mpFont->getGlyphAspectRatio('A') * mCharHeight * 2.0; + spaceWidth = mpFont->getGlyphAspectRatio('A') * mCharHeight; float total_height = mCharHeight; float total_width = 0.0f; @@ -319,7 +319,7 @@ } else { - current_width += mpFont->getGlyphAspectRatio(ch) * mCharHeight * 2.0; + current_width += mpFont->getGlyphAspectRatio(ch) * mCharHeight; } } @@ -332,10 +332,10 @@ switch (mVerticalAlignment) { case MovableText::V_ABOVE: - top = total_height * 2; + top = total_height; break; case MovableText::V_CENTER: - top = 0.5 * total_height * 2; + top = 0.5 * total_height; break; case MovableText::V_BELOW: top = 0.0f; @@ -355,33 +355,17 @@ float left = starting_left; - bool newLine = true; - Real len = 0.0f; // for calculation of AABB - Ogre::Vector3 min(9999999.0f), max(-9999999.0f), currPos(0.0f); - Ogre::Real maxSquaredRadius = -99999999.0f; - float largestWidth = 0.0f; + Ogre::Vector3 currPos(0.0f); + Ogre::Vector3 min(starting_left, top - total_height, 0.0f); + Ogre::Vector3 max(starting_left + total_width, top, 0.0f); auto iend = utfCaption.end(); for (auto i = utfCaption.begin(); i != iend; ++i) { - if (newLine) - { - len = 0.0f; - for (auto j = i; j != iend && *j != '\n'; j++) - { - if (*j == ' ') - len += spaceWidth; - else - len += mpFont->getGlyphAspectRatio(*j) * mCharHeight * 2.0; - } - newLine = false; - } - if (*i == '\n') { left = starting_left; - top -= (mCharHeight + mLineSpacing) * 2.0; - newLine = true; + top -= mCharHeight + mLineSpacing; continue; } @@ -389,14 +373,10 @@ { // Just leave a gap, no tris left += spaceWidth; - currPos = Ogre::Vector3(left, top, 0.0); - min.makeFloor(currPos); - max.makeCeil(currPos); - maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength()); continue; } - Real horiz_height = mpFont->getGlyphAspectRatio(*i); + Real char_width = mpFont->getGlyphAspectRatio(*i) * mCharHeight; Real u1, u2, v1, v2; Ogre::Font::UVRect utmp; utmp = mpFont->getGlyphTexCoords(*i); @@ -418,14 +398,7 @@ *pPCBuff++ = u1; *pPCBuff++ = v1; - // Deal with bounds - - - min.makeFloor(currPos); - max.makeCeil(currPos); - maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength()); - - top -= mCharHeight * 2.0; + top -= mCharHeight; // Bottom left currPos = Ogre::Vector3(left, top, 0.0); @@ -435,13 +408,8 @@ *pPCBuff++ = u1; *pPCBuff++ = v2; - // Deal with bounds - min.makeFloor(currPos); - max.makeCeil(currPos); - maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength()); - - top += mCharHeight * 2.0; - left += horiz_height * mCharHeight * 2.0; + top += mCharHeight; + left += char_width; // Top right currPos = Ogre::Vector3(left, top, 0.0); @@ -450,12 +418,6 @@ *pPCBuff++ = currPos.z; *pPCBuff++ = u2; *pPCBuff++ = v1; - //------------------------------------------------------------------------------------- - - // Deal with bounds - min.makeFloor(currPos); - max.makeCeil(currPos); - maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength()); //------------------------------------------------------------------------------------- // Second tri @@ -468,12 +430,8 @@ *pPCBuff++ = u2; *pPCBuff++ = v1; - min.makeFloor(currPos); - max.makeCeil(currPos); - maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength()); - - top -= mCharHeight * 2.0; - left -= horiz_height * mCharHeight * 2.0; + top -= mCharHeight; + left -= char_width; // Bottom left (again) currPos = Ogre::Vector3(left, top, 0.0); @@ -483,11 +441,7 @@ *pPCBuff++ = u1; *pPCBuff++ = v2; - min.makeFloor(currPos); - max.makeCeil(currPos); - maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength()); - - left += horiz_height * mCharHeight * 2.0; + left += char_width; // Bottom right currPos = Ogre::Vector3(left, top, 0.0); @@ -497,32 +451,15 @@ *pPCBuff++ = u2; *pPCBuff++ = v2; //------------------------------------------------------------------------------------- - min.makeFloor(currPos); - max.makeCeil(currPos); - maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength()); // Go back up with top - top += mCharHeight * 2.0; - - float currentWidth = (left + 1) / 2 - 0; - if (currentWidth > largestWidth) - largestWidth = currentWidth; + top += mCharHeight; } - // Taking empty last line into account for the AABB - if(newLine) - { - top -= mCharHeight * 2.0; - currPos = Ogre::Vector3(left, top, 0.0); - min.makeFloor(currPos); - max.makeCeil(currPos); - maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength()); - } - // Unlock vertex buffer ptbuf->unlock(); // update AABB/Sphere radius mAABB = Ogre::AxisAlignedBox(min, max); - mRadius = Ogre::Math::Sqrt(maxSquaredRadius); + mRadius = Ogre::Math::Sqrt(std::max(mAABB.getMinimum().squaredLength(), mAABB.getMaximum().squaredLength())); if (mUpdateColors) this->_updateColors(); @@ -554,7 +491,7 @@ } #if( (OGRE_VERSION_MAJOR >= 1 && OGRE_VERSION_MINOR >= 6) || OGRE_VERSION_MAJOR >= 2 ) -void MovableText::visitRenderables(Ogre::Renderable::Visitor* visitor, bool debugRenderables) +void MovableText::visitRenderables(Ogre::Renderable::Visitor* visitor, bool /*debugRenderables*/) { visitor->visit( this, 0, false ); } @@ -580,9 +517,9 @@ ppos += rot3x3 * mLocalTranslation; // apply scale - scale3x3[0][0] = mParentNode->_getDerivedScale().x / 2; - scale3x3[1][1] = mParentNode->_getDerivedScale().y / 2; - scale3x3[2][2] = mParentNode->_getDerivedScale().z / 2; + scale3x3[0][0] = mParentNode->_getDerivedScale().x; + scale3x3[1][1] = mParentNode->_getDerivedScale().y; + scale3x3[2][2] = mParentNode->_getDerivedScale().z; // apply all transforms to xform *xform = (rot3x3 * scale3x3); @@ -622,4 +559,3 @@ } } // namespace rviz - diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/movable_text.h ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/movable_text.h --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/movable_text.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/movable_text.h 2019-12-18 16:38:13.000000000 +0000 @@ -175,7 +175,6 @@ assert(!mpMaterial.isNull()); return mpMaterial; } - ; /******************************** protected methods and overload **************/ @@ -191,30 +190,29 @@ { return mRadius; } - ; - Ogre::Real getSquaredViewDepth(const Ogre::Camera *cam) const + + Ogre::Real getSquaredViewDepth(const Ogre::Camera* /*cam*/) const { return 0; } - ; + const Ogre::Quaternion &getWorldOrientation(void) const; const Ogre::Vector3 &getWorldPosition(void) const; const Ogre::AxisAlignedBox &getBoundingBox(void) const { return mAABB; } - ; + const Ogre::String &getName(void) const { return mName; } - ; + const Ogre::String &getMovableType(void) const { static Ogre::String movType = "MovableText"; return movType; } - ; void _notifyCurrentCamera(Ogre::Camera *cam); void _updateRenderQueue(Ogre::RenderQueue* queue); @@ -225,7 +223,6 @@ { return mLList; } - ; }; } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/ogre_logging.cpp ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/ogre_logging.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/ogre_logging.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/ogre_logging.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -44,7 +44,7 @@ virtual ~RosLogListener() {} #if OGRE_VERSION >= ((1 << 16) | (8 << 8)) - virtual void messageLogged( const Ogre::String& message, Ogre::LogMessageLevel lml, bool maskDebug, const Ogre::String &logName, bool& skipThisMessage ) + virtual void messageLogged( const Ogre::String& message, Ogre::LogMessageLevel lml, bool /*maskDebug*/, const Ogre::String & /*logName*/, bool& skipThisMessage ) { if ( !skipThisMessage ) { @@ -55,7 +55,7 @@ } } #else - virtual void messageLogged( const Ogre::String& message, Ogre::LogMessageLevel lml, bool maskDebug, const Ogre::String &logName ) + virtual void messageLogged( const Ogre::String& message, Ogre::LogMessageLevel lml, bool maskDebug, const Ogre::String & /*logName*/ ) { if ( lml >= min_lml ) { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/ogre_render_queue_clearer.cpp ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/ogre_render_queue_clearer.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/ogre_render_queue_clearer.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/ogre_render_queue_clearer.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -45,7 +45,7 @@ } -bool OgreRenderQueueClearer::frameStarted (const Ogre::FrameEvent &evt) +bool OgreRenderQueueClearer::frameStarted (const Ogre::FrameEvent & /*evt*/) { // Workaround taken from http://www.ogre3d.org/mantis/view.php?id=130 // in case a plugin creates its own scene manager. diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/orbit_camera.cpp ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/orbit_camera.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/orbit_camera.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/orbit_camera.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -146,7 +146,7 @@ update(); } -void OrbitCamera::roll( float angle ) +void OrbitCamera::roll( float /*angle*/ ) { } @@ -269,13 +269,13 @@ update(); } -void OrbitCamera::mouseLeftDrag( int diff_x, int diff_y, bool ctrl, bool alt, bool shift ) +void OrbitCamera::mouseLeftDrag( int diff_x, int diff_y, bool /*ctrl*/, bool /*alt*/, bool /*shift*/ ) { yaw( diff_x*0.005 ); pitch( -diff_y*0.005 ); } -void OrbitCamera::mouseMiddleDrag( int diff_x, int diff_y, bool ctrl, bool alt, bool shift ) +void OrbitCamera::mouseMiddleDrag( int diff_x, int diff_y, bool /*ctrl*/, bool /*alt*/, bool /*shift*/ ) { float fovY = camera_->getFOVy().valueRadians(); float fovX = 2.0f * atan( tan( fovY / 2.0f ) * camera_->getAspectRatio() ); @@ -287,7 +287,7 @@ } -void OrbitCamera::mouseRightDrag( int diff_x, int diff_y, bool ctrl, bool alt, bool shift ) +void OrbitCamera::mouseRightDrag( int /*diff_x*/, int diff_y, bool /*ctrl*/, bool /*alt*/, bool shift ) { if (shift) { @@ -299,7 +299,7 @@ } } -void OrbitCamera::scrollWheel( int diff, bool ctrl, bool alt, bool shift ) +void OrbitCamera::scrollWheel( int diff, bool /*ctrl*/, bool /*alt*/, bool shift ) { if (shift) { @@ -311,32 +311,32 @@ } } -void OrbitCamera::mouseLeftDown( int x, int y ) +void OrbitCamera::mouseLeftDown( int /*x*/, int /*y*/ ) { focal_point_object_->getRootNode()->setVisible( true ); } -void OrbitCamera::mouseMiddleDown( int x, int y ) +void OrbitCamera::mouseMiddleDown( int /*x*/, int /*y*/ ) { focal_point_object_->getRootNode()->setVisible( true ); } -void OrbitCamera::mouseRightDown( int x, int y ) +void OrbitCamera::mouseRightDown( int /*x*/, int /*y*/ ) { focal_point_object_->getRootNode()->setVisible( true ); } -void OrbitCamera::mouseLeftUp( int x, int y ) +void OrbitCamera::mouseLeftUp( int /*x*/, int /*y*/ ) { focal_point_object_->getRootNode()->setVisible( false ); } -void OrbitCamera::mouseMiddleUp( int x, int y ) +void OrbitCamera::mouseMiddleUp( int /*x*/, int /*y*/ ) { focal_point_object_->getRootNode()->setVisible( false ); } -void OrbitCamera::mouseRightUp( int x, int y ) +void OrbitCamera::mouseRightUp( int /*x*/, int /*y*/ ) { focal_point_object_->getRootNode()->setVisible( false ); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/point_cloud.cpp ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/point_cloud.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/point_cloud.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/point_cloud.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -786,7 +786,7 @@ } #if (OGRE_VERSION_MAJOR >= 1 && OGRE_VERSION_MINOR >= 6) -void PointCloud::visitRenderables(Ogre::Renderable::Visitor* visitor, bool debugRenderables) +void PointCloud::visitRenderables(Ogre::Renderable::Visitor* /*visitor*/, bool /*debugRenderables*/) { } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/qt_ogre_render_window.cpp ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/qt_ogre_render_window.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/ogre_helpers/qt_ogre_render_window.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/ogre_helpers/qt_ogre_render_window.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -299,7 +299,7 @@ } //------------------------------------------------------------------------------ -void QtOgreRenderWindow::paintEvent( QPaintEvent* e ) +void QtOgreRenderWindow::paintEvent( QPaintEvent* /*e*/ ) { if( auto_render_ && render_window_ ) { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/panel_dock_widget.cpp ros-rviz-1.13.7+dfsg/src/rviz/panel_dock_widget.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/panel_dock_widget.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/panel_dock_widget.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -126,7 +126,7 @@ } } -void PanelDockWidget::closeEvent ( QCloseEvent * event ) +void PanelDockWidget::closeEvent ( QCloseEvent * /*event*/ ) { Q_EMIT closed(); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/color_property.cpp ros-rviz-1.13.7+dfsg/src/rviz/properties/color_property.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/properties/color_property.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/color_property.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -34,6 +34,7 @@ #include "rviz/properties/parse_color.h" #include "rviz/properties/color_property.h" #include "rviz/properties/color_editor.h" +#include "rviz/properties/property_tree_model.h" namespace rviz { @@ -57,6 +58,8 @@ color_ = new_color; updateString(); Q_EMIT changed(); + if( model_ ) + model_->emitDataChanged( this ); return true; } return false; @@ -104,7 +107,7 @@ } QWidget *ColorProperty::createEditor( QWidget* parent, - const QStyleOptionViewItem& option ) + const QStyleOptionViewItem& /*option*/ ) { ColorEditor* editor = new ColorEditor( this, parent ); editor->setFrame( false ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/editable_enum_property.cpp ros-rviz-1.13.7+dfsg/src/rviz/properties/editable_enum_property.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/properties/editable_enum_property.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/editable_enum_property.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -57,7 +57,7 @@ } QWidget* EditableEnumProperty::createEditor( QWidget* parent, - const QStyleOptionViewItem& option ) + const QStyleOptionViewItem& /*option*/ ) { // Emit requestOptions() to give listeners a chance to change the option list. Q_EMIT requestOptions( this ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/enum_property.cpp ros-rviz-1.13.7+dfsg/src/rviz/properties/enum_property.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/properties/enum_property.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/enum_property.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -68,7 +68,7 @@ } QWidget* EnumProperty::createEditor( QWidget* parent, - const QStyleOptionViewItem& option ) + const QStyleOptionViewItem& /*option*/ ) { // Emit requestOptions() to give listeners a chance to change the option list. Q_EMIT requestOptions( this ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/int_property.cpp ros-rviz-1.13.7+dfsg/src/rviz/properties/int_property.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/properties/int_property.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/int_property.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -67,7 +67,7 @@ } QWidget* IntProperty::createEditor( QWidget* parent, - const QStyleOptionViewItem& option ) + const QStyleOptionViewItem& /*option*/ ) { QSpinBox* editor = new QSpinBox( parent ); editor->setFrame( false ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/property.cpp ros-rviz-1.13.7+dfsg/src/rviz/properties/property.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/properties/property.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/property.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -46,7 +46,7 @@ class FailureProperty: public Property { public: - virtual Property* subProp( const QString& sub_name ) { return this; } + virtual Property* subProp( const QString& /*sub_name*/ ) { return this; } }; /** @brief The property returned by subProp() when the requested @@ -495,7 +495,7 @@ } QWidget* Property::createEditor( QWidget* parent, - const QStyleOptionViewItem& option ) + const QStyleOptionViewItem& /*option*/ ) { switch( int( value_.type() )) { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/property_tree_model.cpp ros-rviz-1.13.7+dfsg/src/rviz/properties/property_tree_model.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/properties/property_tree_model.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/property_tree_model.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -132,7 +132,7 @@ return getProp( index )->getViewData( index.column(), role ); } -QVariant PropertyTreeModel::headerData( int section, Qt::Orientation orientation, int role ) const +QVariant PropertyTreeModel::headerData( int /*section*/, Qt::Orientation /*orientation*/, int /*role*/ ) const { // we don't use headers. return QVariant(); @@ -207,7 +207,7 @@ * application this is compiled into. */ bool PropertyTreeModel::dropMimeData( const QMimeData* data, Qt::DropAction action, - int dest_row, int dest_column, + int dest_row, int /*dest_column*/, const QModelIndex& dest_parent ) { if( !data || action != Qt::MoveAction ) diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/property_tree_model.h ros-rviz-1.13.7+dfsg/src/rviz/properties/property_tree_model.h --- ros-rviz-1.13.5+dfsg/src/rviz/properties/property_tree_model.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/property_tree_model.h 2019-12-18 16:38:13.000000000 +0000 @@ -71,7 +71,7 @@ /** @brief Return the number of columns under the given parent * index, which is always 2 for this model. */ - virtual int columnCount( const QModelIndex &parent = QModelIndex() ) const { return 2; } + virtual int columnCount( const QModelIndex &/*parent*/ = QModelIndex() ) const { return 2; } // Editable model functions: virtual Qt::ItemFlags flags( const QModelIndex &index ) const; diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/quaternion_property.cpp ros-rviz-1.13.7+dfsg/src/rviz/properties/quaternion_property.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/properties/quaternion_property.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/quaternion_property.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -30,6 +30,7 @@ #include #include "rviz/properties/quaternion_property.h" +#include "rviz/properties/property_tree_model.h" namespace rviz { @@ -72,6 +73,8 @@ ignore_child_updates_ = false; updateString(); Q_EMIT changed(); + if( model_ ) + model_->emitDataChanged( this ); return true; } return false; diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/splitter_handle.cpp ros-rviz-1.13.7+dfsg/src/rviz/properties/splitter_handle.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/properties/splitter_handle.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/splitter_handle.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -122,7 +122,7 @@ } } -void SplitterHandle::paintEvent( QPaintEvent* event ) +void SplitterHandle::paintEvent( QPaintEvent* /*event*/ ) { QPainter painter( this ); painter.setPen( color_ ); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/properties/vector_property.cpp ros-rviz-1.13.7+dfsg/src/rviz/properties/vector_property.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/properties/vector_property.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/properties/vector_property.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -30,6 +30,7 @@ #include #include "rviz/properties/vector_property.h" +#include "rviz/properties/property_tree_model.h" namespace rviz { @@ -68,6 +69,8 @@ ignore_child_updates_ = false; updateString(); Q_EMIT changed(); + if( model_ ) + model_->emitDataChanged( this ); return true; } return false; diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/render_panel.cpp ros-rviz-1.13.7+dfsg/src/rviz/render_panel.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/render_panel.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/render_panel.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -126,7 +126,7 @@ } } -void RenderPanel::leaveEvent ( QEvent * event ) +void RenderPanel::leaveEvent ( QEvent * /*event*/ ) { setCursor( Qt::ArrowCursor ); if ( context_ ) @@ -213,7 +213,7 @@ return context_menu_visible_; } -void RenderPanel::contextMenuEvent( QContextMenuEvent* event ) +void RenderPanel::contextMenuEvent( QContextMenuEvent* /*event*/ ) { boost::shared_ptr context_menu; { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/robot/link_updater.h ros-rviz-1.13.7+dfsg/src/rviz/robot/link_updater.h --- ros-rviz-1.13.5+dfsg/src/rviz/robot/link_updater.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/robot/link_updater.h 2019-12-18 16:38:13.000000000 +0000 @@ -48,7 +48,7 @@ virtual bool getLinkTransforms(const std::string& link_name, Ogre::Vector3& visual_position, Ogre::Quaternion& visual_orientation, Ogre::Vector3& collision_position, Ogre::Quaternion& collision_orientation) const = 0; - virtual void setLinkStatus(StatusLevel level, const std::string& link_name, const std::string& text) const {} + virtual void setLinkStatus(StatusLevel /*level*/, const std::string& /*link_name*/, const std::string& /*text*/) const {} }; } // namespace rviz diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/robot/robot.cpp ros-rviz-1.13.7+dfsg/src/rviz/robot/robot.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/robot/robot.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/robot/robot.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -124,6 +124,7 @@ scene_manager_->destroySceneNode( root_collision_node_->getName() ); scene_manager_->destroySceneNode( root_other_node_->getName() ); delete link_factory_; + delete link_tree_; } void Robot::setLinkFactory(LinkFactory *link_factory) diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/robot/robot_joint.h ros-rviz-1.13.7+dfsg/src/rviz/robot/robot_joint.h --- ros-rviz-1.13.5+dfsg/src/rviz/robot/robot_joint.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/robot/robot_joint.h 2019-12-18 16:38:13.000000000 +0000 @@ -106,7 +106,7 @@ Ogre::Vector3 getPosition(); Ogre::Quaternion getOrientation(); - void setRobotAlpha(float a) {} + void setRobotAlpha(float) {} bool hasDescendentLinksWithGeometry() const { return has_decendent_links_with_geometry_; } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/robot/robot_link.cpp ros-rviz-1.13.7+dfsg/src/rviz/robot/robot_link.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/robot/robot_link.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/robot/robot_link.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -100,7 +100,7 @@ { } -void RobotLinkSelectionHandler::createProperties( const Picked& obj, Property* parent_property ) +void RobotLinkSelectionHandler::createProperties( const Picked& /*obj*/, Property* parent_property ) { Property* group = new Property( "Link " + QString::fromStdString( link_->getName() ), QVariant(), "", parent_property ); properties_.push_back( group ); @@ -121,7 +121,7 @@ } -void RobotLinkSelectionHandler::preRenderPass(uint32_t pass) +void RobotLinkSelectionHandler::preRenderPass(uint32_t /*pass*/) { if (!link_->is_selectable_) { @@ -144,7 +144,7 @@ } } -void RobotLinkSelectionHandler::postRenderPass(uint32_t pass) +void RobotLinkSelectionHandler::postRenderPass(uint32_t /*pass*/) { if (!link_->is_selectable_) { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/scaled_image_widget.cpp ros-rviz-1.13.7+dfsg/src/rviz/scaled_image_widget.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/scaled_image_widget.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/scaled_image_widget.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -52,7 +52,7 @@ return image_.size() * scale_; } -void ScaledImageWidget::paintEvent( QPaintEvent* event ) +void ScaledImageWidget::paintEvent( QPaintEvent* /*event*/ ) { if( !image_.isNull() ) { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/selection/selection_handler.cpp ros-rviz-1.13.7+dfsg/src/rviz/selection/selection_handler.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/selection/selection_handler.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/selection/selection_handler.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -71,7 +71,7 @@ context_->getSelectionManager()->removeObject( pick_handle_ ); } -void SelectionHandler::preRenderPass(uint32_t pass) +void SelectionHandler::preRenderPass(uint32_t /*pass*/) { M_HandleToBox::iterator it = boxes_.begin(); M_HandleToBox::iterator end = boxes_.end(); @@ -82,7 +82,7 @@ } } -void SelectionHandler::postRenderPass(uint32_t pass) +void SelectionHandler::postRenderPass(uint32_t /*pass*/) { M_HandleToBox::iterator it = boxes_.begin(); M_HandleToBox::iterator end = boxes_.end(); @@ -158,7 +158,7 @@ } } -void SelectionHandler::getAABBs(const Picked& obj, V_AABB& aabbs) +void SelectionHandler::getAABBs(const Picked& /*obj*/, V_AABB& aabbs) { S_Movable::iterator it = tracked_objects_.begin(); S_Movable::iterator end = tracked_objects_.end(); @@ -168,7 +168,7 @@ } } -void SelectionHandler::destroyProperties( const Picked& obj, Property* parent_property ) +void SelectionHandler::destroyProperties( const Picked& /*obj*/, Property* /*parent_property*/ ) { for( int i = 0; i < properties_.size(); i++ ) { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/selection/selection_handler.h ros-rviz-1.13.7+dfsg/src/rviz/selection/selection_handler.h --- ros-rviz-1.13.5+dfsg/src/rviz/selection/selection_handler.h 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/selection/selection_handler.h 2019-12-18 16:38:13.000000000 +0000 @@ -81,7 +81,7 @@ * deleteProperties(). * * This base implementation does nothing. */ - virtual void createProperties( const Picked& obj, Property* parent_property ) {} + virtual void createProperties( const Picked& /*obj*/, Property* /*parent_property*/ ) {} /** @brief Destroy all properties for the given picked object(s). * @@ -103,7 +103,7 @@ * This base implementation does nothing. */ virtual void updateProperties() {} - virtual bool needsAdditionalRenderPass(uint32_t pass) + virtual bool needsAdditionalRenderPass(uint32_t /*pass*/) { return false; } @@ -154,7 +154,7 @@ Listener(SelectionHandler* handler) : handler_(handler) {} - virtual void objectMoved(Ogre::MovableObject* object) + virtual void objectMoved(Ogre::MovableObject* /*object*/) { handler_->updateTrackedBoxes(); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/selection/selection_manager.cpp ros-rviz-1.13.7+dfsg/src/rviz/selection/selection_manager.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/selection/selection_manager.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/selection/selection_manager.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -811,8 +811,8 @@ pub.publish( msg ); } -void SelectionManager::renderQueueStarted( uint8_t queueGroupId, - const std::string& invocation, +void SelectionManager::renderQueueStarted( uint8_t /*queueGroupId*/, + const std::string& /*invocation*/, bool& skipThisInvocation ) { // This render queue listener function tells the scene manager to @@ -989,10 +989,10 @@ } } -Ogre::Technique *SelectionManager::handleSchemeNotFound(unsigned short scheme_index, +Ogre::Technique *SelectionManager::handleSchemeNotFound(unsigned short /*scheme_index*/, const Ogre::String& scheme_name, Ogre::Material* original_material, - unsigned short lod_index, + unsigned short /*lod_index*/, const Ogre::Renderable* rend ) { // Find the original culling mode @@ -1090,7 +1090,7 @@ PickColorSetter( CollObjectHandle handle, const Ogre::ColourValue& color ) : color_vector_( color.r, color.g, color.b, 1.0 ), handle_(handle) {} - virtual void visit( Ogre::Renderable* rend, ushort lodIndex, bool isDebug, Ogre::Any* pAny = 0 ) + virtual void visit( Ogre::Renderable* rend, ushort /*lodIndex*/, bool /*isDebug*/, Ogre::Any* /*pAny*/ = 0 ) { rend->setCustomParameter( PICK_COLOR_PARAMETER, color_vector_ ); rend->getUserObjectBindings().setUserAny( "pick_handle", Ogre::Any( handle_ )); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/time_panel.cpp ros-rviz-1.13.7+dfsg/src/rviz/time_panel.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/time_panel.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/time_panel.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -252,7 +252,7 @@ } } -void TimePanel::syncSourceSelected( int index ) +void TimePanel::syncSourceSelected( int /*index*/ ) { // clear whatever was loaded from the config config_sync_source_.clear(); diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/visualization_frame.cpp ros-rviz-1.13.7+dfsg/src/rviz/visualization_frame.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/visualization_frame.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/visualization_frame.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -214,7 +214,7 @@ } } -void VisualizationFrame::leaveEvent ( QEvent * event ) +void VisualizationFrame::leaveEvent ( QEvent * /*event*/ ) { setStatus(""); } @@ -728,7 +728,7 @@ if (actual_load_path.extension() != "." CONFIG_EXTENSION) actual_load_path += "." CONFIG_EXTENSION; actual_load_path = fs::path(config_dir_) / actual_load_path; - if (valid_load_path = (fs::is_regular_file(actual_load_path) || fs::is_symlink(actual_load_path))) + if ((valid_load_path = (fs::is_regular_file(actual_load_path) || fs::is_symlink(actual_load_path)))) path = actual_load_path.string(); } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/visualization_manager.cpp ros-rviz-1.13.7+dfsg/src/rviz/visualization_manager.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/visualization_manager.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/visualization_manager.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -636,7 +636,7 @@ Q_EMIT configChanged(); } -void VisualizationManager::onToolChanged( Tool* tool ) +void VisualizationManager::onToolChanged( Tool* /*tool*/ ) { } diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/yaml_config_reader.cpp ros-rviz-1.13.7+dfsg/src/rviz/yaml_config_reader.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/yaml_config_reader.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/yaml_config_reader.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -52,7 +52,7 @@ readStream( config, ss, filename ); } -void YamlConfigReader::readStream( Config& config, std::istream& in, const QString& filename ) +void YamlConfigReader::readStream( Config& config, std::istream& in, const QString& /*filename*/ ) { try { diff -Nru ros-rviz-1.13.5+dfsg/src/rviz/yaml_config_writer.cpp ros-rviz-1.13.7+dfsg/src/rviz/yaml_config_writer.cpp --- ros-rviz-1.13.5+dfsg/src/rviz/yaml_config_writer.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/rviz/yaml_config_writer.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -84,7 +84,7 @@ /** @brief Write config data to a std::ostream. This potentially * changes the return values of error() and statusMessage(). */ -void YamlConfigWriter::writeStream( const Config& config, std::ostream& out, const QString& filename ) +void YamlConfigWriter::writeStream( const Config& config, std::ostream& out, const QString& /*filename*/ ) { error_ = false; message_ = ""; diff -Nru ros-rviz-1.13.5+dfsg/src/test/CMakeLists.txt ros-rviz-1.13.7+dfsg/src/test/CMakeLists.txt --- ros-rviz-1.13.5+dfsg/src/test/CMakeLists.txt 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/test/CMakeLists.txt 2019-12-18 16:38:13.000000000 +0000 @@ -184,6 +184,7 @@ add_dependencies(tests two_render_widgets) # This is a GTest which tests the STL loader of assimp +#catkin_lint: ignore_once env_var if (DEFINED ENV{DISPLAY} AND NOT $ENV{DISPLAY} STREQUAL "") catkin_add_gtest(stl_loader_test stl_loader_test.cpp) target_link_libraries(stl_loader_test ${catkin_LIBRARIES} ${PROJECT_NAME}) diff -Nru ros-rviz-1.13.5+dfsg/src/test/connect_test.cpp ros-rviz-1.13.7+dfsg/src/test/connect_test.cpp --- ros-rviz-1.13.5+dfsg/src/test/connect_test.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/test/connect_test.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -42,7 +42,7 @@ #include "connect_test.h" -int main( int argc, char **argv ) +int main( int /*argc*/, char ** /*argv*/ ) { MyObject* obj = new MyObject; obj->enableChanges(); diff -Nru ros-rviz-1.13.5+dfsg/src/test/rviz_logo_marker.cpp ros-rviz-1.13.7+dfsg/src/test/rviz_logo_marker.cpp --- ros-rviz-1.13.5+dfsg/src/test/rviz_logo_marker.cpp 2019-09-29 15:24:01.000000000 +0000 +++ ros-rviz-1.13.7+dfsg/src/test/rviz_logo_marker.cpp 2019-12-18 16:38:13.000000000 +0000 @@ -80,7 +80,7 @@ server->applyChanges(); } -void publishCallback(tf::TransformBroadcaster& tf_broadcaster, const ros::TimerEvent&) +void publishCallback(tf::TransformBroadcaster& /*tf_broadcaster*/, const ros::TimerEvent&) { static tf::TransformBroadcaster br; tf::Transform transform;