enable autoscaling selection for all modes

markusdd · markusdd · commit 55052011ff3b · 2026-04-08T23:51:36.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ## 0.4.3
 
-- TODO: Fix bug that change interval of graph only applies after restart
+- fix bug that change interval of graph only applies after restart
+- make auto scaling of units and measurements selectable per mode
+- simplify repaint logic and ensure number box update is not tied to graph update
 - upgrade to egui 0.34.1
 - upgrade to rust 1.92
 - use temporary version of egui-dropdown until PR is included to build against egui 0.34.1
diff --git a/src/app/mod.rs b/src/app/mod.rs
@@ -1,12 +1,11 @@
 use chrono::DateTime;
 use serde::{Deserialize, Serialize};
 use std::{
-    collections::{BTreeMap, VecDeque},
+    collections::{BTreeMap, HashMap, VecDeque},
     sync::{Arc, Mutex},
-    time::Duration,
 };
 
-use egui::{Color32, Context, FontData, FontDefinitions, FontFamily};
+use egui::{Color32, FontData, FontDefinitions, FontFamily};
 use egui_dock::DockState;
 use mio::{Events, Poll};
 use mio_serial::{SerialPortInfo, SerialStream};
@@ -56,6 +55,11 @@ pub struct Record {
     pub value: f64,
 }
 
+#[derive(Clone, Debug, Default, serde::Serialize, serde::Deserialize)]
+struct ModeDisplaySettings {
+    pub auto_scale_units: bool, // true = use mV / mΩ / kΩ etc. (current default behavior)
+}
+
 /// We derive Deserialize/Serialize so we can persist app state on shutdown.
 #[derive(Serialize, Deserialize)]
 #[serde(default)] // if we add new fields, give them default values when deserializing old state
@@ -94,7 +98,7 @@ pub struct MyApp {
     recording_interval_ms: u64,    // Persistent, fixed interval duration
     recording_active: bool,        // Persistent, whether recording is active
     recording_timestamp_format: TimestampFormat, // Persistent, timestamp format
-    cont_disable_unit_scaling: bool,
+    mode_display_settings: HashMap<MeterMode, ModeDisplaySettings>,
     #[serde(skip)]
     recording_data: Vec<Record>, // Do not persist recording data
     #[serde(skip)]
@@ -254,7 +258,7 @@ impl Default for MyApp {
             last_record_time: 0.0,                           // Initialize last recording time
             graph_config: graph::GraphConfig::default(),     // Default graph config
             plot_dock_state: DockState::new(vec![]), // Initialize empty, populated in update
-            cont_disable_unit_scaling: false,
+            mode_display_settings: HashMap::default(),
         }
     }
 }
@@ -384,4 +388,18 @@ impl MyApp {
         self.hist_values.clear(); // Clear histogram data
         self.meas_count = 0; // Reset measurement counter
     }
+
+    pub fn auto_scale_units(&self, mode: &MeterMode) -> bool {
+        self.mode_display_settings
+            .get(mode)
+            .map_or(true, |s| s.auto_scale_units) // default = enabled (matches current behavior for all modes)
+    }
+
+    pub fn set_auto_scale_units(&mut self, mode: MeterMode, enabled: bool) {
+        self.mode_display_settings
+            .entry(mode)
+            .or_default()
+            .auto_scale_units = enabled;
+        // Optional: self.save_settings() if you have an immediate-save helper
+    }
 }
diff --git a/src/app/settings.rs b/src/app/settings.rs
@@ -23,11 +23,6 @@ impl super::MyApp {
                             self.value_debug = value_debug;
                             *self.value_debug_shared.lock().unwrap() = value_debug;
                         }
-                        ui.checkbox(&
-                          mut self.cont_disable_unit_scaling,
-                    "Disable unit scaling in CONT mode (always show raw Ω)"
-                        );
-                        ui.label("Useful when you prefer the exact resistance value without mΩ/kΩ/MΩ prefixes in continuity mode.");
                         ui.label("Baud rate:");
                         ui.add(
                             TextEdit::singleline(&mut self.baud_rate.to_string())
diff --git a/src/app/ui.rs b/src/app/ui.rs
@@ -381,7 +381,7 @@ impl super::MyApp {
                                 1_000_000.0,
                                 0.0001,
                                 &self.metermode,
-                                self.cont_disable_unit_scaling,
+                                self.auto_scale_units(&self.metermode),
                             );
                             ui.label(
                                 egui::RichText::new(formatted_value)
@@ -688,6 +688,18 @@ impl super::MyApp {
                                 }
                             }
                         }
+
+                        // scale control per mode
+                        let mut auto_scale = self.auto_scale_units(&self.metermode);
+                        if ui
+                            .checkbox(&mut auto_scale, "Auto-scale units")
+                            .on_hover_text(
+                                "Auto scale values and show prefixed units like mV/mΩ/kΩ",
+                            )
+                            .changed()
+                        {
+                            self.set_auto_scale_units(self.metermode.clone(), auto_scale);
+                        }
                     });
                 });
             });
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -6,7 +6,7 @@ pub fn format_measurement(
     sci_threshold_high: f64,
     sci_threshold_low: f64,
     meter_mode: &MeterMode,
-    cont_disable_unit_scaling: bool,
+    auto_scale_units: bool,
 ) -> (String, String) {
     if value.is_nan() {
         return ("    NaN".to_string(), "".to_string());
@@ -40,33 +40,31 @@ pub fn format_measurement(
     .to_string();
 
     // Adjust value and unit based on mode and magnitude
-    match meter_mode {
-        MeterMode::Vdc | MeterMode::Vac => {
-            if abs_value < 1.0 {
-                display_value = value * 1000.0;
-                display_unit = if matches!(meter_mode, MeterMode::Vdc) {
-                    "mVDC"
-                } else {
-                    "mVAC"
+    if auto_scale_units {
+        match meter_mode {
+            MeterMode::Vdc | MeterMode::Vac => {
+                if abs_value < 1.0 {
+                    display_value = value * 1000.0;
+                    display_unit = if matches!(meter_mode, MeterMode::Vdc) {
+                        "mVDC"
+                    } else {
+                        "mVAC"
+                    }
+                    .to_string();
                 }
-                .to_string();
             }
-        }
-        MeterMode::Adc | MeterMode::Aac => {
-            if abs_value < 1.0 {
-                display_value = value * 1000.0;
-                display_unit = if matches!(meter_mode, MeterMode::Adc) {
-                    "mADC"
-                } else {
-                    "mAAC"
+            MeterMode::Adc | MeterMode::Aac => {
+                if abs_value < 1.0 {
+                    display_value = value * 1000.0;
+                    display_unit = if matches!(meter_mode, MeterMode::Adc) {
+                        "mADC"
+                    } else {
+                        "mAAC"
+                    }
+                    .to_string();
                 }
-                .to_string();
             }
-        }
-        MeterMode::Res | MeterMode::Cont => {
-            if cont_disable_unit_scaling && *meter_mode == MeterMode::Cont {
-                // skip formatting in this instance
-            } else {
+            MeterMode::Res | MeterMode::Cont => {
                 if abs_value >= 1_000_000.0 {
                     display_value = value / 1_000_000.0;
                     display_unit = "MOhm".to_string();
@@ -78,26 +76,26 @@ pub fn format_measurement(
                     display_unit = "mOhm".to_string();
                 }
             }
-        }
-        MeterMode::Cap => {
-            if abs_value >= 0.001 {
-                display_value = value * 1000.0;
-                display_unit = "mF".to_string();
-            } else if abs_value >= 0.000_001 {
-                display_value = value * 1_000_000.0;
-                display_unit = "μF".to_string();
-            } else if abs_value > 0.0 {
-                display_value = value * 1_000_000_000.0;
-                display_unit = "nF".to_string();
+            MeterMode::Cap => {
+                if abs_value >= 0.001 {
+                    display_value = value * 1000.0;
+                    display_unit = "mF".to_string();
+                } else if abs_value >= 0.000_001 {
+                    display_value = value * 1_000_000.0;
+                    display_unit = "μF".to_string();
+                } else if abs_value > 0.0 {
+                    display_value = value * 1_000_000_000.0;
+                    display_unit = "nF".to_string();
+                }
             }
-        }
-        MeterMode::Per => {
-            if abs_value < 1.0 {
-                display_value = value * 1000.0;
-                display_unit = "ms".to_string();
+            MeterMode::Per => {
+                if abs_value < 1.0 {
+                    display_value = value * 1000.0;
+                    display_unit = "ms".to_string();
+                }
             }
+            _ => {}
         }
-        _ => {}
     }
 
     let abs_display_value = display_value.abs();
diff --git a/src/multimeter.rs b/src/multimeter.rs
@@ -1,4 +1,5 @@
 use phf::{OrderedMap, phf_ordered_map};
+use serde::{Deserialize, Serialize};
 
 /// A trait that must be implemented for all SCPI command structs.
 /// Gets passed the struct instance itself and the selected option name
@@ -14,7 +15,7 @@ pub enum ScpiMode {
     Meas,
 }
 
-#[derive(PartialEq, Clone, Copy, Debug)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, Serialize, Deserialize)]
 pub enum MeterMode {
     Vdc,
     Vac,
