Use egui_kittest for the graph view (#8578)

Co-authored-by: Andreas Reich <[email protected]> Co-authored-by: Andreas Reich <[email protected]> Co-authored-by: Andreas Reich <[email protected]>
rerun-io · Jan 7, 2025 · f294dbe · f294dbe
1 parent 86fc098
commit f294dbe
Show file tree

Hide file tree

Showing 24 changed files with 390 additions and 141 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -6668,10 +6668,12 @@ version = "0.22.0-alpha.1+dev"
 dependencies = [
  "ahash",
  "egui",
+ "egui_kittest",
  "fjadra",
  "itertools 0.13.0",
  "nohash-hasher",
  "re_chunk",
+ "re_chunk_store",
  "re_data_ui",
  "re_entity_db",
  "re_format",
@@ -6684,6 +6686,7 @@ dependencies = [
  "re_ui",
  "re_view",
  "re_viewer_context",
+ "re_viewport",
  "re_viewport_blueprint",
 ]
 

diff --git a/crates/store/re_dataframe/src/query.rs b/crates/store/re_dataframe/src/query.rs
@@ -167,7 +167,10 @@ impl<E: StorageEngineLike> QueryHandle<E> {
         re_tracing::profile_scope!("init");
 
         // The timeline doesn't matter if we're running in static-only mode.
-        let filtered_index = self.query.filtered_index.unwrap_or_default();
+        let filtered_index = self
+            .query
+            .filtered_index
+            .unwrap_or_else(|| Timeline::new_sequence(""));
 
         // 1. Compute the schema for the query.
         let view_contents = store.schema_for_query(&self.query);
@@ -332,8 +335,10 @@ impl<E: StorageEngineLike> QueryHandle<E> {
                 .map(|(_view_idx, descr)| match descr {
                     ColumnDescriptor::Time(_) => None,
                     ColumnDescriptor::Component(descr) => {
-                        let query =
-                            re_chunk::LatestAtQuery::new(Timeline::default(), TimeInt::STATIC);
+                        let query = re_chunk::LatestAtQuery::new(
+                            Timeline::new_sequence(""),
+                            TimeInt::STATIC,
+                        );
 
                         let results = cache.latest_at(
                             &query,

diff --git a/crates/store/re_log_types/src/time_point/timeline.rs b/crates/store/re_log_types/src/time_point/timeline.rs
@@ -7,12 +7,6 @@ re_string_interner::declare_new_type!(
     pub struct TimelineName;
 );
 
-impl Default for TimelineName {
-    fn default() -> Self {
-        Self::from(String::default())
-    }
-}
-
 // ----------------------------------------------------------------------------
 
 /// A time frame/space, e.g. `log_time` or `frame_nr`, coupled with the type of time
@@ -27,15 +21,6 @@ pub struct Timeline {
     typ: TimeType,
 }
 
-impl Default for Timeline {
-    fn default() -> Self {
-        Self {
-            name: TimelineName::default(),
-            typ: TimeType::Sequence,
-        }
-    }
-}
-
 impl Timeline {
     /// For absolute or relative time.
     #[inline]

diff --git a/crates/viewer/re_view_dataframe/src/dataframe_ui.rs b/crates/viewer/re_view_dataframe/src/dataframe_ui.rs
@@ -9,7 +9,7 @@ use itertools::Itertools;
 use re_chunk_store::{ColumnDescriptor, LatestAtQuery};
 use re_dataframe::external::re_query::StorageEngineArcReadGuard;
 use re_dataframe::QueryHandle;
-use re_log_types::{EntityPath, TimeInt, Timeline, TimelineName};
+use re_log_types::{EntityPath, TimeInt, TimeType, Timeline, TimelineName};
 use re_types_core::ComponentName;
 use re_ui::UiExt as _;
 use re_viewer_context::{SystemCommandSender, ViewId, ViewerContext};
@@ -203,7 +203,11 @@ impl egui_table::TableDelegate for DataframeTableDelegate<'_> {
         re_tracing::profile_function!();
 
         // TODO(ab): actual static-only support
-        let filtered_index = self.query_handle.query().filtered_index.unwrap_or_default();
+        let filtered_index = self
+            .query_handle
+            .query()
+            .filtered_index
+            .unwrap_or_else(|| Timeline::new("", TimeType::Sequence));
 
         self.query_handle
             .seek_to_row(info.visible_rows.start as usize);
@@ -270,8 +274,11 @@ impl egui_table::TableDelegate for DataframeTableDelegate<'_> {
                     let column = &self.selected_columns[cell.col_range.start];
 
                     // TODO(ab): actual static-only support
-                    let filtered_index =
-                        self.query_handle.query().filtered_index.unwrap_or_default();
+                    let filtered_index = self
+                        .query_handle
+                        .query()
+                        .filtered_index
+                        .unwrap_or_else(|| Timeline::new("", TimeType::Sequence));
 
                     // if this column can actually be hidden, then that's the corresponding action
                     let hide_action = match column {
@@ -396,7 +403,11 @@ impl egui_table::TableDelegate for DataframeTableDelegate<'_> {
             .unwrap_or(TimeInt::MAX);
 
         // TODO(ab): actual static-only support
-        let filtered_index = self.query_handle.query().filtered_index.unwrap_or_default();
+        let filtered_index = self
+            .query_handle
+            .query()
+            .filtered_index
+            .unwrap_or_else(|| Timeline::new("", TimeType::Sequence));
         let latest_at_query = LatestAtQuery::new(filtered_index, timestamp);
 
         if ui.is_sizing_pass() {

diff --git a/crates/viewer/re_view_graph/Cargo.toml b/crates/viewer/re_view_graph/Cargo.toml
@@ -39,3 +39,8 @@ egui.workspace = true
 fjadra.workspace = true
 itertools.workspace = true
 nohash-hasher.workspace = true
+
+[dev-dependencies]
+egui_kittest.workspace = true
+re_chunk_store.workspace = true
+re_viewport.workspace = true
diff --git a/crates/viewer/re_view_graph/src/layout/geometry.rs b/crates/viewer/re_view_graph/src/layout/geometry.rs
@@ -39,7 +39,6 @@ impl EdgeGeometry {
     }
 
     /// The starting position of an edge.
-    #[expect(unused)]
     pub fn source_pos(&self) -> Pos2 {
         match self.path {
             PathGeometry::Line { source, .. } | PathGeometry::CubicBezier { source, .. } => source,
@@ -54,7 +53,6 @@ impl EdgeGeometry {
     }
 
     /// The direction of the edge at the source node (normalized).
-    #[expect(unused)]
     pub fn source_arrow_direction(&self) -> Vec2 {
         use PathGeometry::{CubicBezier, Line};
         match self.path {

diff --git a/crates/viewer/re_view_graph/src/layout/result.rs b/crates/viewer/re_view_graph/src/layout/result.rs
@@ -41,7 +41,6 @@ impl Layout {
     }
 
     /// Gets the shape of an edge in the final layout.
-    #[expect(unused)]
     pub fn get_edge(&self, edge: &EdgeId) -> Option<&[EdgeGeometry]> {
         self.edges.get(edge).map(|es| es.as_slice())
     }

diff --git a/crates/viewer/re_view_graph/src/lib.rs b/crates/viewer/re_view_graph/src/lib.rs
@@ -9,4 +9,5 @@ mod ui;
 mod view;
 mod visualizers;
 
+pub use ui::GraphViewState;
 pub use view::GraphView;
diff --git a/crates/viewer/re_view_graph/src/visualizers/edges.rs b/crates/viewer/re_view_graph/src/visualizers/edges.rs
@@ -16,7 +16,7 @@ pub struct EdgesVisualizer {
 
 pub struct EdgeInstance {
     // We will need this in the future, when we want to select individual edges.
-    pub _instance: Instance,
+    pub instance: Instance,
     pub source: components::GraphNode,
     pub target: components::GraphNode,
     pub source_index: NodeId,
@@ -86,7 +86,7 @@ impl VisualizerSystem for EdgesVisualizer {
                         let target_index = NodeId::from_entity_node(entity_path, &target);
 
                         EdgeInstance {
-                            _instance: Instance::from(i as u64),
+                            instance: Instance::from(i as u64),
                             source,
                             target,
                             source_index,