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

Fix a ui issue where a visualiser would have both an override and default set for some component #7206

Merged
merged 2 commits into from
Aug 15, 2024
Merged

Fix a ui issue where a visualiser would have both an override and default set for some component #7206

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b79ad5f
Fix issue in visualizer ui where some component where not editable wh…
abey79 Aug 15, 2024
c761f9d
Spurious removed
abey79 Aug 15, 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
129 changes: 75 additions & 54 deletions crates/viewer/re_selection_panel/src/visualizer_ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,71 +288,92 @@ fn visualizer_components(
};

let add_children = |ui: &mut egui::Ui| {
// NOTE: each of the override/store/etc. UI elements may well resemble each other much,
// e.g. be the same edit UI. We must ensure that we seed egui kd differently for each of
// them to avoid id clashes.

// Override (if available)
if let Some((row_id, raw_override)) = raw_override.as_ref() {
editable_blueprint_component_list_item(
&query_ctx,
ui,
"Override",
override_path,
component_name,
*row_id,
raw_override.as_ref(),
)
.on_hover_text("Override value for this specific entity in the current view");
ui.push_id("override", |ui| {
editable_blueprint_component_list_item(
&query_ctx,
ui,
"Override",
override_path,
component_name,
*row_id,
raw_override.as_ref(),
)
.on_hover_text("Override value for this specific entity in the current view");
});
}

// Store (if available)
if let Some(unit) = result_store {
ui.list_item_flat_noninteractive(
list_item::PropertyContent::new("Store").value_fn(|ui, _style| {
re_data_ui::EntityLatestAtResults {
entity_path: data_result.entity_path.clone(),
component_name,
unit,
}
.data_ui(
ctx.viewer_ctx,
ui,
UiLayout::List,
&store_query,
ctx.recording(),
);
}),
)
.on_hover_text("The value that was logged to the data store");
ui.push_id("store", |ui| {
ui.list_item_flat_noninteractive(
list_item::PropertyContent::new("Store").value_fn(|ui, _style| {
re_data_ui::EntityLatestAtResults {
entity_path: data_result.entity_path.clone(),
component_name,
unit,
}
.data_ui(
ctx.viewer_ctx,
ui,
UiLayout::List,
&store_query,
ctx.recording(),
);
}),
)
.on_hover_text("The value that was logged to the data store");
});
}

// Default (if available)
if let Some((row_id, raw_default)) = raw_default.as_ref() {
editable_blueprint_component_list_item(
&query_ctx,
ui,
"Default",
ctx.defaults_path,
component_name,
*row_id,
raw_default.as_ref(),
)
.on_hover_text("Default value for all component of this type is the current view");
ui.push_id("default", |ui| {
editable_blueprint_component_list_item(
&query_ctx,
ui,
"Default",
ctx.defaults_path,
component_name,
*row_id,
raw_default.as_ref(),
)
.on_hover_text(
"Default value for all components of this type is the current view",
);
});
}

// Fallback (always there)
{
ui.list_item_flat_noninteractive(
list_item::PropertyContent::new("Fallback").value_fn(|ui, _| {
// TODO(andreas): db & entity path don't make sense here.
ctx.viewer_ctx.component_ui_registry.ui_raw(
ctx.viewer_ctx,
ui,
UiLayout::List,
&store_query,
ctx.recording(),
&data_result.entity_path,
component_name,
None,
raw_fallback.as_ref(),
);
}),
)
.on_hover_text("Context sensitive fallback value for this component type, used only if nothing else was specified. Unlike the other values, this may differ per visualizer.");
ui.push_id("fallback", |ui| {
ui.list_item_flat_noninteractive(
list_item::PropertyContent::new("Fallback").value_fn(|ui, _| {
// TODO(andreas): db & entity path don't make sense here.
ctx.viewer_ctx.component_ui_registry.ui_raw(
ctx.viewer_ctx,
ui,
UiLayout::List,
&store_query,
ctx.recording(),
&data_result.entity_path,
component_name,
None,
raw_fallback.as_ref(),
);
}),
)
.on_hover_text(
"Context sensitive fallback value for this component type, used only if \
nothing else was specified. Unlike the other values, this may differ per \
visualizer.",
);
});
}
};

Expand Down
Loading