Skip to content

Commit

Permalink
Set error status when duplicate markers are in the same MarkerArray (#…
Browse files Browse the repository at this point in the history
…891)

* Set error status when duplicate markers are in the same MarkerArray

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

* Use std::set with id before ns

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

* Lock/Unlock for every message

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

* Output first offending namespace and id

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

* Add benchmark

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

More benchmarks

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

* Revert "Add benchmark"

This reverts commit 8aeea4c.

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
(cherry picked from commit e069694)
  • Loading branch information
sloretz authored and mergify[bot] committed Sep 12, 2022
1 parent 1211b17 commit 0fc32de
Showing 1 changed file with 34 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
#include "rviz_default_plugins/displays/marker/marker_common.hpp"

#include <memory>
#include <set>
#include <sstream>
#include <string>
#include <utility>
#include <vector>
Expand Down Expand Up @@ -153,9 +155,41 @@ void MarkerCommon::addMessage(const visualization_msgs::msg::Marker::ConstShared
void MarkerCommon::addMessage(
const visualization_msgs::msg::MarkerArray::ConstSharedPtr array)
{
using ns_type = decltype(visualization_msgs::msg::Marker::ns);
using id_type = decltype(visualization_msgs::msg::Marker::id);
using pair_type = std::pair<id_type, const ns_type &>;

// Keep track of unique markers
std::set<pair_type> unique_markers;
bool found_duplicate = false;
std::string offending_ns;
id_type offending_id = 0;

for (auto const & marker : array->markers) {
if (!found_duplicate) {
pair_type pair(marker.id, marker.ns);
found_duplicate = !unique_markers.insert(pair).second;
if (found_duplicate) {
offending_ns = marker.ns;
offending_id = marker.id;
}
}
addMessage(std::make_shared<visualization_msgs::msg::Marker>(marker));
}

// Can't use setMarkerStatus on individual markers because processAdd would clear it.
const char * kDuplicateStatus = "Duplicate Marker Check";
if (found_duplicate) {
std::stringstream error_stream;
error_stream << "Multiple Markers in the same MarkerArray message had the same ns and id: ";
error_stream << "(" << offending_ns << ", " << offending_id << ")";
display_->setStatusStd(
rviz_common::properties::StatusProperty::Error,
kDuplicateStatus,
error_stream.str());
} else {
display_->deleteStatusStd(kDuplicateStatus);
}
}

// TODO(greimela): Revisit after MessageFilter is available in ROS2
Expand Down

0 comments on commit 0fc32de

Please sign in to comment.