diff options
Diffstat (limited to 'crates/wipfel/src')
| -rw-r--r-- | crates/wipfel/src/app.rs | 9 | ||||
| -rw-r--r-- | crates/wipfel/src/canvas_view.rs | 22 |
2 files changed, 17 insertions, 14 deletions
diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index de64e06..4ed2e90 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -149,7 +149,7 @@ fn find_peak_panel(p: &FpProps) -> Html { pub fn app() -> Html { let bitmap = use_state(|| None::<web_sys::ImageBitmap>); let view = use_state(ViewState::default); - let status = use_state(|| "No image loaded · build 27i".to_string()); + let status = use_state(|| "No image loaded · build 27j".to_string()); let db_status = use_state(|| "Loading hill database…".to_string()); let fit_info = use_state(String::new); let tick = use_state(|| 0u32); @@ -672,7 +672,6 @@ pub fn app() -> Html { zoom: { let view = view.clone(); let user_moved = user_moved.clone(); - let status = status.clone(); Callback::from(move |(cx, cy, factor): (f64, f64, f64)| { *user_moved.borrow_mut() = true; let v = &*view; @@ -683,12 +682,6 @@ pub fn app() -> Html { ox: cx - (cx - v.ox) * k, oy: cy - (cy - v.oy) * k, }); - status.set(format!( - "zoom {:.4}->{:.4} readback {:.4}", - v.scale, - ns, - view.scale - )); }) }, click: { diff --git a/crates/wipfel/src/canvas_view.rs b/crates/wipfel/src/canvas_view.rs index bcff21f..e053add 100644 --- a/crates/wipfel/src/canvas_view.rs +++ b/crates/wipfel/src/canvas_view.rs @@ -114,8 +114,8 @@ pub fn canvas_view(props: &Props) -> Html { pts: Vec::new(), pinch: None, }); - // event counters for pinch diagnostics (pointerdown / pointermove) - let evcount = use_mut_ref(|| (0u32, 0u32)); + // event counters for pinch diagnostics: (pointerdown, pinch-f, seeds) + let evcount = use_mut_ref(|| (0u32, 0u32, 0u32)); // redraw on every view/bitmap/marker change and on resize ticks { @@ -492,14 +492,24 @@ pub fn canvas_view(props: &Props) -> Html { d.moved = true; let dbg = match ev { Some((f, ..)) => { - let (pd, mv) = { + let (pd, mv, sd) = { let mut c = evcount.borrow_mut(); c.1 += 1; - (c.0, c.1) + (c.0, c.1, c.2) }; - format!("pinch d={dist:.0} f={f:.3} pd={pd} mv={mv} s={:.4}", scale) + format!( + "pinch d={dist:.0} f={f:.3} pd={pd} mv={mv} sd={sd} s={:.4}", + scale + ) + } + None => { + let sd = { + let mut c = evcount.borrow_mut(); + c.2 += 1; + c.2 + }; + format!("pinch d={dist:.0} seed#{sd}") } - None => format!("pinch d={dist:.0} seed"), }; (ev, dbg) } else { |
