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

signal_to_timeline

Browse source
This commit is contained in:
Martin Kavík 2024-06-06 22:45:20 +02:00
parent 6e85b7fa35
commit d8c1b0abac
10 changed files with 92 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/platform.rs
View file

@ -37,8 +37,8 @@ pub async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen::Signa
platform::load_and_get_signal(signal_ref).await
}
pub async fn timeline(signal_ref: wellen::SignalRef, screen_width: u32) -> shared::Timeline {
platform::timeline(signal_ref, screen_width).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 unload_signal(signal_ref: wellen::SignalRef) {

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

@ -91,7 +91,7 @@ pub(super) async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen
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) -> shared::Timeline {
pub(super) async fn timeline(signal_ref: wellen::SignalRef, screen_width: u32, block_height: u32) -> shared::Timeline {
shared::Timeline { blocks: Vec::new() }
}

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

@ -30,9 +30,9 @@ pub(super) async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen
.unwrap_throw()
}
pub(super) async fn timeline(signal_ref: wellen::SignalRef, screen_width: u32) -> shared::Timeline {
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)
tauri_glue::timeline(signal_ref.index(), screen_width, block_height)
.await
.unwrap_throw(),
)
@ -67,7 +67,7 @@ mod tauri_glue {
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) -> Result<JsValue, JsValue>;
pub async fn 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>;

2
frontend/src/waveform_panel.rs
View file

@ -117,7 +117,7 @@ impl WaveformPanel {
let var = hierarchy.get(var_ref);
let signal_ref = var.signal_ref();
let timeline = platform::timeline(signal_ref, controller.screen_width()).await;
let timeline = platform::timeline(signal_ref, controller.screen_width(), ROW_HEIGHT).await;
// @TODO remove
zoon::println!("Timeline in Rust: {timeline:#?}");

2
frontend/typescript/bundles/pixi_canvas.js
View file

@ -35225,7 +35225,7 @@ var VarSignalRow = class {
const signal_block = new Container();
signal_block.x = timeline_block.x;
this.signal_blocks_container.addChild(signal_block);
const background = new Graphics().roundRect(0, 0, timeline_block.width, this.row_height, 15).fill("SlateBlue");
const background = new Graphics().roundRect(0, 0, timeline_block.width, timeline_block.height, 15).fill("SlateBlue");
signal_block.addChild(background);
if (timeline_block.label !== void 0) {
const label = new Text({ text: timeline_block.label.text, style: this.label_style });

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

@ -2526,8 +2526,8 @@ async function 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) {
return await invoke2("timeline", { signal_ref_index, screen_width });
async function timeline(signal_ref_index, screen_width, block_height) {
return await invoke2("timeline", { signal_ref_index, screen_width, block_height });
}
async function unload_signal(signal_ref_index) {
return await invoke2("unload_signal", { signal_ref_index });

3
frontend/typescript/pixi_canvas/pixi_canvas.ts
View file

@ -7,6 +7,7 @@ type Timeline = {
type TimelineBlock = {
x: number,
width: number,
height: number,
label: TimeLineBlockLabel | undefined,
}
type TimeLineBlockLabel = {
@ -153,7 +154,7 @@ class VarSignalRow {
// background
const background = new Graphics()
.roundRect(0, 0, timeline_block.width, this.row_height, 15)
.roundRect(0, 0, timeline_block.width, timeline_block.height, 15)
.fill("SlateBlue");
signal_block.addChild(background);

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

@ -30,8 +30,8 @@ export async function load_and_get_signal(signal_ref_index: number): Promise<Wel
return await invoke("load_and_get_signal", { signal_ref_index });
}
export async function timeline(signal_ref_index: number, screen_width: number): Promise<Timeline> {
return await invoke("timeline", { signal_ref_index, screen_width });
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 unload_signal(signal_ref_index: number): Promise<void> {