Fix links for custom timelines (#11333)

Author: IsseW

crates/viewer/re_global_context/src/command_sender.rs

@@ -112,6 +112,9 @@ pub enum SystemCommand {
         store_id: StoreId,
         timeline: re_chunk::Timeline,
         time: Option<re_log_types::TimeReal>,
+
+        /// If this is true the timeline will persist even if it is invalid at the moment.
+        pending: bool,
     },
 
     /// Set the loop selection for the given timeline.

crates/viewer/re_test_context/src/lib.rs

@@ -569,6 +569,7 @@ impl TestContext {
                     store_id,
                     timeline: re_chunk::Timeline::new(timeline, timecell.typ()),
                     time: Some(timecell.as_i64().into()),
+                    pending: true,
                 });
         }
     }
@@ -617,13 +618,18 @@ impl TestContext {
                     store_id: rec_id,
                     timeline,
                     time,
+                    pending,
                 } => {
                     assert_eq!(
                         &rec_id,
                         self.store_hub.lock().active_recording().unwrap().store_id()
                     );
                     let mut time_ctrl = self.recording_config.time_ctrl.write();
-                    time_ctrl.set_timeline(timeline);
+                    if pending {
+                        time_ctrl.set_pending_timeline(timeline);
+                    } else {
+                        time_ctrl.set_timeline(timeline);
+                    }
                     if let Some(time) = time {
                         time_ctrl.set_time(time);
                     }

crates/viewer/re_time_panel/src/time_panel.rs

@@ -395,6 +395,30 @@ impl TimePanel {
     ) {
         re_tracing::profile_function!();
 
+        if time_ctrl.is_pending() {
+            ui.loading_screen_ui(|ui| {
+                ui.label(
+                    egui::RichText::from(format!(
+                        "Waiting for timeline: {}",
+                        time_ctrl.timeline().name()
+                    ))
+                    .heading()
+                    .strong(),
+                );
+                if ui
+                    .button(
+                        egui::RichText::new("Go to default timeline")
+                            .color(ui.style().visuals.weak_text_color()),
+                    )
+                    .clicked()
+                {
+                    time_ctrl.set_timeline(*time_ctrl.timeline());
+                }
+            });
+
+            return;
+        }
+
         //               |timeline            |
         // ------------------------------------
         // tree          |streams             |

crates/viewer/re_ui/src/ui_ext.rs

@@ -784,22 +784,29 @@ pub trait UiExt {
         response
     }
 
+    fn loading_screen_ui<R>(&mut self, add_contents: impl FnOnce(&mut egui::Ui) -> R) -> R {
+        self.ui_mut().center("loading spinner", |ui| {
+            ui.vertical_centered(|ui| {
+                ui.spinner();
+                add_contents(ui)
+            })
+            .inner
+        })
+    }
+
     fn loading_screen(
         &mut self,
         header: impl Into<egui::RichText>,
         source: impl Into<egui::RichText>,
     ) {
-        self.ui_mut().center("loading spinner", |ui| {
-            ui.vertical_centered(|ui| {
-                ui.spinner();
-                ui.label(
-                    header
-                        .into()
-                        .heading()
-                        .color(ui.style().visuals.weak_text_color()),
-                );
-                ui.strong(source);
-            });
+        self.loading_screen_ui(|ui| {
+            ui.label(
+                header
+                    .into()
+                    .heading()
+                    .color(ui.style().visuals.weak_text_color()),
+            );
+            ui.strong(source);
         });
     }
 

crates/viewer/re_view_dataframe/src/dataframe_ui.rs

@@ -377,6 +377,7 @@ impl egui_table::TableDelegate for DataframeTableDelegate<'_> {
                                         store_id: self.ctx.store_id().clone(),
                                         timeline: descr.timeline(),
                                         time: None,
+                                        pending: false,
                                     },
                                 );
                             }

crates/viewer/re_viewer/src/app.rs

@@ -900,11 +900,16 @@ impl App {
                 store_id,
                 timeline,
                 time,
+                pending,
             } => {
                 if let Some(rec_cfg) = self.recording_config_mut(store_hub, &store_id) {
                     let mut time_ctrl = rec_cfg.time_ctrl.write();
 
-                    time_ctrl.set_timeline(timeline);
+                    if pending {
+                        time_ctrl.set_pending_timeline(timeline);
+                    } else {
+                        time_ctrl.set_timeline(timeline);
+                    }
 
                     if let Some(time) = time {
                         time_ctrl.set_time(time);
@@ -1142,6 +1147,7 @@ impl App {
                     store_id,
                     timeline: re_chunk::Timeline::new(timeline, timecell.typ()),
                     time: Some(timecell.as_i64().into()),
+                    pending: true,
                 });
         }
     }

crates/viewer/re_viewer_context/src/time_control.rs

@@ -103,6 +103,7 @@ pub enum PlayState {
 enum ActiveTimeline {
     Auto(Timeline),
     UserEdited(Timeline),
+    Pending(Timeline),
 }
 
 impl std::ops::Deref for ActiveTimeline {
@@ -111,7 +112,7 @@ impl std::ops::Deref for ActiveTimeline {
     #[inline]
     fn deref(&self) -> &Self::Target {
         match self {
-            Self::Auto(t) | Self::UserEdited(t) => t,
+            Self::Auto(t) | Self::UserEdited(t) | Self::Pending(t) => t,
         }
     }
 }
@@ -569,10 +570,25 @@ impl TimeControl {
             false
         }
 
-        // If the timeline is auto refresh it every frame, otherwise only pick a new one if invalid.
-        if matches!(self.timeline, ActiveTimeline::Auto(_))
-            || !is_timeline_valid(self.timeline(), times_per_timeline)
-        {
+        let reset_timeline = match &self.timeline {
+            // If the timeline is auto refresh it every frame.
+            ActiveTimeline::Auto(_) => true,
+            // If it's user edited, refresh it if it's invalid.
+            ActiveTimeline::UserEdited(timeline) => {
+                !is_timeline_valid(timeline, times_per_timeline)
+            }
+            // If it's pending never automatically refresh it.
+            ActiveTimeline::Pending(timeline) => {
+                // If the pending timeline is valid, it shouldn't be pending anymore.
+                if is_timeline_valid(timeline, times_per_timeline) {
+                    self.set_timeline(*timeline);
+                }
+
+                false
+            }
+        };
+
+        if reset_timeline {
             self.timeline =
                 ActiveTimeline::Auto(default_timeline(times_per_timeline.timelines_with_stats()));
         }
@@ -593,6 +609,10 @@ impl TimeControl {
         self.timeline = ActiveTimeline::UserEdited(timeline);
     }
 
+    pub fn set_pending_timeline(&mut self, timeline: Timeline) {
+        self.timeline = ActiveTimeline::Pending(timeline);
+    }
+
     /// The current time.
     pub fn time(&self) -> Option<TimeReal> {
         self.states
@@ -695,6 +715,11 @@ impl TimeControl {
         }
     }
 
+    /// Is the active timeline pending?
+    pub fn is_pending(&self) -> bool {
+        matches!(self.timeline, ActiveTimeline::Pending(_))
+    }
+
     pub fn set_timeline_and_time(&mut self, timeline: Timeline, time: impl Into<TimeReal>) {
         self.timeline = ActiveTimeline::UserEdited(timeline);
         self.set_time(time);