From 26940b8d9485e42d5271b7c5a2f9993f59b222c4 Mon Sep 17 00:00:00 2001 From: Hubald Verzijl Date: Thu, 21 Aug 2025 16:17:33 +0200 Subject: [PATCH] Included settings menu. --- src/app.rs | 208 +++++++++++++++++++++++++++++------------------------ 1 file changed, 116 insertions(+), 92 deletions(-) diff --git a/src/app.rs b/src/app.rs index 8b562ff..d63ea2c 100644 --- a/src/app.rs +++ b/src/app.rs @@ -4,9 +4,8 @@ use std::sync::atomic::{AtomicBool, Ordering}; use atomic_float::AtomicF32; use tokio::{sync::mpsc::{Sender}}; -use eframe::egui::{self, Button, Color32, DragValue, Key, Label, Layout, Modifiers}; +use eframe::egui::{self, Button, CollapsingHeader, Color32, DragValue, Key, Label, Layout, Modifiers}; use egui_plot::{Corner, Legend, Line, Plot, PlotPoints, Points, PlotBounds}; -use egui_dock::tab_viewer::OnCloseResponse; use egui_dock::{DockArea, DockState, Style}; use crate::plot::TimeSeriesPlot; @@ -15,15 +14,16 @@ use crate::signals::SingleFrequencySignal; pub struct App { tree: DockState, + tab_viewer: TabViewer, run_impedancemeter_tx: Sender, pub magnitude: Arc>, pub phase: Arc>, pub magnitude_series: Arc>, pub phase_series: Arc>, pub connected: Arc, - pub on: bool, + pub on: Arc>, pub data_frequency: Arc, - pub single_frequency: u32 + pub single_frequency: Arc> } struct TabViewer { @@ -31,6 +31,10 @@ struct TabViewer { phase: Arc>, magnitude_series: Arc>, phase_series: Arc>, + on: Arc>, + single_frequency: Arc>, + show_settings: bool, + show_settings_toggle: Option, } impl egui_dock::TabViewer for TabViewer { @@ -42,96 +46,117 @@ impl egui_dock::TabViewer for TabViewer { fn ui(&mut self, ui: &mut egui::Ui, tab: &mut Self::Tab) { egui::Frame::default().inner_margin(5).show(ui, |ui| { - let available_height = ui.available_height(); - let half_height = available_height / 2.0; - - let point_pos = vec![[*self.magnitude.lock().unwrap() as f64, *self.phase.lock().unwrap() as f64]]; - - let point_pos = PlotPoints::new(point_pos); - let point_pos = Points::new("pos", point_pos) - .radius(20.0) - .color(Color32::LIGHT_RED); - - let bounds = PlotBounds::from_min_max([-1.5, -1.5], [1.5, 1.5]); - - // Use a vertical layout to stack the plots - ui.with_layout(Layout::top_down(egui::Align::Min), |ui| { - // Plot pressure - ui.allocate_ui_with_layout( - egui::vec2(ui.available_width(), half_height), - Layout::top_down(egui::Align::Min), - |ui| { - // Magnitude - let magnitude = self.magnitude_series.lock().unwrap(); - Plot::new("magnitude") - .allow_scroll(false) - .allow_drag(false) - // .center_y_axis(true) - .legend(Legend::default().position(Corner::LeftTop)) - .y_axis_label("Magnitude [Ω]") - .y_axis_min_width(2.0) - .show(ui, |plot_ui| { - plot_ui.line( - Line::new("Magnitude", magnitude.plot_values()) - .color(Color32::BLUE) - ); - }); - }, - ); - // Plot pressure - ui.allocate_ui_with_layout( - egui::vec2(ui.available_width(), half_height), - Layout::top_down(egui::Align::Min), - |ui| { - // Phase - let phase = self.phase_series.lock().unwrap(); - Plot::new("phase") - .allow_scroll(false) - .allow_drag(false) - // .center_y_axis(true) - .legend(Legend::default().position(Corner::LeftTop)) - .y_axis_label("Phase [rad]") - .y_axis_min_width(2.0) - .show(ui, |plot_ui| { - plot_ui.line( - Line::new("Phase", phase.plot_values()) - .color(Color32::RED) - ); - }); - }, - ); + let settings = CollapsingHeader::new("Settings") + .open(self.show_settings_toggle) + .show(ui, |ui| { + if let Ok(on) = self.on.lock() { + ui.add_enabled_ui(!*on, |ui| { + ui.horizontal(|ui| { + ui.label("Single Frequency:"); + if let Ok(mut freq) = self.single_frequency.lock() { + ui.add(DragValue::new(&mut *freq).speed(0.1)); + } + ui.label("Hz"); + }); + }); + } }); - }); - } - fn on_close(&mut self, _tab: &mut Self::Tab) -> OnCloseResponse { - println!("Closed tab: {_tab}"); - OnCloseResponse::Close + self.show_settings_toggle = None; + self.show_settings = !settings.fully_closed(); + + ui.separator(); + + let available_height = ui.available_height(); + let half_height = available_height / 2.0-2.0; + + // Plot pressure + ui.allocate_ui_with_layout( + egui::vec2(ui.available_width(), half_height), + Layout::top_down(egui::Align::Min), + |ui| { + // Magnitude + let magnitude = self.magnitude_series.lock().unwrap(); + Plot::new("magnitude") + .legend(Legend::default().position(Corner::LeftTop)) + .y_axis_label("Magnitude at {} Hz[Ω]") + .y_axis_min_width(80.0) + .show(ui, |plot_ui| { + plot_ui.line( + Line::new(format!("Magnitude at {} Hz", self.single_frequency.lock().unwrap()), magnitude.plot_values()) + .color(Color32::BLUE) + ); + }); + }, + ); + // Plot pressure + ui.allocate_ui_with_layout( + egui::vec2(ui.available_width(), half_height), + Layout::top_down(egui::Align::Min), + |ui| { + // Phase + let phase = self.phase_series.lock().unwrap(); + Plot::new("phase") + .legend(Legend::default().position(Corner::LeftTop)) + .y_axis_label("Phase [rad]") + .y_axis_min_width(80.0) + .show(ui, |plot_ui| { + plot_ui.line( + Line::new(format!("Phase at {} Hz", self.single_frequency.lock().unwrap()), phase.plot_values()) + .color(Color32::RED) + ); + }); + }, + ); + }); } } impl App { pub fn new(run_impedancemeter_tx: Sender) -> Self { + // Step 1: Initialize shared fields first + let magnitude = Arc::new(Mutex::new(0.0)); + let phase = Arc::new(Mutex::new(0.0)); + let magnitude_series = Arc::new(Mutex::new(TimeSeriesPlot::new())); + let phase_series = Arc::new(Mutex::new(TimeSeriesPlot::new())); + let single_frequency = Arc::new(Mutex::new(50000)); + let on = Arc::new(Mutex::new(true)); + + // Step 2: Now we can initialize tab_viewer + let tab_viewer = TabViewer { + magnitude: magnitude.clone(), + phase: phase.clone(), + magnitude_series: magnitude_series.clone(), + phase_series: phase_series.clone(), + single_frequency: single_frequency.clone(), + on: on.clone(), + show_settings: false, + show_settings_toggle: None, + }; + + // Step 3: Construct App let app = App { tree: DockState::new(vec!["Single".to_string()]), + tab_viewer, run_impedancemeter_tx, - magnitude: Arc::new(Mutex::new(0.0)), - phase: Arc::new(Mutex::new(0.0)), - magnitude_series: Arc::new(Mutex::new(TimeSeriesPlot::new())), - phase_series: Arc::new(Mutex::new(TimeSeriesPlot::new())), + magnitude, + phase, + magnitude_series, + phase_series, connected: Arc::new(AtomicBool::new(false)), - on: true, + on, data_frequency: Arc::new(AtomicF32::new(0.0)), - single_frequency: 50000, + single_frequency, }; + app.update_start_stop(); app } pub fn update_start_stop(&self) { - match self.on { + match *self.on.lock().unwrap() { true => { - if let Err(e) = self.run_impedancemeter_tx.try_send(SingleFrequencySignal::Start(self.single_frequency)) { + if let Err(e) = self.run_impedancemeter_tx.try_send(SingleFrequencySignal::Start(*self.single_frequency.lock().unwrap())) { eprintln!("Failed to send start command: {:?}", e); } }, @@ -159,18 +184,11 @@ impl eframe::App for App { egui::widgets::global_theme_preference_switch(ui); ui.separator(); - ui.label(format!("{} Hz", self.data_frequency.load(Ordering::Relaxed))); + ui.label(format!("Data rate: {} Hz", self.data_frequency.load(Ordering::Relaxed))); ui.separator(); - ui.add_enabled_ui(!self.on, |ui| { - ui.add(DragValue::new(&mut self.single_frequency)); - ui.add(Label::new("Hz")); - }); - - ui.separator(); - - if ui.add_enabled(connected, toggle_start_stop(&mut self.on)).changed() { + if ui.add_enabled(connected, toggle_start_stop(&mut *self.on.lock().unwrap())).changed() { self.update_start_stop(); }; @@ -211,12 +229,7 @@ impl eframe::App for App { .show_leaf_close_all_buttons(false) .show_leaf_collapse_buttons(false) .show_close_buttons(false) - .show_inside(ui, &mut TabViewer { - magnitude: self.magnitude.clone(), - phase: self.phase.clone(), - magnitude_series: self.magnitude_series.clone(), - phase_series: self.phase_series.clone(), - }); + .show_inside(ui, &mut self.tab_viewer); }); // CMD- or control-W to close window @@ -229,13 +242,14 @@ impl eframe::App for App { // CMD- or control-W to close window if ctx.input(|i| i.key_pressed(Key::Space)) { - self.on = !self.on; + let value = *self.on.lock().unwrap(); + *self.on.lock().unwrap() = !value; self.update_start_stop(); } // Send stop command when the window is closed if ctx.input(|i| i.viewport().close_requested()) { - self.on = false; + *self.on.lock().unwrap() = false; self.update_start_stop(); } @@ -244,6 +258,16 @@ impl eframe::App for App { self.reset_view(); } + // Toggle setttings view + if ctx.input(|i| i.key_pressed(egui::Key::S)) { + self.tab_viewer.show_settings = !self.tab_viewer.show_settings; + if self.tab_viewer.show_settings { + self.tab_viewer.show_settings_toggle = Some(true); + } else { + self.tab_viewer.show_settings_toggle = Some(false); + } + } + ctx.request_repaint(); } }