Renames in dataframe view code

rerun-io · Oct 2, 2024 · 2136320 · 2136320
1 parent 92ace6d
commit 2136320
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/crates/viewer/re_space_view_dataframe/src/lib.rs b/crates/viewer/re_space_view_dataframe/src/lib.rs
@@ -6,7 +6,7 @@ mod dataframe_ui;
 mod display_record_batch;
 mod expanded_rows;
 mod space_view_class;
-mod view_query_v2;
+mod view_query;
 mod visualizer_system;
 
 pub use space_view_class::DataframeSpaceView;
diff --git a/crates/viewer/re_space_view_dataframe/src/space_view_class.rs b/crates/viewer/re_space_view_dataframe/src/space_view_class.rs
@@ -1,7 +1,7 @@
 use std::any::Any;
 
 use crate::{
-    dataframe_ui::dataframe_ui, expanded_rows::ExpandedRowsCache, view_query_v2,
+    dataframe_ui::dataframe_ui, expanded_rows::ExpandedRowsCache, view_query,
     visualizer_system::EmptySystem,
 };
 use re_chunk_store::{ColumnDescriptor, ComponentColumnSelector, SparseFillStrategy};
@@ -105,7 +105,7 @@ mode sets the default time range to _everything_. You can override this in the s
         space_view_id: SpaceViewId,
     ) -> Result<(), SpaceViewSystemExecutionError> {
         let state = state.downcast_mut::<DataframeSpaceViewState>()?;
-        let view_query = view_query_v2::QueryV2::from_blueprint(ctx, space_view_id);
+        let view_query = view_query::Query::from_blueprint(ctx, space_view_id);
         let Some(schema) = &state.schema else {
             // Shouldn't happen, except maybe on the first frame, which is too early
             // for the user to click the menu anyway.
@@ -125,7 +125,7 @@ mode sets the default time range to _everything_. You can override this in the s
         re_tracing::profile_function!();
 
         let state = state.downcast_mut::<DataframeSpaceViewState>()?;
-        let view_query = view_query_v2::QueryV2::from_blueprint(ctx, query.space_view_id);
+        let view_query = view_query::Query::from_blueprint(ctx, query.space_view_id);
 
         let query_engine = re_dataframe2::QueryEngine {
             store: ctx.recording().store(),

diff --git a/...taframe/src/view_query_v2/blueprint_io.rs → ..._dataframe/src/view_query/blueprint_io.rs b/...taframe/src/view_query_v2/blueprint_io.rs → ..._dataframe/src/view_query/blueprint_io.rs
@@ -1,14 +1,14 @@
 use std::collections::HashSet;
 
 use crate::dataframe_ui::HideColumnAction;
-use crate::view_query_v2::QueryV2;
+use crate::view_query::Query;
 use re_chunk_store::{ColumnDescriptor, ColumnSelector};
 use re_log_types::{EntityPath, ResolvedTimeRange, TimelineName};
 use re_types::blueprint::{components, datatypes};
 use re_viewer_context::{SpaceViewSystemExecutionError, ViewerContext};
 
 // Accessors wrapping reads/writes to the blueprint store.
-impl QueryV2 {
+impl Query {
     /// Get the query timeline.
     ///
     /// This tries to read the timeline name from the blueprint. If missing or invalid, the current

diff --git a/...e_view_dataframe/src/view_query_v2/mod.rs → ...pace_view_dataframe/src/view_query/mod.rs b/...e_view_dataframe/src/view_query_v2/mod.rs → ...pace_view_dataframe/src/view_query/mod.rs
@@ -7,11 +7,11 @@ use re_viewer_context::{SpaceViewId, SpaceViewSystemExecutionError, ViewerContex
 use re_viewport_blueprint::ViewProperty;
 
 /// Wrapper over the `DataframeQuery` blueprint archetype that can also display some UI.
-pub(crate) struct QueryV2 {
+pub(crate) struct Query {
     query_property: ViewProperty,
 }
 
-impl QueryV2 {
+impl Query {
     /// Create a query object from the blueprint store.
     ///
     /// See the `blueprint_io` module for more related accessors.

diff --git a/...ce_view_dataframe/src/view_query_v2/ui.rs → ...space_view_dataframe/src/view_query/ui.rs b/...ce_view_dataframe/src/view_query_v2/ui.rs → ...space_view_dataframe/src/view_query/ui.rs
@@ -9,10 +9,10 @@ use re_types_core::{ComponentName, ComponentNameSet};
 use re_ui::{list_item, UiExt};
 use re_viewer_context::{SpaceViewId, SpaceViewSystemExecutionError, TimeDragValue, ViewerContext};
 
-use crate::view_query_v2::QueryV2;
+use crate::view_query::Query;
 
 // UI implementation
-impl QueryV2 {
+impl Query {
     pub(super) fn timeline_ui(
         &self,
         ctx: &ViewerContext<'_>,