Skip to content

Commit 09e309a

Browse files
authored
Require descriptor for all calls to RangeResultsExt::iter_as (#9920)
1 parent c24458f commit 09e309a

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

crates/viewer/re_view/src/results_ext.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,12 @@ pub trait RangeResultsExt {
243243
/// Call one of the following methods on the returned [`HybridResultsChunkIter`]:
244244
/// * [`HybridResultsChunkIter::slice`]
245245
/// * [`HybridResultsChunkIter::slice_from_struct_field`]
246-
// TODO(#6889): Take descriptor instead of name.
247246
fn iter_as(
248247
&self,
249248
timeline: TimelineName,
250-
component_descriptor: impl Into<MaybeTagged>,
249+
component_descriptor: ComponentDescriptor,
251250
) -> HybridResultsChunkIter<'_> {
252-
let component_descriptor = component_descriptor.into();
251+
let component_descriptor = MaybeTagged::Descriptor(component_descriptor);
253252
let chunks = self.get_optional_chunks(component_descriptor.clone());
254253
HybridResultsChunkIter {
255254
chunks,

crates/viewer/re_view_time_series/src/line_visualizer_system.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,12 @@ impl SeriesLineSystem {
304304
}
305305
}
306306

307-
let series_visibility = collect_series_visibility(&query, &results, num_series);
307+
let series_visibility = collect_series_visibility(
308+
&query,
309+
&results,
310+
num_series,
311+
archetypes::SeriesLines::descriptor_visible_series(),
312+
);
308313
let series_names = collect_series_name(self, &query_ctx, &results, num_series);
309314

310315
debug_assert_eq!(points_per_series.len(), series_names.len());
@@ -360,7 +365,7 @@ fn collect_recursive_clears(
360365

361366
cleared_indices.extend(
362367
results
363-
.iter_as(*query.timeline(), clear_descriptor.component_name) // TODO(#6889): Pass descriptor on.
368+
.iter_as(*query.timeline(), clear_descriptor.clone())
364369
.slice::<bool>()
365370
.filter_map(|(index, is_recursive_buffer)| {
366371
let is_recursive =

crates/viewer/re_view_time_series/src/point_visualizer_system.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,12 @@ impl SeriesPointSystem {
338338
}
339339
}
340340

341-
let series_visibility = collect_series_visibility(&query, &results, num_series);
341+
let series_visibility = collect_series_visibility(
342+
&query,
343+
&results,
344+
num_series,
345+
archetypes::SeriesPoints::descriptor_visible_series(),
346+
);
342347
let series_names = collect_series_name(self, &query_ctx, &results, num_series);
343348

344349
debug_assert_eq!(points_per_series.len(), series_names.len());

crates/viewer/re_view_time_series/src/series_query.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ use itertools::Itertools as _;
55
use re_chunk_store::RangeQuery;
66
use re_log_types::{EntityPath, TimeInt};
77
use re_types::external::arrow::datatypes::DataType as ArrowDatatype;
8-
use re_types::{components, Component as _, ComponentName, Loggable as _, RowId};
8+
use re_types::{
9+
components, Component as _, ComponentDescriptor, ComponentName, Loggable as _, RowId,
10+
};
911
use re_view::{clamped_or_nothing, ChunksWithDescriptor, HybridRangeResults, RangeResultsExt as _};
1012
use re_viewer_context::{auto_color_egui, QueryContext, TypedComponentFallbackProvider};
1113

@@ -33,9 +35,10 @@ pub fn collect_series_visibility(
3335
query: &RangeQuery,
3436
results: &HybridRangeResults<'_>,
3537
num_series: usize,
38+
visibility_descriptor: ComponentDescriptor,
3639
) -> Vec<bool> {
3740
results
38-
.iter_as(*query.timeline(), components::SeriesVisible::name())
41+
.iter_as(*query.timeline(), visibility_descriptor)
3942
.slice::<bool>()
4043
.next()
4144
.map_or_else(

0 commit comments

Comments
 (0)