From c84a98f2914bb90f55ca55656970957be86b1eac Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Mar 2022 23:54:54 -0500 Subject: [PATCH] when added, new functions should be blank --- src/egui_app.rs | 28 ++++++++++++++++------------ src/function.rs | 4 +--- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/egui_app.rs b/src/egui_app.rs index 06fab9f..8b25c2a 100644 --- a/src/egui_app.rs +++ b/src/egui_app.rs @@ -337,18 +337,22 @@ impl epi::App for MathApp { .on_hover_text("Create and graph new function") .clicked() { - self.functions.push(Function::new( - String::from(DEFAULT_FUNCION), - -1.0, // Doesn't matter, updated later - 1.0, // Doesn't matter, updated later - 100, // Doesn't matter, updated later - false, - None, // Doesn't matter, updated later - None, // Doesn't matter, updated later - None, // Doesn't matter, updated later - Some(self.settings.sum), - )); - self.func_strs.push(String::from(DEFAULT_FUNCION)); + self.functions.push({ + let mut function = Function::new( + String::from(DEFAULT_FUNCION), + -1.0, // Doesn't matter, updated later + 1.0, // Doesn't matter, updated later + 100, // Doesn't matter, updated later + false, + None, // Doesn't matter, updated later + None, // Doesn't matter, updated later + None, // Doesn't matter, updated later + Some(self.settings.sum), + ); + function.func_str = String::new(); + function + }); + self.func_strs.push(String::new()); } if ui diff --git a/src/function.rs b/src/function.rs index 8c7f1f6..6a753ec 100644 --- a/src/function.rs +++ b/src/function.rs @@ -169,9 +169,7 @@ impl Function { pub fn run(&mut self) -> (Line, Option<(BarChart, f64)>) { let back_values: Line = Line::new(Values::from_values(match self.back_cache.is_some() { - true => { - self.back_cache.as_ref().unwrap().clone() - } + true => self.back_cache.as_ref().unwrap().clone(), false => { let absrange = (self.max_x - self.min_x).abs(); let resolution: f64 = (self.pixel_width as f64 / absrange) as f64;