Separate crate for bar chart space view

Cargo.toml

@@ -45,9 +45,10 @@ re_sdk = { path = "crates/re_sdk", version = "0.7.0-alpha.0", default-features =
 re_sdk_comms = { path = "crates/re_sdk_comms", version = "0.7.0-alpha.0", default-features = false }
 re_smart_channel = { path = "crates/re_smart_channel", version = "0.7.0-alpha.0", default-features = false }
 re_space_view = { path = "crates/re_space_view", version = "0.7.0-alpha.0", default-features = false }
+re_space_view_bar_chart = { path = "crates/re_space_view_bar_chart", version = "0.7.0-alpha.0", default-features = false }
+re_space_view_spatial = { path = "crates/re_space_view_spatial", version = "0.7.0-alpha.0", default-features = false }
 re_space_view_text = { path = "crates/re_space_view_text", version = "0.7.0-alpha.0", default-features = false }
 re_space_view_text_box = { path = "crates/re_space_view_text_box", version = "0.7.0-alpha.0", default-features = false }
-re_space_view_spatial = { path = "crates/re_space_view_spatial", version = "0.7.0-alpha.0", default-features = false }
 re_string_interner = { path = "crates/re_string_interner", version = "0.7.0-alpha.0", default-features = false }
 re_tensor_ops = { path = "crates/re_tensor_ops", version = "0.7.0-alpha.0", default-features = false }
 re_time_panel = { path = "crates/re_time_panel", version = "=0.7.0-alpha.0", default-features = false }

crates/re_space_view/Cargo.toml

@@ -17,14 +17,10 @@ all-features = true
 
 [dependencies]
 re_data_store.workspace = true
-re_log_types.workspace = true
-re_renderer.workspace = true
 re_tracing.workspace = true
 re_viewer_context.workspace = true
 
-ahash.workspace = true
 egui.workspace = true
-lazy_static.workspace = true
 nohash-hasher.workspace = true
 serde = "1.0"
 slotmap.workspace = true

crates/re_space_view_bar_chart/Cargo.toml

@@ -0,0 +1,31 @@
+[package]
+authors.workspace = true
+description = "A Space View that shows a single bar chart."
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+name = "re_space_view_bar_chart"
+publish = true
+readme = "README.md"
+repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+re_arrow_store.workspace = true
+re_components.workspace = true
+re_data_store.workspace = true
+re_log_types.workspace = true
+re_log.workspace = true
+re_renderer.workspace = true
+re_space_view.workspace = true
+re_tracing.workspace = true
+re_ui.workspace = true
+re_viewer_context.workspace = true
+
+egui.workspace = true
+vec1.workspace = true

crates/re_space_view_bar_chart/README.md

@@ -0,0 +1,11 @@
+# re_space_view_bar_chart
+
+Part of the [`rerun`](https://github.com/rerun-io/rerun) family of crates.
+
+[![Latest version](https://img.shields.io/crates/v/re_space_view_bar_chart.svg)](https://crates.io/crates/re_space_view_bar_chart)
+[![Documentation](https://docs.rs/re_space_view_bar_chart/badge.svg)](https://docs.rs/re_space_view_bar_chart)
+![MIT](https://img.shields.io/badge/license-MIT-blue.svg)
+![Apache](https://img.shields.io/badge/license-Apache-blue.svg)
+
+A Space View that shows a single bar chart.
+

crates/re_space_view_bar_chart/src/lib.rs

@@ -0,0 +1,8 @@
+//! Rerun bar chart Space View.
+//!
+//! A Space View that shows a single bar chart.
+
+mod scene_part;
+mod space_view_class;
+
+pub use space_view_class::BarChartSpaceView;

crates/re_viewport/src/view_bar_chart/scene.rs → crates/re_space_view_bar_chart/src/scene_part.rs

@@ -3,22 +3,32 @@ use std::collections::BTreeMap;
 use re_arrow_store::LatestAtQuery;
 use re_components::Tensor;
 use re_data_store::EntityPath;
-use re_viewer_context::{SceneQuery, ViewerContext};
+use re_log_types::Component as _;
+use re_viewer_context::{
+    ArchetypeDefinition, ScenePart, SceneQuery, SpaceViewClass, SpaceViewHighlights, ViewerContext,
+};
+
+use crate::BarChartSpaceView;
 
 /// A bar chart scene, with everything needed to render it.
 #[derive(Default)]
 pub struct SceneBarChart {
     pub charts: BTreeMap<EntityPath, Tensor>,
 }
 
-impl SceneBarChart {
-    pub(crate) fn load(&mut self, ctx: &mut ViewerContext<'_>, query: &SceneQuery<'_>) {
-        re_tracing::profile_function!();
-
-        self.load_tensors(ctx, query);
+impl ScenePart<BarChartSpaceView> for SceneBarChart {
+    fn archetype(&self) -> ArchetypeDefinition {
+        vec1::vec1![Tensor::name()]
     }
 
-    fn load_tensors(&mut self, ctx: &mut ViewerContext<'_>, query: &SceneQuery<'_>) {
+    fn populate(
+        &mut self,
+        ctx: &mut ViewerContext<'_>,
+        query: &SceneQuery<'_>,
+        _state: &<BarChartSpaceView as SpaceViewClass>::State,
+        _scene_context: &<BarChartSpaceView as SpaceViewClass>::Context,
+        _highlights: &SpaceViewHighlights,
+    ) -> Vec<re_renderer::QueueableDrawData> {
         re_tracing::profile_function!();
 
         let store = &ctx.store_db.entity_db.data_store;
@@ -37,5 +47,7 @@ impl SceneBarChart {
                 }
             }
         }
+
+        Vec::new()
     }
 }

crates/re_space_view_bar_chart/src/space_view_class.rs

@@ -0,0 +1,150 @@
+use egui::util::hash;
+use re_components::TensorData;
+use re_log_types::EntityPath;
+use re_space_view::{controls, EmptySpaceViewState};
+use re_viewer_context::{
+    auto_color, SpaceViewClass, SpaceViewClassName, SpaceViewId, TypedScene, ViewerContext,
+};
+
+use super::scene_part::SceneBarChart;
+
+#[derive(Default)]
+pub struct BarChartSpaceView;
+
+impl SpaceViewClass for BarChartSpaceView {
+    type State = EmptySpaceViewState;
+    type Context = re_space_view::EmptySceneContext;
+    type SceneParts = SceneBarChart;
+    type ScenePartData = ();
+
+    fn name(&self) -> SpaceViewClassName {
+        "Bar Chart".into()
+    }
+
+    fn icon(&self) -> &'static re_ui::Icon {
+        &re_ui::icons::SPACE_VIEW_HISTOGRAM
+    }
+
+    fn help_text(&self, re_ui: &re_ui::ReUi, _state: &Self::State) -> egui::WidgetText {
+        let mut layout = re_ui::LayoutJobBuilder::new(re_ui);
+
+        layout.add("Pan by dragging, or scroll (+ ");
+        layout.add(controls::HORIZONTAL_SCROLL_MODIFIER);
+        layout.add(" for horizontal).\n");
+
+        layout.add("Zoom with pinch gesture or scroll + ");
+        layout.add(controls::ZOOM_SCROLL_MODIFIER);
+        layout.add(".\n");
+
+        layout.add("Drag ");
+        layout.add(controls::SELECTION_RECT_ZOOM_BUTTON);
+        layout.add(" to zoom in/out using a selection.\n\n");
+
+        layout.add_button_text("double-click");
+        layout.add(" to reset the view.");
+
+        layout.layout_job.into()
+    }
+
+    fn preferred_tile_aspect_ratio(&self, _state: &Self::State) -> Option<f32> {
+        None
+    }
+
+    fn selection_ui(
+        &self,
+        _ctx: &mut ViewerContext<'_>,
+        _ui: &mut egui::Ui,
+        _state: &mut Self::State,
+        _space_origin: &EntityPath,
+        _space_view_id: SpaceViewId,
+    ) {
+    }
+
+    fn ui(
+        &self,
+        _ctx: &mut ViewerContext<'_>,
+        ui: &mut egui::Ui,
+        _state: &mut Self::State,
+        scene: &mut TypedScene<Self>,
+        _space_origin: &EntityPath,
+        _space_view_id: SpaceViewId,
+    ) {
+        use egui::plot::{Bar, BarChart, Legend, Plot};
+
+        ui.scope(|ui| {
+            Plot::new("bar_chart_plot")
+                .legend(Legend::default())
+                .clamp_grid(true)
+                .show(ui, |plot_ui| {
+                    fn create_bar_chart<N: Into<f64>>(
+                        ent_path: &EntityPath,
+                        values: impl Iterator<Item = N>,
+                    ) -> BarChart {
+                        let color = auto_color(hash(ent_path) as _);
+                        let fill = color.gamma_multiply(0.75).additive(); // make sure overlapping bars are obvious
+                        BarChart::new(
+                            values
+                                .enumerate()
+                                .map(|(i, value)| {
+                                    Bar::new(i as f64 + 0.5, value.into())
+                                        .width(0.95)
+                                        .name(format!("{ent_path} #{i}"))
+                                        .fill(fill)
+                                        .stroke(egui::Stroke::NONE)
+                                })
+                                .collect(),
+                        )
+                        .name(ent_path.to_string())
+                        .color(color)
+                    }
+
+                    for (ent_path, tensor) in &scene.parts.charts {
+                        let chart = match &tensor.data {
+                            TensorData::U8(data) => {
+                                create_bar_chart(ent_path, data.iter().copied())
+                            }
+                            TensorData::U16(data) => {
+                                create_bar_chart(ent_path, data.iter().copied())
+                            }
+                            TensorData::U32(data) => {
+                                create_bar_chart(ent_path, data.iter().copied())
+                            }
+                            TensorData::U64(data) => {
+                                create_bar_chart(ent_path, data.iter().copied().map(|v| v as f64))
+                            }
+                            TensorData::I8(data) => {
+                                create_bar_chart(ent_path, data.iter().copied())
+                            }
+                            TensorData::I16(data) => {
+                                create_bar_chart(ent_path, data.iter().copied())
+                            }
+                            TensorData::I32(data) => {
+                                create_bar_chart(ent_path, data.iter().copied())
+                            }
+                            TensorData::I64(data) => {
+                                create_bar_chart(ent_path, data.iter().copied().map(|v| v as f64))
+                            }
+                            TensorData::F16(data) => {
+                                create_bar_chart(ent_path, data.iter().map(|f| f.to_f32()))
+                            }
+                            TensorData::F32(data) => {
+                                create_bar_chart(ent_path, data.iter().copied())
+                            }
+                            TensorData::F64(data) => {
+                                create_bar_chart(ent_path, data.iter().copied())
+                            }
+                            TensorData::JPEG(_) => {
+                                re_log::warn_once!(
+                                    "trying to display JPEG data as a bar chart ({:?})",
+                                    ent_path
+                                );
+                                continue;
+                            }
+                        };
+
+                        plot_ui.bar_chart(chart);
+                    }
+                });
+        });
+    }
+}

crates/re_space_view_text/src/lib.rs

@@ -1,4 +1,4 @@
-//! Rerun Text Space Views
+//! Rerun text Space View
 //!
 //! A Space View that shows text entries in a table and scrolls with the active time.
 

crates/re_space_view_text/src/scene_part.rs

@@ -3,8 +3,7 @@ use re_data_store::EntityPath;
 use re_log_types::{Component as _, InstanceKey, RowId};
 use re_query::{range_entity_with_primary, QueryError};
 use re_viewer_context::{
-    ArchetypeDefinition, ScenePart, ScenePartCollection, SceneQuery, SpaceViewClass,
-    SpaceViewHighlights, ViewerContext,
+    ArchetypeDefinition, ScenePart, SceneQuery, SpaceViewClass, SpaceViewHighlights, ViewerContext,
 };
 
 use crate::TextSpaceView;
@@ -32,16 +31,6 @@ pub struct SceneText {
     pub text_entries: Vec<TextEntry>,
 }
 
-impl ScenePartCollection<TextSpaceView> for SceneText {
-    fn vec_mut(&mut self) -> Vec<&mut dyn ScenePart<TextSpaceView>> {
-        vec![self]
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-}
-
 impl ScenePart<TextSpaceView> for SceneText {
     fn archetype(&self) -> ArchetypeDefinition {
         vec1::vec1![re_components::TextEntry::name()]

crates/re_space_view_text_box/src/scene_part.rs

@@ -2,8 +2,7 @@ use re_arrow_store::LatestAtQuery;
 use re_components::Component;
 use re_query::{query_entity_with_primary, QueryError};
 use re_viewer_context::{
-    ArchetypeDefinition, ScenePart, ScenePartCollection, SceneQuery, SpaceViewClass,
-    SpaceViewHighlights, ViewerContext,
+    ArchetypeDefinition, ScenePart, SceneQuery, SpaceViewClass, SpaceViewHighlights, ViewerContext,
 };
 
 use crate::TextBoxSpaceView;
@@ -21,16 +20,6 @@ pub struct SceneTextBox {
     pub text_entries: Vec<TextBoxEntry>,
 }
 
-impl ScenePartCollection<TextBoxSpaceView> for SceneTextBox {
-    fn vec_mut(&mut self) -> Vec<&mut dyn ScenePart<TextBoxSpaceView>> {
-        vec![self]
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-}
-
 impl ScenePart<TextBoxSpaceView> for SceneTextBox {
     fn archetype(&self) -> ArchetypeDefinition {
         vec1::vec1![re_components::TextBox::name()]