skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix plot bounds of empty plots (#4741) 

We would sometimes hit a `debug_assert` when plots were empty

* Closes https://github.com/rerun-io/rerun/issues/6681
This commit is contained in:
Emil Ernerfeldt 2024-06-30 17:49:54 +02:00 committed by GitHub
parent dc1f032846
commit 31716d787e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/egui_plot/src/lib.rs
View File

@ -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` /// 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)) { 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 first = (min / step_size).ceil() as i64;
let last = (max / step_size).ceil() as i64; let last = (max / step_size).ceil() as i64;

14
crates/egui_plot/src/transform.rs
View File

@ -280,6 +280,11 @@ pub struct PlotTransform {
impl PlotTransform { impl PlotTransform {
pub fn new(frame: Rect, bounds: PlotBounds, x_centered: bool, y_centered: bool) -> Self { 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 // 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. // the original version of the `bounds` before we start modifying it.
let mut new_bounds = bounds; let mut new_bounds = bounds;
@ -291,7 +296,7 @@ impl PlotTransform {
// axis, and default to +/- 1.0 otherwise. // axis, and default to +/- 1.0 otherwise.
if !bounds.is_finite_x() { if !bounds.is_finite_x() {
new_bounds.set_x(&PlotBounds::new_symmetrical(1.0)); 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( new_bounds.set_x_center_width(
bounds.center().x, bounds.center().x,
if bounds.is_valid_y() { if bounds.is_valid_y() {
@ -304,7 +309,7 @@ impl PlotTransform {
if !bounds.is_finite_y() { if !bounds.is_finite_y() {
new_bounds.set_y(&PlotBounds::new_symmetrical(1.0)); 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( new_bounds.set_y_center_height(
bounds.center().y, bounds.center().y,
if bounds.is_valid_x() { if bounds.is_valid_x() {
@ -323,6 +328,11 @@ impl PlotTransform {
new_bounds.make_y_symmetrical(); new_bounds.make_y_symmetrical();
}; };
debug_assert!(
new_bounds.is_valid(),
"Bad final plot bounds: {new_bounds:?}"
);
Self { Self {
frame, frame,
bounds: new_bounds, bounds: new_bounds,