move image ui to re_data_ui and re-enable data ui for tensors

Cargo.toml

@@ -86,6 +86,9 @@ polars-core = "0.27.1"
 polars-lazy = "0.27.1"
 polars-ops = "0.27.1"
 puffin = "0.14"
+rfd = { version = "0.11.3", default_features = false, features = [
+  "xdg-portal",
+] }
 slotmap = { version = "1.0.6", features = ["serde"] }
 smallvec = { version = "1.0", features = ["const_generics", "union"] }
 thiserror = "1.0"

crates/re_data_ui/Cargo.toml

@@ -18,6 +18,7 @@ all-features = true
 [dependencies]
 re_arrow_store.workspace = true
 re_data_store.workspace = true
+re_error.workspace = true
 re_format.workspace = true
 re_log_types.workspace = true
 re_log.workspace = true
@@ -27,10 +28,13 @@ re_ui.workspace = true
 re_viewer_context.workspace = true
 
 anyhow.workspace = true
+bytemuck.workspace = true
 egui_extras.workspace = true
 egui.workspace = true
+image.workspace = true
 itertools.workspace = true
 nohash-hasher.workspace = true
+rfd.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 puffin.workspace = true

crates/re_data_ui/src/component_ui_registry.rs

@@ -57,7 +57,7 @@ pub fn create_component_ui_registry() -> ComponentUiRegistry {
     // add::<re_log_types::component_types::Scalar>(&mut registry);
     // add::<re_log_types::component_types::ScalarPlotProps>(&mut registry);
     // add::<re_log_types::component_types::Size3D>(&mut registry);
-    // add::<re_log_types::component_types::Tensor>(&mut registry); // TODO:
+    add::<re_log_types::component_types::Tensor>(&mut registry);
     add::<re_log_types::component_types::TextEntry>(&mut registry);
     add::<re_log_types::component_types::Transform>(&mut registry);
     add::<re_log_types::component_types::Vec2D>(&mut registry);

crates/re_viewer/src/ui/image.rs → crates/re_data_ui/src/image.rs

@@ -1,7 +1,6 @@
 use egui::{Color32, Vec2};
 use itertools::Itertools as _;
 
-use re_data_ui::EntityDataUi;
 use re_log_types::{
     component_types::{ClassId, Tensor, TensorDataMeaning},
     DecodedTensor, TensorElement,
@@ -13,34 +12,35 @@ use re_viewer_context::{
     TensorStatsCache, UiVerbosity, ViewerContext,
 };
 
+use super::EntityDataUi;
+
 pub fn format_tensor_shape_single_line(
     shape: &[re_log_types::component_types::TensorDimension],
 ) -> String {
     format!("[{}]", shape.iter().join(", "))
 }
 
-// TODO:
-// impl EntityDataUi for Tensor {
-//     fn entity_data_ui(
-//         &self,
-//         ctx: &mut ViewerContext<'_>,
-//         ui: &mut egui::Ui,
-//         verbosity: UiVerbosity,
-//         entity_path: &re_log_types::EntityPath,
-//         query: &re_arrow_store::LatestAtQuery,
-//     ) {
-//         crate::profile_function!();
-
-//         match ctx.cache.entry::<TensorDecodeCache>().entry(self.clone()) {
-//             Ok(decoded) => {
-//                 tensor_ui(ctx, ui, verbosity, entity_path, query, self, &decoded);
-//             }
-//             Err(err) => {
-//                 ui.label(ctx.re_ui.error_text(err.to_string()));
-//             }
-//         }
-//     }
-// }
+impl EntityDataUi for Tensor {
+    fn entity_data_ui(
+        &self,
+        ctx: &mut ViewerContext<'_>,
+        ui: &mut egui::Ui,
+        verbosity: UiVerbosity,
+        entity_path: &re_log_types::EntityPath,
+        query: &re_arrow_store::LatestAtQuery,
+    ) {
+        crate::profile_function!();
+
+        match ctx.cache.entry::<TensorDecodeCache>().entry(self.clone()) {
+            Ok(decoded) => {
+                tensor_ui(ctx, ui, verbosity, entity_path, query, self, &decoded);
+            }
+            Err(err) => {
+                ui.label(ctx.re_ui.error_text(err.to_string()));
+            }
+        }
+    }
+}
 
 fn tensor_ui(
     ctx: &mut ViewerContext<'_>,
@@ -670,7 +670,7 @@ fn copy_and_save_image_ui(ui: &mut egui::Ui, tensor: &Tensor, _encoded_tensor: &
             match tensor.to_dynamic_image() {
                 Ok(dynamic_image) => {
                     let rgba = dynamic_image.to_rgba8();
-                    crate::misc::Clipboard::with(|clipboard| {
+                    re_viewer_context::Clipboard::with(|clipboard| {
                         clipboard.set_image(
                             [rgba.width() as _, rgba.height() as _],
                             bytemuck::cast_slice(rgba.as_raw()),

crates/re_data_ui/src/lib.rs

@@ -12,11 +12,16 @@ mod component_path;
 mod component_ui_registry;
 mod data;
 mod entity_path;
+mod image;
 mod instance_path;
 mod item;
 pub mod item_ui;
 mod log_msg;
 
+pub use crate::image::{
+    show_zoomed_image_region, show_zoomed_image_region_area_outline,
+    tensor_summary_ui_grid_contents,
+};
 pub use component_ui_registry::create_component_ui_registry;
 
 /// Types implementing [`DataUi`] can display themselves in an [`egui::Ui`].

crates/re_viewer/Cargo.toml

@@ -96,9 +96,7 @@ macaw = { workspace = true, features = ["with_serde"] }
 ndarray = "0.15"
 nohash-hasher = "0.2"
 poll-promise = "0.2"
-rfd = { version = "0.11.3", default_features = false, features = [
-  "xdg-portal",
-] }
+rfd.workspace = true
 serde = { version = "1", features = ["derive"] }
 slotmap.workspace = true
 smallvec = { workspace = true, features = ["serde"] }
@@ -110,9 +108,6 @@ wgpu.workspace = true
 
 # native dependencies:
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-arboard = { version = "3.2", default-features = false, features = [
-  "image-data",
-] }
 puffin_http = "0.11"
 puffin.workspace = true
 

crates/re_viewer/src/misc/mod.rs

@@ -9,15 +9,9 @@ mod transform_cache;
 
 pub mod instance_hash_conversions;
 
-#[cfg(not(target_arch = "wasm32"))]
-pub(crate) use clipboard::Clipboard;
-
 #[cfg(not(target_arch = "wasm32"))]
 pub(crate) mod profiler;
 
-#[cfg(not(target_arch = "wasm32"))]
-pub mod clipboard;
-
 pub use mesh_cache::MeshCache;
 pub use time_control_ui::TimeControlUi;
 pub use transform_cache::{TransformCache, UnreachableTransform};

crates/re_viewer/src/misc/profiler.rs

@@ -45,7 +45,7 @@ fn start_puffin_viewer() {
 
     if let Err(err) = child {
         let cmd = format!("cargo install puffin_viewer && puffin_viewer --url {url}",);
-        crate::misc::Clipboard::with(|cliboard| cliboard.set_text(cmd.clone()));
+        re_viewer_context::Clipboard::with(|clipboard| clipboard.set_text(cmd.clone()));
         re_log::warn!("Failed to start puffin_viewer: {err}. Try connecting manually with:  {cmd}");
 
         rfd::MessageDialog::new()

crates/re_viewer/src/ui/mod.rs

@@ -1,7 +1,6 @@
 mod auto_layout;
 mod blueprint;
 mod data_blueprint;
-mod image;
 mod selection_history_ui;
 mod space_view;
 mod space_view_entity_picker;

crates/re_viewer/src/ui/space_view.rs

@@ -110,7 +110,7 @@ impl SpaceView {
     fn handle_pending_screenshots(&self, data: &[u8], extent: glam::UVec2, mode: ScreenshotMode) {
         // Set to clipboard.
         #[cfg(not(target_arch = "wasm32"))]
-        crate::misc::Clipboard::with(|clipboard| {
+        re_viewer_context::Clipboard::with(|clipboard| {
             clipboard.set_image([extent.x as _, extent.y as _], data);
         });
         if mode == ScreenshotMode::CopyToClipboard {

crates/re_viewer/src/ui/view_spatial/scene/mod.rs

@@ -3,7 +3,6 @@ use std::sync::Arc;
 use ahash::HashMap;
 
 use re_data_store::{EntityPath, InstancePathHash};
-use re_data_ui::DataUi;
 use re_log_types::{
     component_types::{ClassId, InstanceKey, KeypointId},
     DecodedTensor,

crates/re_viewer/src/ui/view_spatial/scene/scene_part/points2d.rs

@@ -4,7 +4,7 @@ use re_log_types::{
     Component,
 };
 use re_query::{query_primary_with_history, EntityView, QueryError};
-use re_viewer_context::{DefaultColor, ResolvedAnnotationInfo, SceneQuery, ViewerContext};
+use re_viewer_context::{ResolvedAnnotationInfo, SceneQuery, ViewerContext};
 
 use crate::{
     misc::{SpaceViewHighlights, SpaceViewOutlineMasks, TransformCache},

crates/re_viewer/src/ui/view_spatial/ui.rs

@@ -4,6 +4,7 @@ use macaw::BoundingBox;
 
 use re_data_store::{query_latest_single, EditableAutoValue, EntityPath, EntityPropertyMap};
 use re_data_ui::{item_ui, DataUi};
+use re_data_ui::{show_zoomed_image_region, show_zoomed_image_region_area_outline};
 use re_format::format_f32;
 use re_log_types::component_types::{Tensor, TensorDataMeaning};
 use re_renderer::OutlineConfig;
@@ -15,10 +16,7 @@ use re_viewer_context::{
 use crate::{
     misc::{space_info::query_view_coordinates, SpaceViewHighlights},
     ui::{
-        data_blueprint::DataBlueprintTree,
-        image::{show_zoomed_image_region, show_zoomed_image_region_area_outline},
-        space_view::ScreenshotMode,
-        view_spatial::UiLabelTarget,
+        data_blueprint::DataBlueprintTree, space_view::ScreenshotMode, view_spatial::UiLabelTarget,
     },
 };
 

crates/re_viewer/src/ui/view_tensor/ui.rs

@@ -4,6 +4,7 @@ use eframe::emath::Align2;
 use egui::{epaint::TextShape, NumExt as _, Vec2};
 use ndarray::Axis;
 
+use re_data_ui::tensor_summary_ui_grid_contents;
 use re_log_types::{
     component_types::{self, Tensor},
     DecodedTensor,
@@ -12,8 +13,6 @@ use re_renderer::Colormap;
 use re_tensor_ops::dimension_mapping::{DimensionMapping, DimensionSelector};
 use re_viewer_context::{gpu_bridge, TensorStatsCache, ViewerContext};
 
-use crate::ui::image::tensor_summary_ui_grid_contents;
-
 use super::dimension_mapping_ui;
 
 // ---

crates/re_viewer_context/Cargo.toml

@@ -42,5 +42,9 @@ thiserror.workspace = true
 uuid = { version = "1.1", features = ["serde", "v4", "js"] }
 wgpu.workspace = true
 
+# Native only dependencies.
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+arboard = { version = "3.2", default-features = false, features = [
+  "image-data",
+] }
 puffin.workspace = true

crates/re_viewer_context/src/lib.rs

@@ -33,6 +33,11 @@ pub use time_control::{Looping, PlayState, TimeControl, TimeView};
 pub use utils::{auto_color, level_to_rich_text, DefaultColor};
 pub use viewer_context::{RecordingConfig, ViewerContext};
 
+#[cfg(not(target_arch = "wasm32"))]
+mod clipboard;
+#[cfg(not(target_arch = "wasm32"))]
+pub use clipboard::Clipboard;
+
 // ---------------------------------------------------------------------------
 
 /// A unique id for each space view.