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

remove integral_used

Browse Source
This commit is contained in:
Simon Gardling 2022-03-04 09:19:42 -05:00
parent 3e6e0e5adb
commit f9cbd8b950
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/egui_app.rs
View File

@ -93,9 +93,6 @@ struct AppSettings {
// Number of rectangles used to calculate integral // Number of rectangles used to calculate integral
pub integral_num: usize, pub integral_num: usize,
// Stores whether or not the integral functionality is being used
pub integral_used: bool,
} }
impl Default for AppSettings { impl Default for AppSettings {
@ -108,7 +105,6 @@ impl Default for AppSettings {
integral_min_x: DEFAULT_MIN_X, integral_min_x: DEFAULT_MIN_X,
integral_max_x: DEFAULT_MAX_X, integral_max_x: DEFAULT_MAX_X,
integral_num: DEFAULT_INTEGRAL_NUM, integral_num: DEFAULT_INTEGRAL_NUM,
integral_used: true,
} }
} }
} }
@ -152,19 +148,13 @@ impl MathApp {
SidePanel::left("side_panel") SidePanel::left("side_panel")
.resizable(false) .resizable(false)
.show(ctx, |ui| { .show(ctx, |ui| {
if self.settings.integral_used { ComboBox::from_label("Riemann Sum Type")
ComboBox::from_label("Riemann Sum Type") .selected_text(self.settings.sum.to_string())
.selected_text(self.settings.sum.to_string()) .show_ui(ui, |ui| {
.show_ui(ui, |ui| { ui.selectable_value(&mut self.settings.sum, RiemannSum::Left, "Left");
ui.selectable_value(&mut self.settings.sum, RiemannSum::Left, "Left"); ui.selectable_value(&mut self.settings.sum, RiemannSum::Middle, "Middle");
ui.selectable_value( ui.selectable_value(&mut self.settings.sum, RiemannSum::Right, "Right");
&mut self.settings.sum, });
RiemannSum::Middle,
"Middle",
);
ui.selectable_value(&mut self.settings.sum, RiemannSum::Right, "Right");
});
}
let min_x_old = self.settings.integral_min_x; let min_x_old = self.settings.integral_min_x;
let min_x_changed = ui let min_x_changed = ui
@ -282,8 +272,6 @@ impl MathApp {
} }
} }
self.settings.integral_used = using_integral;
if self.functions.len() > 1 { if self.functions.len() > 1 {
if let Some(remove_i_unwrap) = remove_i { if let Some(remove_i_unwrap) = remove_i {
self.functions.remove(remove_i_unwrap); self.functions.remove(remove_i_unwrap);