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

remove load_and_get_signal, rename timeline to load_signal_and_get_timeline

Browse source
This commit is contained in:
Martin Kavík 2024-06-07 00:45:05 +02:00
parent d8c1b0abac
commit 3f61f9f3fe
7 changed files with 15 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/platform.rs
View file

@ -33,12 +33,8 @@ pub async fn get_time_table() -> wellen::TimeTable {
platform::get_time_table().await
}
pub async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen::Signal {
platform::load_and_get_signal(signal_ref).await
}
pub async fn timeline(signal_ref: wellen::SignalRef, screen_width: u32, block_height: u32) -> shared::Timeline {
platform::timeline(signal_ref, screen_width, block_height).await
pub async fn load_signal_and_get_timeline(signal_ref: wellen::SignalRef, screen_width: u32, block_height: u32) -> shared::Timeline {
platform::load_signal_and_get_timeline(signal_ref, screen_width, block_height).await
}
pub async fn unload_signal(signal_ref: wellen::SignalRef) {

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

@ -81,17 +81,8 @@ pub(super) async fn get_time_table() -> wellen::TimeTable {
serde_json::from_value(serde_json::to_value(time_table).unwrap_throw()).unwrap_throw()
}
pub(super) async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen::Signal {
let mut waveform_lock = STORE.waveform.lock().unwrap_throw();
let waveform = waveform_lock.as_mut().unwrap_throw();
// @TODO maybe run it in a thread to not block the main one and then
waveform.load_signals(&[signal_ref]);
let signal = waveform.get_signal(signal_ref).unwrap_throw();
// @TODO `clone` / `Rc/Arc` / refactor?
serde_json::from_value(serde_json::to_value(signal).unwrap_throw()).unwrap_throw()
}
pub(super) async fn timeline(signal_ref: wellen::SignalRef, screen_width: u32, block_height: u32) -> shared::Timeline {
pub(super) async fn load_signal_and_get_timeline(signal_ref: wellen::SignalRef, screen_width: u32, block_height: u32) -> shared::Timeline {
// @TODO implement, copy from tauri platform
shared::Timeline { blocks: Vec::new() }
}

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

@ -21,18 +21,9 @@ pub(super) async fn get_time_table() -> wellen::TimeTable {
serde_wasm_bindgen::from_value(tauri_glue::get_time_table().await.unwrap_throw()).unwrap_throw()
}
pub(super) async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen::Signal {
pub(super) async fn load_signal_and_get_timeline(signal_ref: wellen::SignalRef, screen_width: u32, block_height: u32) -> shared::Timeline {
serde_wasm_bindgen::from_value(
tauri_glue::load_and_get_signal(signal_ref.index())
.await
.unwrap_throw(),
)
.unwrap_throw()
}
pub(super) async fn timeline(signal_ref: wellen::SignalRef, screen_width: u32, block_height: u32) -> shared::Timeline {
serde_wasm_bindgen::from_value(
tauri_glue::timeline(signal_ref.index(), screen_width, block_height)
tauri_glue::load_signal_and_get_timeline(signal_ref.index(), screen_width, block_height)
.await
.unwrap_throw(),
)
@ -64,10 +55,7 @@ mod tauri_glue {
pub async fn get_time_table() -> Result<JsValue, JsValue>;
#[wasm_bindgen(catch)]
pub async fn load_and_get_signal(signal_ref_index: usize) -> Result<JsValue, JsValue>;
#[wasm_bindgen(catch)]
pub async fn timeline(signal_ref_index: usize, screen_width: u32, block_height: u32) -> Result<JsValue, JsValue>;
pub async fn load_signal_and_get_timeline(signal_ref_index: usize, screen_width: u32, block_height: u32) -> Result<JsValue, JsValue>;
#[wasm_bindgen(catch)]
pub async fn unload_signal(signal_ref_index: usize) -> Result<(), JsValue>;

3
frontend/src/waveform_panel.rs
View file

@ -113,11 +113,10 @@ impl WaveformPanel {
eprintln!("timetable is empty");
return;
}
let last_time = time_table.last().copied().unwrap_throw();
let var = hierarchy.get(var_ref);
let signal_ref = var.signal_ref();
let timeline = platform::timeline(signal_ref, controller.screen_width(), ROW_HEIGHT).await;
let timeline = platform::load_signal_and_get_timeline(signal_ref, controller.screen_width(), ROW_HEIGHT).await;
// @TODO remove
zoon::println!("Timeline in Rust: {timeline:#?}");

10
frontend/typescript/bundles/tauri_glue.js
View file

@ -2523,11 +2523,8 @@ async function get_hierarchy() {
async function get_time_table() {
return await invoke2("get_time_table");
}
async function load_and_get_signal(signal_ref_index) {
return await invoke2("load_and_get_signal", { signal_ref_index });
}
async function timeline(signal_ref_index, screen_width, block_height) {
return await invoke2("timeline", { signal_ref_index, screen_width, block_height });
async function load_signal_and_get_timeline(signal_ref_index, screen_width, block_height) {
return await invoke2("load_signal_and_get_timeline", { signal_ref_index, screen_width, block_height });
}
async function unload_signal(signal_ref_index) {
return await invoke2("unload_signal", { signal_ref_index });
@ -2535,9 +2532,8 @@ async function unload_signal(signal_ref_index) {
export {
get_hierarchy,
get_time_table,
load_and_get_signal,
load_signal_and_get_timeline,
pick_and_load_waveform,
show_window,
timeline,
unload_signal
};

8
frontend/typescript/tauri_glue/tauri_glue.ts
View file

@ -26,12 +26,8 @@ export async function get_time_table(): Promise<WellenTimeTable> {
return await invoke("get_time_table");
}
export async function load_and_get_signal(signal_ref_index: number): Promise<WellenSignal> {
return await invoke("load_and_get_signal", { signal_ref_index });
}
export async function timeline(signal_ref_index: number, screen_width: number, block_height: number): Promise<Timeline> {
return await invoke("timeline", { signal_ref_index, screen_width, block_height });
export async function load_signal_and_get_timeline(signal_ref_index: number, screen_width: number, block_height: number): Promise<Timeline> {
return await invoke("load_signal_and_get_timeline", { signal_ref_index, screen_width, block_height });
}
export async function unload_signal(signal_ref_index: number): Promise<void> {

20
src-tauri/src/lib.rs
View file

@ -47,22 +47,7 @@ async fn get_time_table(store: tauri::State<'_, Store>) -> Result<serde_json::Va
}
#[tauri::command(rename_all = "snake_case")]
async fn load_and_get_signal(
signal_ref_index: usize,
store: tauri::State<'_, Store>,
) -> Result<serde_json::Value, ()> {
let signal_ref = wellen::SignalRef::from_index(signal_ref_index).unwrap();
let mut waveform_lock = store.waveform.lock().unwrap();
let waveform = waveform_lock.as_mut().unwrap();
// @TODO maybe run it in a thread to not block the main one and then
// make the command async or return the result through a Tauri channel
waveform.load_signals_multi_threaded(&[signal_ref]);
let signal = waveform.get_signal(signal_ref).unwrap();
Ok(serde_json::to_value(signal).unwrap())
}
#[tauri::command(rename_all = "snake_case")]
async fn timeline(
async fn load_signal_and_get_timeline(
signal_ref_index: usize,
screen_width: u32,
block_height: u32,
@ -104,8 +89,7 @@ pub fn run() {
pick_and_load_waveform,
get_hierarchy,
get_time_table,
load_and_get_signal,
timeline,
load_signal_and_get_timeline,
unload_signal,
])
.run(tauri::generate_context!())