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

borrow more stuff

Browse Source
This commit is contained in:
Simon Gardling 2022-03-29 15:00:59 -04:00
parent 17d2455d35
commit 4ef0743409
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/egui_app.rs
View File

@ -722,8 +722,8 @@ impl epi::App for MathApp {
.filter(|(i, _)| !self.func_strs[*i].is_empty()) .filter(|(i, _)| !self.func_strs[*i].is_empty())
.for_each(|(_, function)| { .for_each(|(_, function)| {
function.calculate( function.calculate(
minx_bounds, &minx_bounds,
maxx_bounds, &maxx_bounds,
width_changed, width_changed,
&self.settings, &self.settings,
) )

16
src/function.rs
View File

@ -166,10 +166,10 @@ impl FunctionEntry {
/// Does the calculations and stores results in `self.output` /// Does the calculations and stores results in `self.output`
pub fn calculate( pub fn calculate(
&mut self, min_x: f64, max_x: f64, width_changed: bool, settings: &AppSettings, &mut self, min_x: &f64, max_x: &f64, width_changed: bool, settings: &AppSettings,
) { ) {
let resolution: f64 = settings.plot_width as f64 / (max_x.abs() + min_x.abs()); let resolution: f64 = settings.plot_width as f64 / (max_x.abs() + min_x.abs());
let resolution_iter = resolution_helper(settings.plot_width + 1, min_x, resolution); let resolution_iter = resolution_helper(settings.plot_width + 1, *min_x, resolution);
// Makes sure proper arguments are passed when integral is enabled // Makes sure proper arguments are passed when integral is enabled
if self.integral && settings.integral_changed { if self.integral && settings.integral_changed {
@ -177,13 +177,13 @@ impl FunctionEntry {
} }
let mut partial_regen = false; let mut partial_regen = false;
let min_max_changed = (min_x != self.min_x) | (max_x != self.max_x); let min_max_changed = (min_x != &self.min_x) | (max_x != &self.max_x);
if width_changed { if width_changed {
self.output.invalidate_back(); self.output.invalidate_back();
self.output.invalidate_derivative(); self.output.invalidate_derivative();
self.min_x = min_x; self.min_x = *min_x;
self.max_x = max_x; self.max_x = *max_x;
} else if min_max_changed && self.output.back.is_some() { } else if min_max_changed && self.output.back.is_some() {
partial_regen = true; partial_regen = true;
@ -227,8 +227,8 @@ impl FunctionEntry {
self.output.invalidate_derivative(); self.output.invalidate_derivative();
} }
self.min_x = min_x; self.min_x = *min_x;
self.max_x = max_x; self.max_x = *max_x;
let threshold: f64 = resolution / 2.0; let threshold: f64 = resolution / 2.0;
@ -360,7 +360,7 @@ impl FunctionEntry {
derivative_target: Vec<(f64, f64)>, area_target: f64, min_x: f64, max_x: f64, derivative_target: Vec<(f64, f64)>, area_target: f64, min_x: f64, max_x: f64,
) { ) {
{ {
self.calculate(min_x, max_x, true, &settings); self.calculate(&min_x, &max_x, true, &settings);
let settings = settings; let settings = settings;
let back_target = back_target; let back_target = back_target;
assert!(self.output.back.is_some()); assert!(self.output.back.is_some());