Skip to content

systematic check of incoming markers #1275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Aug 13, 2019
Merged

systematic check of incoming markers #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d30cda4
checking text in TEXT_VIEW_FACING marker to prevent crashes
jgueldenstein Aug 3, 2018
9c15d9a
unknown marker is ignored and does not crash rviz anymore
jgueldenstein Aug 3, 2018
60ddc3c
systematic check of incoming markers
jgueldenstein Aug 3, 2018
d02db0b
changed string to char* for performance
jgueldenstein Mar 31, 2019
eaa5419
stringstream initialization after fast track return
jgueldenstein Apr 1, 2019
63e1d6a
minor formatting
jgueldenstein Apr 1, 2019
08c8351
set -> sorted vector for performance
jgueldenstein Apr 1, 2019
1f5f8fd
check for adding marker in MarkerArray before warining about DELETEAL…
jgueldenstein Apr 1, 2019
86c4ffa
passing reference to stringstream to checking functions for efficiency
jgueldenstein Apr 1, 2019
db705e2
removed unnecessary comma check
jgueldenstein Apr 1, 2019
0cc5e8c
formatting
jgueldenstein May 15, 2019
b8ef09d
single allocation of string for efficiency
jgueldenstein May 29, 2019
c414eac
colors check for single color corrected
jgueldenstein May 29, 2019
c028953
replaced comma with newline for readability
jgueldenstein May 29, 2019
428f564
continue array checks after already warning
jgueldenstein May 29, 2019
3a75c5b
Add comma to separator since rviz status display does not handle new …
jgueldenstein Aug 2, 2019
3aadbff
variable severity for different messages
jgueldenstein Aug 2, 2019
cf0d693
Special case for Triangle list in scale checking dropped
jgueldenstein Aug 2, 2019
7874336
cleanup
rhaschke Aug 12, 2019
d424e48
fix segfault: correctly handle undefined owner
rhaschke Aug 12, 2019
f7dea2b
MarkerArray: handle multiple warning messages in a row
rhaschke Aug 12, 2019
2fed5ce
Consistently use full sentences
rhaschke Aug 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 6 additions & 20 deletions src/rviz/default_plugin/marker_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include "rviz/properties/ros_topic_property.h"
#include "rviz/selection/selection_manager.h"
#include "rviz/validate_floats.h"
#include "rviz/validate_quaternions.h"

#include "rviz/default_plugin/marker_display.h"

Expand Down Expand Up @@ -247,17 +246,16 @@ void MarkerDisplay::deleteMarkerStatus(MarkerID id)

void MarkerDisplay::incomingMarkerArray(const visualization_msgs::MarkerArray::ConstPtr& array)
{
std::vector<visualization_msgs::Marker>::const_iterator it = array->markers.begin();
std::vector<visualization_msgs::Marker>::const_iterator end = array->markers.end();
for (; it != end; ++it)
checkMarkerArrayMsg(*array, this);
for (const visualization_msgs::Marker& marker : array->markers)
{
const visualization_msgs::Marker& marker = *it;
tf_filter_->add(visualization_msgs::Marker::Ptr(new visualization_msgs::Marker(marker)));
}
}

void MarkerDisplay::incomingMarker( const visualization_msgs::Marker::ConstPtr& marker )
{
checkMarkerMsg(*marker, this);
boost::mutex::scoped_lock lock(queue_mutex_);

message_queue_.push_back(marker);
Expand Down Expand Up @@ -295,16 +293,6 @@ void MarkerDisplay::processMessage( const visualization_msgs::Marker::ConstPtr&
return;
}

if( !validateQuaternions( message->pose ))
{
ROS_WARN_ONCE_NAMED( "quaternions", "Marker '%s/%d' contains unnormalized quaternions. "
"This warning will only be output once but may be true for others; "
"enable DEBUG messages for ros.rviz.quaternions to see more details.",
message->ns.c_str(), message->id );
ROS_DEBUG_NAMED( "quaternions", "Marker '%s/%d' contains unnormalized quaternions.",
message->ns.c_str(), message->id );
}

switch ( message->action )
{
case visualization_msgs::Marker::ADD:
Expand Down Expand Up @@ -345,8 +333,6 @@ void MarkerDisplay::processAdd( const visualization_msgs::Marker::ConstPtr& mess
return;
}

deleteMarkerStatus( MarkerID( message->ns, message->id ));

bool create = true;
MarkerBasePtr marker;

Expand All @@ -368,10 +354,10 @@ void MarkerDisplay::processAdd( const visualization_msgs::Marker::ConstPtr& mess
if ( create )
{
marker.reset(createMarker(message->type, this, context_, scene_node_));
if (!marker) {
ROS_ERROR( "Unknown marker type: %d", message->type );
if (marker)
{
markers_.insert(std::make_pair(MarkerID(message->ns, message->id), marker));
}
markers_.insert(std::make_pair(MarkerID(message->ns, message->id), marker));
}

if (marker)
Expand Down
Loading