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

code improvements and logging

Browse Source
This commit is contained in:
Simon Gardling 2022-02-15 10:46:39 -05:00
parent db404f3d68
commit d63fc8d3ea
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib.rs
View File

@ -10,6 +10,14 @@ static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
pub type DrawResult<T> = Result<T, Box<dyn std::error::Error>>; pub type DrawResult<T> = Result<T, Box<dyn std::error::Error>>;
#[wasm_bindgen]
extern "C" {
// Use `js_namespace` here to bind `console.log(..)` instead of just
// `log(..)`
#[wasm_bindgen(js_namespace = console)]
fn log(s: &str);
}
/// Result of screen to chart coordinates conversion. /// Result of screen to chart coordinates conversion.
#[wasm_bindgen] #[wasm_bindgen]
pub struct Point { pub struct Point {
@ -62,6 +70,7 @@ impl ChartManager {
pub fn init_panic_hook() { panic::set_hook(Box::new(console_error_panic_hook::hook)); } pub fn init_panic_hook() { panic::set_hook(Box::new(console_error_panic_hook::hook)); }
fn get_back_cache(&self) -> Vec<(f32, f32)> { fn get_back_cache(&self) -> Vec<(f32, f32)> {
log("Using back_cache");
match &self.back_cache { match &self.back_cache {
Some(x) => x.clone(), Some(x) => x.clone(),
None => panic!("use_back_cache is true, but back_cache is None!"), None => panic!("use_back_cache is true, but back_cache is None!"),
@ -69,6 +78,7 @@ impl ChartManager {
} }
fn get_front_cache(&self) -> (Vec<(f32, f32, f32)>, f32) { fn get_front_cache(&self) -> (Vec<(f32, f32, f32)>, f32) {
log("Using front_cache");
match &self.front_cache { match &self.front_cache {
Some(x) => x.clone(), Some(x) => x.clone(),
None => panic!("use_front_cache is true, but front_cache is None!"), None => panic!("use_front_cache is true, but front_cache is None!"),
@ -82,7 +92,6 @@ impl ChartManager {
let func = expr.bind("x").unwrap(); let func = expr.bind("x").unwrap();
let backend = CanvasBackend::with_canvas_object(element).unwrap(); let backend = CanvasBackend::with_canvas_object(element).unwrap();
let root = backend.into_drawing_area(); let root = backend.into_drawing_area();
let font: FontDesc = ("sans-serif", 20.0).into(); let font: FontDesc = ("sans-serif", 20.0).into();
@ -101,6 +110,7 @@ impl ChartManager {
let data: Vec<(f32, f32)> = match self.use_back_cache { let data: Vec<(f32, f32)> = match self.use_back_cache {
true => self.get_back_cache(), true => self.get_back_cache(),
false => { false => {
log("Updating back_cache");
let output: Vec<(f32, f32)> = (1..=self.resolution) let output: Vec<(f32, f32)> = (1..=self.resolution)
.map(|x| ((x as f32 / self.resolution as f32) * absrange) + self.min_x) .map(|x| ((x as f32 / self.resolution as f32) * absrange) + self.min_x)
.map(|x| (x, func(x as f64) as f32)) .map(|x| (x, func(x as f64) as f32))
@ -113,9 +123,10 @@ impl ChartManager {
chart.draw_series(LineSeries::new(data, &RED))?; chart.draw_series(LineSeries::new(data, &RED))?;
let (data2, area): (Vec<(f32, f32, f32)>, f32) = match self.use_front_cache { let (rect_data, area): (Vec<(f32, f32, f32)>, f32) = match self.use_front_cache {
true => self.get_front_cache(), true => self.get_front_cache(),
false => { false => {
log("Updating front_cache");
let step = absrange / (self.num_interval as f32); let step = absrange / (self.num_interval as f32);
let output: (Vec<(f32, f32, f32)>, f32) = self.integral_rectangles(step, &func); let output: (Vec<(f32, f32, f32)>, f32) = self.integral_rectangles(step, &func);
self.front_cache = Some(output.clone()); self.front_cache = Some(output.clone());
@ -125,7 +136,7 @@ impl ChartManager {
// Draw rectangles // Draw rectangles
chart.draw_series( chart.draw_series(
data2 rect_data
.iter() .iter()
.map(|(x1, x2, y)| Rectangle::new([(*x2, *y), (*x1, 0.0)], &BLUE)), .map(|(x1, x2, y)| Rectangle::new([(*x2, *y), (*x1, 0.0)], &BLUE)),
)?; )?;