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

cleanup

Browse Source
This commit is contained in:
Simon Gardling 2022-02-24 13:45:19 -05:00
parent eaae1554d7
commit aa6d42560c
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/chart_manager.rs
View File

@ -1,10 +1,10 @@
use crate::misc::{add_asterisks, Function}; use crate::misc::{add_asterisks, Function};
pub enum UpdateType { pub enum UpdateType {
FULL, Full,
FRONT, Front,
BACK, Back,
NONE, None,
} }
// Manages Chart generation and caching of values // Manages Chart generation and caching of values
@ -69,13 +69,13 @@ impl ChartManager {
self.resolution = resolution; self.resolution = resolution;
if update_back && update_front { if update_back && update_front {
UpdateType::FULL UpdateType::Full
} else if update_back { } else if update_back {
UpdateType::BACK UpdateType::Back
} else if update_front { } else if update_front {
UpdateType::FRONT UpdateType::Front
} else { } else {
UpdateType::NONE UpdateType::None
} }
} }

6
src/egui_app.rs
View File

@ -139,12 +139,12 @@ impl epi::App for MathApp {
let do_update = chart_manager.update(func_str.clone(), *min_x, *max_x, *num_interval, *resolution); let do_update = chart_manager.update(func_str.clone(), *min_x, *max_x, *num_interval, *resolution);
match do_update { match do_update {
UpdateType::FULL => { UpdateType::Full => {
back_cache.invalidate(); back_cache.invalidate();
front_cache.invalidate(); front_cache.invalidate();
} }
UpdateType::BACK => back_cache.invalidate(), UpdateType::Back => back_cache.invalidate(),
UpdateType::FRONT => front_cache.invalidate(), UpdateType::Front => front_cache.invalidate(),
_ => {} _ => {}
} }
} }

4
src/misc.rs
View File

@ -57,9 +57,7 @@ pub fn add_asterisks(function_in: String) -> String {
add_asterisk = true; add_asterisk = true;
} }
} else if letters.contains(&c) { } else if letters.contains(&c) {
if numbers.contains(&prev_char) { if numbers.contains(&prev_char) | (valid_variables.contains(&prev_char) && valid_variables.contains(&c)) {
add_asterisk = true;
} else if valid_variables.contains(&prev_char) && valid_variables.contains(&c) {
add_asterisk = true; add_asterisk = true;
} }
} else if (numbers.contains(&c) | c_letters_var) && prev_letters_var { } else if (numbers.contains(&c) | c_letters_var) && prev_letters_var {