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

improve integral options

Browse Source
This commit is contained in:
Simon Gardling
2022-05-18 22:56:41 -04:00
parent a013207890
commit 4a8bd74d84
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/consts.rs
View File

@@ -1,5 +1,3 @@
use std::ops::RangeInclusive;
use const_format::formatc; use const_format::formatc;
use epaint::Color32; use epaint::Color32;
use shadow_rs::shadow; use shadow_rs::shadow;
@@ -18,9 +16,6 @@ pub const BUILD_INFO: &str = formatc!(
// Hard-Coded limits // Hard-Coded limits
/// Range of acceptable input values for integral_num
pub const INTEGRAL_NUM_RANGE: RangeInclusive<usize> = 1..=50000;
// Default values // Default values
/// Default minimum X value to display /// Default minimum X value to display
pub const DEFAULT_MIN_X: f64 = -10.0; pub const DEFAULT_MIN_X: f64 = -10.0;

27
src/math_app.rs
View File

@@ -6,7 +6,7 @@ use crate::misc::{dyn_mut_iter, option_vec_printer};
use eframe::App; use eframe::App;
use egui::{ use egui::{
plot::Plot, style::Margin, Button, CentralPanel, ComboBox, Context, Frame, Key, Layout, plot::Plot, style::Margin, Button, CentralPanel, ComboBox, Context, Frame, Key, Layout,
SidePanel, Slider, TopBottomPanel, Vec2, Window, SidePanel, TopBottomPanel, Vec2, Window,
}; };
use egui::{DragValue, Ui}; use egui::{DragValue, Ui};
use emath::{Align, Align2}; use emath::{Align, Align2};
@@ -276,6 +276,10 @@ impl MathApp {
let prev_sum = self.settings.riemann_sum; let prev_sum = self.settings.riemann_sum;
// ComboBox for selecting what Riemann sum type to use // ComboBox for selecting what Riemann sum type to use
ui.add_enabled_ui(any_using_integral, |ui| { ui.add_enabled_ui(any_using_integral, |ui| {
let spacing_mut = ui.spacing_mut();
spacing_mut.item_spacing.x = 1.0;
spacing_mut.interact_size *= 0.5;
ComboBox::from_label("Riemann Sum") ComboBox::from_label("Riemann Sum")
.selected_text(self.settings.riemann_sum.to_string()) .selected_text(self.settings.riemann_sum.to_string())
.show_ui(ui, |ui| { .show_ui(ui, |ui| {
@@ -303,10 +307,10 @@ impl MathApp {
let (min_x_changed, max_x_changed) = ui let (min_x_changed, max_x_changed) = ui
.horizontal(|ui: &mut Ui| { .horizontal(|ui: &mut Ui| {
let spacing_mut = ui.spacing_mut(); // let spacing_mut = ui.spacing_mut();
spacing_mut.item_spacing = Vec2::new(1.0, 0.0); // spacing_mut.item_spacing = Vec2::new(1.0, 0.0);
spacing_mut.interact_size *= 0.5; // spacing_mut.interact_size *= 0.5;
ui.label("Integral: ["); ui.label("Integral: [");
let min_x_changed = ui let min_x_changed = ui
@@ -336,12 +340,15 @@ impl MathApp {
// Number of Rectangles for Riemann sum // Number of Rectangles for Riemann sum
let integral_num_changed = ui let integral_num_changed = ui
.add_enabled( .horizontal(|ui| {
any_using_integral, let spacing_mut = ui.spacing_mut();
Slider::new(&mut self.settings.integral_num, INTEGRAL_NUM_RANGE)
.text("Interval"), spacing_mut.item_spacing.x = 1.5;
) ui.label("Interval:");
.changed(); ui.add(DragValue::new(&mut self.settings.integral_num))
.changed()
})
.inner;
self.settings.integral_changed = any_using_integral self.settings.integral_changed = any_using_integral
&& (max_x_changed | min_x_changed | integral_num_changed | riemann_changed); && (max_x_changed | min_x_changed | integral_num_changed | riemann_changed);