pan & zoom boundaries + related gifs

README.md

@@ -4,11 +4,23 @@
 ---
 
 <p align="center">
-  <img width="800" src="docs/screenshot_firefox.png" alt="fastwave_screenshot_firefox" />
+  <img width="800" src="docs/screenshot_firefox.png" alt="Fastwave - Browser (Firefox)" />
+  Browser (Firefox)
 </p>
 
 <p align="center">
-  <img width="800" src="docs/video_desktop.gif" alt="fastwave_video_desktop" />
+  <img width="800" src="docs/video_desktop.gif" alt="Fastwave - Desktop, miller columns and tree" />
+  Desktop, miller columns and tree 
+</p>
+
+<p align="center">
+  <img width="800" src="docs/video_zoom_formatting_simple.gif" alt="Fastwave - Zoom, pan and basic number formats" />
+  Zoom, pan and basic number formats 
+</p>
+
+<p align="center">
+  <img width="800" src="docs/video_zoom_formatting.gif" alt="Fastwave - Zoom and all formats" />
+  Zoom and all formats 
 </p>
 
 ---

frontend/src/platform.rs

@@ -44,7 +44,8 @@ pub async fn load_signal_and_get_timeline(
         timeline_viewport_x,
         block_height,
         var_format,
-    ).await
+    )
+    .await
 }
 
 pub async fn unload_signal(signal_ref: wellen::SignalRef) {

frontend/src/platform/browser.rs

@@ -87,16 +87,15 @@ pub(super) async fn load_signal_and_get_timeline(
     waveform.load_signals_multi_threaded(&[signal_ref]);
     let signal = waveform.get_signal(signal_ref).unwrap();
     let time_table = waveform.time_table();
-    let timeline =
+    let timeline = shared::signal_to_timeline(
-        shared::signal_to_timeline(
+        signal,
-            signal, 
+        time_table,
-            time_table, 
+        timeline_zoom,
-            timeline_zoom, 
+        timeline_viewport_width,
-            timeline_viewport_width, 
+        timeline_viewport_x,
-            timeline_viewport_x,
+        block_height,
-            block_height,
+        var_format,
-            var_format,
+    );
-        );
     timeline
 }
 

frontend/src/waveform_panel/pixi_canvas.rs

@@ -53,7 +53,12 @@ impl PixiCanvas {
         let task_with_controller = Mutable::new(None);
         // -- FastWave-specific --
         let timeline_getter = Rc::new(Closure::new(
-            |signal_ref_index, timeline_zoom, timeline_viewport_width, timeline_viewport_x, row_height, var_format| {
+            |signal_ref_index,
+             timeline_zoom,
+             timeline_viewport_width,
+             timeline_viewport_x,
+             row_height,
+             var_format| {
                 future_to_promise(async move {
                     let signal_ref = wellen::SignalRef::from_index(signal_ref_index).unwrap_throw();
                     let timeline = platform::load_signal_and_get_timeline(
@@ -84,15 +89,17 @@ impl PixiCanvas {
                 }))
                 .update_raw_el(|raw_el| {
                     // @TODO rewrite to a native Zoon API
-                    raw_el.event_handler(clone!((controller) move |event: events_extra::WheelEvent| {
+                    raw_el.event_handler(
-                        if let Some(controller) = controller.lock_ref().as_ref() {
+                        clone!((controller) move |event: events_extra::WheelEvent| {
-                            controller.zoom_or_pan(
+                            if let Some(controller) = controller.lock_ref().as_ref() {
-                                event.delta_y(), 
+                                controller.zoom_or_pan(
-                                event.shift_key(),
+                                    event.delta_y(),
-                                event.offset_x() as u32,
+                                    event.shift_key(),
-                            );
+                                    event.offset_x() as u32,
-                        }
+                                );
-                    }))
+                            }
+                        }),
+                    )
                 })
                 .after_insert(clone!((controller, timeline_getter) move |element| {
                     Task::start(async move {
@@ -140,8 +147,16 @@ mod js_bridge {
     type TimelineViewportX = i32;
     type RowHeight = u32;
     type VarFormatJs = JsValue;
-    type TimelineGetter =
+    type TimelineGetter = Closure<
-        Closure<dyn FnMut(SignalRefIndex, TimelineZoom, TimelineViewportWidth, TimelineViewportX, RowHeight, VarFormatJs) -> TimelinePromise>;
+        dyn FnMut(
+            SignalRefIndex,
+            TimelineZoom,
+            TimelineViewportWidth,
+            TimelineViewportX,
+            RowHeight,
+            VarFormatJs,
+        ) -> TimelinePromise,
+    >;
 
     // Note: Add all corresponding methods to `frontend/typescript/pixi_canvas/pixi_canvas.ts`
     #[wasm_bindgen(module = "/typescript/bundles/pixi_canvas.js")]
@@ -184,7 +199,12 @@ mod js_bridge {
         pub fn set_var_format(this: &PixiController, index: usize, var_format: JsValue);
 
         #[wasm_bindgen(method)]
-        pub fn zoom_or_pan(this: &PixiController, wheel_delta_y: f64, shift_key: bool, offset_x: u32);
+        pub fn zoom_or_pan(
+            this: &PixiController,
+            wheel_delta_y: f64,
+            shift_key: bool,
+            offset_x: u32,
+        );
 
         #[wasm_bindgen(method)]
         pub fn remove_var(this: &PixiController, index: usize);

frontend/typescript/bundles/pixi_canvas.js

@@ -35223,10 +35223,22 @@ var PixiController = class {
     } else {
       const offset_x_ratio = offset_x / this.timeline_viewport_width;
       const old_timeline_width = this.timeline_viewport_width * this.timeline_zoom;
-      this.timeline_zoom -= Math.sign(wheel_delta_y) * this.timeline_zoom * 0.5;
+      const new_zoom = this.timeline_zoom - Math.sign(wheel_delta_y) * this.timeline_zoom * 0.5;
-      const new_timeline_width = this.timeline_viewport_width * this.timeline_zoom;
+      const new_timeline_width = this.timeline_viewport_width * new_zoom;
-      const timeline_width_difference = new_timeline_width - old_timeline_width;
+      if (new_timeline_width < this.timeline_viewport_width) {
-      this.timeline_viewport_x += timeline_width_difference * offset_x_ratio;
+        this.timeline_zoom = 1;
+        this.timeline_viewport_x = 0;
+      } else {
+        const timeline_width_difference = new_timeline_width - old_timeline_width;
+        this.timeline_viewport_x += timeline_width_difference * offset_x_ratio;
+        this.timeline_zoom = new_zoom;
+      }
+    }
+    const timeline_width = this.timeline_viewport_width * this.timeline_zoom;
+    if (this.timeline_viewport_x < 0) {
+      this.timeline_viewport_x = 0;
+    } else if (this.timeline_viewport_x + this.timeline_viewport_width > timeline_width) {
+      this.timeline_viewport_x = timeline_width - this.timeline_viewport_width;
     }
     this.redraw_all_rows();
   }

frontend/typescript/pixi_canvas/pixi_canvas.ts

@@ -151,13 +151,24 @@ export class PixiController {
         if (shift_key) {
             this.timeline_viewport_x += Math.sign(wheel_delta_y) * 20;
         } else {
-            // @TODO bounds
             const offset_x_ratio = offset_x / this.timeline_viewport_width;
             const old_timeline_width = this.timeline_viewport_width * this.timeline_zoom; 
-            this.timeline_zoom -= Math.sign(wheel_delta_y) * this.timeline_zoom * 0.5;
+            const new_zoom = this.timeline_zoom - Math.sign(wheel_delta_y) * this.timeline_zoom * 0.5;
-            const new_timeline_width = this.timeline_viewport_width * this.timeline_zoom;
+            const new_timeline_width = this.timeline_viewport_width * new_zoom;
-            const timeline_width_difference = new_timeline_width - old_timeline_width;
+            if (new_timeline_width < this.timeline_viewport_width) {
-            this.timeline_viewport_x += timeline_width_difference * offset_x_ratio;
+                this.timeline_zoom = 1;
+                this.timeline_viewport_x = 0;
+            } else {
+                const timeline_width_difference = new_timeline_width - old_timeline_width;
+                this.timeline_viewport_x += timeline_width_difference * offset_x_ratio;
+                this.timeline_zoom = new_zoom;
+            }
+        }
+        const timeline_width = this.timeline_viewport_width * this.timeline_zoom;
+        if (this.timeline_viewport_x < 0) {
+            this.timeline_viewport_x = 0;
+        } else if (this.timeline_viewport_x + this.timeline_viewport_width > timeline_width) {
+            this.timeline_viewport_x = timeline_width - this.timeline_viewport_width;
         }
         this.redraw_all_rows();
     }

src-tauri/src/lib.rs

@@ -56,16 +56,15 @@ async fn load_signal_and_get_timeline(
     waveform.load_signals_multi_threaded(&[signal_ref]);
     let signal = waveform.get_signal(signal_ref).unwrap();
     let time_table = waveform.time_table();
-    let timeline =
+    let timeline = shared::signal_to_timeline(
-        shared::signal_to_timeline(
+        signal,
-            signal, 
+        time_table,
-            time_table, 
+        timeline_zoom,
-            timeline_zoom, 
+        timeline_viewport_width,
-            timeline_viewport_width, 
+        timeline_viewport_x,
-            timeline_viewport_x,
+        block_height,
-            block_height,
+        var_format,
-            var_format,
+    );
-        );
     Ok(serde_json::to_value(timeline).unwrap())
 }