titaniumtown/YTBN-Graphing-Software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename some variables

Browse Source
This commit is contained in:
Simon Gardling 2022-03-08 10:17:54 -05:00
parent 945c2e1ab1
commit 4358d240f0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/egui_app.rs
View File

@ -523,7 +523,7 @@ impl epi::App for MathApp {
function.update_bounds(minx_bounds, maxx_bounds, available_width); 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(); let func_str = function.get_func_str();
plot_ui.line(back_values.color(Color32::RED).name(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 { if let Some(integral_data) = integral {
let (integral_bar, integral_line, area) = bars_data; let (integral_bar, integral_line, area) = integral_data;
let integral_name = format!("Integral of {}", func_str); let integral_name = format!("Integral of {}", func_str);
match self.settings.integral_display_type { match self.settings.integral_display_type {
IntegralDisplay::Rectangles => plot_ui.bar_chart( IntegralDisplay::Rectangles => plot_ui.bar_chart(

14
src/function.rs
View File

@ -189,7 +189,7 @@ impl FunctionEntry {
false => None, false => None,
}; };
let front_bars = match self.integral { let integral_data = match self.integral {
true => { true => {
if self.front_cache.is_none() { if self.front_cache.is_none() {
let (data, area) = self.integral_rectangles(); let (data, area) = self.integral_rectangles();
@ -205,19 +205,19 @@ impl FunctionEntry {
false => None, 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<Line>) { pub fn run(&mut self) -> (Line, Option<(BarChart, Line, f64)>, Option<Line>) {
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)), Line::new(Values::from_values(back_values)),
if let Some(front_data1) = front_data_option { if let Some(integral_data) = integral_data_option {
Some(( Some((
BarChart::new(front_data1.0), BarChart::new(integral_data.0),
Line::new(Values::from_values(front_data1.1)), Line::new(Values::from_values(integral_data.1)),
front_data1.2, integral_data.2,
)) ))
} else { } else {
None None