Skip to content

Commit

Permalink
Moved [data_]label_for_ui_layout and table_for_ui_layout to `UiLa…
Browse files Browse the repository at this point in the history 
…yout` methods
  • Loading branch information
@abey79
abey79 committed May 20, 2024
1 parent 06573e2 commit e08c88a
Show file tree
Hide file tree
Showing 13 changed files with 144 additions and 150 deletions.
1 change: 1 addition & 0 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5058,6 +5058,7 @@ dependencies = [
"bytemuck",
"egui",
"egui-wgpu",
"egui_extras",
"egui_tiles",
"glam",
"half 2.3.1",
Expand Down
18 changes: 10 additions & 8 deletions crates/re_data_ui/src/annotation_context.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use re_types::datatypes::{
};
use re_viewer_context::{auto_color, UiLayout, ViewerContext};

use super::{data_label_for_ui_layout, label_for_ui_layout, table_for_ui_layout, DataUi};
use super::DataUi;

impl crate::EntityDataUi for re_types::components::ClassId {
fn entity_data_ui(
Expand All @@ -32,7 +32,7 @@ impl crate::EntityDataUi for re_types::components::ClassId {
text.push(' ');
text.push_str(label.as_str());
}
label_for_ui_layout(ui, ui_layout, text);
ui_layout.label(ui, text);
});

let id = self.0;
Expand All @@ -54,7 +54,7 @@ impl crate::EntityDataUi for re_types::components::ClassId {
}
}
} else {
label_for_ui_layout(ui, ui_layout, format!("{}", self.0));
ui_layout.label(ui, format!("{}", self.0));
}
}
}
Expand All @@ -79,10 +79,10 @@ impl crate::EntityDataUi for re_types::components::KeypointId {
text.push_str(label.as_str());
}

data_label_for_ui_layout(ui, ui_layout, text);
ui_layout.data_label(ui, text);
});
} else {
data_label_for_ui_layout(ui, ui_layout, format!("{}", self.0));
ui_layout.data_label(ui, format!("{}", self.0));
}
}
}
Expand Down Expand Up @@ -124,7 +124,7 @@ impl DataUi for AnnotationContext {
} else {
format!("{} classes", self.0.len())
};
label_for_ui_layout(ui, ui_layout, text);
ui_layout.label(ui, text);
}
UiLayout::SelectionPanelLimitHeight | UiLayout::SelectionPanelFull => {
ui.vertical(|ui| {
Expand Down Expand Up @@ -204,7 +204,8 @@ fn class_description_ui(
ui.push_id(format!("keypoints_connections_{}", id.0), |ui| {
use egui_extras::Column;

let table = table_for_ui_layout(ui_layout, ui)
let table = ui_layout
.table(ui)
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.column(Column::auto().clip(true).at_least(40.0))
.column(Column::auto().clip(true).at_least(40.0));
Expand Down Expand Up @@ -272,7 +273,8 @@ fn annotation_info_table_ui(

use egui_extras::Column;

let table = table_for_ui_layout(ui_layout, ui)
let table = ui_layout
.table(ui)
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.column(Column::auto()) // id
.column(Column::auto().clip(true).at_least(40.0)) // label
Expand Down
5 changes: 3 additions & 2 deletions crates/re_data_ui/src/component.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use re_types::ComponentName;
use re_ui::SyntaxHighlighting as _;
use re_viewer_context::{UiLayout, ViewerContext};

use super::{table_for_ui_layout, DataUi};
use super::DataUi;
use crate::item_ui;

/// All the values of a specific [`re_log_types::ComponentPath`].
Expand Down Expand Up @@ -139,7 +139,8 @@ impl DataUi for EntityLatestAtResults {
} else if one_line {
ui.label(format!("{} values", re_format::format_uint(num_instances)));
} else {
table_for_ui_layout(ui_layout, ui)
ui_layout
.table(ui)
.resizable(false)
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.column(egui_extras::Column::auto())
Expand Down
10 changes: 5 additions & 5 deletions crates/re_data_ui/src/component_ui_registry.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use re_viewer_context::{ComponentUiRegistry, UiLayout, ViewerContext};

use crate::editors::register_editors;

use super::{data_label_for_ui_layout, EntityDataUi};
use super::EntityDataUi;

pub fn create_component_ui_registry() -> ComponentUiRegistry {
re_tracing::profile_function!();
Expand Down Expand Up @@ -90,14 +90,14 @@ fn arrow_ui(ui: &mut egui::Ui, ui_layout: UiLayout, array: &dyn arrow2::array::A
if let Some(utf8) = array.as_any().downcast_ref::<Utf8Array<i32>>() {
if utf8.len() == 1 {
let string = utf8.value(0);
data_label_for_ui_layout(ui, ui_layout, string);
ui_layout.data_label(ui, string);
return;
}
}
if let Some(utf8) = array.as_any().downcast_ref::<Utf8Array<i64>>() {
if utf8.len() == 1 {
let string = utf8.value(0);
data_label_for_ui_layout(ui, ui_layout, string);
ui_layout.data_label(ui, string);
return;
}
}
Expand All @@ -108,7 +108,7 @@ fn arrow_ui(ui: &mut egui::Ui, ui_layout: UiLayout, array: &dyn arrow2::array::A
let mut string = String::new();
let display = arrow2::array::get_display(array, "null");
if display(&mut string, 0).is_ok() {
data_label_for_ui_layout(ui, ui_layout, &string);
ui_layout.data_label(ui, &string);
return;
}
}
Expand All @@ -121,7 +121,7 @@ fn arrow_ui(ui: &mut egui::Ui, ui_layout: UiLayout, array: &dyn arrow2::array::A

if data_type_formatted.len() < 20 {
// e.g. "4.2 KiB of Float32"
data_label_for_ui_layout(ui, ui_layout, &format!("{bytes} of {data_type_formatted}"));
ui_layout.data_label(ui, &format!("{bytes} of {data_type_formatted}"));
} else {
// Huge datatype, probably a union horror show
ui.label(format!("{bytes} of data"));
Expand Down
33 changes: 18 additions & 15 deletions crates/re_data_ui/src/data.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use re_format::format_f32;
use re_types::components::{Color, LineStrip2D, LineStrip3D, Range1D, Range2D, ViewCoordinates};
use re_viewer_context::{UiLayout, ViewerContext};

use super::{data_label_for_ui_layout, label_for_ui_layout, table_for_ui_layout, DataUi};
use super::DataUi;

/// Default number of ui points to show a number.
const DEFAULT_NUMBER_WIDTH: f32 = 52.0;
Expand Down Expand Up @@ -64,13 +64,14 @@ impl DataUi for ViewCoordinates {
) {
match ui_layout {
UiLayout::List => {
label_for_ui_layout(ui, ui_layout, self.describe_short())
ui_layout
.label(ui, self.describe_short())
.on_hover_text(self.describe());
}
UiLayout::SelectionPanelFull
| UiLayout::SelectionPanelLimitHeight
| UiLayout::Tooltip => {
label_for_ui_layout(ui, ui_layout, self.describe());
ui_layout.label(ui, self.describe());
}
}
}
Expand Down Expand Up @@ -113,7 +114,7 @@ impl DataUi for re_types::datatypes::Vec2D {
_query: &re_data_store::LatestAtQuery,
_db: &re_entity_db::EntityDb,
) {
data_label_for_ui_layout(ui, ui_layout, self.to_string());
ui_layout.data_label(ui, self.to_string());
}
}

Expand All @@ -126,7 +127,7 @@ impl DataUi for re_types::datatypes::Vec3D {
_query: &re_data_store::LatestAtQuery,
_db: &re_entity_db::EntityDb,
) {
data_label_for_ui_layout(ui, ui_layout, self.to_string());
ui_layout.data_label(ui, self.to_string());
}
}

Expand All @@ -139,7 +140,7 @@ impl DataUi for re_types::datatypes::Vec4D {
_query: &re_data_store::LatestAtQuery,
_db: &re_entity_db::EntityDb,
) {
data_label_for_ui_layout(ui, ui_layout, self.to_string());
ui_layout.data_label(ui, self.to_string());
}
}

Expand All @@ -152,7 +153,7 @@ impl DataUi for re_types::datatypes::UVec2D {
_query: &re_data_store::LatestAtQuery,
_db: &re_entity_db::EntityDb,
) {
data_label_for_ui_layout(ui, ui_layout, self.to_string());
ui_layout.data_label(ui, self.to_string());
}
}

Expand All @@ -165,7 +166,7 @@ impl DataUi for re_types::datatypes::UVec3D {
_query: &re_data_store::LatestAtQuery,
_db: &re_entity_db::EntityDb,
) {
data_label_for_ui_layout(ui, ui_layout, self.to_string());
ui_layout.data_label(ui, self.to_string());
}
}

Expand All @@ -178,7 +179,7 @@ impl DataUi for re_types::datatypes::UVec4D {
_query: &re_data_store::LatestAtQuery,
_db: &re_entity_db::EntityDb,
) {
data_label_for_ui_layout(ui, ui_layout, self.to_string());
ui_layout.data_label(ui, self.to_string());
}
}

Expand All @@ -191,7 +192,7 @@ impl DataUi for Range1D {
_query: &LatestAtQuery,
_db: &EntityDb,
) {
data_label_for_ui_layout(ui, ui_layout, self.to_string());
ui_layout.data_label(ui, self.to_string());
}
}

Expand All @@ -204,7 +205,7 @@ impl DataUi for Range2D {
_query: &LatestAtQuery,
_db: &EntityDb,
) {
data_label_for_ui_layout(ui, ui_layout, self.to_string());
ui_layout.data_label(ui, self.to_string());
}
}

Expand All @@ -219,11 +220,12 @@ impl DataUi for LineStrip2D {
) {
match ui_layout {
UiLayout::List | UiLayout::Tooltip => {
label_for_ui_layout(ui, ui_layout, format!("{} positions", self.0.len()));
ui_layout.label(ui, format!("{} positions", self.0.len()));
}
UiLayout::SelectionPanelLimitHeight | UiLayout::SelectionPanelFull => {
use egui_extras::Column;
table_for_ui_layout(ui_layout, ui)
ui_layout
.table(ui)
.resizable(true)
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.columns(Column::initial(DEFAULT_NUMBER_WIDTH).clip(true), 2)
Expand Down Expand Up @@ -266,11 +268,12 @@ impl DataUi for LineStrip3D {
) {
match ui_layout {
UiLayout::List | UiLayout::Tooltip => {
label_for_ui_layout(ui, ui_layout, format!("{} positions", self.0.len()));
ui_layout.label(ui, format!("{} positions", self.0.len()));
}
UiLayout::SelectionPanelFull | UiLayout::SelectionPanelLimitHeight => {
use egui_extras::Column;
table_for_ui_layout(ui_layout, ui)
ui_layout
.table(ui)
.resizable(true)
.cell_layout(egui::Layout::left_to_right(egui::Align::Center))
.columns(Column::initial(DEFAULT_NUMBER_WIDTH).clip(true), 3)
Expand Down
6 changes: 3 additions & 3 deletions crates/re_data_ui/src/image.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use re_viewer_context::{
ViewerContext,
};

use crate::{image_meaning_for_entity, label_for_ui_layout};
use crate::image_meaning_for_entity;

use super::EntityDataUi;

Expand Down Expand Up @@ -85,7 +85,7 @@ impl EntityDataUi for re_types::components::TensorData {
);
}
Err(err) => {
label_for_ui_layout(ui, ui_layout, ctx.re_ui.error_text(err.to_string()));
ui_layout.label(ui, ctx.re_ui.error_text(err.to_string()));
}
}
}
Expand Down Expand Up @@ -183,7 +183,7 @@ pub fn tensor_ui(
original_tensor.dtype(),
format_tensor_shape_single_line(&shape)
);
label_for_ui_layout(ui, ui_layout, text).on_hover_ui(|ui| {
ui_layout.label(ui, text).on_hover_ui(|ui| {
tensor_summary_ui(
ctx.re_ui,
ui,
Expand Down
11 changes: 4 additions & 7 deletions crates/re_data_ui/src/instance_path.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use re_entity_db::InstancePath;
use re_log_types::ComponentPath;
use re_viewer_context::{HoverHighlight, Item, UiLayout, ViewerContext};

use super::{label_for_ui_layout, DataUi};
use super::DataUi;

impl DataUi for InstancePath {
fn data_ui(
Expand All @@ -24,18 +24,16 @@ impl DataUi for InstancePath {
else {
if ctx.recording().is_known_entity(entity_path) {
// This is fine - e.g. we're looking at `/world` and the user has only logged to `/world/car`.
label_for_ui_layout(
ui_layout.label(
ui,
ui_layout,
format!(
"No components logged on timeline {:?}",
query.timeline().name()
),
);
} else {
label_for_ui_layout(
ui_layout.label(
ui,
ui_layout,
ctx.re_ui
.error_text(format!("Unknown entity: {entity_path:?}")),
);
Expand All @@ -50,9 +48,8 @@ impl DataUi for InstancePath {
.count();

if ui_layout == UiLayout::List {
label_for_ui_layout(
ui_layout.label(
ui,
ui_layout,
format!(
"{} component{} (including {} indicator component{})",
components.len(),
Expand Down
Loading

0 comments on commit e08c88a

Please sign in to comment.