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

optimize integral display

Browse Source
This commit is contained in:
Simon Gardling 2022-04-13 09:23:40 -04:00
parent d435307259
commit f2181dc695
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/function.rs
View File

@ -391,8 +391,26 @@ impl FunctionEntry {
let step = (settings.integral_min_x - settings.integral_max_x).abs() let step = (settings.integral_min_x - settings.integral_max_x).abs()
/ (settings.integral_num as f64); / (settings.integral_num as f64);
let resolution = (self.min_x - self.max_x).abs() / (settings.plot_width as f64);
// Plot back data // Plot back data
if !self.back_data.is_empty() { if !self.back_data.is_empty() {
if self.integral && (resolution >= step) {
plot_ui.line(
self.back_data
.iter()
.filter(|value| {
(value.x > settings.integral_min_x)
&& (settings.integral_max_x > value.x)
})
.cloned()
.collect::<Vec<Value>>()
.to_line()
.color(Color32::BLUE)
.name(&self.raw_func_str)
.fill(0.0),
);
}
plot_ui.line( plot_ui.line(
self.back_data self.back_data
.to_line() .to_line()
@ -445,11 +463,13 @@ impl FunctionEntry {
// Plot integral data // Plot integral data
match &self.integral_data { match &self.integral_data {
Some(integral_data) => { Some(integral_data) => {
if step > resolution {
plot_ui.bar_chart( plot_ui.bar_chart(
BarChart::new(integral_data.0.clone()) BarChart::new(integral_data.0.clone())
.color(Color32::BLUE) .color(Color32::BLUE)
.width(step), .width(step),
); );
}
// return value rounded to 8 decimal places // return value rounded to 8 decimal places
Some(crate::misc::decimal_round(integral_data.1, 8)) Some(crate::misc::decimal_round(integral_data.1, 8))