working on todo.md features

src/main.cpp

@@ -3,6 +3,7 @@
 
 #include "acquisition.hpp"
 #include "config.hpp"
+#include "waveform.hpp"
 #include "model.hpp"
 #include "plot_host.hpp"
 #include "source_dialog.hpp"
@@ -22,17 +23,51 @@ int main(int argc, char** argv) {
 
   // No `--server` means the user has not said which source to open, so ask. Before the model:
   // declining must cost no buffer and no socket, and nothing below has to cope with "no source".
-  if (!cfg.server_specified && !udpscope::choose_source(cfg)) return 0;
+  // `--open` is the other answer to that question, and the chooser knows it: its Waveforms page
+  // fills `open_waveform` in instead of the connection fields.
+  if (!cfg.server_specified && cfg.open_waveform.empty() && !udpscope::choose_source(cfg)) return 0;
+  // A source named on the command line skips the chooser, but its *stored* configuration still
+  // applies: the buffer size, the clock and the capture ring are decided here, before the model --
+  // which is the only moment they can be -- and a saved host whose buffer was ignored because the
+  // address came from the command line is an edit that looks like it never took effect.
+  if (cfg.server_specified) udpscope::apply_stored_settings(cfg);
 
   udpscope::ScopeModel model(cfg);
   udpscope::RowSet rows;
   rows.set_row_count(cfg.plots);
   udpscope::Acquisition acquisition(model, cfg);
-  try {
-    acquisition.start();
-  } catch (const std::exception& e) {
-    std::fprintf(stderr, "udpscope: %s\n", e.what());
-    return 1;
+  if (cfg.open_waveform.empty()) {
+    try {
+      acquisition.start();
+    } catch (const std::exception& e) {
+      std::fprintf(stderr, "udpscope: %s\n", e.what());
+      return 1;
+    }
+  } else {
+    // No socket and no thread: the file is the source, and there is nothing to arrive afterwards.
+    // The acquisition object is passed to the UI all the same -- stopped, which is what every
+    // "paused"/"capturing" question answers as false.
+    udpscope::WaveformLoadReport report;
+    std::string error;
+    if (!udpscope::load_waveform_into_model(model, cfg.open_waveform, &report, &error)) {
+      std::fprintf(stderr, "udpscope: %s\n", error.c_str());
+      return 1;
+    }
+    // One row per column, so every trace opens where a user can see and rearrange it -- and sized
+    // *here*, before the UI exists, exactly as `--plots` does: resizing the rows from inside the
+    // activation leaves the panels built for the old count.
+    rows.set_row_count(std::min<int>(std::max<int>(cfg.plots, static_cast<int>(report.signals)),
+                                     udpscope::RowSet::kMaxRows));
+    udpscope::remember_waveform(cfg.open_waveform);
+    // The whole file framed from the start: the window is the recording's own span, and nothing
+    // afterwards restates it -- a zoom is the user's.
+    if (report.span_s > 0.0) rows.set_time_window(report.span_s);
+    std::fprintf(stderr,
+                 "[udpscope] waveform loaded: %s signals=%zu samples=%zu span=%.6fs rate=%.6g "
+                 "time=[%.6f..%.6f]\n",
+                 cfg.open_waveform.c_str(), report.signals, report.samples, report.span_s,
+                 report.rate_hz, report.first_time, report.last_time);
+    std::fflush(stderr);
   }
 
   const int result = udpscope::run_ui(argc, argv, cfg, model, acquisition, rows);