Merge pull request #6 from Brickworks/sim-interface-update

Sim interface update
philiplinden · Feb 23, 2024 · fd222e7 · fd222e7
2 parents 32f0792 + 643f552
commit fd222e7
Show file tree

Hide file tree

Showing 29 changed files with 495 additions and 5,069 deletions.
diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -31,7 +31,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-
       - name: Cargo Check
-        run: cargo check
+        run: RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo check
       - name: Cargo Build
         run: cargo build --release --all-features
   test:

diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,14 @@ license-file = "LICENSE"
 
 [features]
 default = ["gui"]
-gui = ["egui", "egui_extras", "egui_plot", "eframe", "emath"]
+gui = [
+    "egui",
+    "egui_extras",
+    "egui_plot",
+    "eframe",
+    "emath",
+    "rfd",
+]
 
 [dependencies]
 pretty_env_logger = "0.5.0"
@@ -30,7 +37,13 @@ egui = { version = "0.26.2", features = ["log", "serde"], optional = true }
 egui_plot = { version = "0.26.2", features = ["serde"], optional = true }
 eframe = { version = "0.26.2", features = ["persistence"], optional = true }
 emath = { version = "0.26.2", optional = true }
-egui_extras = { version = "0.26.2", features = ["chrono", "datepicker", "file"], optional = true}
+egui_extras = { version = "0.26.2", features = [
+    "chrono",
+    "datepicker",
+    "file",
+], optional = true }
+rfd = { version = "0.14.0", optional = true }
+ultraviolet = { version = "0.9.2", features = ["serde"] }
 
 [[bin]]
 name = "yahs"

diff --git a/src/cli.rs b/src/cli.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use clap::{Parser, Subcommand};
 use log::error;
 
-use crate::simulator::{AsyncSim, Rate};
+use crate::simulator::schedule::{AsyncSim, Rate};
 
 #[derive(Parser)]
 #[clap(author, version, about)]

diff --git a/src/gui/demo/context_menu.rs b/src/gui/demo/context_menu.rs