Spectrum panel: a short dock shows 'Not enough room for the spectrum' with an Open in window button instead of a squashed plot; tighter control labels (#214)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Y1pWhDKvhakdnjg3taYGxM

Author: andy

src/apps/builder/NModePanel.C

@@ -369,11 +369,11 @@ void NModePanel::createSpectrumPane()
    const int gap = 6;
 
    row->Add(new wxStaticText(pane, wxID_ANY,
-              wxString::FromUTF8("Width (cm\xE2\x81\xBB\xC2\xB9):")),
+              wxString::FromUTF8("Width:")),
             0, wxALIGN_CENTER_VERTICAL | wxLEFT, gap);
    p_fwhmText = new wxTextCtrl(pane, wxID_ANY,
                   wxString::Format("%g", fwhm), wxDefaultPosition,
-                  wxSize(56, -1), wxTE_PROCESS_ENTER);
+                  wxSize(48, -1), wxTE_PROCESS_ENTER);
    p_fwhmText->SetToolTip(wxString::FromUTF8(
       "Full width at half maximum of each band, in cm\xE2\x81\xBB\xC2\xB9 "
       "(0 to 200).\nCondensed-phase bands are typically 5 to 30 wide.\n"
@@ -382,26 +382,26 @@ void NModePanel::createSpectrumPane()
       "gas-phase spectrum."));
    row->Add(p_fwhmText, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 3);
 
-   row->Add(new wxStaticText(pane, wxID_ANY, "Frequency scale:"),
+   row->Add(new wxStaticText(pane, wxID_ANY, "Freq. scale:"),
             0, wxALIGN_CENTER_VERTICAL | wxLEFT, gap * 2);
    p_scaleText = new wxTextCtrl(pane, wxID_ANY,
                   wxString::Format("%g", scale), wxDefaultPosition,
-                  wxSize(56, -1), wxTE_PROCESS_ENTER);
+                  wxSize(48, -1), wxTE_PROCESS_ENTER);
    p_scaleText->SetToolTip(wxString::FromUTF8(
       "Multiplies every frequency. Harmonic frequencies from most "
       "methods are 3 to 5 % too high; a typical factor is 0.96."));
    row->Add(p_scaleText, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 3);
 
    wxCheckBox *left = new wxCheckBox(pane, wxID_ANY,
-                                     "High wavenumber left");
+                                     "High on left");
    left->SetValue(reversed);
    row->Add(left, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, gap * 2);
 
    wxCheckBox *stk = new wxCheckBox(pane, wxID_ANY, "Sticks");
    stk->SetValue(sticks);
    row->Add(stk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, gap * 2);
 
-   wxButton *reset = new wxButton(pane, wxID_ANY, "Reset zoom");
+   wxButton *reset = new wxButton(pane, wxID_ANY, "Reset");
    reset->SetToolTip("Show the whole spectrum (or double-click the plot, "
                      "or press Home).\nClick a peak to show its mode. Drag "
                      "to zoom to a band, mouse wheel to zoom, right-drag "
@@ -413,6 +413,30 @@ void NModePanel::createSpectrumPane()
    row->Add(popout, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, gap);
    col->Add(row, 0, wxEXPAND | wxTOP | wxBOTTOM, 3);
 
+   //  The dock can give this panel less height than a plot is readable
+   //  in; then this stands in for the whole plot rather than a squashed one.
+   wxBoxSizer *noRoom = new wxBoxSizer(wxHORIZONTAL);
+   noRoom->AddStretchSpacer(1);
+   noRoom->Add(new wxStaticText(pane, wxID_ANY,
+                                "Not enough room for the spectrum"),
+               0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 8);
+   wxButton *noRoomButton = new wxButton(pane, wxID_ANY, "Open in window");
+   noRoom->Add(noRoomButton, 0, wxALIGN_CENTER_VERTICAL);
+   noRoom->AddStretchSpacer(1);
+   col->Add(noRoom, 1, wxEXPAND);
+   col->Show(noRoom, false);
+   noRoomButton->Bind(wxEVT_BUTTON,
+                      [this](wxCommandEvent&) { openSpectrumWindow(); });
+   pane->Bind(wxEVT_SIZE, [pane, col, row, noRoom, this](wxSizeEvent& e) {
+      const bool tight = e.GetSize().y < 190;
+      if (col->IsShown(noRoom) != tight) {
+         col->Show(p_spectrum, !tight);
+         col->Show(row, !tight);
+         col->Show(noRoom, tight);
+      }
+      e.Skip();
+   });
+
    pane->SetSizer(col);
    p_gridPlotSizer->Add(pane, 1, wxGROW);
 

tests/spectrum/capture.py

@@ -155,7 +155,7 @@ def run(case, builder, png, timeout, window=False):
         if window:
             env["ECCE_SPECTRUM_WINDOW"] = "1"
         if png:
-            env["ECCE_EXIT_AFTER_DUMP_DELAY_MS"] = "8000"
+            env["ECCE_EXIT_AFTER_DUMP_DELAY_MS"] = "14000"
         auth = os.path.join(state, "auth.pipe")
         fixture.authFile(auth, port=int(settings["ECCE_DATASERVER_PORT"]))
         proc = subprocess.Popen(
@@ -169,7 +169,7 @@ def run(case, builder, png, timeout, window=False):
             if os.path.exists(out) and os.path.getsize(out) > 0:
                 #  The binary that ran must be the one under test.
                 if png and not shot:
-                    time.sleep(3)
+                    time.sleep(float(os.environ.get("SPECTRUM_SHOT_WAIT", "3")))
                     subprocess.run(["import", "-display", display.name,
                                     "-window", "root", png], env=env,
                                    check=False)
@@ -199,6 +199,8 @@ def run(case, builder, png, timeout, window=False):
             if "[PANESIZE]" in line and "Vibrational" in line:
                 print("  " + line)
         tail = full[-3000:]
+        if os.environ.get("SPECTRUM_VERBOSE"):
+            print(full[-2500:])
         apps.stopServices(display)
         restorePrefs()