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

cleanup some plot code

Browse Source
This commit is contained in:
Simon Gardling 2022-03-02 23:38:43 -05:00
parent 638e50203c
commit 395deb70da
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/egui_app.rs
View File

@ -421,42 +421,39 @@ impl epi::App for MathApp {
}); });
return; return;
} }
let available_width: usize = ui.available_width() as usize; let available_width: usize = ui.available_width() as usize;
let plot_size = ui.available_size();
let plot_size = Vec2::new(plot_size.x, plot_size.y);
ui.allocate_ui(plot_size, |ui| { Plot::new("plot")
Plot::new("plot") .set_margin_fraction(Vec2::ZERO)
.set_margin_fraction(Vec2::ZERO) .data_aspect(1.0)
.data_aspect(1.0) .include_y(0)
.include_y(0) .show(ui, |plot_ui| {
.show(ui, |plot_ui| { let bounds = plot_ui.plot_bounds();
let bounds = plot_ui.plot_bounds(); 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];
for (i, function) in self.functions.iter_mut().enumerate() { for (i, function) in self.functions.iter_mut().enumerate() {
if self.func_strs[i].is_empty() { if self.func_strs[i].is_empty() {
continue; 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 {
let (bar_chart, area) = bars_data;
plot_ui.bar_chart(bar_chart.color(Color32::BLUE).width(step));
digits_precision(area, 8)
} else {
f64::NAN
}
});
} }
});
}); 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 {
let (bar_chart, area) = bars_data;
plot_ui.bar_chart(bar_chart.color(Color32::BLUE).width(step));
digits_precision(area, 8)
} else {
f64::NAN
}
});
}
});
}); });
self.last_info = (area_list, start.elapsed()); self.last_info = (area_list, start.elapsed());