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 secondary plot components ignoring blueprint defaults #7302

Merged
merged 2 commits into from
Aug 28, 2024
Merged

Fix secondary plot components ignoring blueprint defaults #7302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72d56c2
make sure secondary plot components check out default values
teh-cmc Aug 28, 2024
767cf0b
do not collapse panels in checklist
teh-cmc Aug 28, 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
11 changes: 6 additions & 5 deletions crates/viewer/re_space_view_time_series/src/line_visualizer_system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,10 @@ impl SeriesLineSystem {
})
}

if let Some(all_color_chunks) = results.get_required_chunks(&Color::name()) {
{
let all_color_chunks = results.get_optional_chunks(&Color::name());
if all_color_chunks.len() == 1 && all_color_chunks[0].is_static() {
re_tracing::profile_scope!("override fast path");
re_tracing::profile_scope!("override/default fast path");

let color = all_color_chunks[0]
.iter_primitive::<u32>(&Color::name())
Expand Down Expand Up @@ -337,12 +338,12 @@ impl SeriesLineSystem {

debug_assert_eq!(StrokeWidth::arrow_datatype(), ArrowDatatype::Float32);

if let Some(all_stroke_width_chunks) =
results.get_required_chunks(&StrokeWidth::name())
{
let all_stroke_width_chunks = results.get_optional_chunks(&StrokeWidth::name());

if all_stroke_width_chunks.len() == 1 && all_stroke_width_chunks[0].is_static()
{
re_tracing::profile_scope!("override fast path");
re_tracing::profile_scope!("override/default fast path");

let stroke_width = all_stroke_width_chunks[0]
.iter_primitive::<f32>(&StrokeWidth::name())
Expand Down
19 changes: 11 additions & 8 deletions crates/viewer/re_space_view_time_series/src/point_visualizer_system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,11 @@ impl SeriesPointSystem {
})
}

if let Some(all_color_chunks) = results.get_required_chunks(&Color::name()) {
{
let all_color_chunks = results.get_optional_chunks(&Color::name());

if all_color_chunks.len() == 1 && all_color_chunks[0].is_static() {
re_tracing::profile_scope!("override fast path");
re_tracing::profile_scope!("override/default fast path");

let color = all_color_chunks[0]
.iter_primitive::<u32>(&Color::name())
Expand Down Expand Up @@ -353,11 +355,11 @@ impl SeriesPointSystem {

debug_assert_eq!(MarkerSize::arrow_datatype(), ArrowDatatype::Float32);

if let Some(all_marker_size_chunks) =
results.get_required_chunks(&MarkerSize::name())
{
let all_marker_size_chunks = results.get_optional_chunks(&MarkerSize::name());

if all_marker_size_chunks.len() == 1 && all_marker_size_chunks[0].is_static() {
re_tracing::profile_scope!("override fast path");
re_tracing::profile_scope!("override/default fast path");

let marker_size = all_marker_size_chunks[0]
.iter_primitive::<f32>(&MarkerSize::name())
Expand Down Expand Up @@ -401,13 +403,14 @@ impl SeriesPointSystem {
{
re_tracing::profile_scope!("fill marker shapes");

if let Some(all_marker_shapes_chunks) =
results.get_required_chunks(&MarkerShape::name())
{
let all_marker_shapes_chunks =
results.get_optional_chunks(&MarkerShape::name());

if all_marker_shapes_chunks.len() == 1
&& all_marker_shapes_chunks[0].is_static()
{
re_tracing::profile_scope!("override fast path");
re_tracing::profile_scope!("override/default fast path");

let marker_shape = all_marker_shapes_chunks[0]
.iter_component::<MarkerShape>()
Expand Down
7 changes: 4 additions & 3 deletions tests/python/release_checklist/check_latest_at_partial_updates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ def blueprint() -> rrb.BlueprintLike:
),
]
),
rrb.BlueprintPanel(state="collapsed"),
rrb.TimePanel(state="collapsed"),
rrb.SelectionPanel(state="collapsed"),
# NOTE: It looks nice but it's very annoying when going through several checklists.
# rrb.BlueprintPanel(state="collapsed"),
# rrb.TimePanel(state="collapsed"),
# rrb.SelectionPanel(state="collapsed"),
)


Expand Down
7 changes: 4 additions & 3 deletions tests/python/release_checklist/check_range_partial_updates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,10 @@ def blueprint() -> rrb.BlueprintLike:
],
grid_columns=3,
),
rrb.BlueprintPanel(state="collapsed"),
rrb.TimePanel(state="collapsed"),
rrb.SelectionPanel(state="collapsed"),
# NOTE: It looks nice but it's very annoying when going through several checklists.
# rrb.BlueprintPanel(state="collapsed"),
# rrb.TimePanel(state="collapsed"),
# rrb.SelectionPanel(state="collapsed"),
)


Expand Down
Loading