New debug option to show an actual timeline for the Blueprint

crates/re_data_ui/src/component_path.rs

@@ -16,13 +16,7 @@ impl DataUi for ComponentPath {
             component_name,
         } = self;
 
-        let store = if ctx.app_options.show_blueprint_in_timeline
-            && ctx.store_context.blueprint.is_logged_entity(entity_path)
-        {
-            ctx.store_context.blueprint.store()
-        } else {
-            ctx.entity_db.store()
-        };
+        let store = ctx.choose_store_for_query(query);
 
         if let Some(archetype_name) = component_name.indicator_component_archetype() {
             ui.label(format!(

crates/re_data_ui/src/image.rs

@@ -84,7 +84,10 @@ fn tensor_ui(
     let meter = if meaning == TensorDataMeaning::Depth {
         ctx.entity_db
             .store()
-            .query_latest_component::<DepthMeter>(entity_path, &ctx.current_query())
+            .query_latest_component::<DepthMeter>(
+                entity_path,
+                &ctx.current_query_for_entity_path(entity_path),
+            )
             .map(|meter| meter.value.0)
     } else {
         None

crates/re_data_ui/src/image_meaning.rs

@@ -11,7 +11,7 @@ pub fn image_meaning_for_entity(
     ctx: &ViewerContext<'_>,
 ) -> TensorDataMeaning {
     let store = ctx.entity_db.store();
-    let timeline = &ctx.current_query().timeline;
+    let timeline = &ctx.current_query_for_entity_path(entity_path).timeline;
     if store.entity_has_component(timeline, entity_path, &DepthImage::indicator().name()) {
         TensorDataMeaning::Depth
     } else if store.entity_has_component(

crates/re_data_ui/src/instance_path.rs

@@ -19,13 +19,7 @@ impl DataUi for InstancePath {
             instance_key,
         } = self;
 
-        let store = if ctx.app_options.show_blueprint_in_timeline
-            && ctx.store_context.blueprint.is_logged_entity(entity_path)
-        {
-            ctx.store_context.blueprint.store()
-        } else {
-            ctx.entity_db.store()
-        };
+        let store = ctx.choose_store_for_query(query);
 
         let Some(components) = store.all_components(&query.timeline, entity_path) else {
             if ctx.entity_db.is_known_entity(entity_path) {

crates/re_data_ui/src/item_ui.rs

@@ -374,7 +374,7 @@ pub fn instance_hover_card_ui(
 
     // TODO(emilk): give data_ui an alternate "everything on this timeline" query?
     // Then we can move the size view into `data_ui`.
-    let query = ctx.current_query();
+    let query = ctx.current_query_for_entity_path(&instance_path.entity_path);
 
     if instance_path.instance_key.is_splat() {
         if let Some(subtree) = ctx.entity_db.tree().subtree(&instance_path.entity_path) {

crates/re_space_view/src/data_query.rs

@@ -1,4 +1,4 @@
-use re_entity_db::{EntityProperties, EntityPropertyMap};
+use re_entity_db::{external::re_data_store::LatestAtQuery, EntityProperties, EntityPropertyMap};
 use re_viewer_context::{
     DataQueryResult, IndicatorMatchingEntities, PerVisualizer, StoreContext, VisualizableEntities,
 };
@@ -14,7 +14,12 @@ pub struct EntityOverrideContext {
 /// The `SpaceViewBlueprint` is the only thing that likely implements this today
 /// but we use a trait here so we don't have to pick up a full dependency on `re_viewport`.
 pub trait PropertyResolver {
-    fn update_overrides(&self, ctx: &StoreContext<'_>, query_result: &mut DataQueryResult);
+    fn update_overrides(
+        &self,
+        ctx: &StoreContext<'_>,
+        query: &LatestAtQuery,
+        query_result: &mut DataQueryResult,
+    );
 }
 
 /// The common trait implemented for data queries

crates/re_space_view/src/data_query_blueprint.rs

@@ -3,17 +3,18 @@ use slotmap::SlotMap;
 use smallvec::SmallVec;
 
 use re_entity_db::{
-    EntityDb, EntityProperties, EntityPropertiesComponent, EntityPropertyMap, EntityTree,
+    external::re_data_store::LatestAtQuery, EntityDb, EntityProperties, EntityPropertiesComponent,
+    EntityPropertyMap, EntityTree,
 };
 use re_log_types::{
-    path::RuleEffect, DataRow, EntityPath, EntityPathFilter, EntityPathRule, RowId, TimePoint,
+    path::RuleEffect, DataRow, EntityPath, EntityPathFilter, EntityPathRule, RowId,
 };
 use re_types_core::archetypes::Clear;
 use re_viewer_context::{
-    DataQueryId, DataQueryResult, DataResult, DataResultHandle, DataResultNode, DataResultTree,
-    IndicatorMatchingEntities, PerVisualizer, PropertyOverrides, SpaceViewClassIdentifier,
-    SpaceViewId, StoreContext, SystemCommand, SystemCommandSender as _, ViewSystemIdentifier,
-    ViewerContext, VisualizableEntities,
+    blueprint_timepoint, DataQueryId, DataQueryResult, DataResult, DataResultHandle,
+    DataResultNode, DataResultTree, IndicatorMatchingEntities, PerVisualizer, PropertyOverrides,
+    SpaceViewClassIdentifier, SpaceViewId, StoreContext, SystemCommand, SystemCommandSender as _,
+    ViewSystemIdentifier, ViewerContext, VisualizableEntities,
 };
 
 use crate::{
@@ -66,11 +67,12 @@ impl DataQueryBlueprint {
     pub fn try_from_db(
         id: DataQueryId,
         blueprint_db: &EntityDb,
+        query: &LatestAtQuery,
         space_view_class_identifier: SpaceViewClassIdentifier,
     ) -> Option<Self> {
         let expressions = blueprint_db
             .store()
-            .query_timeless_component::<QueryExpressions>(&id.as_entity_path())
+            .query_latest_component::<QueryExpressions>(&id.as_entity_path(), query)
             .map(|c| c.value)?;
 
         let entity_path_filter = EntityPathFilter::from(&expressions);
@@ -128,7 +130,7 @@ impl DataQueryBlueprint {
     }
 
     fn save_expressions(&self, ctx: &ViewerContext<'_>, entity_path_filter: &EntityPathFilter) {
-        let timepoint = TimePoint::timeless();
+        let timepoint = blueprint_timepoint();
 
         let expressions_component = QueryExpressions::from(entity_path_filter);
 
@@ -351,24 +353,36 @@ impl DataQueryPropertyResolver<'_> {
     ///  may include properties from the `SpaceView` or `DataQuery`.
     ///  - The individual overrides are found by walking an override subtree under the `data_query/<id>/individual_overrides`
     ///  - The group overrides are found by walking an override subtree under the `data_query/<id>/group_overrides`
-    fn build_override_context(&self, ctx: &StoreContext<'_>) -> EntityOverrideContext {
+    fn build_override_context(
+        &self,
+        ctx: &StoreContext<'_>,
+        query: &LatestAtQuery,
+    ) -> EntityOverrideContext {
         re_tracing::profile_function!();
 
         let mut root: EntityProperties = Default::default();
         for prefix in &self.default_stack {
             if let Some(overrides) = ctx
                 .blueprint
                 .store()
-                .query_timeless_component::<EntityPropertiesComponent>(prefix)
+                .query_latest_component::<EntityPropertiesComponent>(prefix, query)
             {
                 root = root.with_child(&overrides.value.0);
             }
         }
 
         EntityOverrideContext {
             root,
-            individual: self.resolve_entity_overrides_for_path(ctx, &self.individual_override_root),
-            group: self.resolve_entity_overrides_for_path(ctx, &self.recursive_override_root),
+            individual: self.resolve_entity_overrides_for_path(
+                ctx,
+                query,
+                &self.individual_override_root,
+            ),
+            group: self.resolve_entity_overrides_for_path(
+                ctx,
+                query,
+                &self.recursive_override_root,
+            ),
         }
     }
 
@@ -381,6 +395,7 @@ impl DataQueryPropertyResolver<'_> {
     fn resolve_entity_overrides_for_path(
         &self,
         ctx: &StoreContext<'_>,
+        query: &LatestAtQuery,
         override_root: &EntityPath,
     ) -> EntityPropertyMap {
         re_tracing::profile_function!();
@@ -392,7 +407,7 @@ impl DataQueryPropertyResolver<'_> {
             tree.visit_children_recursively(&mut |path: &EntityPath| {
                 if let Some(props) = blueprint
                     .store()
-                    .query_timeless_component_quiet::<EntityPropertiesComponent>(path)
+                    .query_latest_component_quiet::<EntityPropertiesComponent>(path, query)
                 {
                     let overridden_path =
                         EntityPath::from(&path.as_slice()[override_root.len()..path.len()]);
@@ -473,9 +488,14 @@ impl DataQueryPropertyResolver<'_> {
 
 impl<'a> PropertyResolver for DataQueryPropertyResolver<'a> {
     /// Recursively walk the [`DataResultTree`] and update the [`PropertyOverrides`] for each node.
-    fn update_overrides(&self, ctx: &StoreContext<'_>, query_result: &mut DataQueryResult) {
+    fn update_overrides(
+        &self,
+        ctx: &StoreContext<'_>,
+        query: &LatestAtQuery,
+        query_result: &mut DataQueryResult,
+    ) {
         re_tracing::profile_function!();
-        let entity_overrides = self.build_override_context(ctx);
+        let entity_overrides = self.build_override_context(ctx, query);
 
         if let Some(root) = query_result.tree.root_handle() {
             self.update_overrides_recursive(

crates/re_space_view_spatial/src/contexts/depth_offsets.rs

@@ -49,10 +49,9 @@ impl ViewContextSystem for EntityDepthOffsets {
         // Use a BTreeSet for entity hashes to get a stable order.
         let mut entities_per_draw_order = BTreeMap::<DrawOrder, BTreeSet<DrawOrderTarget>>::new();
         for data_result in query.iter_visible_data_results(Self::identifier()) {
-            if let Some(draw_order) = store.query_latest_component::<DrawOrder>(
-                &data_result.entity_path,
-                &ctx.rec_cfg.time_ctrl.read().current_query(),
-            ) {
+            if let Some(draw_order) = store
+                .query_latest_component::<DrawOrder>(&data_result.entity_path, &ctx.current_query())
+            {
                 entities_per_draw_order
                     .entry(draw_order.value)
                     .or_default()

crates/re_space_view_spatial/src/contexts/transform_context.rs

@@ -114,7 +114,7 @@ impl ViewContextSystem for TransformContext {
             return;
         };
 
-        let time_query = ctx.rec_cfg.time_ctrl.read().current_query();
+        let time_query = ctx.current_query();
 
         // Child transforms of this space
         self.gather_descendants_transforms(