cmd_play: basic topic information in status message

xqms · Feb 19, 2024 · 14e7fc1 · 14e7fc1
1 parent 668429b
commit 14e7fc1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/rosbag_fancy/src/cmd_play.cpp b/rosbag_fancy/src/cmd_play.cpp
@@ -237,32 +237,20 @@ int play(const std::vector<std::string>& options)
 		msg->current = currentTime-startTime;
 		msg->duration = endTime-startTime;
 
-		for(const auto & bag : bags)
+		msg->bagfiles.reserve(bags.size());
+		for(const auto& bag : bags)
 			msg->bagfiles.emplace_back(bag.filename_);
 
+		msg->topics.reserve(topicManager.topics().size());
+		for(const auto& topic : topicManager.topics())
+		{
+			msg->topics.emplace_back();
+			auto& topicMsg = msg->topics.back();
 
-		// TODO: fill some of this information
-
-//		auto& counts = writer.messageCounts();
-
-//		for(auto& topic : topicManager.topics())
-//		{
-//			msg->topics.emplace_back();
-//			auto& topicMsg = msg->topics.back();
-
-//			msg->bandwidth += topic.bandwidth;
-
-//			topicMsg.name = topic.name;
-//			topicMsg.publishers = topic.numPublishers;
-//			topicMsg.bandwidth = topic.bandwidth;
-//			topicMsg.bytes = topic.totalBytes;
-//			topicMsg.messages = topic.totalMessages;
-
-//			if(topic.id < counts.size())
-//				topicMsg.messages_in_current_bag = counts[topic.id];
-
-//			topicMsg.rate = topic.messageRateAt(now);
-//		}
+			topicMsg.name = topic.name;
+			topicMsg.bandwidth = topic.bandwidth;
+			topicMsg.rate = topic.messageRate;
+		}
 
 		pub_status.publish(msg);
 	}));

diff --git a/rosbag_fancy_msgs/CMakeLists.txt b/rosbag_fancy_msgs/CMakeLists.txt
@@ -11,6 +11,7 @@ add_message_files(FILES
     Status.msg
     TopicStatus.msg
     PlayStatus.msg
+    PlayTopicStatus.msg
 )
 
 generate_messages(DEPENDENCIES

diff --git a/rosbag_fancy_msgs/msg/PlayStatus.msg b/rosbag_fancy_msgs/msg/PlayStatus.msg
@@ -13,5 +13,5 @@ time startTime
 time endTime
 string[] bagfiles
 
-TopicStatus[] topics
+PlayTopicStatus[] topics
 
diff --git a/rosbag_fancy_msgs/msg/PlayTopicStatus.msg b/rosbag_fancy_msgs/msg/PlayTopicStatus.msg
@@ -0,0 +1,5 @@
+
+string name
+
+float32 rate
+float32 bandwidth