SyncFrame as last enum entry

... to keep existing config files valid
rhaschke · May 27, 2022 · 37a28c3 · 37a28c3
1 parent 686ae16
commit 37a28c3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/rviz/frame_manager.h b/src/rviz/frame_manager.h
@@ -67,10 +67,10 @@ class FrameManager : public QObject
 public:
   enum SyncMode
   {
-    SyncOff = 0,
+    SyncOff = 0, // use latest TF updates
+    SyncExact,   // sync to incoming messages of a display (emitting timeSignal())
+    SyncApprox,
     SyncFrame, // synchronize frame lookups to start of update() loop
-    SyncExact,
-    SyncApprox
   };
 
   /// Constructor, will create a TransformListener (and Buffer) automatically if not provided

diff --git a/src/rviz/time_panel.cpp b/src/rviz/time_panel.cpp
@@ -59,12 +59,17 @@ TimePanel::TimePanel(QWidget* parent) : Panel(parent)
 
   sync_mode_selector_ = new QComboBox(this);
   sync_mode_selector_->addItem("Off");
-  sync_mode_selector_->addItem("Frame");
-  sync_mode_selector_->setItemData(1, "Synchronize TF lookups within a frame", Qt::ToolTipRole);
+  sync_mode_selector_->setItemData(FrameManager::SyncOff, "Display data using latest TF data",
+                                   Qt::ToolTipRole);
   sync_mode_selector_->addItem("Exact");
-  sync_mode_selector_->setItemData(1, "Synchronize TF lookups to an external (Display) source",
+  sync_mode_selector_->setItemData(FrameManager::SyncExact, "Synchronize TF lookups to a source display",
                                    Qt::ToolTipRole);
   sync_mode_selector_->addItem("Approximate");
+  sync_mode_selector_->setItemData(
+      FrameManager::SyncApprox, "Synchronize to a source display in a smooth fashion", Qt::ToolTipRole);
+  sync_mode_selector_->addItem("Frame");
+  sync_mode_selector_->setItemData(FrameManager::SyncFrame, "Synchronize TF lookups within a frame",
+                                   Qt::ToolTipRole);
   sync_mode_selector_->setSizeAdjustPolicy(QComboBox::AdjustToContents);
   sync_mode_selector_->setToolTip(
       "Allows you to synchronize the ROS time and Tf transforms to a given source.");
@@ -227,7 +232,7 @@ void TimePanel::syncSourceSelected(int /*index*/)
 void TimePanel::syncModeSelected(int mode)
 {
   vis_manager_->getFrameManager()->setSyncMode((FrameManager::SyncMode)mode);
-  sync_source_selector_->setVisible(mode > FrameManager::SyncFrame);
+  sync_source_selector_->setVisible(mode >= FrameManager::SyncExact && mode <= FrameManager::SyncApprox);
   vis_manager_->notifyConfigChanged();
 }