fix more functions

Author: IsseW

crates/viewer/re_test_context/src/lib.rs

@@ -193,7 +193,7 @@ impl TestContext {
         let reflection =
             re_types::reflection::generate_reflection().expect("Failed to generate reflection");
 
-        Self {
+        let this = Self {
             app_options: Default::default(),
 
             view_class_registry: Default::default(),
@@ -215,7 +215,13 @@ impl TestContext {
             called_setup_kittest_for_rendering: AtomicBool::new(false),
 
             store_hub: Mutex::new(store_hub),
-        }
+        };
+
+        this.with_blueprint_ctx(|ctx| {
+            ctx.set_timeline("log_tick".into());
+        });
+
+        this
     }
 
     /// Create a new test context that knows about a specific view class.

crates/viewer/re_time_panel/tests/time_panel_filter_tests.rs

@@ -44,7 +44,7 @@ pub fn test_various_filter_ui_snapshot() {
         }
 
         run_time_panel_and_save_snapshot(
-            test_context,
+            &test_context,
             time_panel,
             &format!(
                 "various_filters-{}",
@@ -116,7 +116,7 @@ fn add_point_to_chunk_builder(builder: ChunkBuilder) -> ChunkBuilder {
 }
 
 fn run_time_panel_and_save_snapshot(
-    test_context: TestContext,
+    test_context: &TestContext,
     mut time_panel: TimePanel,
     snapshot_name: &str,
 ) {

crates/viewer/re_time_panel/tests/time_panel_tests.rs

@@ -226,7 +226,7 @@ pub fn run_time_panel_filter_tests(filter_active: bool, query: &str, snapshot_na
         time_panel.activate_filter(query);
     }
 
-    run_time_panel_and_save_snapshot(&mut test_context, time_panel, 300.0, false, snapshot_name);
+    run_time_panel_and_save_snapshot(&test_context, time_panel, 300.0, false, snapshot_name);
 }
 
 // --
@@ -263,7 +263,7 @@ pub fn test_various_entity_kinds_in_time_panel() {
             let time_panel = TimePanel::default();
 
             run_time_panel_and_save_snapshot(
-                &mut test_context,
+                &test_context,
                 time_panel,
                 1200.0,
                 true,
@@ -287,7 +287,7 @@ pub fn test_focused_item_is_focused() {
     let time_panel = TimePanel::default();
 
     run_time_panel_and_save_snapshot(
-        &mut test_context,
+        &test_context,
         time_panel,
         200.0,
         false,

crates/viewer/re_viewer/src/app.rs

@@ -916,7 +916,7 @@ impl App {
                 time,
             } => {
                 if let Some(blueprint_ctx) =
-                    blueprint_ctx(&mut self.state, &self.command_sender, store_hub)
+                    active_blueprint_ctx(&mut self.state, &self.command_sender, store_hub)
                 {
                     blueprint_ctx.set_timeline(timeline);
 
@@ -941,7 +941,7 @@ impl App {
                 time_range,
             } => {
                 if let Some(blueprint_ctx) =
-                    blueprint_ctx(&mut self.state, &self.command_sender, store_hub)
+                    active_blueprint_ctx(&mut self.state, &self.command_sender, store_hub)
                 {
                     blueprint_ctx.set_timeline(*timeline.name());
 
@@ -1021,14 +1021,22 @@ impl App {
                     url: url.to_string(),
                     follow: *follow,
                 };
+                let Some(blueprint_ctx) =
+                    active_blueprint_ctx(&mut self.state, &self.command_sender, store_hub)
+                else {
+                    return;
+                };
+
                 if all_sources.any(|source| source.is_same_ignoring_uri_fragments(&new_source)) {
                     if let Some(entity_db) = store_hub.find_recording_store_by_source(&new_source) {
                         if *follow {
-                            let rec_cfg = self.state.recording_config_mut(entity_db);
+                            let rec_cfg =
+                                self.state.recording_config_mut(entity_db, &blueprint_ctx);
                             let time_ctrl = rec_cfg.time_ctrl.get_mut();
                             time_ctrl.set_play_state(
                                 entity_db.times_per_timeline(),
                                 PlayState::Following,
+                                &blueprint_ctx,
                             );
                         }
 
@@ -1688,26 +1696,26 @@ impl App {
         }) else {
             return;
         };
-        let rec_cfg = self.state.recording_config_mut(entity_db);
+        let rec_cfg = self.state.recording_config_mut(entity_db, &blueprint_ctx);
         let time_ctrl = rec_cfg.time_ctrl.get_mut();
 
         let times_per_timeline = entity_db.times_per_timeline();
 
         match command {
             TimeControlCommand::TogglePlayPause => {
-                time_ctrl.toggle_play_pause(times_per_timeline);
+                time_ctrl.toggle_play_pause(times_per_timeline, &blueprint_ctx);
             }
             TimeControlCommand::Follow => {
-                time_ctrl.set_play_state(times_per_timeline, PlayState::Following);
+                time_ctrl.set_play_state(times_per_timeline, PlayState::Following, &blueprint_ctx);
             }
             TimeControlCommand::StepBack => {
-                time_ctrl.step_time_back(&blueprint_ctx, times_per_timeline);
+                time_ctrl.step_time_back(times_per_timeline, &blueprint_ctx);
             }
             TimeControlCommand::StepForward => {
-                time_ctrl.step_time_fwd(&blueprint_ctx, times_per_timeline);
+                time_ctrl.step_time_fwd(times_per_timeline, &blueprint_ctx);
             }
             TimeControlCommand::Restart => {
-                time_ctrl.restart(times_per_timeline);
+                time_ctrl.restart(times_per_timeline, &blueprint_ctx);
             }
         }
     }
@@ -2364,8 +2372,11 @@ impl App {
         store_hub: &StoreHub,
         store_id: &StoreId,
     ) -> Option<&mut RecordingConfig> {
-        if let Some(entity_db) = store_hub.store_bundle().get(store_id) {
-            Some(self.state.recording_config_mut(entity_db))
+        if let Some(entity_db) = store_hub.store_bundle().get(store_id)
+            && let Some(blueprint_ctx) =
+                active_blueprint_ctx(&mut self.state, &self.command_sender, store_hub)
+        {
+            Some(self.state.recording_config_mut(entity_db, &blueprint_ctx))
         } else {
             re_log::debug!("Failed to find recording '{store_id:?}' in store hub");
             None
@@ -2609,6 +2620,25 @@ impl App {
             self.screenshotter.save(&self.egui_ctx, image);
         }
     }
+
+    /// Get an [`AppBlueprintCtx`] to interact with the given recording.
+    pub fn blueprint_ctx<'a>(&'a self, recording_id: &StoreId) -> Option<AppBlueprintCtx<'a>> {
+        let hub = self.store_hub.as_ref()?;
+
+        let blueprint = hub.active_blueprint_for_app(recording_id.application_id())?;
+
+        let default_blueprint = hub.default_blueprint_for_app(recording_id.application_id());
+
+        let blueprint_query =
+            re_chunk::LatestAtQuery::latest(re_viewer_context::blueprint_timeline());
+
+        Some(AppBlueprintCtx {
+            command_sender: &self.command_sender,
+            current_blueprint: blueprint,
+            default_blueprint,
+            blueprint_query,
+        })
+    }
 }
 
 #[cfg(target_arch = "wasm32")]
@@ -3334,10 +3364,10 @@ async fn async_save_dialog(
 }
 
 pub struct AppBlueprintCtx<'a> {
-    command_sender: &'a CommandSender,
-    current_blueprint: &'a EntityDb,
-    default_blueprint: Option<&'a EntityDb>,
-    blueprint_query: re_chunk::LatestAtQuery,
+    pub command_sender: &'a CommandSender,
+    pub current_blueprint: &'a EntityDb,
+    pub default_blueprint: Option<&'a EntityDb>,
+    pub blueprint_query: re_chunk::LatestAtQuery,
 }
 
 impl BlueprintContext for AppBlueprintCtx<'_> {
@@ -3359,21 +3389,22 @@ impl BlueprintContext for AppBlueprintCtx<'_> {
 }
 
 /// Build a [`AppBlueprintCtx`] to interact with the active blueprint.
-fn blueprint_ctx<'a>(
+pub fn active_blueprint_ctx<'a>(
     app_state: &mut AppState,
     command_sender: &'a CommandSender,
-    store_hub: &'a mut StoreHub,
+    hub: &'a StoreHub,
 ) -> Option<AppBlueprintCtx<'a>> {
-    let (_, Some(store_context)) = store_hub.read_context() else {
-        return None;
-    };
+    let active_app = hub.active_app()?;
+    let current_blueprint = hub.active_blueprint_for_app(active_app)?;
+
+    let default_blueprint = hub.default_blueprint_for_app(active_app);
 
-    let blueprint_query = app_state.blueprint_query_for_viewer(store_context.blueprint);
+    let blueprint_query = app_state.blueprint_query_for_viewer(current_blueprint);
 
     Some(AppBlueprintCtx {
         command_sender,
-        current_blueprint: store_context.blueprint,
-        default_blueprint: store_context.default_blueprint,
+        current_blueprint,
+        default_blueprint,
         blueprint_query,
     })
 }

crates/viewer/re_viewer/src/app_state.rs

@@ -13,20 +13,21 @@ use re_smart_channel::ReceiveSet;
 use re_types::blueprint::components::PanelState;
 use re_ui::{ContextExt as _, UiExt as _};
 use re_viewer_context::{
-    AppOptions, ApplicationSelectionState, AsyncRuntimeHandle, BlueprintTimeControl,
-    BlueprintUndoState, CommandSender, ComponentUiRegistry, DisplayMode, DragAndDropManager,
-    GlobalContext, Item, PlayState, RecordingConfig, SelectionChange, StorageContext, StoreContext,
-    StoreHub, SystemCommand, SystemCommandSender as _, TableStore, TimeControl, ViewClassRegistry,
-    ViewStates, ViewerContext, blueprint_timeline,
+    AppOptions, ApplicationSelectionState, AsyncRuntimeHandle, BlueprintContext,
+    BlueprintTimeControl, BlueprintUndoState, CommandSender, ComponentUiRegistry, DisplayMode,
+    DragAndDropManager, GlobalContext, Item, PlayState, RecordingConfig, SelectionChange,
+    StorageContext, StoreContext, StoreHub, SystemCommand, SystemCommandSender as _, TableStore,
+    ViewClassRegistry, ViewStates, ViewerContext, blueprint_timeline,
     open_url::{self, ViewerOpenUrl},
 };
 use re_viewport::ViewportUi;
 use re_viewport_blueprint::ViewportBlueprint;
 use re_viewport_blueprint::ui::add_view_or_container_modal_ui;
 
 use crate::{
-    StartupOptions, app_blueprint::AppBlueprint, event::ViewerEventDispatcher,
-    navigation::Navigation, open_url_description::ViewerOpenUrlDescription, ui::settings_screen_ui,
+    StartupOptions, app::AppBlueprintCtx, app_blueprint::AppBlueprint,
+    event::ViewerEventDispatcher, navigation::Navigation,
+    open_url_description::ViewerOpenUrlDescription, ui::settings_screen_ui,
 };
 
 const WATERMARK: bool = false; // Nice for recording media material
@@ -311,7 +312,16 @@ impl AppState {
                         .collect::<_>()
                 };
 
-                let rec_cfg = recording_config_entry(recording_configs, recording);
+                let app_blueprint_ctx = AppBlueprintCtx {
+                    command_sender,
+                    current_blueprint: store_context.blueprint,
+                    default_blueprint: store_context.default_blueprint,
+                    blueprint_query,
+                };
+                let rec_cfg =
+                    recording_config_entry(recording_configs, recording, &app_blueprint_ctx);
+                let blueprint_query = app_blueprint_ctx.blueprint_query;
+
                 let egui_ctx = ui.ctx().clone();
                 let display_mode = self.navigation.peek();
                 let ctx = ViewerContext {
@@ -722,8 +732,12 @@ impl AppState {
         self.recording_configs.get(rec_id)
     }
 
-    pub fn recording_config_mut(&mut self, entity_db: &EntityDb) -> &mut RecordingConfig {
-        recording_config_entry(&mut self.recording_configs, entity_db)
+    pub fn recording_config_mut(
+        &mut self,
+        entity_db: &EntityDb,
+        blueprint_ctx: &impl BlueprintContext,
+    ) -> &mut RecordingConfig {
+        recording_config_entry(&mut self.recording_configs, entity_db, blueprint_ctx)
     }
 
     pub fn cleanup(&mut self, store_hub: &StoreHub) {
@@ -795,7 +809,7 @@ fn move_time(
         // The state diffs are used to trigger callbacks if they are configured.
         // Unless we have a real recording open, we should not actually trigger any callbacks.
         should_diff_time_ctrl,
-        Some(ctx),
+        ctx,
     );
 
     handle_time_ctrl_event(recording, events, &recording_time_ctrl_response);
@@ -812,7 +826,6 @@ fn move_time(
                 dt,
                 more_data_is_coming,
                 should_diff_time_ctrl,
-                None::<&ViewerContext<'_>>,
             )
             .needs_repaint
     } else {
@@ -851,8 +864,12 @@ fn handle_time_ctrl_event(
 pub(crate) fn recording_config_entry<'cfgs>(
     configs: &'cfgs mut HashMap<StoreId, RecordingConfig>,
     entity_db: &'_ EntityDb,
+    blueprint_ctx: &'_ impl BlueprintContext,
 ) -> &'cfgs mut RecordingConfig {
-    fn new_recording_config(entity_db: &'_ EntityDb) -> RecordingConfig {
+    fn new_recording_config(
+        entity_db: &'_ EntityDb,
+        blueprint_ctx: &'_ impl BlueprintContext,
+    ) -> RecordingConfig {
         let play_state = if let Some(data_source) = &entity_db.data_source {
             match data_source {
                 // Play files from the start by default - it feels nice and alive.
@@ -873,19 +890,20 @@ pub(crate) fn recording_config_entry<'cfgs>(
             PlayState::Following // No known source 🤷‍♂️
         };
 
-        let mut rec_cfg = RecordingConfig::<TimeControl>::default();
+        let mut rec_cfg = RecordingConfig::from_blueprint(blueprint_ctx);
 
-        rec_cfg
-            .time_ctrl
-            .get_mut()
-            .set_play_state(entity_db.times_per_timeline(), play_state);
+        rec_cfg.time_ctrl.get_mut().set_play_state(
+            entity_db.times_per_timeline(),
+            play_state,
+            blueprint_ctx,
+        );
 
         rec_cfg
     }
 
     configs
         .entry(entity_db.store_id().clone())
-        .or_insert_with(|| new_recording_config(entity_db))
+        .or_insert_with(|| new_recording_config(entity_db, blueprint_ctx))
 }
 
 /// Handles all kind of links that can be opened within the viewer.