Skip to content

Commit 1804cbf

Browse files
committed
Updated the marker display and tf plugins to update the map of enabled namespaces and frames whenever those frames are enabled/disabled using the check boxes. Also updated the plugins so that the map of enabled namespaces and frames does not get erased whenever the plugin is reset. (#988) (#989)
This allows the currently selected namespaces/frames to remain selected after the Reset button is pressed.
1 parent 0cdf1ee commit 1804cbf

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/rviz/default_plugin/marker_display.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ void MarkerDisplay::clearMarkers()
123123
tf_filter_->clear();
124124
namespaces_category_->removeChildren();
125125
namespaces_.clear();
126-
namespace_config_enabled_state_.clear();
127126
}
128127

129128
void MarkerDisplay::onEnable()
@@ -533,6 +532,9 @@ void MarkerNamespace::onEnableChanged()
533532
{
534533
owner_->deleteMarkersInNamespace( getName().toStdString() );
535534
}
535+
536+
// Update the configuration that stores the enabled state of all markers
537+
owner_->namespace_config_enabled_state_[getName()] = isEnabled();
536538
}
537539

538540
} // namespace rviz

src/rviz/default_plugin/tf_display.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ void TFDisplay::clear()
260260
}
261261

262262
frames_.clear();
263-
frame_config_enabled_state_.clear();
264263

265264
update_timer_ = 0.0f;
266265

@@ -782,6 +781,9 @@ void FrameInfo::setEnabled( bool enabled )
782781
display_->changing_single_frame_enabled_state_ = false;
783782
}
784783

784+
// Update the configuration that stores the enabled state of all frames
785+
display_->frame_config_enabled_state_[this->name_] = enabled;
786+
785787
display_->context_->queueRender();
786788
}
787789

0 commit comments

Comments
 (0)