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

plot zoom out max (#4695) 

* Closes <https://github.com/emilk/egui/issues/3462>


#3462 panics when when hit the bound like `f64::MAX` 

This PR "blocks" zoom if to big


Linked to
- comment in
https://github.com/emilk/egui/pull/4637#issuecomment-2154848767
- #3462
This commit is contained in:
n4n5 2024-06-26 16:34:34 +02:00 committed by GitHub
parent fee6719f99
commit 1036e18440
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,16 +115,37 @@ impl PlotBounds {
self.max[1] = self.max[1].max(y); self.max[1] = self.max[1].max(y);
} }
#[inline]
fn clamp_to_finite(&mut self) {
for d in 0..2 {
self.min[d] = self.min[d].clamp(f64::MIN, f64::MAX);
if self.min[d].is_nan() {
self.min[d] = 0.0;
}
self.max[d] = self.max[d].clamp(f64::MIN, f64::MAX);
if self.max[d].is_nan() {
self.max[d] = 0.0;
}
}
}
#[inline] #[inline]
pub fn expand_x(&mut self, pad: f64) { pub fn expand_x(&mut self, pad: f64) {
self.min[0] -= pad; if pad.is_finite() {
self.max[0] += pad; self.min[0] -= pad;
self.max[0] += pad;
self.clamp_to_finite();
}
} }
#[inline] #[inline]
pub fn expand_y(&mut self, pad: f64) { pub fn expand_y(&mut self, pad: f64) {
self.min[1] -= pad; if pad.is_finite() {
self.max[1] += pad; self.min[1] -= pad;
self.max[1] += pad;
self.clamp_to_finite();
}
} }
#[inline] #[inline]
@ -173,14 +194,20 @@ impl PlotBounds {
#[inline] #[inline]
pub fn translate_x(&mut self, delta: f64) { pub fn translate_x(&mut self, delta: f64) {
self.min[0] += delta; if delta.is_finite() {
self.max[0] += delta; self.min[0] += delta;
self.max[0] += delta;
self.clamp_to_finite();
}
} }
#[inline] #[inline]
pub fn translate_y(&mut self, delta: f64) { pub fn translate_y(&mut self, delta: f64) {
self.min[1] += delta; if delta.is_finite() {
self.max[1] += delta; self.min[1] += delta;
self.max[1] += delta;
self.clamp_to_finite();
}
} }
#[inline] #[inline]
@ -374,12 +401,12 @@ impl PlotTransform {
let x = remap( let x = remap(
pos.x as f64, pos.x as f64,
(self.frame.left() as f64)..=(self.frame.right() as f64), (self.frame.left() as f64)..=(self.frame.right() as f64),
self.bounds.min[0]..=self.bounds.max[0], self.bounds.range_x(),
); );
let y = remap( let y = remap(
pos.y as f64, pos.y as f64,
(self.frame.bottom() as f64)..=(self.frame.top() as f64), // negated y axis! (self.frame.bottom() as f64)..=(self.frame.top() as f64), // negated y axis!
self.bounds.min[1]..=self.bounds.max[1], self.bounds.range_y(),
); );
PlotPoint::new(x, y) PlotPoint::new(x, y)
} }