Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generic view property building, applied to TimeSeriesView's PlotLegend #6400

Merged
merged 11 commits into from
May 22, 2024
Merged

Generic view property building, applied to TimeSeriesView's PlotLegend #6400

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b8f72c4
move editors to its own mod
Wumpf May 20, 2024
b2d5e6d
latest_at utility on re_entity_db
Wumpf May 21, 2024
ba6729d
Corner2D data ui editor
Wumpf May 21, 2024
76b0b17
editor visible component
Wumpf May 21, 2024
ffb3b99
edit_ui even if there's no component present in LatestAtComponentResults
Wumpf May 21, 2024
7f1df07
better short_name for blueprint components
Wumpf May 21, 2024
7ed7cd4
quasi generic legend_ui
Wumpf May 21, 2024
dd1eb6a
remove legend_ui - it's fully generically driven now
Wumpf May 21, 2024
188a226
expand on todo, remove unused default value
Wumpf May 21, 2024
43ccd48
ticket link
Wumpf May 22, 2024
02f7c74
Merge remote-tracking branch 'origin/main' into andreas/generic-view-…
Wumpf May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 31 additions & 63 deletions crates/re_space_view_time_series/src/space_view_class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ use egui_plot::{Legend, Line, Plot, PlotPoint, Points};
use re_data_store::TimeType;
use re_format::next_grid_tick_magnitude_ns;
use re_log_types::{EntityPath, TimeInt, TimeZone};
use re_space_view::{controls, query_view_property_or_default};
use re_space_view::{controls, entity_path_for_view_property, query_view_property_or_default};
use re_types::blueprint::archetypes::PlotLegend;
use re_types::blueprint::components::Visible;
use re_types::Loggable;
use re_types::{
blueprint::components::Corner2D, components::Range1D, datatypes::TimeRange,
SpaceViewClassIdentifier, View,
Expand Down Expand Up @@ -621,72 +624,37 @@ impl SpaceViewClass for TimeSeriesSpaceView {
fn legend_ui(ctx: &ViewerContext<'_>, space_view_id: SpaceViewId, ui: &mut egui::Ui) {
let blueprint_db = ctx.store_context.blueprint;
let blueprint_query = ctx.blueprint_query;
let (re_types::blueprint::archetypes::PlotLegend { visible, corner }, blueprint_path) =
query_view_property_or_default(space_view_id, blueprint_db, blueprint_query);
let blueprint_path =
entity_path_for_view_property::<PlotLegend>(space_view_id, blueprint_db.tree());

let visible = visible.unwrap_or(true.into());
let corner = corner.unwrap_or(DEFAULT_LEGEND_CORNER.into());
let component_names = [Visible::name(), Corner2D::name()];
let component_results =
blueprint_db.latest_at(blueprint_query, &blueprint_path, component_names);

let sub_prop_ui = |re_ui: &re_ui::ReUi, ui: &mut egui::Ui| {
// TODO(ab): components should provide the `value_fn` closure or the entire
// `PropertyContent` object

//
// Visible
//

let mut edit_visibility = visible;
list_item2::ListItem::new(re_ui)
.interactive(false)
.show_flat(
ui,
list_item2::PropertyContent::new("Visible").value_bool_mut(&mut edit_visibility.0),
);
if visible != edit_visibility {
ctx.save_blueprint_component(&blueprint_path, &edit_visibility);
}

//
// Corner
//

let mut edit_corner = corner;
list_item2::ListItem::new(re_ui)
.interactive(false)
.show_flat(
ui,
list_item2::PropertyContent::new("Corner").value_fn(|_, ui, _| {
egui::ComboBox::from_id_source("legend_corner")
.selected_text(format!("{corner}"))
.show_ui(ui, |ui| {
ui.style_mut().wrap = Some(false);
ui.set_min_width(64.0);

ui.selectable_value(
&mut edit_corner,
egui_plot::Corner::LeftTop.into(),
format!("{}", Corner2D::from(egui_plot::Corner::LeftTop)),
);
ui.selectable_value(
&mut edit_corner,
egui_plot::Corner::RightTop.into(),
format!("{}", Corner2D::from(egui_plot::Corner::RightTop)),
);
ui.selectable_value(
&mut edit_corner,
egui_plot::Corner::LeftBottom.into(),
format!("{}", Corner2D::from(egui_plot::Corner::LeftBottom)),
);
ui.selectable_value(
&mut edit_corner,
egui_plot::Corner::RightBottom.into(),
format!("{}", Corner2D::from(egui_plot::Corner::RightBottom)),
for component_name in component_names {
list_item2::ListItem::new(re_ui)
.interactive(false)
.show_flat(
ui,
// TODO(andreas): Note that we loose the archetype's field name here, instead we label the item with the component name.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Somewhat related, we'd need to route some textual information to hover tooltips.

list_item2::PropertyContent::new(component_name.short_name()).value_fn(
|_, ui, _| {
ctx.component_ui_registry.edit_ui(
ctx,
ui,
re_viewer_context::UiLayout::List,
blueprint_query,
blueprint_db,
&blueprint_path,
&blueprint_path,
component_results.get_or_empty(component_name),
&component_name,
&0.into(),
);
});
}),
);
if corner != edit_corner {
ctx.save_blueprint_component(&blueprint_path, &edit_corner);
},
),
);
}
};

Expand Down