Merge with dev

.github/workflows/rust.yml

@@ -2,7 +2,7 @@ name: Rust
 
 on:
   push:
-    branches: ["master"]
+    branches: ["master", "egui_generic"]
   pull_request:
     branches: ["master"]
 
@@ -42,4 +42,4 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: rustfmt
-        run: cargo fmt --all -- --check
+        run: cargo fmt --all -- --check

.vscode/settings.json

@@ -14,21 +14,38 @@
     "Swatinem",
     "Textbox",
     "Tpdf",
+    "bgeu",
+    "bltu",
     "blueviolet",
+    "clic",
+    "clicintattr",
+    "clicintctl",
+    "clicintie",
+    "clicintip",
+    "csrstore",
     "darkgray",
     "eframe",
     "egui",
     "epaint",
     "graphviz",
     "hoverable",
+    "imem",
+    "interactable",
+    "jalr",
     "librust",
     "lightcoral",
     "lightgray",
     "lightgreen",
+    "lsbzero",
     "menubutton",
+    "mepc",
+    "mintthresh",
+    "mmio",
+    "mret",
     "petgraph",
     "println",
     "regfile",
+    "regs",
     "repr",
     "rgbaf",
     "rgbf",
@@ -39,6 +56,7 @@
     "struct",
     "stylesheet",
     "syncrim",
+    "szext",
     "toposort",
     "trik",
     "typetag",

Cargo.toml

@@ -29,18 +29,18 @@ optional = true
 
 [dependencies.egui]
 optional = true
-version = "0.22.0"
+version = "0.23.0"
 
 [dependencies.eframe]
 optional = true
-version = "0.22.0"
+version = "0.23.0"
 
 [dependencies.epaint]
 optional = true
-version = "0.22.0"
+version = "0.23.0"
 
 [features]
-default = ["gui-vizia"]
+default = ["gui-egui"]
 components = []
 gui-vizia = ["vizia", "components"]
 gui-egui = ["egui", "eframe", "epaint", "components"]

empty.json

@@ -0,0 +1,3 @@
+{
+  "store": []
+}

examples/add.rs

@@ -1,4 +1,6 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input},
     components::*,
@@ -40,8 +42,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/add_edit.rs

@@ -1,4 +1,6 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input},
     components::*,
@@ -40,8 +42,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/add_mux.rs

@@ -1,10 +1,11 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input},
     components::*,
     fern::fern_setup,
 };
-
 fn main() {
     fern_setup();
     let cs = ComponentStore {
@@ -107,8 +108,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/add_reg.rs

@@ -1,10 +1,11 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input, SignalFmt, SignalSize},
     components::*,
     fern::fern_setup,
 };
-
 fn main() {
     fern_setup();
 
@@ -66,8 +67,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/add_reg_compound_wire.rs

@@ -1,10 +1,11 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input},
     components::*,
     fern::fern_setup,
 };
-
 fn main() {
     fern_setup();
     let cs = ComponentStore {
@@ -48,8 +49,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/data_mem.rs

@@ -1,10 +1,11 @@
 use std::{ops::Range, path::PathBuf};
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input, SignalUnsigned},
     components::*,
     fern::fern_setup,
 };
-
 fn main() {
     fern_setup();
     let cs = ComponentStore {
@@ -79,8 +80,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/mux_edit.rs

@@ -1,10 +1,11 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input},
     components::*,
     fern::fern_setup,
 };
-
 fn main() {
     fern_setup();
     let cs = ComponentStore {
@@ -63,8 +64,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/probe_constant.rs

@@ -1,6 +1,7 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{common::ComponentStore, components::*, fern::fern_setup};
-
 fn main() {
     fern_setup();
 
@@ -15,8 +16,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/probe_edit.rs

@@ -1,10 +1,11 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input},
     components::*,
     fern::fern_setup,
 };
-
 fn main() {
     fern_setup();
     let cs = ComponentStore {
@@ -18,8 +19,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/probe_stim.rs

@@ -1,6 +1,7 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{common::ComponentStore, components::*, fern::fern_setup};
-
 fn main() {
     fern_setup();
     let cs = ComponentStore {
@@ -11,8 +12,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/probe_stim_assert.rs

@@ -1,10 +1,11 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input},
     components::*,
     fern::fern_setup,
 };
-
 fn main() {
     fern_setup();
     let cs = ComponentStore {
@@ -23,8 +24,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/sext.rs

@@ -1,10 +1,11 @@
 use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
 use syncrim::{
     common::{ComponentStore, Input},
     components::*,
     fern::fern_setup,
 };
-
 fn main() {
     fern_setup();
     let cs = ComponentStore {
@@ -21,16 +22,16 @@ fn main() {
                 vec![(220.0, 100.0), (250.0, 100.0)],
                 Input::new("sxt0", "out"),
             ),
-            Probe::rc_new("p1", (260.0, 100.0), Input::new("sxt0", "out")),
+            Cross::rc_new("p1", (260.0, 100.0), Input::new("sxt0", "out")),
         ],
     };
 
     let path = PathBuf::from("sext.json");
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

mips/examples/mips.rs

@@ -68,8 +68,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

mips/examples/reg_file.rs

@@ -92,8 +92,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }