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

egui_plot: fix panic when the base step size is set to 0 (#4078) 

This can happen e.g. when the user forces some axis range to (0.0, 0.0)
like in rerun-io/rerun#5239
This commit is contained in:
Antoine Beyeler 2024-02-20 16:26:47 +01:00 committed by GitHub
parent ca8eeb8621
commit 74891cac2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1391,6 +1391,11 @@ pub struct GridMark {
pub fn log_grid_spacer(log_base: i64) -> GridSpacer { pub fn log_grid_spacer(log_base: i64) -> GridSpacer {
let log_base = log_base as f64; let log_base = log_base as f64;
let step_sizes = move |input: GridInput| -> Vec<GridMark> { let step_sizes = move |input: GridInput| -> Vec<GridMark> {
// handle degenerate cases
if input.base_step_size.abs() < f64::EPSILON {
return Vec::new();
}
// The distance between two of the thinnest grid lines is "rounded" up // The distance between two of the thinnest grid lines is "rounded" up
// to the next-bigger power of base // to the next-bigger power of base
let smallest_visible_unit = next_power(input.base_step_size, log_base); let smallest_visible_unit = next_power(input.base_step_size, log_base);
@ -1693,7 +1698,7 @@ impl PreparedPlot {
/// assert_eq!(next_power(0.2, 10.0), 1); /// assert_eq!(next_power(0.2, 10.0), 1);
/// ``` /// ```
fn next_power(value: f64, base: f64) -> f64 { fn next_power(value: f64, base: f64) -> f64 {
assert_ne!(value, 0.0); // can be negative (typical for Y axis) debug_assert_ne!(value, 0.0); // can be negative (typical for Y axis)
base.powi(value.abs().log(base).ceil() as i32) base.powi(value.abs().log(base).ceil() as i32)
} }
@ -1708,7 +1713,7 @@ fn generate_marks(step_sizes: [f64; 3], bounds: (f64, f64)) -> Vec<GridMark> {
/// 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)) {
assert!(max > min); debug_assert!(max > min);
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;