wip

luftkode · Feb 2, 2025 · e1b4d7e · e1b4d7e
1 parent 8ed85f9
commit e1b4d7e
Show file tree

Hide file tree

Showing 47 changed files with 630 additions and 98 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,41 +1,35 @@
-[package]
-name = "plotinator3000"
-description = "Log viewer app for viewing plots of data from projects such as motor and generator control"
-authors = ["SkyTEM Surveys", "Marc Beck König"]
+[workspace]
+members = ["crates/*"]
+resolver = "2"
+
+[workspace.package]
 version = "1.6.4"
+authors = ["SkyTEM Surveys", "Marc Beck König"]
 edition = "2021"
-repository = "https://github.com/luftkode/plotinator3000"
-homepage = "https://github.com/luftkode/plotinator3000"
 license = "MIT OR Apache-2.0"
-
-[[bin]]
-name = "plotinator3000"
-path = "src/main.rs"
-required-features = ["selfupdater"]
-
-[[bin]]
-name = "plotinator3000-h5"
-path = "src/main_h5.rs"
-required-features = ["hdf"]
-
-[features]
-default = ["selfupdater"]
-hdf = ["skytem_hdf"]
-selfupdater = []
-
-[package.metadata.wix]
-upgrade-guid = "7063C05B-24FE-4CE5-A338-6D750F3F10CE"
-path-guid = "025605DB-83DB-4162-B505-26B36C02D0B9"
-license = false
-eula = false
-product-icon = "assets/favicon.ico"
-
-[workspace]
-members = ["crates/*"]
+description = "Log viewer app for viewing plots of data from projects such as motor and generator control"
+homepage = "https://github.com/luftkode/plotinator3000"
+repository = "https://github.com/luftkode/plotinator3000"
 
 [workspace.dependencies]
+plotinator-lib = { version = "*", path = "crates/plotinator-lib" }
+skytem_logs = { version = "*", path = "crates/skytem_logs" }
+log_if = { version = "*", path = "crates/log_if" }
+plot_util = { version = "*", path = "crates/plot_util" }
+skytem_hdf = { version = "*", path = "crates/skytem_hdf" }
+eframe = { version = "0.30", default-features = false, features = [
+    "default_fonts", # Embed the default egui fonts.
+    "glow",          # Use the glow rendering backend. Alternative: "wgpu".
+    "persistence",   # Enable restoring app state when restarting the app.
+    "wayland",
+    "x11"
+] }
 egui = { version = "0.30", features = ["rayon"] }
 egui_plot = { version = "0.30", features = ["serde"] }
+rfd = "0.15"
+egui-phosphor = "0.8.0"
+egui-notify = "0.18.0"
+tokio = "1.43.0"
 log = "0.4"
 serde = { version = "1", features = ["derive"] }
 serde-big-array = "0.5.1"
@@ -57,54 +51,6 @@ pretty_assertions = "1.4.1"
 tempfile = "3.15.0"
 reqwest = "0.12.12"
 
-[dependencies]
-skytem_logs = { version = "*", path = "crates/skytem_logs" }
-log_if = { version = "*", path = "crates/log_if" }
-plot_util = { version = "*", path = "crates/plot_util" }
-skytem_hdf = { version = "*", path = "crates/skytem_hdf", optional = true }
-egui_plot.workspace = true
-log.workspace = true
-serde.workspace = true
-strum.workspace = true
-strum_macros.workspace = true
-chrono.workspace = true
-getset.workspace = true
-semver.workspace = true
-egui.workspace = true
-eframe = { version = "0.30", default-features = false, features = [
-    "default_fonts", # Embed the default egui fonts.
-    "glow",          # Use the glow rendering backend. Alternative: "wgpu".
-    "persistence",   # Enable restoring app state when restarting the app.
-    "wayland",
-    "x11"
-] }
-rfd = "0.15"
-egui-phosphor = "0.8.0"
-egui-notify = "0.18.0"
-tokio = "1.43.0"
-
-[dev-dependencies]
-testresult.workspace = true
-tempfile.workspace = true
-reqwest.workspace = true
-
-
-# native:
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-env_logger = "0.11"
-zip = "2.2.2"
-axoupdater = { version = "0.9.0", features = ["blocking"] }
-
-
-# web:
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen-futures = "0.4"
-web-sys = "0.3.70"
-
-# windows
-[target.'cfg(target_os = "windows")'.dependencies]
-elevated-command.workspace = true
-
 [profile.release]
 opt-level = 3
 debug = false
@@ -121,9 +67,6 @@ opt-level = 2
 [profile.dist]
 inherits = "release"
 
-[lints]
-workspace = true
-
 [workspace.lints.rust]
 missing_debug_implementations = "warn"
 missing_copy_implementations = "warn"

diff --git a/crates/plotinator-lib/Cargo.toml b/crates/plotinator-lib/Cargo.toml
@@ -0,0 +1,59 @@
+[package]
+name = "plotinator-lib"
+description.workspace = true
+authors.workspace = true
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+homepage.workspace = true
+license.workspace = true
+
+[features]
+default = ["selfupdater"]
+hdf = ["dep:skytem_hdf"]
+selfupdater = ["dep:axoupdater"]
+
+[dependencies]
+skytem_hdf = { workspace = true, optional = true }
+skytem_logs.workspace = true
+log_if.workspace = true
+plot_util.workspace = true
+egui_plot.workspace = true
+log.workspace = true
+serde.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+chrono.workspace = true
+getset.workspace = true
+semver.workspace = true
+egui.workspace = true
+eframe.workspace = true
+rfd.workspace = true
+egui-phosphor.workspace = true
+egui-notify.workspace = true
+tokio.workspace = true
+
+[dev-dependencies]
+testresult.workspace = true
+tempfile.workspace = true
+reqwest.workspace = true
+
+
+# native:
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+env_logger = "0.11"
+zip = "2.2.2"
+axoupdater = { version = "0.9.0", features = ["blocking"], optional = true }
+
+
+# web:
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wasm-bindgen-futures = "0.4"
+web-sys = "0.3.70"
+
+# windows
+[target.'cfg(target_os = "windows")'.dependencies]
+elevated-command.workspace = true
+
+[lints]
+workspace = true
diff --git a/src/app.rs → crates/plotinator-lib/src/app.rs b/src/app.rs → crates/plotinator-lib/src/app.rs
diff --git a/src/app/dropped_files.rs → ...s/plotinator-lib/src/app/dropped_files.rs b/src/app/dropped_files.rs → ...s/plotinator-lib/src/app/dropped_files.rs
diff --git a/src/app/dropped_files/preview_dropped.rs → .../src/app/dropped_files/preview_dropped.rs b/src/app/dropped_files/preview_dropped.rs → .../src/app/dropped_files/preview_dropped.rs
diff --git a/src/app/file_dialog.rs → crates/plotinator-lib/src/app/file_dialog.rs b/src/app/file_dialog.rs → crates/plotinator-lib/src/app/file_dialog.rs
diff --git a/src/app/file_dialog/native.rs → ...tinator-lib/src/app/file_dialog/native.rs b/src/app/file_dialog/native.rs → ...tinator-lib/src/app/file_dialog/native.rs
diff --git a/src/app/file_dialog/web.rs → ...plotinator-lib/src/app/file_dialog/web.rs b/src/app/file_dialog/web.rs → ...plotinator-lib/src/app/file_dialog/web.rs
diff --git a/src/app/supported_formats.rs → ...otinator-lib/src/app/supported_formats.rs b/src/app/supported_formats.rs → ...otinator-lib/src/app/supported_formats.rs
diff --git a/src/app/supported_formats/hdf.rs → ...ator-lib/src/app/supported_formats/hdf.rs b/src/app/supported_formats/hdf.rs → ...ator-lib/src/app/supported_formats/hdf.rs
diff --git a/src/app/supported_formats/logs.rs → ...tor-lib/src/app/supported_formats/logs.rs b/src/app/supported_formats/logs.rs → ...tor-lib/src/app/supported_formats/logs.rs
diff --git a/src/app/supported_formats/logs/parse_info.rs → .../app/supported_formats/logs/parse_info.rs b/src/app/supported_formats/logs/parse_info.rs → .../app/supported_formats/logs/parse_info.rs
diff --git a/src/app/supported_formats/util.rs → ...tor-lib/src/app/supported_formats/util.rs b/src/app/supported_formats/util.rs → ...tor-lib/src/app/supported_formats/util.rs
diff --git a/src/app/util.rs → crates/plotinator-lib/src/app/util.rs b/src/app/util.rs → crates/plotinator-lib/src/app/util.rs
diff --git a/src/lib.rs → crates/plotinator-lib/src/lib.rs b/src/lib.rs → crates/plotinator-lib/src/lib.rs
@@ -9,7 +9,7 @@ pub const APP_NAME: &str = env!("CARGO_PKG_NAME");
 pub const APP_OWNER: &str = "luftkode";
 
 #[cfg(not(target_arch = "wasm32"))]
-pub const APP_ICON: &[u8] = include_bytes!("../assets/skytem-icon-256.png");
+pub const APP_ICON: &[u8] = include_bytes!("../../../assets/skytem-icon-256.png");
 
 pub const APP_VERSION_MAJOR: &str = env!("CARGO_PKG_VERSION_MAJOR");
 pub const APP_VERSION_MINOR: &str = env!("CARGO_PKG_VERSION_MINOR");

diff --git a/src/plot.rs → crates/plotinator-lib/src/plot.rs b/src/plot.rs → crates/plotinator-lib/src/plot.rs
diff --git a/src/plot/axis_config.rs → ...es/plotinator-lib/src/plot/axis_config.rs b/src/plot/axis_config.rs → ...es/plotinator-lib/src/plot/axis_config.rs
diff --git a/src/plot/axis_config/axis_lock.rs → ...tor-lib/src/plot/axis_config/axis_lock.rs b/src/plot/axis_config/axis_lock.rs → ...tor-lib/src/plot/axis_config/axis_lock.rs
diff --git a/src/plot/click_delta.rs → ...es/plotinator-lib/src/plot/click_delta.rs b/src/plot/click_delta.rs → ...es/plotinator-lib/src/plot/click_delta.rs
diff --git a/src/plot/plot_graphics.rs → .../plotinator-lib/src/plot/plot_graphics.rs b/src/plot/plot_graphics.rs → .../plotinator-lib/src/plot/plot_graphics.rs
diff --git a/src/plot/plot_settings.rs → .../plotinator-lib/src/plot/plot_settings.rs b/src/plot/plot_settings.rs → .../plotinator-lib/src/plot/plot_settings.rs
diff --git a/src/plot/plot_settings/date_settings.rs → ...b/src/plot/plot_settings/date_settings.rs b/src/plot/plot_settings/date_settings.rs → ...b/src/plot/plot_settings/date_settings.rs
diff --git a/src/plot/plot_settings/loaded_logs.rs → ...lib/src/plot/plot_settings/loaded_logs.rs b/src/plot/plot_settings/loaded_logs.rs → ...lib/src/plot/plot_settings/loaded_logs.rs
diff --git a/src/plot/plot_settings/mipmap_settings.rs → ...src/plot/plot_settings/mipmap_settings.rs b/src/plot/plot_settings/mipmap_settings.rs → ...src/plot/plot_settings/mipmap_settings.rs
diff --git a/src/plot/plot_settings/plot_filter.rs → ...lib/src/plot/plot_settings/plot_filter.rs b/src/plot/plot_settings/plot_filter.rs → ...lib/src/plot/plot_settings/plot_filter.rs
diff --git a/...t/plot_settings/plot_visibility_config.rs → ...t/plot_settings/plot_visibility_config.rs b/...t/plot_settings/plot_visibility_config.rs → ...t/plot_settings/plot_visibility_config.rs
diff --git a/src/plot/plot_ui.rs → crates/plotinator-lib/src/plot/plot_ui.rs b/src/plot/plot_ui.rs → crates/plotinator-lib/src/plot/plot_ui.rs
diff --git a/src/plot/util.rs → crates/plotinator-lib/src/plot/util.rs b/src/plot/util.rs → crates/plotinator-lib/src/plot/util.rs
diff --git a/src/updater.rs → crates/plotinator-lib/src/updater.rs b/src/updater.rs → crates/plotinator-lib/src/updater.rs
diff --git a/src/updater/ui.rs → crates/plotinator-lib/src/updater/ui.rs b/src/updater/ui.rs → crates/plotinator-lib/src/updater/ui.rs
diff --git a/src/updater/ui/error_window.rs → ...inator-lib/src/updater/ui/error_window.rs b/src/updater/ui/error_window.rs → ...inator-lib/src/updater/ui/error_window.rs
diff --git a/src/updater/ui/pre_admin_window.rs → ...or-lib/src/updater/ui/pre_admin_window.rs b/src/updater/ui/pre_admin_window.rs → ...or-lib/src/updater/ui/pre_admin_window.rs
diff --git a/src/updater/ui/updates_disabled.rs → ...or-lib/src/updater/ui/updates_disabled.rs b/src/updater/ui/updates_disabled.rs → ...or-lib/src/updater/ui/updates_disabled.rs
diff --git a/src/util.rs → crates/plotinator-lib/src/util.rs b/src/util.rs → crates/plotinator-lib/src/util.rs
diff --git a/crates/plotinator3000-h5/Cargo.toml b/crates/plotinator3000-h5/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "plotinator3000-h5"
+description = "Log viewer app for viewing plots of data from projects such as motor and generator control"
+authors = ["SkyTEM Surveys", "Marc Beck König"]
+version = "1.6.4"
+edition = "2021"
+repository = "https://github.com/luftkode/plotinator3000"
+homepage = "https://github.com/luftkode/plotinator3000"
+license = "MIT OR Apache-2.0"
+
+[package.metadata.wix]
+upgrade-guid = "F0BD0082-87A7-43DA-930A-6CFC1B3BCC52"
+path-guid = "04977CE9-B016-4331-8DA5-FCD7DC6D9BE0"
+license = false
+eula = false
+
+
+[dependencies]
+plotinator-lib = { workspace = true, features = ["selfupdater", "hdf"] }
+
+[lints]
+workspace = true
diff --git a/src/main.rs → crates/plotinator3000-h5/src/main.rs b/src/main.rs → crates/plotinator3000-h5/src/main.rs
@@ -1,6 +1,6 @@
 #![warn(clippy::all, rust_2018_idioms)]
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
 
-fn main() -> eframe::Result {
-    plotinator3000::run_app()
+fn main() {
+    plotinator_lib::run_app().expect("Plotinator3000 failed");
 }