From c8952b2ba93bed2c42fdf4447f86ac637652a1a4 Mon Sep 17 00:00:00 2001 From: Levi Armstrong Date: Tue, 4 Jun 2024 14:57:50 -0500 Subject: [PATCH] Fix incompatibility issues with rviz version 1.14.23 --- tesseract_rviz/src/environment_display.cpp | 3 +-- tesseract_rviz/src/workbench_display.cpp | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tesseract_rviz/src/environment_display.cpp b/tesseract_rviz/src/environment_display.cpp index 31e2d0f9..8271e872 100644 --- a/tesseract_rviz/src/environment_display.cpp +++ b/tesseract_rviz/src/environment_display.cpp @@ -46,8 +46,7 @@ int EnvironmentDisplay::Implementation::environment_display_counter = -1; EnvironmentDisplay::EnvironmentDisplay() : data_(std::make_unique()) { - auto monitor_property = - new rviz::Property("Environment Properties", "", "Tesseract environment properties", this, nullptr, this); + auto monitor_property = new rviz::Property("Environment Properties", "", "Tesseract environment properties", this); data_->monitor_properties = std::make_unique(this, data_->environment_display_ns, monitor_property); diff --git a/tesseract_rviz/src/workbench_display.cpp b/tesseract_rviz/src/workbench_display.cpp index 28483b55..4ec0be81 100644 --- a/tesseract_rviz/src/workbench_display.cpp +++ b/tesseract_rviz/src/workbench_display.cpp @@ -52,10 +52,9 @@ int WorkbenchDisplay::Implementation::workbench_display_counter = -1; // NOLINT WorkbenchDisplay::WorkbenchDisplay() : data_(std::make_unique()) { - auto* monitor_property = - new rviz::Property("Environment Properties", "", "Tesseract environment properties", this, nullptr, this); - auto* joint_trajectory_property = new rviz::Property( - "Joint Trajectory Properties", "", "Tesseract joint trajectory properties", this, nullptr, this); + auto* monitor_property = new rviz::Property("Environment Properties", "", "Tesseract environment properties", this); + auto* joint_trajectory_property = + new rviz::Property("Joint Trajectory Properties", "", "Tesseract joint trajectory properties", this); data_->monitor_properties = std::make_unique(this, data_->workbench_display_ns, monitor_property);