12345qiupeng
/
cartographer_ros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Publish one last progress message when PlayableBag is finished. (#1160) 

Without this, it might look like the processing hangs.
master
Michael Grupp 2019-01-18 13:10:40 +01:00 committed by Wally B. Feed
parent 68f60ff763
commit 63eaf6d257
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cartographer_ros/cartographer_ros/playable_bag.cc
View File

@ -140,10 +140,15 @@ PlayableBagMultiplexer::GetNextMessage() {
PlayableBag& current_bag = playable_bags_.at(current_bag_index); PlayableBag& current_bag = playable_bags_.at(current_bag_index);
cartographer_ros_msgs::BagfileProgress progress; cartographer_ros_msgs::BagfileProgress progress;
rosbag::MessageInstance msg = current_bag.GetNextMessage(&progress); rosbag::MessageInstance msg = current_bag.GetNextMessage(&progress);
if (ros::Time::now() - bag_progress_time_map_[current_bag.bag_id()] >= const bool publish_progress =
ros::Duration(progress_pub_interval_) && current_bag.finished() ||
bag_progress_pub_.getNumSubscribers() > 0) { ros::Time::now() - bag_progress_time_map_[current_bag.bag_id()] >=
ros::Duration(progress_pub_interval_);
if (bag_progress_pub_.getNumSubscribers() > 0 && publish_progress) {
progress.total_bagfiles = playable_bags_.size(); progress.total_bagfiles = playable_bags_.size();
if (current_bag.finished()) {
progress.processed_seconds = current_bag.duration_in_seconds();
}
bag_progress_pub_.publish(progress); bag_progress_pub_.publish(progress);
bag_progress_time_map_[current_bag.bag_id()] = ros::Time::now(); bag_progress_time_map_[current_bag.bag_id()] = ros::Time::now();
} }

2
cartographer_ros/cartographer_ros/playable_bag.h
View File

@ -47,6 +47,8 @@ class PlayableBag {
int bag_id() const; int bag_id() const;
std::set<std::string> topics() const { return topics_; } std::set<std::string> topics() const { return topics_; }
double duration_in_seconds() const { return duration_in_seconds_; }
bool finished() const { return finished_; }
private: private:
void AdvanceOneMessage(); void AdvanceOneMessage();