Add CLI args for setting column labels and colors

Add two more CLI arguments, `--column` and `--color` which can be used
to set column labels and colors automatically.  For multiple columns,
these arguments can be specified multiple times.  For example:

	--column Raw --color 555555 --column Temperature --color ff8000

The color arguments are hex colors without a leading `#` sign.

Author: Rahix

src/gui.rs

@@ -157,6 +157,7 @@ pub struct MyApp {
     show_warning_window: WindowFeedback,
     do_not_show_clear_warning: bool,
     init: bool,
+    cli_column_colors: Vec<egui::Color32>,
     #[cfg(feature = "self_update")]
     new_release: Option<Release>,
 }
@@ -176,6 +177,7 @@ impl MyApp {
         load_names_rx: Receiver<Vec<String>>,
         send_tx: Sender<String>,
         gui_cmd_tx: Sender<GuiCommand>,
+        cli_column_colors: Vec<egui::Color32>,
     ) -> Self {
         let mut file_dialog = FileDialog::default()
             //.initial_directory(PathBuf::from("/path/to/app"))
@@ -256,6 +258,7 @@ impl MyApp {
             init: false,
             show_color_window: ColorWindow::NoShow,
             file_opened: false,
+            cli_column_colors,
             #[cfg(feature = "self_update")]
             new_release: None,
             settings_window_open: false,
@@ -325,9 +328,15 @@ impl MyApp {
                         }
                         if self.colors.len() != self.labels.len() {
                             self.colors = (0..max(self.labels.len(), 1))
-                                .map(|i| COLORS[i % COLORS.len()])
+                                .map(|i| {
+                                    self.cli_column_colors
+                                        .get(i)
+                                        .copied()
+                                        .unwrap_or(COLORS[i % COLORS.len()])
+                                })
                                 .collect();
-                            self.color_vals = (0..max(self.data.plots.len(), 1)).map(|_| 0.0).collect();
+                            self.color_vals =
+                                (0..max(self.data.plots.len(), 1)).map(|_| 0.0).collect();
                         }
                     }
 

src/main.rs

@@ -77,6 +77,7 @@ fn main_thread(
     load_rx: Receiver<PathBuf>,
     load_names_tx: Sender<Vec<String>>,
     gui_cmd_rx: Receiver<GuiCommand>,
+    cli_column_labels: Vec<String>,
 ) {
     // reads data from mutex, samples and saves if needed
     let mut data = DataContainer::default();
@@ -111,7 +112,7 @@ fn main_thread(
                                 data.dataset = vec![vec![]; max(split_data.len(), 1)];
                                 if let Ok(mut gui_data) = data_lock.write() {
                                     gui_data.plots = (0..max(split_data.len(), 1))
-                                        .map(|i| (format!("Column {i}"), vec![]))
+                                        .map(|i| (cli_column_labels.get(i).cloned().unwrap_or_else(|| format!("Column {i}")), vec![]))
                                         .collect();
                                 }
                                 failed_format_counter = 0;
@@ -295,6 +296,12 @@ fn parse_parity(s: &str) -> Result<serialport::Parity, String> {
     }
 }
 
+fn parse_color(s: &str) -> Result<egui::Color32, String> {
+    Ok(egui::ecolor::HexColor::from_str_without_hash(s)
+        .map_err(|e| format!("invalid color {s:?}: {e:?}"))?
+        .color())
+}
+
 #[derive(Debug, Options)]
 struct CliOptions {
     /// Serial port device to open on startup
@@ -325,6 +332,14 @@ struct CliOptions {
     #[options(short = "F")]
     file: Option<std::path::PathBuf>,
 
+    /// Column labels, can be specified multiple times for more columns
+    #[options(no_short, long = "column")]
+    column_labels: Vec<String>,
+
+    /// Column colors (hex color without #), can be specified multiple times for more columns
+    #[options(no_short, long = "color", parse(try_from_str = "parse_color"))]
+    column_colors: Vec<egui::Color32>,
+
     help: bool,
 }
 
@@ -404,6 +419,7 @@ fn main() {
             load_rx,
             loaded_names_tx,
             gui_cmd_rx,
+            args.column_labels,
         );
     });
 
@@ -457,6 +473,7 @@ fn main() {
                 loaded_names_rx,
                 send_tx,
                 gui_cmd_tx,
+                args.column_colors,
             )))
         }),
     ) {