Merge branch 'melodic-devel' into noetic-devel

rhaschke · Jun 19, 2021 · 5531206 · 5531206
2 parents 0e5a1b6 + 8baaef6
commit 5531206
Show file tree

Hide file tree

Showing 164 changed files with 733 additions and 651 deletions.
diff --git a/.clang-format b/.clang-format
@@ -34,8 +34,8 @@ BreakConstructorInitializersBeforeComma: true
 
 BinPackParameters: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
-DerivePointerBinding: false
-PointerBindsToType: true
+DerivePointerAlignment: false
+PointerAlignment: Left
 
 PenaltyExcessCharacter: 50
 PenaltyBreakBeforeFirstCallParameter: 30

diff --git a/.github/workflows/abi.yaml b/.github/workflows/abi.yaml
@@ -0,0 +1,56 @@
+# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
+# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
+
+name: ABI
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+
+jobs:
+  default:
+    strategy:
+      matrix:
+        distro: [noetic]
+
+    env:
+      UPSTREAM_WORKSPACE: github:rhaschke/python_qt_binding#silent-external-warnings
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      BASEDIR: /home/runner/work
+      DOCKER_IMAGE: rhaschke/ici:rviz-${{ matrix.distro }}-${{ matrix.repo || 'ros' }}
+      CACHE_PREFIX: ${{ matrix.distro }}
+      ABICHECK_URL: github:ros-visualization/rviz#1.14.7
+
+    name: "check"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache ccache
+        uses: pat-s/[email protected]
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
+          restore-keys: |
+            ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}
+            ccache-${{ env.CACHE_PREFIX }}
+
+      - name: Cache ABI workspace
+        uses: pat-s/[email protected]
+        with:
+          path: ${{ env.BASEDIR }}/base_ws
+          key: base_ws-${{ env.CACHE_PREFIX }}-${{ env.ABICHECK_URL }}
+          restore-keys: |
+            base_ws-${{ env.CACHE_PREFIX }}
+
+      - name: industrial_ci
+        uses: rhaschke/industrial_ci@master
+        env: ${{ matrix.env || env }}
+
+      - name: Upload test results (on failure)
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: abi-check
+          path: ${{ env.BASEDIR }}/abicheck/**
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -3,9 +3,7 @@
 
 name: pre-release
 
-on:
-  workflow_dispatch:
-  push:
+on: [workflow_dispatch]
 
 jobs:
   default:
@@ -20,7 +18,6 @@ jobs:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CACHE_PREFIX: "${{ matrix.env.IMAGE }}${{ matrix.env.CCOV && '-ccov' || '' }}"
 
-    if: github.event_name == 'workflow_dispatch'  # only allow manual triggering
     name: "${{ matrix.distro }}"
     runs-on: ubuntu-latest
     steps:

diff --git a/src/image_view/image_view.cpp b/src/image_view/image_view.cpp
@@ -39,17 +39,17 @@
 #include "ros/ros.h"
 #include <ros/package.h>
 
-#include <OgreRoot.h>
-#include <OgreRenderWindow.h>
-#include <OgreSceneManager.h>
-#include <OgreViewport.h>
-#include <OgreRectangle2D.h>
-#include <OgreMaterial.h>
-#include <OgreMaterialManager.h>
-#include <OgreTextureUnitState.h>
-#include <OgreSharedPtr.h>
-#include <OgreTechnique.h>
-#include <OgreSceneNode.h>
+#include <OGRE/OgreRoot.h>
+#include <OGRE/OgreRenderWindow.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreViewport.h>
+#include <OGRE/OgreRectangle2D.h>
+#include <OGRE/OgreMaterial.h>
+#include <OGRE/OgreMaterialManager.h>
+#include <OGRE/OgreTextureUnitState.h>
+#include <OGRE/OgreSharedPtr.h>
+#include <OGRE/OgreTechnique.h>
+#include <OGRE/OgreSceneNode.h>
 
 #include "image_view.h"
 

diff --git a/src/image_view/image_view.h b/src/image_view/image_view.h
@@ -35,13 +35,13 @@
 #include "ros/ros.h"
 #include <ros/package.h>
 
-#include <OgreRoot.h>
-#include <OgreSceneManager.h>
-#include <OgreViewport.h>
-#include <OgreRectangle2D.h>
-#include <OgreMaterial.h>
-#include <OgreMaterialManager.h>
-#include <OgreTextureUnitState.h>
+#include <OGRE/OgreRoot.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreViewport.h>
+#include <OGRE/OgreRectangle2D.h>
+#include <OGRE/OgreMaterial.h>
+#include <OGRE/OgreMaterialManager.h>
+#include <OGRE/OgreTextureUnitState.h>
 
 #include <image_transport/image_transport.h>
 #include <image_transport/subscriber_filter.h>

diff --git a/src/rviz/default_plugin/axes_display.cpp b/src/rviz/default_plugin/axes_display.cpp
@@ -29,8 +29,8 @@
 
 #include <boost/bind.hpp>
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <rviz/display_context.h>
 #include <rviz/frame_manager.h>

diff --git a/src/rviz/default_plugin/camera_display.cpp b/src/rviz/default_plugin/camera_display.cpp
@@ -29,17 +29,17 @@
 
 #include <boost/bind.hpp>
 
-#include <OgreManualObject.h>
-#include <OgreMaterialManager.h>
-#include <OgreRectangle2D.h>
-#include <OgreRenderSystem.h>
-#include <OgreRenderWindow.h>
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
-#include <OgreTextureManager.h>
-#include <OgreViewport.h>
-#include <OgreTechnique.h>
-#include <OgreCamera.h>
+#include <OGRE/OgreManualObject.h>
+#include <OGRE/OgreMaterialManager.h>
+#include <OGRE/OgreRectangle2D.h>
+#include <OGRE/OgreRenderSystem.h>
+#include <OGRE/OgreRenderWindow.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreTextureManager.h>
+#include <OGRE/OgreViewport.h>
+#include <OGRE/OgreTechnique.h>
+#include <OGRE/OgreCamera.h>
 
 #include <tf2_ros/message_filter.h>
 

diff --git a/src/rviz/default_plugin/camera_display.h b/src/rviz/default_plugin/camera_display.h
@@ -35,9 +35,9 @@
 #include <QObject>
 
 #ifndef Q_MOC_RUN
-#include <OgreMaterial.h>
-#include <OgreRenderTargetListener.h>
-#include <OgreSharedPtr.h>
+#include <OGRE/OgreMaterial.h>
+#include <OGRE/OgreRenderTargetListener.h>
+#include <OGRE/OgreSharedPtr.h>
 
 #include <sensor_msgs/CameraInfo.h>
 

diff --git a/src/rviz/default_plugin/covariance_property.cpp b/src/rviz/default_plugin/covariance_property.cpp
@@ -36,8 +36,8 @@
 
 #include <QColor>
 
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
 
 namespace rviz
 {

diff --git a/src/rviz/default_plugin/covariance_property.h b/src/rviz/default_plugin/covariance_property.h
@@ -32,7 +32,7 @@
 
 #include <QColor>
 
-#include <OgreColourValue.h>
+#include <OGRE/OgreColourValue.h>
 
 #include <rviz/properties/bool_property.h>
 

diff --git a/src/rviz/default_plugin/covariance_visual.cpp b/src/rviz/default_plugin/covariance_visual.cpp
@@ -32,9 +32,9 @@
 #include <rviz/ogre_helpers/shape.h>
 #include <rviz/validate_quaternions.h>
 
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
-#include <OgreQuaternion.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreQuaternion.h>
 
 #include <ros/console.h>
 

diff --git a/src/rviz/default_plugin/covariance_visual.h b/src/rviz/default_plugin/covariance_visual.h
@@ -40,8 +40,8 @@
 
 #include <Eigen/Dense>
 
-#include <OgreVector3.h>
-#include <OgreColourValue.h>
+#include <OGRE/OgreVector3.h>
+#include <OGRE/OgreColourValue.h>
 
 namespace Ogre
 {

diff --git a/src/rviz/default_plugin/depth_cloud_display.cpp b/src/rviz/default_plugin/depth_cloud_display.cpp
@@ -46,8 +46,8 @@
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <image_transport/camera_common.h>
 #include <image_transport/subscriber_plugin.h>
@@ -159,10 +159,6 @@ void DepthCloudDisplay::onInitialize()
   updateUseAutoSize();
   updateUseOcclusionCompensation();
 
-  // PointCloudCommon sets up a callback queue with a thread for each
-  // instance.  Use that for processing incoming messages.
-  threaded_nh_.setCallbackQueue(pointcloud_common_->getCallbackQueue());
-
   // Scan for available transport plugins
   scanForTransportSubscriberPlugins();
 

diff --git a/src/rviz/default_plugin/effort_display.cpp b/src/rviz/default_plugin/effort_display.cpp
@@ -1,5 +1,5 @@
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 #include <QTimer>
 
 #include <rviz/visualization_manager.h>

diff --git a/src/rviz/default_plugin/effort_visual.cpp b/src/rviz/default_plugin/effort_visual.cpp
@@ -1,6 +1,6 @@
-#include <OgreVector3.h>
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreVector3.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <rviz/ogre_helpers/arrow.h>
 #include <rviz/ogre_helpers/billboard_line.h>

diff --git a/src/rviz/default_plugin/effort_visual.h b/src/rviz/default_plugin/effort_visual.h
@@ -1,7 +1,7 @@
 #ifndef EFFORT_VISUAL_H
 #define EFFORT_VISUAL_H
 
-#include <OgrePrerequisites.h>
+#include <OGRE/OgrePrerequisites.h>
 
 namespace rviz
 {

diff --git a/src/rviz/default_plugin/fluid_pressure_display.cpp b/src/rviz/default_plugin/fluid_pressure_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <ros/time.h>
 
@@ -46,9 +46,6 @@ namespace rviz
 {
 FluidPressureDisplay::FluidPressureDisplay() : point_cloud_common_(new PointCloudCommon(this))
 {
-  // PointCloudCommon sets up a callback queue with a thread for each
-  // instance.  Use that for processing incoming messages.
-  update_nh_.setCallbackQueue(point_cloud_common_->getCallbackQueue());
 }
 
 FluidPressureDisplay::~FluidPressureDisplay()
@@ -58,6 +55,9 @@ FluidPressureDisplay::~FluidPressureDisplay()
 
 void FluidPressureDisplay::onInitialize()
 {
+  // Use the threaded queue for processing of incoming messages
+  update_nh_.setCallbackQueue(context_->getThreadedQueue());
+
   MFDClass::onInitialize();
   point_cloud_common_->initialize(context_, scene_node_);
 

diff --git a/src/rviz/default_plugin/grid_cells_display.cpp b/src/rviz/default_plugin/grid_cells_display.cpp
@@ -28,10 +28,10 @@
  */
 
 #include <boost/bind.hpp>
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
-#include <OgreManualObject.h>
-#include <OgreBillboardSet.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreManualObject.h>
+#include <OGRE/OgreBillboardSet.h>
 
 #include <rviz/frame_manager.h>
 #include <rviz/ogre_helpers/arrow.h>

diff --git a/src/rviz/default_plugin/grid_display.cpp b/src/rviz/default_plugin/grid_display.cpp
@@ -31,8 +31,8 @@
 
 #include <boost/bind.hpp>
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <rviz/display_context.h>
 #include <rviz/frame_manager.h>

diff --git a/src/rviz/default_plugin/illuminance_display.cpp b/src/rviz/default_plugin/illuminance_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <ros/time.h>
 
@@ -46,9 +46,6 @@ namespace rviz
 {
 IlluminanceDisplay::IlluminanceDisplay() : point_cloud_common_(new PointCloudCommon(this))
 {
-  // PointCloudCommon sets up a callback queue with a thread for each
-  // instance.  Use that for processing incoming messages.
-  update_nh_.setCallbackQueue(point_cloud_common_->getCallbackQueue());
 }
 
 IlluminanceDisplay::~IlluminanceDisplay()
@@ -58,6 +55,9 @@ IlluminanceDisplay::~IlluminanceDisplay()
 
 void IlluminanceDisplay::onInitialize()
 {
+  // Use the threaded queue for processing of incoming messages
+  update_nh_.setCallbackQueue(context_->getThreadedQueue());
+
   MFDClass::onInitialize();
   point_cloud_common_->initialize(context_, scene_node_);