Fix plot bounds of empty plots (#4741)

We would sometimes hit a `debug_assert` when plots were empty * Closes rerun-io/rerun#6681
emilk · Jun 30, 2024 · 31716d7 · 31716d7
1 parent dc1f032
commit 31716d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/crates/egui_plot/src/lib.rs b/crates/egui_plot/src/lib.rs
@@ -1826,7 +1826,7 @@ fn cmp_f64(a: f64, b: f64) -> Ordering {
 
 /// Fill in all values between [min, max] which are a multiple of `step_size`
 fn fill_marks_between(out: &mut Vec<GridMark>, step_size: f64, (min, max): (f64, f64)) {
-    debug_assert!(max > min);
+    debug_assert!(min <= max, "Bad plot bounds: min: {min}, max: {max}");
     let first = (min / step_size).ceil() as i64;
     let last = (max / step_size).ceil() as i64;
 

diff --git a/crates/egui_plot/src/transform.rs b/crates/egui_plot/src/transform.rs
@@ -280,6 +280,11 @@ pub struct PlotTransform {
 
 impl PlotTransform {
     pub fn new(frame: Rect, bounds: PlotBounds, x_centered: bool, y_centered: bool) -> Self {
+        debug_assert!(
+            0.0 <= frame.width() && 0.0 <= frame.height(),
+            "Bad plot frame: {frame:?}"
+        );
+
         // Since the current Y bounds an affect the final X bounds and vice versa, we need to keep
         // the original version of the `bounds` before we start modifying it.
         let mut new_bounds = bounds;
@@ -291,7 +296,7 @@ impl PlotTransform {
         // axis, and default to +/- 1.0 otherwise.
         if !bounds.is_finite_x() {
             new_bounds.set_x(&PlotBounds::new_symmetrical(1.0));
-        } else if bounds.width() == 0.0 {
+        } else if bounds.width() <= 0.0 {
             new_bounds.set_x_center_width(
                 bounds.center().x,
                 if bounds.is_valid_y() {
@@ -304,7 +309,7 @@ impl PlotTransform {
 
         if !bounds.is_finite_y() {
             new_bounds.set_y(&PlotBounds::new_symmetrical(1.0));
-        } else if bounds.height() == 0.0 {
+        } else if bounds.height() <= 0.0 {
             new_bounds.set_y_center_height(
                 bounds.center().y,
                 if bounds.is_valid_x() {
@@ -323,6 +328,11 @@ impl PlotTransform {
             new_bounds.make_y_symmetrical();
         };
 
+        debug_assert!(
+            new_bounds.is_valid(),
+            "Bad final plot bounds: {new_bounds:?}"
+        );
+
         Self {
             frame,
             bounds: new_bounds,