diff --git a/src/egui_app.rs b/src/egui_app.rs index 7f1e702..da88597 100644 --- a/src/egui_app.rs +++ b/src/egui_app.rs @@ -523,7 +523,7 @@ impl epi::App for MathApp { function.update_bounds(minx_bounds, maxx_bounds, available_width); - let (back_values, bars, derivative) = function.run(); + let (back_values, integral, derivative) = function.run(); let func_str = function.get_func_str(); plot_ui.line(back_values.color(Color32::RED).name(func_str)); @@ -535,8 +535,8 @@ impl epi::App for MathApp { ); } - if let Some(bars_data) = bars { - let (integral_bar, integral_line, area) = bars_data; + if let Some(integral_data) = integral { + let (integral_bar, integral_line, area) = integral_data; let integral_name = format!("Integral of {}", func_str); match self.settings.integral_display_type { IntegralDisplay::Rectangles => plot_ui.bar_chart( diff --git a/src/function.rs b/src/function.rs index 1499945..c2916fa 100644 --- a/src/function.rs +++ b/src/function.rs @@ -189,7 +189,7 @@ impl FunctionEntry { false => None, }; - let front_bars = match self.integral { + let integral_data = match self.integral { true => { if self.front_cache.is_none() { let (data, area) = self.integral_rectangles(); @@ -205,19 +205,19 @@ impl FunctionEntry { false => None, }; - (back_values, front_bars, derivative_values) + (back_values, integral_data, derivative_values) } pub fn run(&mut self) -> (Line, Option<(BarChart, Line, f64)>, Option) { - let (back_values, front_data_option, derivative_option) = self.run_back(); + let (back_values, integral_data_option, derivative_option) = self.run_back(); ( Line::new(Values::from_values(back_values)), - if let Some(front_data1) = front_data_option { + if let Some(integral_data) = integral_data_option { Some(( - BarChart::new(front_data1.0), - Line::new(Values::from_values(front_data1.1)), - front_data1.2, + BarChart::new(integral_data.0), + Line::new(Values::from_values(integral_data.1)), + integral_data.2, )) } else { None