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

set_var_format

Browse source
This commit is contained in:
Martin Kavík 2024-06-09 22:53:02 +02:00
parent d654714c0d
commit 1881d62c56
11 changed files with 145 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,13 +78,14 @@ pub(super) async fn load_signal_and_get_timeline(
signal_ref: wellen::SignalRef,
screen_width: u32,
block_height: u32,
var_format: shared::VarFormat,
) -> shared::Timeline {
let mut waveform_lock = STORE.waveform.lock().unwrap();
let waveform = waveform_lock.as_mut().unwrap();
waveform.load_signals_multi_threaded(&[signal_ref]);
let signal = waveform.get_signal(signal_ref).unwrap();
let time_table = waveform.time_table();
let timeline = signal_to_timeline(signal, time_table, screen_width, block_height);
let timeline = signal_to_timeline(signal, time_table, screen_width, block_height, var_format);
timeline
}
@ -100,11 +101,12 @@ fn signal_to_timeline(
time_table: &[wellen::Time],
screen_width: u32,
block_height: u32,
var_format: shared::VarFormat,
) -> shared::Timeline {
const MIN_BLOCK_WIDTH: u32 = 3;
// Courier New, 16px, sync with `label_style` in `pixi_canvas.rs`
const LETTER_WIDTH: f64 = 9.61;
const LETTER_HEIGHT: u32 = 21;
const LETTER_HEIGHT: u32 = 18;
const LABEL_X_PADDING: u32 = 10;
let Some(last_time) = time_table.last().copied() else {
@ -139,7 +141,7 @@ fn signal_to_timeline(
}
// @TODO cache?
let value = shared::VarFormat::default().format(value);
let value = var_format.format(value);
let value_width = (value.chars().count() as f64 * LETTER_WIDTH) as u32;
// @TODO Ellipsis instead of hiding?

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

@ -21,11 +21,18 @@ pub(super) async fn load_signal_and_get_timeline(
signal_ref: wellen::SignalRef,
screen_width: u32,
block_height: u32,
var_format: shared::VarFormat,
) -> shared::Timeline {
let var_format = serde_wasm_bindgen::to_value(&var_format).unwrap_throw();
serde_wasm_bindgen::from_value(
tauri_glue::load_signal_and_get_timeline(signal_ref.index(), screen_width, block_height)
.await
.unwrap_throw(),
tauri_glue::load_signal_and_get_timeline(
signal_ref.index(),
screen_width,
block_height,
var_format,
)
.await
.unwrap_throw(),
)
.unwrap_throw()
}
@ -56,6 +63,7 @@ mod tauri_glue {
signal_ref_index: usize,
screen_width: u32,
block_height: u32,
var_format: JsValue,
) -> Result<JsValue, JsValue>;
#[wasm_bindgen(catch)]