Cargo.lock

@@ -658,7 +658,6 @@ dependencies = [
  "clap",
  "eframe",
  "egui",
- "egui-file-dialog",
  "egui_plot",
  "rand",
 ]
@@ -878,27 +877,6 @@ dependencies = [
  "crypto-common",
 ]
 
-[[package]]
-name = "directories"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -994,18 +972,6 @@ dependencies = [
  "nohash-hasher",
 ]
 
-[[package]]
-name = "egui-file-dialog"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09999eebe148a045df9e0d38f32b4ac03ac51bbf136d96fc4ff5e05f73a19ec5"
-dependencies = [
- "directories",
- "egui",
- "serde",
- "sysinfo",
-]
-
 [[package]]
 name = "egui-wgpu"
 version = "0.29.1"
@@ -2091,12 +2057,6 @@ version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
 [[package]]
 name = "orbclient"
 version = "0.3.48"
@@ -2364,17 +2324,6 @@ dependencies = [
  "bitflags 2.6.0",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
-dependencies = [
- "getrandom",
- "libredox",
- "thiserror",
-]
-
 [[package]]
 name = "renderdoc-sys"
 version = "1.1.0"
@@ -2615,17 +2564,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.31.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
-dependencies = [
- "core-foundation-sys",
- "libc",
- "windows 0.57.0",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.13.0"
@@ -3228,16 +3166,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
-dependencies = [
- "windows-core 0.57.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.58.0"
@@ -3257,42 +3185,19 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
-dependencies = [
- "windows-implement 0.57.0",
- "windows-interface 0.57.0",
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
- "windows-implement 0.58.0",
+ "windows-implement",
- "windows-interface 0.58.0",
+ "windows-interface",
- "windows-result 0.2.0",
+ "windows-result",
  "windows-strings",
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-implement"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "windows-implement"
 version = "0.58.0"
@@ -3304,17 +3209,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "windows-interface"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "windows-interface"
 version = "0.58.0"
@@ -3326,15 +3220,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "windows-result"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.2.0"
@@ -3350,7 +3235,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
 dependencies = [
- "windows-result 0.2.0",
+ "windows-result",
  "windows-targets 0.52.6",
 ]
 
@@ -3363,15 +3248,6 @@ dependencies = [
  "windows-targets 0.42.2",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"

Cargo.toml

@@ -8,6 +8,5 @@ anyhow = "1.0.92"
 clap = { version = "4.5.20", features = ["derive"] }
 eframe = "0.29.1"
 egui = "0.29.1"
-egui-file-dialog = "0.7.0"
 egui_plot = "0.29.0"
 rand = "0.8.5"

src/cli/display.rs

@@ -32,20 +32,9 @@ impl PlotDisplay {
 
 impl eframe::App for PlotDisplay {
     fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {    
+            egui::CentralPanel::default().show(ctx, |ui| { 
-            ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
-                save_button(ui);
                 crate::plot(ui, &mut self.circles, &self.circle_length, &self.line_colors);
-            });
+       });
-        });   
-    }
-}
-
-fn save_button(ui: &mut egui::Ui) {
-    if ui.button("Save").clicked() {
-        //TODO: Open file dialog
-        // Get destination path
-        // save screenshot of plot to path
     }
 }
 

src/gui.rs

@@ -1,15 +1,8 @@
-pub struct Error(eframe::Error);
+pub fn gui() -> Result<(), eframe::Error> {
-
-pub fn gui() -> anyhow::Result<()> {
     let options = eframe::NativeOptions::default();
-    eframe::run_native(
+    eframe::run_native("Encoded Message", options, Box::new(|_cc| Ok(Box::<Gui>::new(
-        "Encoded Message", 
-        options, 
-        Box::new(|_cc| Ok(Box::<Gui>::new(
                     Default::default()
-        )))
+    ))))
-    ).map_err(crate::Error::from)?;
-    Ok(())
 }
 
 struct Gui {
@@ -38,6 +31,7 @@ impl eframe::App for Gui {
     }
 }
 
+pub struct Error(eframe::Error);
 
 impl From<eframe::Error> for Error {
     fn from(err: eframe::Error) -> Self {

src/plotting.rs

@@ -1,9 +1,9 @@
+use egui_plot::{Plot, PlotPoints};
 use std::f64::{self, consts::PI};
 
 pub fn plot(ui: &mut egui::Ui, circles: &mut Vec<crate::Circle>, num_points: &usize, line_colors: &Vec<egui::Color32>) {
-    egui_plot::Plot::new("Encoded Message")
+    Plot::new("Encoded Message")
-        .height(ui.available_height())
+        .min_size(ui.available_size())
-        .width(ui.available_width())
         .show_axes(false)
         .show_grid(false)
         .show_x(false)
@@ -23,10 +23,10 @@ pub fn plot(ui: &mut egui::Ui, circles: &mut Vec<crate::Circle>, num_points: &us
                         gaussian_distribution(num_points, &points, &(count as f64))
                 ).color(line_colors[count]));
             });
-        });
+        }); 
 }
 
-fn gaussian_distribution(num_points: &usize, peak_values: &Vec<f64>, offset: &f64) -> egui_plot::PlotPoints {
+fn gaussian_distribution(num_points: &usize, peak_values: &Vec<f64>, offset: &f64) -> PlotPoints {
     let mut radii: Vec<f64> = vec![1.0; *num_points];
     let num_peaks = peak_values.len();
     let peak_angles = generate_peak_angles(&num_peaks);
@@ -53,7 +53,7 @@ fn normalize(radii: &mut Vec<f64>, offset: &f64) -> Vec<f64> {
     }).collect()
 }
 
-fn cartesian_to_polar(radii: &Vec<f64>, theta: &Vec<f64>) -> egui_plot::PlotPoints {
+fn cartesian_to_polar(radii: &Vec<f64>, theta: &Vec<f64>) -> PlotPoints {
     theta.iter()
         .zip(radii.iter())
         .map(|(&theta, &radius)| {