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

Jump to bottom

Initial support for manually adding container and space view in the hierarchy #4616

Merged
merged 22 commits into from
Jan 4, 2024
Merged

Initial support for manually adding container and space view in the hierarchy #4616

merged 22 commits into from
Jan 4, 2024

Conversation

abey79
Copy link
Member

@abey79 abey79 commented Dec 22, 2023 •
edited
Loading

What

This is an initial take for the new so-called "additive workflow", which enables building a hierarchy of container and space views from scratch. It involves the following changes in UX:

  • The automatic simplification of the container tree is (mostly) disabled, as empty containers must be (temporarily) allowed while building a hierarchy.
  • Instead, a new "Simplify Container" button is available in the Selection Panel to simplify the subtree under the selected container.
  • A list if container children is displayed in the container Selection Panel, with a button to add more.
  • A new "Add Container or Space View" modal makes it possible to add a container and/or a space view of any type in the selected container.
    This feature is gated behind an experimental flag (Rerun Menu -> Options -> Enable the container addition workflow).
image

This PR also reorganises the experimental flags in the rerun menu such that they are visible in web and release builds. (superseded by #4661)

Fixes #4492
Fixes #4493

TODO (not necessarily in this PR)

Checklist

  • I have read and agree to Contributor Guide and the Code of Conduct
  • I've included a screenshot or gif (if applicable)
  • I have tested the web demo (if applicable):
  • The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG

abey79 added 13 commits December 22, 2023 16:23
@abey79
(WIP) Update to next egui_tiles and disable container GC
a152451 
Disable container GC lint fix: add back ticks
@abey79
Add a "simplify hierarchy" button to containers
b1e4924
@abey79
Blueprint tree UI: only hide a single-child container if it's a `Cont…
7c048b5 
…ainer::Tab`
@abey79
Container selection panel: add children list
59ea714
@abey79
Rebase fix to "simplify hierarchy" button
b2a33a7
@abey79
Add SV/Container modal
54c53db
@abey79
Fix to the "simplify container" feature
2141a4e 
- stop auto-simplify introduced by new Container blueprints
- mark edited when running manual simplification
@abey79
Gate everything in the container selection panel behind container blu…
b36328d 
…eprint flag
@abey79
WIP: wiring up everything via tree actions
1b377ac
@abey79
Rebase fixes
e9dc8d5
@abey79
Added a feature flag + various clean-ups
2ca0749
@abey79
Moved feature flag to new "Experimental" section in option menu + bun…
425f38c 
…ch of lint fixes
@abey79
Improved copy in the experimental menu
c655ae3
@abey79 abey79 added ui concerns graphical user interface 📺 re_viewer affects re_viewer itself include in changelog labels Dec 22, 2023
jleibs
jleibs reviewed Dec 22, 2023
View reviewed changes
crates/re_viewer/src/ui/add_space_view_or_container_modal.rs
.map(|entry| {
SpaceViewBlueprint::new(
entry.class.identifier(),
&format!("empty {}", entry.class.display_name()),
Copy link
Member

Choose a reason for hiding this comment

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

Naming it "empty" immediately makes the name wrong as soon as you add content.

Maybe: "New {}"?

Better yet, we could make name optional -- if it's None then we could generate the name dynamically at runtime and otherwise we could use whatever the user has provided.

Copy link
Member Author

Choose a reason for hiding this comment

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

This default naming is becoming annoying :) #4669

jleibs
jleibs approved these changes Dec 22, 2023
View reviewed changes
Copy link
Member

@jleibs jleibs left a comment

Choose a reason for hiding this comment

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

I pushed a small mutabillity fix -- otherwise looks great.

crates/re_viewer/src/ui/add_space_view_or_container_modal.rs Show resolved Hide resolved
jleibs
jleibs approved these changes Dec 22, 2023
View reviewed changes
Copy link
Member

@jleibs jleibs left a comment

Choose a reason for hiding this comment

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

I pushed a small mutabillity fix -- otherwise looks great.

@abey79 abey79 mentioned this pull request Jan 3, 2024
Closed
abey79 added 5 commits January 3, 2024 18:38
@abey79
Merge branch 'main' into antoine/additive-workflow
a1877e0 
# Conflicts:
#	crates/re_viewer/src/ui/rerun_menu.rs
#	crates/re_viewer_context/src/app_options.rs
#	crates/re_viewport/src/viewport.rs
#	crates/re_viewport/src/viewport_blueprint.rs
@abey79
Post merge fix
7abc998
@abey79
Merge branch 'main' into antoine/additive-workflow
f04e032
@abey79
Show icons for containers
b353f65
@abey79
Fix the interact rectangle computation
044dfdf
@abey79 abey79 merged commit 7342ff8 into main Jan 4, 2024
41 of 42 checks passed
@abey79 abey79 deleted the antoine/additive-workflow branch January 4, 2024 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jleibs jleibs jleibs approved these changes

Assignees
No one assigned
Labels
include in changelog 📺 re_viewer affects re_viewer itself ui concerns graphical user interface
Projects
None yet
Milestone
No milestone
2 participants
@abey79 @jleibs