diff --git a/SPECS.md b/SPECS.md index e73ea10..c25cb63 100644 --- a/SPECS.md +++ b/SPECS.md @@ -28,6 +28,14 @@ Implement a "Zero-Code-Change" observability layer for the MARTe2 real-time fram - **FR-09 (Navigation):** - Context menus for resetting zoom (X, Y, or both). - "Fit to View" functionality that automatically scales both axes to encompass all available buffered data points. +- **FR-10 (Scope Mode):** + - High-performance oscilloscope mode with configurable time windows (10ms to 10s). + - Global synchronization of time axes across all plot panels. + - Support for Free-run and Triggered acquisition (Single/Continuous, rising/falling edges). +- **FR-11 (Data Recording):** + - Record any traced signal to disk in Parquet format. + - Native file dialog for destination selection. + - Visual recording indicator in the GUI. ### 2.2 Technical Constraints (TC) - **TC-01:** No modifications allowed to the MARTe2 core library or component source code. diff --git a/Tools/gui_client/Cargo.lock b/Tools/gui_client/Cargo.lock index 9c65660..88146cc 100644 --- a/Tools/gui_client/Cargo.lock +++ b/Tools/gui_client/Cargo.lock @@ -35,7 +35,7 @@ dependencies = [ "atspi-common", "serde", "thiserror 1.0.69", - "zvariant", + "zvariant 4.2.0", ] [[package]] @@ -78,7 +78,7 @@ dependencies = [ "futures-lite", "futures-util", "serde", - "zbus", + "zbus 4.4.0", ] [[package]] @@ -123,6 +123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", + "const-random", "getrandom 0.3.4", "once_cell", "version_check", @@ -138,6 +139,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "android-activity" version = "0.6.0" @@ -165,6 +181,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -212,6 +234,220 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +[[package]] +name = "arrow" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3a3ec4fe573f9d1f59d99c085197ef669b00b088ba1d7bb75224732d9357a74" +dependencies = [ + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-csv", + "arrow-data", + "arrow-ipc", + "arrow-json", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", +] + +[[package]] +name = "arrow-arith" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dcf19f07792d8c7f91086c67b574a79301e367029b17fcf63fb854332246a10" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-array" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7845c32b41f7053e37a075b3c2f29c6f5ea1b3ca6e5df7a2d325ee6e1b4a63cf" +dependencies = [ + "ahash", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "hashbrown 0.15.5", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b5c681a99606f3316f2a99d9c8b6fa3aad0b1d34d8f6d7a1b471893940219d8" +dependencies = [ + "bytes", + "half", + "num", +] + +[[package]] +name = "arrow-cast" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365f8527d4f87b133eeb862f9b8093c009d41a210b8f101f91aa2392f61daac" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "atoi", + "base64", + "chrono", + "half", + "lexical-core", + "num", + "ryu", +] + +[[package]] +name = "arrow-csv" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30dac4d23ac769300349197b845e0fd18c7f9f15d260d4659ae6b5a9ca06f586" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-data" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd962fc3bf7f60705b25bcaa8eb3318b2545aa1d528656525ebdd6a17a6cd6fb" +dependencies = [ + "arrow-buffer", + "arrow-schema", + "half", + "num", +] + +[[package]] +name = "arrow-ipc" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3527365b24372f9c948f16e53738eb098720eea2093ae73c7af04ac5e30a39b" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "flatbuffers", +] + +[[package]] +name = "arrow-json" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdec0024749fc0d95e025c0b0266d78613727b3b3a5d4cf8ea47eb6d38afdd1" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "indexmap", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-ord" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79af2db0e62a508d34ddf4f76bfd6109b6ecc845257c9cba6f939653668f89ac" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "half", + "num", +] + +[[package]] +name = "arrow-row" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da30e9d10e9c52f09ea0cf15086d6d785c11ae8dcc3ea5f16d402221b6ac7735" +dependencies = [ + "ahash", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "half", +] + +[[package]] +name = "arrow-schema" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b0f9c0c3582dd55db0f136d3b44bfa0189df07adcf7dc7f2f2e74db0f52eb8" + +[[package]] +name = "arrow-select" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92fc337f01635218493c23da81a364daf38c694b05fc20569c3193c11c561984" +dependencies = [ + "ahash", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "num", +] + +[[package]] +name = "arrow-string" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d596a9fc25dae556672d5069b090331aca8acb93cae426d8b7dcdf1c558fa0ce" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "memchr", + "num", + "regex", + "regex-syntax", +] + [[package]] name = "as-raw-xcb-connection" version = "1.0.1" @@ -227,6 +463,28 @@ dependencies = [ "libloading", ] +[[package]] +name = "ashpd" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f3f79755c74fd155000314eb349864caa787c6592eace6c6882dad873d9c39" +dependencies = [ + "async-fs", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand 0.9.2", + "raw-window-handle", + "serde", + "serde_repr", + "url", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "zbus 5.14.0", +] + [[package]] name = "async-broadcast" version = "0.7.2" @@ -305,6 +563,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + [[package]] name = "async-process" version = "2.5.0" @@ -369,6 +638,15 @@ dependencies = [ "syn", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -395,11 +673,11 @@ dependencies = [ "enumflags2", "serde", "static_assertions", - "zbus", + "zbus 4.4.0", "zbus-lockstep", "zbus-lockstep-macros", - "zbus_names", - "zvariant", + "zbus_names 3.0.0", + "zvariant 4.2.0", ] [[package]] @@ -411,7 +689,7 @@ dependencies = [ "atspi-common", "atspi-proxies", "futures-lite", - "zbus", + "zbus 4.4.0", ] [[package]] @@ -422,8 +700,8 @@ checksum = "a5e6c5de3e524cf967569722446bcd458d5032348554d9a17d7d72b041ab7496" dependencies = [ "atspi-common", "serde", - "zbus", - "zvariant", + "zbus 4.4.0", + "zvariant 4.2.0", ] [[package]] @@ -432,6 +710,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bit-set" version = "0.8.0" @@ -486,6 +770,15 @@ dependencies = [ "objc2 0.5.2", ] +[[package]] +name = "block2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" +dependencies = [ + "objc2 0.6.3", +] + [[package]] name = "blocking" version = "1.6.2" @@ -499,6 +792,27 @@ dependencies = [ "piper", ] +[[package]] +name = "brotli" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a334ef7c9e23abf0ce748e8cd309037da93e606ad52eb372e4ce327a0dcfbdfd" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bumpalo" version = "3.20.2" @@ -525,6 +839,12 @@ dependencies = [ "syn", ] +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "byteorder-lite" version = "0.1.0" @@ -629,15 +949,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.43" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-link", + "windows-targets 0.52.6", ] [[package]] @@ -678,6 +999,26 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.17", + "once_cell", + "tiny-keccak", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -777,6 +1118,27 @@ dependencies = [ "typenum", ] +[[package]] +name = "csv" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde_core", +] + +[[package]] +name = "csv-core" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" +dependencies = [ + "memchr", +] + [[package]] name = "cursor-icon" version = "1.2.0" @@ -806,6 +1168,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" dependencies = [ "bitflags 2.11.0", + "block2 0.6.2", + "libc", "objc2 0.6.3", ] @@ -1125,6 +1489,16 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +[[package]] +name = "flatbuffers" +version = "24.12.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1baf0dbf96932ec9a3038d57900329c015b0bfb7b63d904f3bc27e2b02a096" +dependencies = [ + "bitflags 1.3.2", + "rustc_version", +] + [[package]] name = "flate2" version = "1.1.9" @@ -1177,6 +1551,15 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures-channel" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +dependencies = [ + "futures-core", +] + [[package]] name = "futures-core" version = "0.3.32" @@ -1433,6 +1816,7 @@ checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "cfg-if", "crunchy", + "num-traits", "zerocopy", ] @@ -1642,6 +2026,12 @@ dependencies = [ "serde_core", ] +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + [[package]] name = "itoa" version = "1.0.17" @@ -1707,12 +2097,75 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + [[package]] name = "leb128fmt" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" +[[package]] +name = "lexical-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d8d125a277f807e55a77304455eb7b1cb52f2b18c143b60e766c120bd64a594" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a9f232fbd6f550bc0137dcb5f99ab674071ac2d690ac69704593cb4abbea56" +dependencies = [ + "lexical-parse-integer", + "lexical-util", +] + +[[package]] +name = "lexical-parse-integer" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a7a039f8fb9c19c996cd7b2fcce303c1b2874fe1aca544edc85c4a5f8489b34" +dependencies = [ + "lexical-util", +] + +[[package]] +name = "lexical-util" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2604dd126bb14f13fb5d1bd6a66155079cb9fa655b37f875b3a742c705dbed17" + +[[package]] +name = "lexical-write-float" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c438c87c013188d415fbabbb1dceb44249ab81664efbd31b14ae55dabb6361" +dependencies = [ + "lexical-util", + "lexical-write-integer", +] + +[[package]] +name = "lexical-write-integer" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "409851a618475d2d5796377cad353802345cba92c867d9fbcde9cf4eac4e14df" +dependencies = [ + "lexical-util", +] + [[package]] name = "libc" version = "0.2.182" @@ -1729,6 +2182,12 @@ dependencies = [ "windows-link", ] +[[package]] +name = "libm" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" + [[package]] name = "libredox" version = "0.1.12" @@ -1779,6 +2238,15 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +[[package]] +name = "lz4_flex" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" +dependencies = [ + "twox-hash 2.1.2", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -1792,12 +2260,15 @@ dependencies = [ name = "marte_debug_gui" version = "0.1.0" dependencies = [ + "arrow", "chrono", "crossbeam-channel", "eframe", "egui_plot", "once_cell", + "parquet", "regex", + "rfd", "serde", "serde_json", "socket2", @@ -1942,6 +2413,70 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -1949,6 +2484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2014,7 +2550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ "bitflags 2.11.0", - "block2", + "block2 0.5.1", "libc", "objc2 0.5.2", "objc2-core-data", @@ -2030,6 +2566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.11.0", + "block2 0.6.2", "objc2 0.6.3", "objc2-core-foundation", "objc2-core-graphics", @@ -2043,7 +2580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" dependencies = [ "bitflags 2.11.0", - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-core-location", "objc2-foundation 0.2.2", @@ -2055,7 +2592,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" dependencies = [ - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", ] @@ -2067,7 +2604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ "bitflags 2.11.0", - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", ] @@ -2102,7 +2639,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" dependencies = [ - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", "objc2-metal", @@ -2114,7 +2651,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" dependencies = [ - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-contacts", "objc2-foundation 0.2.2", @@ -2133,7 +2670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.11.0", - "block2", + "block2 0.5.1", "dispatch", "libc", "objc2 0.5.2", @@ -2167,7 +2704,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" dependencies = [ - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", @@ -2180,7 +2717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ "bitflags 2.11.0", - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", ] @@ -2192,7 +2729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ "bitflags 2.11.0", - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", "objc2-metal", @@ -2215,7 +2752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" dependencies = [ "bitflags 2.11.0", - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-cloud-kit", "objc2-core-data", @@ -2235,7 +2772,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" dependencies = [ - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", ] @@ -2247,7 +2784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" dependencies = [ "bitflags 2.11.0", - "block2", + "block2 0.5.1", "objc2 0.5.2", "objc2-core-location", "objc2-foundation 0.2.2", @@ -2269,6 +2806,15 @@ dependencies = [ "libredox", ] +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-float" version = "4.6.0" @@ -2326,6 +2872,39 @@ dependencies = [ "windows-link", ] +[[package]] +name = "parquet" +version = "53.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f8cf58b29782a7add991f655ff42929e31a7859f5319e53db9e39a714cb113c" +dependencies = [ + "ahash", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ipc", + "arrow-schema", + "arrow-select", + "base64", + "brotli", + "bytes", + "chrono", + "flate2", + "half", + "hashbrown 0.15.5", + "lz4_flex", + "num", + "num-bigint", + "paste", + "seq-macro", + "snap", + "thrift", + "twox-hash 1.6.3", + "zstd", + "zstd-sys", +] + [[package]] name = "paste" version = "1.0.15" @@ -2408,6 +2987,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "pollster" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" + [[package]] name = "potential_utf" version = "0.1.4" @@ -2516,8 +3101,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.5", ] [[package]] @@ -2527,7 +3122,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.5", ] [[package]] @@ -2539,6 +3144,15 @@ dependencies = [ "getrandom 0.2.17", ] +[[package]] +name = "rand_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +dependencies = [ + "getrandom 0.3.4", +] + [[package]] name = "raw-window-handle" version = "0.6.2" @@ -2607,6 +3221,30 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" +[[package]] +name = "rfd" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed" +dependencies = [ + "ashpd", + "block2 0.6.2", + "dispatch2", + "js-sys", + "log", + "objc2 0.6.3", + "objc2-app-kit 0.3.2", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "pollster", + "raw-window-handle", + "urlencoding", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.59.0", +] + [[package]] name = "rustc-hash" version = "1.1.0" @@ -2619,6 +3257,15 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.38.44" @@ -2651,6 +3298,12 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +[[package]] +name = "ryu" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" + [[package]] name = "same-file" version = "1.0.6" @@ -2691,6 +3344,12 @@ version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +[[package]] +name = "seq-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" + [[package]] name = "serde" version = "1.0.228" @@ -2871,6 +3530,12 @@ dependencies = [ "serde", ] +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + [[package]] name = "socket2" version = "0.5.10" @@ -3014,6 +3679,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding", + "ordered-float 2.10.1", +] + [[package]] name = "tiff" version = "0.10.3" @@ -3028,6 +3704,15 @@ dependencies = [ "zune-jpeg", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tiny-skia" version = "0.11.4" @@ -3131,6 +3816,22 @@ version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "twox-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" + [[package]] name = "type-map" version = "0.5.1" @@ -3191,14 +3892,32 @@ dependencies = [ "idna", "percent-encoding", "serde", + "serde_derive", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf8_iter" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "uuid" +version = "1.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b672338555252d43fd2240c714dc444b8c6fb0a5c5335e65a07bba7742735ddb" +dependencies = [ + "js-sys", + "serde_core", + "wasm-bindgen", +] + [[package]] name = "version_check" version = "0.9.5" @@ -3586,7 +4305,7 @@ dependencies = [ "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", - "ordered-float", + "ordered-float 4.6.0", "parking_lot", "profiling", "raw-window-handle", @@ -4007,7 +4726,7 @@ dependencies = [ "android-activity", "atomic-waker", "bitflags 2.11.0", - "block2", + "block2 0.5.1", "bytemuck", "calloop 0.13.0", "cfg_aliases", @@ -4272,7 +4991,7 @@ dependencies = [ "hex", "nix", "ordered-stream", - "rand", + "rand 0.8.5", "serde", "serde_repr", "sha1", @@ -4281,9 +5000,44 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", + "zbus_macros 4.4.0", + "zbus_names 3.0.0", + "zvariant 4.2.0", +] + +[[package]] +name = "zbus" +version = "5.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc" +dependencies = [ + "async-broadcast", + "async-executor", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener", + "futures-core", + "futures-lite", + "hex", + "libc", + "ordered-stream", + "rustix 1.1.3", + "serde", + "serde_repr", + "tracing", + "uds_windows", + "uuid", + "windows-sys 0.61.2", + "winnow", + "zbus_macros 5.14.0", + "zbus_names 4.3.1", + "zvariant 5.10.0", ] [[package]] @@ -4293,7 +5047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ca2c5dceb099bddaade154055c926bb8ae507a18756ba1d8963fd7b51d8ed1d" dependencies = [ "zbus_xml", - "zvariant", + "zvariant 4.2.0", ] [[package]] @@ -4307,7 +5061,7 @@ dependencies = [ "syn", "zbus-lockstep", "zbus_xml", - "zvariant", + "zvariant 4.2.0", ] [[package]] @@ -4320,7 +5074,22 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zvariant_utils", + "zvariant_utils 2.1.0", +] + +[[package]] +name = "zbus_macros" +version = "5.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zbus_names 4.3.1", + "zvariant 5.10.0", + "zvariant_utils 3.3.0", ] [[package]] @@ -4331,7 +5100,18 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant", + "zvariant 4.2.0", +] + +[[package]] +name = "zbus_names" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f" +dependencies = [ + "serde", + "winnow", + "zvariant 5.10.0", ] [[package]] @@ -4343,8 +5123,8 @@ dependencies = [ "quick-xml 0.30.0", "serde", "static_assertions", - "zbus_names", - "zvariant", + "zbus_names 3.0.0", + "zvariant 4.2.0", ] [[package]] @@ -4427,6 +5207,34 @@ version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +[[package]] +name = "zstd" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] + [[package]] name = "zune-core" version = "0.4.12" @@ -4452,7 +5260,22 @@ dependencies = [ "enumflags2", "serde", "static_assertions", - "zvariant_derive", + "zvariant_derive 4.2.0", +] + +[[package]] +name = "zvariant" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b" +dependencies = [ + "endi", + "enumflags2", + "serde", + "url", + "winnow", + "zvariant_derive 5.10.0", + "zvariant_utils 3.3.0", ] [[package]] @@ -4465,7 +5288,20 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zvariant_utils", + "zvariant_utils 2.1.0", +] + +[[package]] +name = "zvariant_derive" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils 3.3.0", ] [[package]] @@ -4478,3 +5314,16 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zvariant_utils" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "syn", + "winnow", +] diff --git a/Tools/gui_client/Cargo.toml b/Tools/gui_client/Cargo.toml index 882622f..a1e1e84 100644 --- a/Tools/gui_client/Cargo.toml +++ b/Tools/gui_client/Cargo.toml @@ -12,4 +12,7 @@ chrono = "0.4" crossbeam-channel = "0.5" regex = "1.10" socket2 = { version = "0.5", features = ["all"] } -once_cell = "1.21.3" +once_cell = "1.21" +rfd = "0.15" +parquet = { version = "53.0", features = ["arrow"] } +arrow = "53.0" diff --git a/Tools/gui_client/src/main.rs b/Tools/gui_client/src/main.rs index 8bbf01e..acf987e 100644 --- a/Tools/gui_client/src/main.rs +++ b/Tools/gui_client/src/main.rs @@ -3,6 +3,7 @@ use egui_plot::{Line, Plot, PlotPoints, MarkerShape, LineStyle, PlotBounds, VLin use std::collections::{HashMap, VecDeque}; use std::net::{TcpStream, UdpSocket}; use std::io::{Write, BufReader, BufRead}; +use std::fs::File; use std::sync::{Arc, Mutex}; use std::thread; use serde::{Deserialize, Serialize}; @@ -11,6 +12,12 @@ use crossbeam_channel::{unbounded, Receiver, Sender}; use socket2::{Socket, Domain, Type, Protocol}; use regex::Regex; use once_cell::sync::Lazy; +use rfd::FileDialog; +use arrow::array::{Float64Array, Array}; +use arrow::record_batch::RecordBatch; +use arrow::datatypes::{DataType, Field, Schema}; +use parquet::arrow::arrow_writer::ArrowWriter; +use parquet::file::properties::WriterProperties; static APP_START_TIME: Lazy = Lazy::new(std::time::Instant::now); @@ -56,6 +63,8 @@ struct LogEntry { struct TraceData { values: VecDeque<[f64; 2]>, last_value: f64, + recording_tx: Option>, + recording_path: Option, } struct SignalMetadata { @@ -146,6 +155,8 @@ enum InternalEvent { ClearTrace(String), UdpStats(u64), UdpDropped(u32), + RecordPathChosen(String, String), // SignalName, FilePath + RecordingError(String, String), // SignalName, ErrorMessage } // --- App State --- @@ -169,15 +180,11 @@ struct ScopeSettings { window_ms: f64, mode: AcquisitionMode, paused: bool, - - // Trigger Settings trigger_type: TriggerType, trigger_source: String, trigger_edge: TriggerEdge, trigger_threshold: f64, pre_trigger_percent: f64, - - // Internal State trigger_active: bool, last_trigger_time: f64, is_armed: bool, @@ -188,35 +195,25 @@ struct MarteDebugApp { is_breaking: bool, config: ConnectionConfig, shared_config: Arc>, - app_tree: Option, - - traced_signals: Arc>>, id_to_meta: Arc>>, - + traced_signals: Arc>>, plots: Vec, forced_signals: HashMap, - logs: VecDeque, log_filters: LogFilters, - show_left_panel: bool, show_right_panel: bool, show_bottom_panel: bool, - selected_node: String, node_info: String, - udp_packets: u64, udp_dropped: u64, - forcing_dialog: Option, - style_editor: Option<(usize, usize)>, // plot_idx, signal_idx - + style_editor: Option<(usize, usize)>, tx_cmd: Sender, rx_events: Receiver, internal_tx: Sender, - shared_x_range: Option<[f64; 2]>, scope: ScopeSettings, } @@ -226,25 +223,15 @@ impl MarteDebugApp { let (tx_cmd, rx_cmd_internal) = unbounded::(); let (tx_events, rx_events) = unbounded::(); let internal_tx = tx_events.clone(); - - let config = ConnectionConfig { - ip: "127.0.0.1".to_string(), - tcp_port: "8080".to_string(), - udp_port: "8081".to_string(), - log_port: "8082".to_string(), - version: 0, - }; - + let config = ConnectionConfig { ip: "127.0.0.1".to_string(), tcp_port: "8080".to_string(), udp_port: "8081".to_string(), log_port: "8082".to_string(), version: 0 }; let shared_config = Arc::new(Mutex::new(config.clone())); let id_to_meta = Arc::new(Mutex::new(HashMap::new())); let traced_signals = Arc::new(Mutex::new(HashMap::new())); - let id_to_meta_clone = id_to_meta.clone(); let traced_signals_clone = traced_signals.clone(); let shared_config_cmd = shared_config.clone(); let shared_config_log = shared_config.clone(); let shared_config_udp = shared_config.clone(); - let tx_events_c = tx_events.clone(); thread::spawn(move || { tcp_command_worker(shared_config_cmd, rx_cmd_internal, tx_events_c); }); let tx_events_log = tx_events.clone(); @@ -253,46 +240,20 @@ impl MarteDebugApp { thread::spawn(move || { udp_worker(shared_config_udp, id_to_meta_clone, traced_signals_clone, tx_events_udp); }); Self { - connected: false, - is_breaking: false, - config, - shared_config, - app_tree: None, - id_to_meta, - traced_signals, - plots: vec![PlotInstance { - id: "Plot 1".to_string(), - plot_type: PlotType::Normal, - signals: Vec::new(), - auto_bounds: true, - }], - forced_signals: HashMap::new(), - logs: VecDeque::with_capacity(2000), - log_filters: LogFilters { - show_debug: true, show_info: true, show_warning: true, show_error: true, paused: false, - content_regex: "".to_string(), - }, - show_left_panel: true, - show_right_panel: true, - show_bottom_panel: true, + connected: false, is_breaking: false, config, shared_config, app_tree: None, id_to_meta, traced_signals, + plots: vec![PlotInstance { id: "Plot 1".to_string(), plot_type: PlotType::Normal, signals: Vec::new(), auto_bounds: true }], + forced_signals: HashMap::new(), logs: VecDeque::with_capacity(2000), + log_filters: LogFilters { show_debug: true, show_info: true, show_warning: true, show_error: true, paused: false, content_regex: "".to_string() }, + show_left_panel: true, show_right_panel: true, show_bottom_panel: true, selected_node: "".to_string(), node_info: "".to_string(), udp_packets: 0, udp_dropped: 0, forcing_dialog: None, style_editor: None, tx_cmd, rx_events, internal_tx, shared_x_range: None, scope: ScopeSettings { - enabled: false, - window_ms: 1000.0, - mode: AcquisitionMode::FreeRun, - paused: false, - trigger_type: TriggerType::Continuous, - trigger_source: "".to_string(), - trigger_edge: TriggerEdge::Rising, - trigger_threshold: 0.0, - pre_trigger_percent: 25.0, - trigger_active: false, - last_trigger_time: 0.0, - is_armed: true, + enabled: false, window_ms: 1000.0, mode: AcquisitionMode::FreeRun, paused: false, + trigger_type: TriggerType::Continuous, trigger_source: "".to_string(), trigger_edge: TriggerEdge::Rising, trigger_threshold: 0.0, pre_trigger_percent: 25.0, + trigger_active: false, last_trigger_time: 0.0, is_armed: true, }, } } @@ -307,6 +268,34 @@ impl MarteDebugApp { colors[idx % colors.len()] } + fn apply_trigger_logic(&mut self) { + if self.scope.mode != AcquisitionMode::Triggered || !self.scope.is_armed { return; } + if self.scope.trigger_source.is_empty() { return; } + let data_map = self.traced_signals.lock().unwrap(); + if let Some(data) = data_map.get(&self.scope.trigger_source) { + if data.values.len() < 2 { return; } + let start_idx = if data.values.len() > 100 { data.values.len() - 100 } else { 0 }; + for i in (start_idx + 1..data.values.len()).rev() { + let v_prev = data.values[i-1][1]; + let v_curr = data.values[i][1]; + let t_curr = data.values[i][0]; + if t_curr <= self.scope.last_trigger_time { continue; } + let triggered = match self.scope.trigger_edge { + TriggerEdge::Rising => v_prev < self.scope.trigger_threshold && v_curr >= self.scope.trigger_threshold, + TriggerEdge::Falling => v_prev > self.scope.trigger_threshold && v_curr <= self.scope.trigger_threshold, + TriggerEdge::Both => (v_prev < self.scope.trigger_threshold && v_curr >= self.scope.trigger_threshold) || + (v_prev > self.scope.trigger_threshold && v_curr <= self.scope.trigger_threshold), + }; + if triggered { + self.scope.last_trigger_time = t_curr; + self.scope.trigger_active = true; + if self.scope.trigger_type == TriggerType::Single { self.scope.is_armed = false; } + break; + } + } + } + } + fn render_tree(&mut self, ui: &mut egui::Ui, item: &TreeItem, path: String) { let current_path = if path.is_empty() { if item.name == "Root" { "".to_string() } else { item.name.clone() } } else { if path.is_empty() { item.name.clone() } else { format!("{}.{}", path, item.name) } }; @@ -321,54 +310,12 @@ impl MarteDebugApp { ui.horizontal(|ui| { if ui.selectable_label(self.selected_node == current_path, format!("{} [{}]", label, item.class)).clicked() { self.selected_node = current_path.clone(); let _ = self.tx_cmd.send(format!("INFO {}", current_path)); } if item.class.contains("Signal") { - if ui.button("Trace").clicked() { - let _ = self.tx_cmd.send(format!("TRACE {} 1", current_path)); - let _ = self.internal_tx.send(InternalEvent::TraceRequested(current_path.clone())); - } - if ui.button("⚡ Force").clicked() { - self.forcing_dialog = Some(ForcingDialog { signal_path: current_path.clone(), value: "".to_string() }); - } + if ui.button("Trace").clicked() { let _ = self.tx_cmd.send(format!("TRACE {} 1", current_path)); let _ = self.internal_tx.send(InternalEvent::TraceRequested(current_path.clone())); } + if ui.button("⚡ Force").clicked() { self.forcing_dialog = Some(ForcingDialog { signal_path: current_path.clone(), value: "".to_string() }); } } }); } } - - fn apply_trigger_logic(&mut self) { - if self.scope.mode != AcquisitionMode::Triggered || !self.scope.is_armed { return; } - if self.scope.trigger_source.is_empty() { return; } - - let data_map = self.traced_signals.lock().unwrap(); - if let Some(data) = data_map.get(&self.scope.trigger_source) { - if data.values.len() < 2 { return; } - - // Search for edge crossing in the last 100 samples - let start_idx = if data.values.len() > 100 { data.values.len() - 100 } else { 0 }; - for i in (start_idx + 1..data.values.len()).rev() { - let v_prev = data.values[i-1][1]; - let v_curr = data.values[i][1]; - let t_curr = data.values[i][0]; - - // Avoid re-triggering on the same exact sample - if t_curr <= self.scope.last_trigger_time { continue; } - - let triggered = match self.scope.trigger_edge { - TriggerEdge::Rising => v_prev < self.scope.trigger_threshold && v_curr >= self.scope.trigger_threshold, - TriggerEdge::Falling => v_prev > self.scope.trigger_threshold && v_curr <= self.scope.trigger_threshold, - TriggerEdge::Both => (v_prev < self.scope.trigger_threshold && v_curr >= self.scope.trigger_threshold) || - (v_prev > self.scope.trigger_threshold && v_curr <= self.scope.trigger_threshold), - }; - - if triggered { - self.scope.last_trigger_time = t_curr; - self.scope.trigger_active = true; - if self.scope.trigger_type == TriggerType::Single { - self.scope.is_armed = false; - } - break; - } - } - } - } } fn tcp_command_worker(shared_config: Arc>, rx_cmd: Receiver, tx_events: Sender) { @@ -435,6 +382,31 @@ fn tcp_log_worker(shared_config: Arc>, tx_events: Sender } } +fn recording_worker(rx: Receiver<[f64; 2]>, path: String, signal_name: String, tx_events: Sender) { + let file = match File::create(&path) { + Ok(f) => f, + Err(e) => { let _ = tx_events.send(InternalEvent::RecordingError(signal_name, format!("File Error: {}", e))); return; } + }; + let schema = Arc::new(Schema::new(vec![Field::new("timestamp", DataType::Float64, false), Field::new("value", DataType::Float64, false)])); + let mut writer = match ArrowWriter::try_new(file, schema.clone(), Some(WriterProperties::builder().build())) { + Ok(w) => w, + Err(e) => { let _ = tx_events.send(InternalEvent::RecordingError(signal_name, format!("Parquet Error: {}", e))); return; } + }; + let (mut t_acc, mut v_acc) = (Vec::with_capacity(1000), Vec::with_capacity(1000)); + while let Ok([t, v]) = rx.recv() { + t_acc.push(t); v_acc.push(v); + if t_acc.len() >= 1000 { + let batch = RecordBatch::try_new(schema.clone(), vec![Arc::new(Float64Array::from(t_acc.clone())), Arc::new(Float64Array::from(v_acc.clone()))]).unwrap(); + let _ = writer.write(&batch); t_acc.clear(); v_acc.clear(); + } + } + if !t_acc.is_empty() { + let batch = RecordBatch::try_new(schema.clone(), vec![Arc::new(Float64Array::from(t_acc)), Arc::new(Float64Array::from(v_acc))]).unwrap(); + let _ = writer.write(&batch); + } + let _ = writer.close(); +} + fn udp_worker(shared_config: Arc>, id_to_meta: Arc>>, traced_data: Arc>>, tx_events: Sender) { let mut current_version = 0; let mut socket: Option = None; @@ -468,17 +440,14 @@ fn udp_worker(shared_config: Arc>, id_to_meta: Arc last { let _ = tx_events.send(InternalEvent::UdpDropped(seq - last - 1)); } } last_seq = Some(seq); let count = u32::from_le_bytes(buf[16..20].try_into().unwrap()); let now = APP_START_TIME.elapsed().as_secs_f64(); let mut offset = 20; - let mut local_updates: HashMap> = HashMap::new(); - let mut last_values: HashMap = HashMap::new(); + let (mut local_updates, mut last_values): (HashMap>, HashMap) = (HashMap::new(), HashMap::new()); let metas = id_to_meta.lock().unwrap(); for _ in 0..count { if offset + 8 > n { break; } @@ -505,7 +474,7 @@ fn udp_worker(shared_config: Arc>, id_to_meta: Arc 100000 { entry.values.pop_front(); } } @@ -524,7 +493,7 @@ impl eframe::App for MarteDebugApp { InternalEvent::Discovery(signals) => { let mut metas = self.id_to_meta.lock().unwrap(); metas.clear(); for s in &signals { let meta = metas.entry(s.id).or_insert_with(|| SignalMetadata { names: Vec::new(), sig_type: s.sig_type.clone() }); if !meta.names.contains(&s.name) { meta.names.push(s.name.clone()); } } } InternalEvent::Tree(tree) => { self.app_tree = Some(tree); } InternalEvent::NodeInfo(info) => { self.node_info = info; } - InternalEvent::TraceRequested(name) => { let mut data_map = self.traced_signals.lock().unwrap(); data_map.entry(name).or_insert_with(|| TraceData { values: VecDeque::with_capacity(10000), last_value: 0.0 }); } + InternalEvent::TraceRequested(name) => { let mut data_map = self.traced_signals.lock().unwrap(); data_map.entry(name).or_insert_with(|| TraceData { values: VecDeque::with_capacity(10000), last_value: 0.0, recording_tx: None, recording_path: None }); } InternalEvent::ClearTrace(name) => { let mut data_map = self.traced_signals.lock().unwrap(); data_map.remove(&name); for plot in &mut self.plots { plot.signals.retain(|s| s.source_name != name); } } InternalEvent::UdpStats(count) => { self.udp_packets = count; } InternalEvent::UdpDropped(dropped) => { self.udp_dropped += dropped as u64; } @@ -532,6 +501,19 @@ impl eframe::App for MarteDebugApp { InternalEvent::Disconnected => { self.connected = false; } InternalEvent::InternalLog(msg) => { self.logs.push_back(LogEntry { time: Local::now().format("%H:%M:%S").to_string(), level: "GUI_ERROR".to_string(), message: msg }); } InternalEvent::CommandResponse(resp) => { self.logs.push_back(LogEntry { time: Local::now().format("%H:%M:%S").to_string(), level: "CMD_RESP".to_string(), message: resp }); } + InternalEvent::RecordPathChosen(name, path) => { + let mut data_map = self.traced_signals.lock().unwrap(); + if let Some(entry) = data_map.get_mut(&name) { + let (tx, rx) = unbounded(); + entry.recording_tx = Some(tx); + entry.recording_path = Some(path.clone()); + let tx_err = self.internal_tx.clone(); + thread::spawn(move || { recording_worker(rx, path, name, tx_err); }); + } + } + InternalEvent::RecordingError(name, err) => { + self.logs.push_back(LogEntry { time: Local::now().format("%H:%M:%S").to_string(), level: "REC_ERROR".to_string(), message: format!("{}: {}", name, err) }); + } } } @@ -571,44 +553,36 @@ impl eframe::App for MarteDebugApp { ui.toggle_value(&mut self.show_bottom_panel, "📜 Logs"); ui.separator(); if ui.button("➕ Plot").clicked() { self.plots.push(PlotInstance { id: format!("Plot {}", self.plots.len()+1), plot_type: PlotType::Normal, signals: Vec::new(), auto_bounds: true }); } - + ui.separator(); + let (btn_text, btn_color) = if self.is_breaking { ("▶ Resume App", egui::Color32::GREEN) } else { ("⏸ Pause App", egui::Color32::YELLOW) }; + if ui.button(egui::RichText::new(btn_text).color(btn_color)).clicked() { self.is_breaking = !self.is_breaking; let _ = self.tx_cmd.send(if self.is_breaking { "PAUSE".to_string() } else { "RESUME".to_string() }); } ui.separator(); ui.checkbox(&mut self.scope.enabled, "🔭 Scope"); if self.scope.enabled { - egui::ComboBox::from_id_salt("window_size").selected_text(format!("{}ms", self.scope.window_ms)).show_ui(ui, |ui| { - for ms in [10.0, 20.0, 50.0, 100.0, 200.0, 500.0, 1000.0, 2000.0, 5000.0, 10000.0] { ui.selectable_value(&mut self.scope.window_ms, ms, format!("{}ms", ms)); } - }); + egui::ComboBox::from_id_salt("window_size").selected_text(format!("{}ms", self.scope.window_ms)).show_ui(ui, |ui| { for ms in [10.0, 20.0, 50.0, 100.0, 200.0, 500.0, 1000.0, 2000.0, 5000.0, 10000.0] { ui.selectable_value(&mut self.scope.window_ms, ms, format!("{}ms", ms)); } }); ui.selectable_value(&mut self.scope.mode, AcquisitionMode::FreeRun, "Free"); ui.selectable_value(&mut self.scope.mode, AcquisitionMode::Triggered, "Trig"); - if self.scope.mode == AcquisitionMode::FreeRun { - if ui.button(if self.scope.paused { "▶ Resume" } else { "⏸ Pause" }).clicked() { self.scope.paused = !self.scope.paused; } - } else { + if self.scope.mode == AcquisitionMode::FreeRun { if ui.button(if self.scope.paused { "▶ Resume" } else { "⏸ Pause" }).clicked() { self.scope.paused = !self.scope.paused; } } + else { if ui.button(if self.scope.is_armed { "🔴 Armed" } else { "⚪ Single" }).clicked() { self.scope.is_armed = true; self.scope.trigger_active = false; } - ui.menu_button("⚙ Trigger", |ui| { - egui::Grid::new("trig_grid").num_columns(2).show(ui, |ui| { + ui.menu_button("⚙ Trig", |ui| { + egui::Grid::new("trig").num_columns(2).show(ui, |ui| { ui.label("Source:"); ui.text_edit_singleline(&mut self.scope.trigger_source); ui.end_row(); - ui.label("Edge:"); egui::ComboBox::from_id_salt("edge").selected_text(format!("{:?}", self.scope.trigger_edge)).show_ui(ui, |ui| { - ui.selectable_value(&mut self.scope.trigger_edge, TriggerEdge::Rising, "Rising"); - ui.selectable_value(&mut self.scope.trigger_edge, TriggerEdge::Falling, "Falling"); - ui.selectable_value(&mut self.scope.trigger_edge, TriggerEdge::Both, "Both"); - }); ui.end_row(); - ui.label("Threshold:"); ui.add(egui::DragValue::new(&mut self.scope.trigger_threshold).speed(0.1)); ui.end_row(); - ui.label("Pre-trig %:"); ui.add(egui::Slider::new(&mut self.scope.pre_trigger_percent, 0.0..=100.0)); ui.end_row(); - ui.label("Mode:"); ui.selectable_value(&mut self.scope.trigger_type, TriggerType::Single, "Single"); ui.selectable_value(&mut self.scope.trigger_type, TriggerType::Continuous, "Cont"); ui.end_row(); + ui.label("Edge:"); egui::ComboBox::from_id_salt("edge").selected_text(format!("{:?}", self.scope.trigger_edge)).show_ui(ui, |ui| { ui.selectable_value(&mut self.scope.trigger_edge, TriggerEdge::Rising, "Rising"); ui.selectable_value(&mut self.scope.trigger_edge, TriggerEdge::Falling, "Falling"); ui.selectable_value(&mut self.scope.trigger_edge, TriggerEdge::Both, "Both"); }); ui.end_row(); + ui.label("Thresh:"); ui.add(egui::DragValue::new(&mut self.scope.trigger_threshold).speed(0.1)); ui.end_row(); + ui.label("Pre %:"); ui.add(egui::Slider::new(&mut self.scope.pre_trigger_percent, 0.0..=100.0)); ui.end_row(); + ui.label("Type:"); ui.selectable_value(&mut self.scope.trigger_type, TriggerType::Single, "Single"); ui.selectable_value(&mut self.scope.trigger_type, TriggerType::Continuous, "Cont"); ui.end_row(); }); }); } } - - ui.separator(); - let (btn_text, btn_color) = if self.is_breaking { ("▶ Resume App", egui::Color32::GREEN) } else { ("⏸ Pause App", egui::Color32::YELLOW) }; - if ui.button(egui::RichText::new(btn_text).color(btn_color)).clicked() { self.is_breaking = !self.is_breaking; let _ = self.tx_cmd.send(if self.is_breaking { "PAUSE".to_string() } else { "RESUME".to_string() }); } - ui.separator(); ui.menu_button("🔌 Conn", |ui| { egui::Grid::new("conn_grid").num_columns(2).show(ui, |ui| { ui.label("IP:"); ui.text_edit_singleline(&mut self.config.ip); ui.end_row(); ui.label("Control:"); ui.text_edit_singleline(&mut self.config.tcp_port); ui.end_row(); + ui.label("Telemetry:"); ui.text_edit_singleline(&mut self.config.udp_port); ui.end_row(); + ui.label("Logs:"); ui.text_edit_singleline(&mut self.config.log_port); ui.end_row(); }); if ui.button("🔄 Apply").clicked() { self.config.version += 1; *self.shared_config.lock().unwrap() = self.config.clone(); ui.close_menu(); } if ui.button("❌ Off").clicked() { self.config.version += 1; let mut cfg = self.config.clone(); cfg.ip = "".to_string(); *self.shared_config.lock().unwrap() = cfg; ui.close_menu(); } @@ -626,12 +600,33 @@ impl eframe::App for MarteDebugApp { names.sort(); egui::ScrollArea::vertical().id_salt("traced_scroll").show(ui, |ui| { for key in names { - let last_val = { self.traced_signals.lock().unwrap().get(&key).map(|d| d.last_value).unwrap_or(0.0) }; - ui.horizontal(|ui| { - let response = ui.add(egui::Label::new(format!("{}: {:.2}", key, last_val)).sense(egui::Sense::drag())); - if response.drag_started() { ctx.data_mut(|d| d.insert_temp(egui::Id::new("drag_signal"), key.clone())); } - if ui.button("❌").clicked() { let _ = self.tx_cmd.send(format!("TRACE {} 0", key)); let _ = self.internal_tx.send(InternalEvent::ClearTrace(key)); } - }); + let mut data_map = self.traced_signals.lock().unwrap(); + if let Some(entry) = data_map.get_mut(&key) { + let last_val = entry.last_value; + let is_recording = entry.recording_tx.is_some(); + ui.horizontal(|ui| { + if is_recording { ui.label(egui::RichText::new("●").color(egui::Color32::RED)); } + let response = ui.add(egui::Label::new(format!("{}: {:.2}", key, last_val)).sense(egui::Sense::drag().union(egui::Sense::click()))); + if response.drag_started() { ctx.data_mut(|d| d.insert_temp(egui::Id::new("drag_signal"), key.clone())); } + response.context_menu(|ui| { + if !is_recording { + if ui.button("⏺ Record to Parquet").clicked() { + let tx = self.internal_tx.clone(); + let name_clone = key.clone(); + thread::spawn(move || { + if let Some(path) = FileDialog::new().add_filter("Parquet", &["parquet"]).save_file() { + let _ = tx.send(InternalEvent::RecordPathChosen(name_clone, path.to_string_lossy().to_string())); + } + }); + ui.close_menu(); + } + } else { + if ui.button("⏹ Stop").clicked() { entry.recording_tx = None; ui.close_menu(); } + } + }); + if ui.button("❌").clicked() { let _ = self.tx_cmd.send(format!("TRACE {} 0", key)); let _ = self.internal_tx.send(InternalEvent::ClearTrace(key.clone())); } + }); + } } }); ui.separator(); @@ -642,13 +637,7 @@ impl eframe::App for MarteDebugApp { if self.show_bottom_panel { egui::TopBottomPanel::bottom("log_panel").resizable(true).default_height(150.0).show(ctx, |ui| { - ui.horizontal(|ui| { - ui.heading("Logs"); ui.separator(); - ui.checkbox(&mut self.log_filters.show_debug, "Debug"); ui.checkbox(&mut self.log_filters.show_info, "Info"); ui.checkbox(&mut self.log_filters.show_warning, "Warn"); ui.checkbox(&mut self.log_filters.show_error, "Error"); - ui.separator(); - ui.label("Filter:"); ui.text_edit_singleline(&mut self.log_filters.content_regex); - if ui.button("🗑 Clear").clicked() { self.logs.clear(); } - }); + ui.horizontal(|ui| { ui.heading("Logs"); ui.separator(); ui.checkbox(&mut self.log_filters.show_debug, "Debug"); ui.checkbox(&mut self.log_filters.show_info, "Info"); ui.checkbox(&mut self.log_filters.show_warning, "Warn"); ui.checkbox(&mut self.log_filters.show_error, "Error"); ui.separator(); ui.label("Filter:"); ui.text_edit_singleline(&mut self.log_filters.content_regex); if ui.button("🗑 Clear").clicked() { self.logs.clear(); } }); ui.separator(); let regex = if !self.log_filters.content_regex.is_empty() { Regex::new(&self.log_filters.content_regex).ok() } else { None }; egui::ScrollArea::vertical().stick_to_bottom(true).auto_shrink([false, false]).show(ui, |ui| { @@ -669,68 +658,37 @@ impl eframe::App for MarteDebugApp { let plot_height = ui.available_height() / n_plots as f32; let mut to_remove = None; let mut current_range = None; - for (p_idx, plot_inst) in self.plots.iter_mut().enumerate() { ui.group(|ui| { - ui.horizontal(|ui| { - ui.label(egui::RichText::new(&plot_inst.id).strong()); - ui.selectable_value(&mut plot_inst.plot_type, PlotType::Normal, "Series"); - ui.selectable_value(&mut plot_inst.plot_type, PlotType::LogicAnalyzer, "Logic"); - if ui.button("🗑").clicked() { to_remove = Some(p_idx); } - }); - + ui.horizontal(|ui| { ui.label(egui::RichText::new(&plot_inst.id).strong()); ui.selectable_value(&mut plot_inst.plot_type, PlotType::Normal, "Series"); ui.selectable_value(&mut plot_inst.plot_type, PlotType::LogicAnalyzer, "Logic"); if ui.button("🗑").clicked() { to_remove = Some(p_idx); } }); let mut plot = Plot::new(&plot_inst.id).height(plot_height - 40.0).show_axes([true, true]); - - // SCOPE SYNC LOGIC if self.scope.enabled { let window_s = self.scope.window_ms / 1000.0; - let center_t = if self.scope.mode == AcquisitionMode::Triggered { - if self.scope.trigger_active { self.scope.last_trigger_time } else { APP_START_TIME.elapsed().as_secs_f64() } - } else { - APP_START_TIME.elapsed().as_secs_f64() - }; - - let pre_trigger_s = (self.scope.pre_trigger_percent / 100.0) * window_s; - let x_min = center_t - pre_trigger_s; - let x_max = x_min + window_s; - - plot = plot.include_x(x_min).include_x(x_max); - if !self.scope.paused { - plot = plot.auto_bounds(egui::Vec2b::new(true, true)); - } + let center_t = if self.scope.mode == AcquisitionMode::Triggered { if self.scope.trigger_active { self.scope.last_trigger_time } else { APP_START_TIME.elapsed().as_secs_f64() } } else { APP_START_TIME.elapsed().as_secs_f64() }; + let x_min = center_t - (self.scope.pre_trigger_percent / 100.0) * window_s; + plot = plot.include_x(x_min).include_x(x_min + window_s); + if !self.scope.paused { plot = plot.auto_bounds(egui::Vec2b::new(true, true)); } } else { if let Some(range) = self.shared_x_range { if !plot_inst.auto_bounds { plot = plot.include_x(range[0]).include_x(range[1]); } } if plot_inst.auto_bounds { plot = plot.auto_bounds(egui::Vec2b::new(true, true)); } } - let plot_resp = plot.show(ui, |plot_ui| { - if !self.scope.enabled && !plot_inst.auto_bounds { - if let Some(range) = self.shared_x_range { - let bounds = plot_ui.plot_bounds(); - plot_ui.set_plot_bounds(PlotBounds::from_min_max([range[0], bounds.min()[1]], [range[1], bounds.max()[1]])); - } - } - - // Trigger Line - if self.scope.enabled && self.scope.mode == AcquisitionMode::Triggered && self.scope.trigger_active { - plot_ui.vline(VLine::new(self.scope.last_trigger_time).color(egui::Color32::YELLOW).style(LineStyle::Dashed { length: 5.0 })); - } - + if !self.scope.enabled && !plot_inst.auto_bounds { if let Some(range) = self.shared_x_range { let bounds = plot_ui.plot_bounds(); plot_ui.set_plot_bounds(PlotBounds::from_min_max([range[0], bounds.min()[1]], [range[1], bounds.max()[1]])); } } + if self.scope.enabled && self.scope.mode == AcquisitionMode::Triggered && self.scope.trigger_active { plot_ui.vline(VLine::new(self.scope.last_trigger_time).color(egui::Color32::YELLOW).style(LineStyle::Dashed { length: 5.0 })); } let data_map = self.traced_signals.lock().unwrap(); for (s_idx, sig_cfg) in plot_inst.signals.iter().enumerate() { if let Some(data) = data_map.get(&sig_cfg.source_name) { - let mut points_vec = Vec::new(); + let mut points = Vec::new(); for [t, v] in &data.values { let mut final_v = *v * sig_cfg.gain + sig_cfg.offset; if plot_inst.plot_type == PlotType::LogicAnalyzer { final_v = (s_idx as f64 * 1.5) + (if final_v > 0.5 { 1.0 } else { 0.0 }); } - points_vec.push([*t, final_v]); + points.push([*t, final_v]); } - plot_ui.line(Line::new(PlotPoints::from(points_vec)).name(&sig_cfg.label).color(sig_cfg.color)); + plot_ui.line(Line::new(PlotPoints::from(points)).name(&sig_cfg.label).color(sig_cfg.color)); } } if p_idx == 0 || current_range.is_none() { let b = plot_ui.plot_bounds(); current_range = Some([b.min()[0], b.max()[0]]); } }); - if plot_resp.response.hovered() && ctx.input(|i| i.pointer.any_released()) { if let Some(dropped) = ctx.data_mut(|d| d.get_temp::(egui::Id::new("drag_signal"))) { let color = Self::next_color(plot_inst.signals.len()); @@ -738,19 +696,13 @@ impl eframe::App for MarteDebugApp { ctx.data_mut(|d| d.remove_temp::(egui::Id::new("drag_signal"))); } } - if plot_resp.response.dragged() || ctx.input(|i| i.pointer.any_click() || i.smooth_scroll_delta.y != 0.0) { - if plot_resp.response.hovered() { - plot_inst.auto_bounds = false; - let b = plot_resp.transform.bounds(); - self.shared_x_range = Some([b.min()[0], b.max()[0]]); - } - } + if plot_resp.response.dragged() || ctx.input(|i| i.smooth_scroll_delta.y != 0.0) { if plot_resp.response.hovered() { plot_inst.auto_bounds = false; let b = plot_resp.transform.bounds(); self.shared_x_range = Some([b.min()[0], b.max()[0]]); } } plot_resp.response.context_menu(|ui| { if ui.button("🔍 Fit View").clicked() { plot_inst.auto_bounds = true; self.shared_x_range = None; ui.close_menu(); } ui.separator(); let mut sig_to_remove = None; for (s_idx, sig) in plot_inst.signals.iter().enumerate() { - ui.horizontal(|ui| { ui.label(&sig.label); if ui.button("🎨").clicked() { self.style_editor = Some((p_idx, s_idx)); ui.close_menu(); } if ui.button("❌").clicked() { sig_to_remove = Some(s_idx); ui.close_menu(); } }); + ui.horizontal(|ui| { ui.label(&sig.label); if ui.button("🎨 Style").clicked() { self.style_editor = Some((p_idx, s_idx)); ui.close_menu(); } if ui.button("❌ Remove").clicked() { sig_to_remove = Some(s_idx); ui.close_menu(); } }); } if let Some(idx) = sig_to_remove { plot_inst.signals.remove(idx); } }); @@ -760,7 +712,6 @@ impl eframe::App for MarteDebugApp { if !self.scope.enabled { if let Some(range) = current_range { if self.shared_x_range.is_none() { self.shared_x_range = Some(range); } } } } else { ui.centered_and_justified(|ui| { ui.label("Add a plot panel to begin analysis"); }); } }); - ctx.request_repaint_after(std::time::Duration::from_millis(16)); } }