Products/FastWave2.0
Archived
2
0
Fork 0
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

zoom_or_pan, fix first row width

Browse source
This commit is contained in:
Martin Kavík 2024-06-11 22:42:14 +02:00
parent 7107f77c82
commit 60d4231575
12 changed files with 92 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/platform.rs
View file

@ -31,15 +31,15 @@ pub async fn get_hierarchy() -> wellen::Hierarchy {
pub async fn load_signal_and_get_timeline(
signal_ref: wellen::SignalRef,
timeline_width: u32,
timeline_zoom: f64,
timeline_viewport_width: u32,
timeline_viewport_x: u32,
timeline_viewport_x: i32,
block_height: u32,
var_format: shared::VarFormat,
) -> shared::Timeline {
platform::load_signal_and_get_timeline(
signal_ref,
timeline_width,
timeline_zoom,
timeline_viewport_width,
timeline_viewport_x,
block_height,

6
frontend/src/platform/browser.rs
View file

@ -76,9 +76,9 @@ pub(super) async fn get_hierarchy() -> wellen::Hierarchy {
pub(super) async fn load_signal_and_get_timeline(
signal_ref: wellen::SignalRef,
timeline_width: u32,
timeline_zoom: f64,
timeline_viewport_width: u32,
timeline_viewport_x: u32,
timeline_viewport_x: i32,
block_height: u32,
var_format: shared::VarFormat,
) -> shared::Timeline {
@ -91,7 +91,7 @@ pub(super) async fn load_signal_and_get_timeline(
shared::signal_to_timeline(
signal,
time_table,
timeline_width,
timeline_zoom,
timeline_viewport_width,
timeline_viewport_x,
block_height,

10
frontend/src/platform/tauri.rs
View file

@ -19,9 +19,9 @@ pub(super) async fn get_hierarchy() -> wellen::Hierarchy {
pub(super) async fn load_signal_and_get_timeline(
signal_ref: wellen::SignalRef,
timeline_width: u32,
timeline_zoom: f64,
timeline_viewport_width: u32,
timeline_viewport_x: u32,
timeline_viewport_x: i32,
block_height: u32,
var_format: shared::VarFormat,
) -> shared::Timeline {
@ -29,7 +29,7 @@ pub(super) async fn load_signal_and_get_timeline(
serde_wasm_bindgen::from_value(
tauri_glue::load_signal_and_get_timeline(
signal_ref.index(),
timeline_width,
timeline_zoom,
timeline_viewport_width,
timeline_viewport_x,
block_height,
@ -65,9 +65,9 @@ mod tauri_glue {
#[wasm_bindgen(catch)]
pub async fn load_signal_and_get_timeline(
signal_ref_index: usize,
timeline_width: u32,
timeline_zoom: f64,
timeline_viewport_width: u32,
timeline_viewport_x: u32,
timeline_viewport_x: i32,
block_height: u32,
var_format: JsValue,
) -> Result<JsValue, JsValue>;

2
frontend/src/waveform_panel.rs
View file

@ -122,7 +122,7 @@ impl WaveformPanel {
let signal_ref = var.signal_ref();
let timeline = platform::load_signal_and_get_timeline(
signal_ref,
controller.get_timeline_width(),
controller.get_timeline_zoom(),
controller.get_timeline_viewport_width(),
controller.get_timeline_viewport_x(),
ROW_HEIGHT,

32
frontend/src/waveform_panel/pixi_canvas.rs
View file

@ -40,6 +40,7 @@ impl PixiCanvas {
let width = width.signal(),
let height = height.signal() => (*width, *height)
}
.dedupe()
.throttle(|| Timer::sleep(50))
.for_each(
clone!((controller) move |(width, height)| clone!((controller) async move {
@ -52,12 +53,12 @@ impl PixiCanvas {
let task_with_controller = Mutable::new(None);
// -- FastWave-specific --
let timeline_getter = Rc::new(Closure::new(
|signal_ref_index, timeline_width, 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(
signal_ref,
timeline_width,
timeline_zoom,
timeline_viewport_width,
timeline_viewport_x,
row_height,
@ -81,10 +82,18 @@ impl PixiCanvas {
width.set_neq(new_width);
height.set_neq(new_height);
}))
.update_raw_el(|raw_el| {
// @TODO rewrite to a native Zoon API
raw_el.event_handler(clone!((controller) move |event: events_extra::WheelEvent| {
if let Some(controller) = controller.lock_ref().as_ref() {
controller.zoom_or_pan(event.delta_y(), event.shift_key());
}
}))
})
.after_insert(clone!((controller, timeline_getter) move |element| {
Task::start(async move {
let pixi_controller = js_bridge::PixiController::new(
width.get(),
1.,
width.get(),
0,
row_height,
@ -122,13 +131,13 @@ mod js_bridge {
type TimelinePromise = js_sys::Promise;
type SignalRefIndex = usize;
type TimelineWidth = u32;
type TimelineZoom = f64;
type TimelineViewportWidth = u32;
type TimelineViewportX = u32;
type TimelineViewportX = i32;
type RowHeight = u32;
type VarFormatJs = JsValue;
type TimelineGetter =
Closure<dyn FnMut(SignalRefIndex, TimelineWidth, TimelineViewportWidth, TimelineViewportX, RowHeight, VarFormatJs) -> TimelinePromise>;
Closure<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")]
@ -139,9 +148,9 @@ mod js_bridge {
// @TODO `row_height` and `row_gap` is FastWave-specific
#[wasm_bindgen(constructor)]
pub fn new(
timeline_width: u32,
timeline_zoom: f64,
timeline_viewport_width: u32,
timeline_viewport_x: u32,
timeline_viewport_x: i32,
row_height: u32,
row_gap: u32,
timeline_getter: &TimelineGetter,
@ -157,19 +166,22 @@ mod js_bridge {
pub fn destroy(this: &PixiController);
#[wasm_bindgen(method)]
pub fn get_timeline_width(this: &PixiController) -> u32;
pub fn get_timeline_zoom(this: &PixiController) -> f64;
#[wasm_bindgen(method)]
pub fn get_timeline_viewport_width(this: &PixiController) -> u32;
#[wasm_bindgen(method)]
pub fn get_timeline_viewport_x(this: &PixiController) -> u32;
pub fn get_timeline_viewport_x(this: &PixiController) -> i32;
// -- FastWave-specific --
#[wasm_bindgen(method)]
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);
#[wasm_bindgen(method)]
pub fn remove_var(this: &PixiController, index: usize);