diff --git a/src/chart_manager.rs b/src/chart_manager.rs index c3f4832..e2ffb31 100644 --- a/src/chart_manager.rs +++ b/src/chart_manager.rs @@ -1,10 +1,10 @@ use crate::misc::{add_asterisks, Function}; pub enum UpdateType { - FULL, - FRONT, - BACK, - NONE, + Full, + Front, + Back, + None, } // Manages Chart generation and caching of values @@ -69,13 +69,13 @@ impl ChartManager { self.resolution = resolution; if update_back && update_front { - UpdateType::FULL + UpdateType::Full } else if update_back { - UpdateType::BACK + UpdateType::Back } else if update_front { - UpdateType::FRONT + UpdateType::Front } else { - UpdateType::NONE + UpdateType::None } } diff --git a/src/egui_app.rs b/src/egui_app.rs index bbb426d..f99ff68 100644 --- a/src/egui_app.rs +++ b/src/egui_app.rs @@ -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); match do_update { - UpdateType::FULL => { + UpdateType::Full => { back_cache.invalidate(); front_cache.invalidate(); } - UpdateType::BACK => back_cache.invalidate(), - UpdateType::FRONT => front_cache.invalidate(), + UpdateType::Back => back_cache.invalidate(), + UpdateType::Front => front_cache.invalidate(), _ => {} } } diff --git a/src/misc.rs b/src/misc.rs index bc4e445..efa9fe7 100644 --- a/src/misc.rs +++ b/src/misc.rs @@ -57,9 +57,7 @@ pub fn add_asterisks(function_in: String) -> String { add_asterisk = true; } } else if letters.contains(&c) { - if numbers.contains(&prev_char) { - add_asterisk = true; - } else if valid_variables.contains(&prev_char) && valid_variables.contains(&c) { + if numbers.contains(&prev_char) | (valid_variables.contains(&prev_char) && valid_variables.contains(&c)) { add_asterisk = true; } } else if (numbers.contains(&c) | c_letters_var) && prev_letters_var {