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

hide side panel

Browse Source
This commit is contained in:
Simon Gardling 2022-03-02 15:47:53 -05:00
parent 45365144dc
commit f3b5af6ddb
1 changed files with 151 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

277
src/egui_app.rs
View File

@ -45,9 +45,10 @@ const HELP_EXPR: &str = "- sqrt(x): square root of x
- signum, min, max"; - signum, min, max";
// Used in the "Buttons" section of the Help window // Used in the "Buttons" section of the Help window
const HELP_BUTTONS: &str = "- The ∫ button next to the function input indicates whether estimating an integral for that function is enabled or not. const HELP_BUTTONS: &str = "- The 'Panel' button on the top bar toggles if the side bar should be shown or not.
- The ∫ button next to the function input indicates whether estimating an integral for that function is enabled or not.
- The 'Add Function' button on the top panel adds a new function to be graphed. You can then configure that function in the side panel. - The 'Add Function' button on the top panel adds a new function to be graphed. You can then configure that function in the side panel.
- The 'Help' Button on the top bar opens and closes this window!"; - The 'Help' bbutton on the top bar opens and closes this window!";
const HELP_MISC: &str = "- In some edge cases, math functions may not parse correctly. More specifically with implicit multiplication. If you incounter this issue, please do report it on the project's Github page (linked on the side panel). But a bypass would be explicitly stating a multiplication operation through the use of an asterisk"; const HELP_MISC: &str = "- In some edge cases, math functions may not parse correctly. More specifically with implicit multiplication. If you incounter this issue, please do report it on the project's Github page (linked on the side panel). But a bypass would be explicitly stating a multiplication operation through the use of an asterisk";
@ -71,6 +72,11 @@ pub struct MathApp {
// Stores whether or not the help window is open // Stores whether or not the help window is open
help_open: bool, help_open: bool,
// Stores whether or not the side panel is shown or not
show_side_panel: bool,
last_error: String,
// Stores font data that's used when displaying text // Stores font data that's used when displaying text
font: FontData, font: FontData,
@ -99,6 +105,8 @@ impl Default for MathApp {
integral_max_x: DEFAULT_MAX_X, integral_max_x: DEFAULT_MAX_X,
integral_num: DEFAULT_INTEGRAL_NUM, integral_num: DEFAULT_INTEGRAL_NUM,
help_open: true, help_open: true,
show_side_panel: true,
last_error: String::new(),
font: FontData::from_static(&FONT_DATA), font: FontData::from_static(&FONT_DATA),
sum: DEFAULT_RIEMANN, sum: DEFAULT_RIEMANN,
last_info: (vec![0.0], Duration::ZERO), last_info: (vec![0.0], Duration::ZERO),
@ -146,6 +154,17 @@ impl epi::App for MathApp {
// Creates Top bar that contains some general options // Creates Top bar that contains some general options
egui::TopBottomPanel::top("top_bar").show(ctx, |ui| { egui::TopBottomPanel::top("top_bar").show(ctx, |ui| {
ui.horizontal(|ui| { ui.horizontal(|ui| {
if ui
.add(egui::Button::new("Panel"))
.on_hover_text(if self.show_side_panel {
"Hides Side Panel"
} else {
"Shows Side Panel"
})
.clicked()
{
self.show_side_panel = !self.show_side_panel;
}
if ui if ui
.add(egui::Button::new("Add Function")) .add(egui::Button::new("Add Function"))
.on_hover_text("Create and graph new function") .on_hover_text("Create and graph new function")
@ -200,142 +219,148 @@ impl epi::App for MathApp {
}); });
}); });
let mut parse_error: String = String::new(); // Stores errors found when interpreting input functions
// Side Panel which contains vital options to the operation of the application (such as adding functions and other options) // Side Panel which contains vital options to the operation of the application (such as adding functions and other options)
egui::SidePanel::left("side_panel") if self.show_side_panel {
.resizable(false) egui::SidePanel::left("side_panel")
.show(ctx, |ui| { .resizable(false)
egui::ComboBox::from_label("Riemann Sum Type") .show(ctx, |ui| {
.selected_text(self.sum.to_string()) egui::ComboBox::from_label("Riemann Sum Type")
.show_ui(ui, |ui| { .selected_text(self.sum.to_string())
ui.selectable_value(&mut self.sum, RiemannSum::Left, "Left"); .show_ui(ui, |ui| {
ui.selectable_value(&mut self.sum, RiemannSum::Middle, "Middle"); ui.selectable_value(&mut self.sum, RiemannSum::Left, "Left");
ui.selectable_value(&mut self.sum, RiemannSum::Right, "Right"); ui.selectable_value(&mut self.sum, RiemannSum::Middle, "Middle");
}); ui.selectable_value(&mut self.sum, RiemannSum::Right, "Right");
});
let min_x_old = self.integral_min_x; let min_x_old = self.integral_min_x;
let min_x_changed = ui let min_x_changed = ui
.add( .add(
egui::Slider::new(&mut self.integral_min_x, INTEGRAL_X_RANGE.clone()) egui::Slider::new(&mut self.integral_min_x, INTEGRAL_X_RANGE.clone())
.text("Min X"), .text("Min X"),
) )
.changed(); .changed();
let max_x_old = self.integral_max_x; let max_x_old = self.integral_max_x;
let max_x_changed = ui let max_x_changed = ui
.add( .add(
egui::Slider::new(&mut self.integral_max_x, INTEGRAL_X_RANGE).text("Max X"), egui::Slider::new(&mut self.integral_max_x, INTEGRAL_X_RANGE)
) .text("Max X"),
.changed(); )
.changed();
// Checks bounds, and if they are invalid, fix them // Checks bounds, and if they are invalid, fix them
if self.integral_min_x >= self.integral_max_x { if self.integral_min_x >= self.integral_max_x {
if max_x_changed { if max_x_changed {
self.integral_max_x = max_x_old; self.integral_max_x = max_x_old;
} else if min_x_changed { } else if min_x_changed {
self.integral_min_x = min_x_old; self.integral_min_x = min_x_old;
} else {
// No clue how this would happen, but just in case
self.integral_min_x = -10.0;
self.integral_max_x = 10.0;
}
}
ui.add(
egui::Slider::new(&mut self.integral_num, INTEGRAL_NUM_RANGE).text("Interval"),
);
let mut remove_i: Option<usize> = None;
for (i, function) in self.functions.iter_mut().enumerate() {
let mut integral_toggle: bool = false;
let integral_enabled = function.integral;
// Entry for a function
ui.horizontal(|ui| {
ui.label("Function:");
if ui
.add(Button::new("X"))
.on_hover_text("Delete Function")
.clicked()
{
remove_i = Some(i);
}
if ui
.add(Button::new("∫"))
.on_hover_text(if integral_enabled {
"Don't integrate"
} else {
"Integrate"
})
.clicked()
{
integral_toggle = true;
}
ui.text_edit_singleline(&mut self.func_strs[i]);
});
let integral: bool = if integral_toggle {
!integral_enabled
} else {
integral_enabled
};
if !self.func_strs[i].is_empty() {
let proc_func_str = add_asterisks(self.func_strs[i].clone());
let func_test_output = test_func(proc_func_str.clone());
if let Some(test_output_value) = func_test_output {
parse_error += &format!("(Function #{}) {}", i, test_output_value);
} else { } else {
function.update( // No clue how this would happen, but just in case
proc_func_str, self.integral_min_x = -10.0;
integral, self.integral_max_x = 10.0;
Some(self.integral_min_x),
Some(self.integral_max_x),
Some(self.integral_num),
Some(self.sum),
);
} }
} else {
function.func_str = "".to_string();
} }
}
if self.functions.len() > 1 { ui.add(
if let Some(remove_i_unwrap) = remove_i { egui::Slider::new(&mut self.integral_num, INTEGRAL_NUM_RANGE)
self.functions.remove(remove_i_unwrap); .text("Interval"),
self.func_strs.remove(remove_i_unwrap); );
let mut remove_i: Option<usize> = None;
self.last_error = String::new();
for (i, function) in self.functions.iter_mut().enumerate() {
let mut integral_toggle: bool = false;
let integral_enabled = function.integral;
// Entry for a function
ui.horizontal(|ui| {
ui.label("Function:");
if ui
.add(Button::new("X"))
.on_hover_text("Delete Function")
.clicked()
{
remove_i = Some(i);
}
if ui
.add(Button::new("∫"))
.on_hover_text(if integral_enabled {
"Don't integrate"
} else {
"Integrate"
})
.clicked()
{
integral_toggle = true;
}
ui.text_edit_singleline(&mut self.func_strs[i]);
});
let integral: bool = if integral_toggle {
!integral_enabled
} else {
integral_enabled
};
if !self.func_strs[i].is_empty() {
let proc_func_str = add_asterisks(self.func_strs[i].clone());
let func_test_output = test_func(proc_func_str.clone());
if let Some(test_output_value) = func_test_output {
self.last_error +=
&format!("(Function #{}) {}", i, test_output_value);
} else {
function.update(
proc_func_str,
integral,
Some(self.integral_min_x),
Some(self.integral_max_x),
Some(self.integral_num),
Some(self.sum),
);
}
} else {
function.func_str = "".to_string();
}
} }
}
// Open Source and Licensing information if self.functions.len() > 1 {
ui.hyperlink_to( if let Some(remove_i_unwrap) = remove_i {
"I'm Opensource!", self.functions.remove(remove_i_unwrap);
"https://github.com/Titaniumtown/integral_site", self.func_strs.remove(remove_i_unwrap);
); }
ui.label(RichText::new("(and licensed under AGPLv3)").color(Color32::LIGHT_GRAY)) }
// Open Source and Licensing information
ui.hyperlink_to(
"I'm Opensource!",
"https://github.com/Titaniumtown/integral_site",
);
ui.label(
RichText::new("(and licensed under AGPLv3)").color(Color32::LIGHT_GRAY),
)
.on_hover_text(LICENSE_INFO); .on_hover_text(LICENSE_INFO);
// Displays commit info // Displays commit info
ui.horizontal(|ui| { ui.horizontal(|ui| {
ui.label("Commit:"); ui.label("Commit:");
// Only include hyperlink if the build doesn't have untracked files // Only include hyperlink if the build doesn't have untracked files
if GIT_VERSION.contains("-modified") { if GIT_VERSION.contains("-modified") {
// If git version is modified, don't display a link to the commit on github (as the commit will not exist) // If git version is modified, don't display a link to the commit on github (as the commit will not exist)
ui.label(GIT_VERSION).on_hover_text( ui.label(GIT_VERSION).on_hover_text(
"This build has been modified from the latest git commit.", "This build has been modified from the latest git commit.",
); );
} else { } else {
ui.hyperlink_to( ui.hyperlink_to(
GIT_VERSION, GIT_VERSION,
format!( format!(
"https://github.com/Titaniumtown/integral_site/commit/{}", "https://github.com/Titaniumtown/integral_site/commit/{}",
GIT_VERSION GIT_VERSION
), ),
); );
} }
});
}); });
}); }
let step = (self.integral_min_x - self.integral_max_x).abs() / (self.integral_num as f64); let step = (self.integral_min_x - self.integral_max_x).abs() / (self.integral_num as f64);
@ -345,9 +370,9 @@ impl epi::App for MathApp {
egui::CentralPanel::default() egui::CentralPanel::default()
.frame(Frame::none()) .frame(Frame::none())
.show(ctx, |ui| { .show(ctx, |ui| {
if !parse_error.is_empty() { if !self.last_error.is_empty() {
ui.centered_and_justified(|ui| { ui.centered_and_justified(|ui| {
ui.heading(parse_error); ui.heading(self.last_error.clone());
}); });
return; return;
} }