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

simplify plotting logic

Browse Source
This commit is contained in:
Simon Gardling 2022-03-03 08:31:23 -05:00
parent c0d65193bd
commit ee508a7148
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/egui_app.rs
View File

@ -426,6 +426,8 @@ impl epi::App for MathApp {
} }
let available_width: usize = ui.available_width() as usize; let available_width: usize = ui.available_width() as usize;
let step = (self.settings.integral_min_x - self.settings.integral_max_x).abs()
/ (self.settings.integral_num as f64);
Plot::new("plot") Plot::new("plot")
.set_margin_fraction(Vec2::ZERO) .set_margin_fraction(Vec2::ZERO)
@ -436,31 +438,29 @@ impl epi::App for MathApp {
let minx_bounds: f64 = bounds.min()[0]; let minx_bounds: f64 = bounds.min()[0];
let maxx_bounds: f64 = bounds.max()[0]; let maxx_bounds: f64 = bounds.max()[0];
let step = (self.settings.integral_min_x - self.settings.integral_max_x).abs() let area_list: Vec<f64> = self
/ (self.settings.integral_num as f64); .functions
.iter_mut()
.enumerate()
.map(|(i, function)| {
if self.func_strs[i].is_empty() {
return f64::NAN;
}
let mut area_list: Vec<f64> = Vec::new(); // Stores list of areas resulting from calculating the integral of functions function.update_bounds(minx_bounds, maxx_bounds, available_width);
for (i, function) in self.functions.iter_mut().enumerate() { let (back_values, bars) = function.run();
if self.func_strs[i].is_empty() { plot_ui.line(back_values.color(Color32::RED));
continue;
}
function.update_bounds(minx_bounds, maxx_bounds, available_width);
let (back_values, bars) = function.run();
plot_ui.line(back_values.color(Color32::RED));
area_list.push({
if let Some(bars_data) = bars { if let Some(bars_data) = bars {
let (bar_chart, area) = bars_data; let (bar_chart, area) = bars_data;
plot_ui.bar_chart(bar_chart.color(Color32::BLUE).width(step)); plot_ui.bar_chart(bar_chart.color(Color32::BLUE).width(step));
digits_precision(area, 8) return digits_precision(area, 8);
} else { } else {
f64::NAN return f64::NAN;
} }
}); })
} .collect();
self.last_info = (area_list, start.elapsed()); self.last_info = (area_list, start.elapsed());
}); });
}); });