Fix plot legend items disappearing when they have the same name

Wumpf · web-flow · commit 9c9578697076 · 2026-02-16T16:09:30.000+01:00
### Related * requires emilk/egui_plot#231 * Fixes RR-3717 <img width="692" height="709" alt="image" src="https://github.com/user-attachments/assets/421d50db-bc63-4b45-a138-5c4fed713d9d" /> Source-Ref: a6fc782b9b65fa87c5cb832b9a771ccd09a5b941
diff --git a/Cargo.lock b/Cargo.lock
@@ -3437,9 +3437,9 @@ dependencies = [
 
 [[package]]
 name = "egui_plot"
-version = "0.34.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33233ffc010fd450381805bbbebecbbb82f077de7712ddc439f0b20effd42db7"
+checksum = "67fc9b427a837264e55381a5cade6e28fe83ac5b165a61b9c888548c732a9c95"
 dependencies = [
  "ahash",
  "egui",
diff --git a/Cargo.toml b/Cargo.toml
@@ -181,7 +181,7 @@ emath = "0.33.3"
 # other egui crates:
 egui_commonmark = { version = "0.22.0", default-features = false }
 egui_dnd = { version = "0.14.0" }
-egui_plot = "0.34.0" # https://github.com/emilk/egui_plot
+egui_plot = "0.34.1" # https://github.com/emilk/egui_plot
 egui_table = "0.6.0" # https://github.com/rerun-io/egui_table
 egui_tiles = "0.14.1" # https://github.com/rerun-io/egui_tiles
 walkers = "0.50.0"
@@ -877,8 +877,8 @@ unnecessary_debug_formatting = "allow"
 # emath = { path = "../../egui/crates/emath" }
 # wgpu = { path = "../../wgpu/wgpu" }
 
-# egui_plot = { git = "https://github.com/emilk/egui_plot.git", branch = "main" }
-# egui_plot = { path = "../../egui_plot/egui_plot" }
+#egui_plot = { git = "https://github.com/emilk/egui_plot.git", branch = "legend-id-keying" }
+#egui_plot = { path = "../../../egui_plot/egui_plot" }
 
 # egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", branch = "emilk/update-egui" }
 # egui_tiles = { path = "../egui_tiles" }
diff --git a/crates/viewer/re_selection_panel/src/visualizer_ui.rs b/crates/viewer/re_selection_panel/src/visualizer_ui.rs
@@ -711,8 +711,7 @@ fn current_component_source(
             }
         }
         None => {
-            re_log::debug_assert!(
-                false,
+            re_log::debug_panic!(
                 "Expected component {component:?} to be resolved to a source kind in the query result",
             );
             VisualizerComponentSource::Default
diff --git a/crates/viewer/re_view_bar_chart/src/view_class.rs b/crates/viewer/re_view_bar_chart/src/view_class.rs
@@ -207,6 +207,8 @@ impl ViewClass for BarChartView {
                 plot = plot.legend(
                     Legend::default()
                         .position(legend_corner.into())
+                        .follow_insertion_order(true)
+                        .grouping(egui_plot::LegendGrouping::ById)
                         .color_conflict_handling(ColorConflictHandling::PickFirst),
                 );
             }
diff --git a/crates/viewer/re_view_time_series/src/view_class.rs b/crates/viewer/re_view_time_series/src/view_class.rs
@@ -657,6 +657,8 @@ impl ViewClass for TimeSeriesView {
                 plot = plot.legend(
                     Legend::default()
                         .position(legend_corner.into())
+                        .follow_insertion_order(true)
+                        .grouping(egui_plot::LegendGrouping::ById)
                         .color_conflict_handling(ColorConflictHandling::PickFirst),
                 );
             }
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series.png b/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:024eb96fefaadf752a827733ad76e63ac7630786ae3259b73420a5bb38de88d1
-size 20940
+oid sha256:e068a63c957afaa020ed89bc2db8720d62c01689e4554766af251a2da128adef
+size 20981
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_absolute.png b/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_absolute.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbce4858925b08fbbe8f1c13191c502cb9e460b02beaa8c95f62537b9d16072b
-size 10855
+oid sha256:755d6b92c01cdf070cd4be8f104b6dee5a2a5780f85e3ddc132e6fdf6a7e88a1
+size 10879
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_absolute_until_end.png b/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_absolute_until_end.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb813d9817b4bd69350328e26f7c42f576017d7938c3d93c9e7c8564b7ac1c72
-size 16456
+oid sha256:8906963d608d78bd60b5607f4ec17de54b24b965015dcfbbad9cf71336d5ad04
+size 16504
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_around_cursor.png b/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_around_cursor.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc2a8cca400661d96ffc620f98ab7b4961145c31f50758746c58df01292b673c
-size 16590
+oid sha256:ce97b8aa0fbd8e81fa6d95b664fea4dabb8becfc13102aaad86ff5525f036b46
+size 16596
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_at_cursor.png b/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_at_cursor.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d78720ed8245b6542b246323cf58ef115fe8eeed112578301fee09f908c85e92
-size 14705
+oid sha256:a40ca90c59da48e1cf411c13ccb6a0b144c59695d57287f42fee72dd5d4f9a89
+size 14697
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_everything.png b/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_everything.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:024eb96fefaadf752a827733ad76e63ac7630786ae3259b73420a5bb38de88d1
-size 20940
+oid sha256:e068a63c957afaa020ed89bc2db8720d62c01689e4554766af251a2da128adef
+size 20981
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_start_until_absolute.png b/crates/viewer/re_view_time_series/tests/snapshots/blueprint_overrides_and_defaults_with_time_series_start_until_absolute.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b69280b9cdee7ec9bd6145576c011764283721957a3cef482b8e5feeb6f980f8
-size 16329
+oid sha256:49e6d573027e32a51ddfbedcb5898d31e9d7eacb3cc5347981197b286fc997a9
+size 16334
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/explicit_component_mapping.png b/crates/viewer/re_view_time_series/tests/snapshots/explicit_component_mapping.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8f4ff78ab8cd84fa5e1de780d10707e15d7ac57b96b4581dc39abb6b0c8516c
-size 26038
+oid sha256:c9ef10d25d9c1730f08cc9827e839f861520b606f20de7f25de03e1fa75f4d09
+size 26253
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_absolute_until_end_view_data.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_absolute_until_end_view_data.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9108cbbe9649915694726b23a5ee61bcaef1c161ad3dce472db8fb01242f6c15
-size 17173
+oid sha256:2cdf979293a2288f58ae121d208803dec48532f88e955ff77cb2020e8852a243
+size 17205
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_absolute_until_end_view_timeline.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_absolute_until_end_view_timeline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d72e331893d17333cbb14719a752b1716cfc70d7273e3c5771802b27ac6a3169
-size 19464
+oid sha256:2b573057d812bca08a8d5402e2acedb725046b2739a9383083c2d6477d12d3f1
+size 19502
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_absolute_view_data.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_absolute_view_data.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:296a595ae5fcbf4fb5990db3880074eec42a70f295ba8c8abda5c51a1e7d5ce0
-size 12077
+oid sha256:84c4c3cdd8701331ef6564b789194ad64e27ae2bc429e6d694ee413e784daae1
+size 12098
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_absolute_view_timeline.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_absolute_view_timeline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cb6ecae1f8b5f387f70151e6c63ae00e5faebd56a6955663e7cee335ff109f0
-size 16877
+oid sha256:3b5b7780375b15b4a5e598ed9b6f100380ae77850bb5817da09477d2e81f48ad
+size 16903
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_around_cursor_view_data.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_around_cursor_view_data.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60b6750ddf1b29888a86b033cfea0beeffd18d26025bb630e07f739f2b07f3bb
-size 15403
+oid sha256:4c5d9b6865bfec2c50750b6736bd5966efd21247716a9bf1dd6c81e3fcd74b20
+size 15410
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_around_cursor_view_timeline.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_around_cursor_view_timeline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2657d9075391e5e483595607b4abc731691a089f41895e584607ce45c8a4b2b
-size 18298
+oid sha256:f55321f80e4228e587818335a7019fa3846196416c86c900d4bfb1ed1b57555d
+size 18303
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_everything_view_data.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_everything_view_data.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:024eb96fefaadf752a827733ad76e63ac7630786ae3259b73420a5bb38de88d1
-size 20940
+oid sha256:e068a63c957afaa020ed89bc2db8720d62c01689e4554766af251a2da128adef
+size 20981
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_everything_view_timeline.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_everything_view_timeline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:024eb96fefaadf752a827733ad76e63ac7630786ae3259b73420a5bb38de88d1
-size 20940
+oid sha256:e068a63c957afaa020ed89bc2db8720d62c01689e4554766af251a2da128adef
+size 20981
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_start_until_absolute_view_data.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_start_until_absolute_view_data.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4db14c4d23033af9c8ef86653844e8dd7388516f87f466c88ebb3154534299ba
-size 16646
+oid sha256:77fed8d3d114283d8d429321345733464ee2eeaf4eaf5e79fc111bcb19c6f5c0
+size 16641
diff --git a/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_start_until_absolute_view_timeline.png b/crates/viewer/re_view_time_series/tests/snapshots/visible_time_range_start_until_absolute_view_timeline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0abd9bd177ac4855333138e1600334595d829fdac7327db352b8ff11703144d8
-size 18564
+oid sha256:aebf347af49279842b496237be1e14cf89ff0d55fc36a6dce3c59a4b776b783d
+size 18560
diff --git a/tests/rust/re_integration_test/tests/snapshots/view_visualizers_1_initial.png b/tests/rust/re_integration_test/tests/snapshots/view_visualizers_1_initial.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8d616615acd6e9f71ce072455d103f727f0bf8b2d922a908455a898b42b3807
-size 170522
+oid sha256:8c1e86ba050d152fd661375f8062d28e3aab0b4d236477d5f1e4ce2d88ebf22b
+size 170512
diff --git a/tests/rust/re_integration_test/tests/snapshots/view_visualizers_2_plots_view_selected.png b/tests/rust/re_integration_test/tests/snapshots/view_visualizers_2_plots_view_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e6adc9be5bf78850e9ea0b8b08d3ae3f5baccdb59769fcae7c0c22da0d91b5a
-size 228930
+oid sha256:bc949518ea32a10a1bfdcac76c79c1e67e62b07e756e12568e10e3decafae554
+size 228486
diff --git a/tests/rust/re_integration_test/tests/snapshots/view_visualizers_3_other_view_selected.png b/tests/rust/re_integration_test/tests/snapshots/view_visualizers_3_other_view_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d42aa10395890d677fb4b2160e0e89c8b735908d5e0b21e2637c0f477732cc02
-size 218273
+oid sha256:67d77542cb57c3ef20fd97bac751b2afe92f96bb5ff84a58eaf54fbd958b7903
+size 218171

Original file line number	Diff line number	Diff line change
`@@ -711,8 +711,7 @@ fn current_component_source(`
`711`	`711`	`}`
`712`	`712`	`}`
`713`	`713`	`None => {`
`714`		`- re_log::debug_assert!(`
`715`		`- false,`
	`714`	`+ re_log::debug_panic!(`
`716`	`715`	`"Expected component {component:?} to be resolved to a source kind in the query result",`
`717`	`716`	`);`
`718`	`717`	`VisualizerComponentSource::Default`
Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,8 @@ impl ViewClass for BarChartView {`
`207`	`207`	`plot = plot.legend(`
`208`	`208`	`Legend::default()`
`209`	`209`	`.position(legend_corner.into())`
	`210`	`+ .follow_insertion_order(true)`
	`211`	`+ .grouping(egui_plot::LegendGrouping::ById)`
`210`	`212`	`.color_conflict_handling(ColorConflictHandling::PickFirst),`
`211`	`213`	`);`
`212`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -657,6 +657,8 @@ impl ViewClass for TimeSeriesView {`
`657`	`657`	`plot = plot.legend(`
`658`	`658`	`Legend::default()`
`659`	`659`	`.position(legend_corner.into())`
	`660`	`+ .follow_insertion_order(true)`
	`661`	`+ .grouping(egui_plot::LegendGrouping::ById)`
`660`	`662`	`.color_conflict_handling(ColorConflictHandling::PickFirst),`
`661`	`663`	`);`
`662`	`664`	`}`