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

simplify

Browse Source
This commit is contained in:
Simon Gardling 2022-03-04 09:21:06 -05:00
parent a9f6e05b39
commit fd72a1e351
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/egui_app.rs
View File

@ -191,7 +191,6 @@ impl MathApp {
); );
let mut remove_i: Option<usize> = None; let mut remove_i: Option<usize> = None;
let mut using_integral: bool = false;
self.last_error = String::new(); self.last_error = String::new();
for (i, function) in self.functions.iter_mut().enumerate() { for (i, function) in self.functions.iter_mut().enumerate() {
let mut integral_toggle: bool = false; let mut integral_toggle: bool = false;
@ -235,18 +234,6 @@ impl MathApp {
ui.text_edit_singleline(&mut self.func_strs[i]); ui.text_edit_singleline(&mut self.func_strs[i]);
}); });
let integral: bool = if integral_toggle {
!integral_enabled
} else {
integral_enabled
};
let derivative: bool = if derivative_toggle {
!derivative_enabled
} else {
derivative_enabled
};
if !self.func_strs[i].is_empty() { if !self.func_strs[i].is_empty() {
let proc_func_str = add_asterisks(self.func_strs[i].clone()); let proc_func_str = add_asterisks(self.func_strs[i].clone());
let func_test_output = test_func(proc_func_str.clone()); let func_test_output = test_func(proc_func_str.clone());
@ -256,17 +243,22 @@ impl MathApp {
} else { } else {
function.update( function.update(
proc_func_str, proc_func_str,
integral, if integral_toggle {
derivative, !integral_enabled
} else {
integral_enabled
},
if derivative_toggle {
!derivative_enabled
} else {
derivative_enabled
},
Some(self.settings.integral_min_x), Some(self.settings.integral_min_x),
Some(self.settings.integral_max_x), Some(self.settings.integral_max_x),
Some(self.settings.integral_num), Some(self.settings.integral_num),
Some(self.settings.sum), Some(self.settings.sum),
); );
} }
if integral {
using_integral = true;
}
} else { } else {
function.empty_func_str(); function.empty_func_str();
} }