Merge branch 'development'

Author: anselanza

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "tether-egui"
-version = "0.10.2"
+version = "0.10.5"
 edition = "2021"
 license = "MIT"
 description = "GUI for building and testing Tether-based applications"
@@ -32,6 +32,7 @@ rmpv = { version = "0.4", features = ["with-serde"] }
 rmp-serde = "0.15"
 clap = { version = "4.1.1", features = ["derive"] }
 rfd = "0.11"
+anyhow = "1.0.96"
 
 # The profile that 'cargo dist' will build with
 [profile.dist]

Cargo.toml

@@ -7,16 +7,16 @@
           "description": "A true or false value",
           "plug": {
             "OutputPlug": {
-              "name": "Message",
+              "name": "",
               "topic": {
                 "Tether": {
                   "role": "gui",
                   "id": "any",
-                  "plug_name": "Message",
-                  "full_topic": "gui/any/Message"
+                  "plug_name": "",
+                  "full_topic": "gui/any/"
                 }
               },
-              "qos": 0,
+              "qos": 1,
               "retain": false
             }
           },
@@ -50,7 +50,8 @@
         "value": 0.0,
         "rangeMin": 0.0,
         "rangeMax": 1.0,
-        "shouldRound": false
+        "shouldRound": false,
+        "stepSize": 1.0
       }
     },
     {
@@ -75,9 +76,12 @@
           },
           "midiMapping": null
         },
-        "value": [0.0, 0.0]
+        "value": [
+          0.0,
+          0.0
+        ]
       }
     }
   ],
   "tetherSettings": null
-}
+}

demo.json

@@ -1,5 +1,6 @@
 use std::fs;
 
+use anyhow::anyhow;
 use egui::{Color32, DragValue, RichText, Ui};
 use log::*;
 
@@ -23,28 +24,23 @@ pub fn general_agent_area(ui: &mut Ui, model: &mut Model) {
         ui.small("(No JSON file loaded)");
     }
     ui.horizontal(|ui| {
-        if ui.button("Save").clicked() {
-            if let Some(path) = rfd::FileDialog::new()
+        if let Some(path_string) = &model.json_file {
+            if ui.button("Save").clicked() {
+                save_to_disk(model, path_string).expect("failed to save");
+            }
+        }
+
+        if ui.button("Save As...").clicked() {
+            if let Some(path_string) = rfd::FileDialog::new()
                 .add_filter("text", &["json"])
                 .save_file()
+                .map(|path| path.display().to_string())
             {
-                //   if model.project.tether_settings.was_changed {
-                //       info!("Tether Settings were edited; copying these to project");
-                //       model.project.tether_settings = Some(model.editable_tether_settings.clone());
-                //   };
-                let path_string = path.display().to_string();
-                let text = serde_json::to_string_pretty(&model.project)
-                    .expect("failed to serialise widget data");
-                match fs::write(path_string, text) {
-                    Ok(()) => {
-                        info!("Saved OK");
-                    }
-                    Err(e) => {
-                        error!("Error saving to disk: {:?}", e);
-                    }
-                }
+                save_to_disk(model, &path_string).expect("failed to save as");
+                model.json_file = Some(path_string);
             }
         }
+
         if ui.button("Load").clicked() {
             if let Some(path) = rfd::FileDialog::new()
                 .add_filter("text", &["json"])
@@ -60,7 +56,7 @@ pub fn general_agent_area(ui: &mut Ui, model: &mut Model) {
                 }
             }
         }
-        if ui.button("Clear").clicked() {
+        if ui.button("New").clicked() {
             model.project.widgets.clear();
             model.json_file = None;
         }
@@ -127,3 +123,15 @@ pub fn general_agent_area(ui: &mut Ui, model: &mut Model) {
         }
     }
 }
+
+fn save_to_disk(model: &Model, path: &str) -> anyhow::Result<()> {
+    let text =
+        serde_json::to_string_pretty(&model.project).expect("failed to serialise widget data");
+    match fs::write(path, text) {
+        Ok(_) => {
+            info!("Saved OK to \"{}\"", path);
+            Ok(())
+        }
+        Err(e) => Err(anyhow!("Error writing to disk: {}", e)),
+    }
+}

src/gui/common.rs

@@ -59,9 +59,9 @@ impl Default for Model {
             // edit_tether_settings: false,
             json_file: {
                 if was_loaded_from_disk {
-                    None
-                } else {
                     Some(json_path)
+                } else {
+                    None
                 }
             },
             monitor_topic: cli.monitor_topic.clone(),

src/model.rs

@@ -24,6 +24,12 @@ pub struct NumberWidget {
     range_min: f64,
     range_max: f64,
     should_round: bool,
+    #[serde(default = "default_step_size")]
+    step_size: f64,
+}
+
+fn default_step_size() -> f64 {
+    1.0
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -44,6 +50,13 @@ impl NumberWidget {
             range_min: *range.start(),
             range_max: *range.end(),
             should_round: round_off,
+            step_size: {
+                if round_off {
+                    1.0
+                } else {
+                    (*range.start() - *range.end()).abs() / 100.
+                }
+            },
         }
     }
 
@@ -79,7 +92,11 @@ impl View for NumberWidget {
         let &max = self.range().end();
 
         if ui
-            .add(Slider::new(&mut self.value, min..=max).clamp_to_range(false))
+            .add(
+                Slider::new(&mut self.value, min..=max)
+                    .clamp_to_range(false)
+                    .step_by(self.step_size),
+            )
             .changed()
             && self.common().auto_send
         {
@@ -141,6 +158,10 @@ impl View for NumberWidget {
                 &mut self.range_max,
                 SENSIBLE_MIN..=SENSIBLE_MAX,
             ));
+
+            ui.label("StepSize");
+            let max_step = self.range_max - self.range_min;
+            ui.add(Slider::new(&mut self.step_size, 0.0..=max_step));
         });
 
         common_save_button(ui, self, tether_agent);