better-rtplot 0.2.2__tar.gz → 0.2.5__tar.gz

{better_rtplot-0.2.2 → better_rtplot-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-rtplot
-Version: 0.2.2
+Version: 0.2.5
 Summary: 
 License: GPL V3.0
 Author: jmontp

{better_rtplot-0.2.2 → better_rtplot-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "better-rtplot"
-version = "0.2.2"
+version = "0.2.5"
 description = ""
 authors = ["jmontp <jmontp@umich.edu>"]
 license = "GPL V3.0"

{better_rtplot-0.2.2 → better_rtplot-0.2.5}/rtplot/server_browser.py

@@ -12,6 +12,7 @@ import datetime
 import json
 import os
 import struct
+import sys
 import time
 import webbrowser
 from collections import OrderedDict
@@ -21,6 +22,16 @@ import numpy as np
 import zmq
 import zmq.asyncio
 
+# pyzmq's asyncio integration needs event_loop.add_reader(), which the
+# Windows-default ProactorEventLoop (Python 3.8+) does not implement.
+# Without this policy override, zmq_receiver() throws on its very first
+# recv_string, the task dies silently, and any data the client pushes
+# after that gets dropped — the browser plot stays blank with no visible
+# error. Force SelectorEventLoop on Windows before any asyncio loop is
+# created so pyzmq's reader-based integration works.
+if sys.platform == "win32":
+    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+
 try:
     from aiohttp import WSMsgType, web
 except ImportError as _exc:
@@ -306,9 +317,20 @@ def save_current_plot(log_name=None):
     """Persist the current buffer to a Parquet file.
 
     Identical layout to ``server.save_current_plot`` so saved files are
-    interchangeable between the Qt and browser servers.
+    interchangeable between the Qt and browser servers. pandas + pyarrow
+    are optional and may be absent from slim builds (e.g. the Windows
+    exe). In that case we log a clear message and return without
+    raising — the receiver loop must not die because the user clicked
+    Save.
     """
-    import pandas as pd  # local import keeps Parquet deps optional
+    try:
+        import pandas as pd  # local import keeps Parquet deps optional
+    except ImportError as exc:
+        print(
+            "[rtplot] Save Plot unavailable: "
+            f"pandas/pyarrow not installed in this build ({exc})."
+        )
+        return
 
     li = state["li"]
     num_datapoints_in_plot = state["num_datapoints_in_plot"]
@@ -677,7 +699,10 @@ async def zmq_receiver():
 
         elif category == SAVE_PLOT:
             log_name = await zmq_socket.recv_string()
-            save_current_plot(log_name)
+            try:
+                save_current_plot(log_name)
+            except Exception as exc:  # noqa: BLE001
+                print(f"[rtplot] save_current_plot failed: {exc}")
 
         elif category == RECEIVED_DISPLAY:
             payload = await zmq_socket.recv_json()
@@ -720,16 +745,49 @@ async def reconfigure_zmq(app, connect_ip=None):
     except Exception:  # noqa: BLE001
         pass
 
+    # Give the OS a moment to release the freed TCP ports before we try
+    # to re-bind them. Linux usually releases immediately; Windows can
+    # hold on briefly even with linger=0, which caused "Bind doesn't work"
+    # reports in the exe. 150 ms is empirically enough in both cases.
+    await asyncio.sleep(0.15)
+
+    # Retry the open with a small backoff in case the OS is still
+    # releasing the port. Three quick attempts cover the typical Windows
+    # rebind race without making the UI feel sluggish.
+    def _try_open_zmq(ip):
+        last_exc = None
+        for attempt in range(3):
+            try:
+                return _open_zmq_socket(connect_ip=ip)
+            except Exception as exc:  # noqa: BLE001
+                last_exc = exc
+                print(f"ZMQ open failed (attempt {attempt + 1}/3): {exc}")
+                time.sleep(0.1 * (attempt + 1))
+        raise last_exc if last_exc else RuntimeError("zmq open failed")
+
+    def _try_open_control(ip):
+        last_exc = None
+        for attempt in range(3):
+            try:
+                return _open_control_socket(connect_ip=ip)
+            except Exception as exc:  # noqa: BLE001
+                last_exc = exc
+                print(f"ZMQ control open failed (attempt {attempt + 1}/3): {exc}")
+                time.sleep(0.1 * (attempt + 1))
+        raise last_exc if last_exc else RuntimeError("zmq control open failed")
+
     try:
-        zmq_socket = _open_zmq_socket(connect_ip=connect_ip)
+        zmq_socket = _try_open_zmq(connect_ip)
     except Exception as exc:  # noqa: BLE001
-        # Fall back to bind so the server keeps running and tell the browser.
-        print(f"ZMQ reconfigure failed ({exc}); falling back to bind")
-        zmq_socket = _open_zmq_socket(connect_ip=None)
-        connect_ip = None
+        print(f"ZMQ reconfigure failed ({exc}); keeping previous state")
+        # Leave zmq_status pointing at whatever the caller asked for so
+        # the browser knows the new intent; the zmq_socket global may be
+        # in a partially-closed state but we'll retry on the next click.
+        await broadcast_zmq_status()
+        return
 
     try:
-        control_push_socket = _open_control_socket(connect_ip=connect_ip)
+        control_push_socket = _try_open_control(connect_ip)
     except Exception as exc:  # noqa: BLE001
         print(f"ZMQ control reconfigure failed ({exc}); control channel offline")
         control_push_socket = None
@@ -818,27 +876,32 @@ INDEX_HTML = """<!doctype html>
 <style>
   html, body { margin: 0; padding: 0; height: 100%; font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, sans-serif; background: #fafafa; color: #222; }
   #header { display: flex; align-items: center; gap: 16px; padding: 8px 16px; background: #fff; border-bottom: 1px solid #ddd; position: sticky; top: 0; z-index: 10; }
-  #header h1 { margin: 0; font-size: 18px; font-weight: 600; }
-  #status { font-size: 14px; padding: 4px 10px; border-radius: 4px; background: #eee; }
+  #header h1 { margin: 0; font-size: calc(18px * var(--ui-scale)); font-weight: 600; }
+  #status { font-size: calc(14px * var(--ui-scale)); padding: 4px 10px; border-radius: 4px; background: #eee; }
   #status.green { background: #d4f5d4; color: #186a18; }
   #status.red { background: #f9d4d4; color: #8a1a1a; }
-  .btn { padding: 6px 12px; font-size: 14px; border: 1px solid #888; background: #fff; cursor: pointer; border-radius: 4px; }
+  .btn { padding: 6px 12px; font-size: calc(14px * var(--ui-scale)); border: 1px solid #888; background: #fff; cursor: pointer; border-radius: 4px; }
+  /* zmq mode buttons: the currently-active mode is green + not clickable, the other is white + clickable */
+  .btn.zmq-active { background: #d4f5d4; color: #186a18; border-color: #8dc88d; cursor: default; }
+  .btn.zmq-active:hover { background: #d4f5d4; }
+  .btn.zmq-disabled { background: #f0f0f0; color: #aaa; border-color: #ccc; cursor: not-allowed; }
+  .btn.zmq-disabled:hover { background: #f0f0f0; }
   .btn:hover { background: #f0f0f0; }
-  #ip-input { padding: 6px 8px; font-size: 13px; border: 1px solid #888; border-radius: 4px; width: 170px; font-family: monospace; }
-  #zmq-mode { font-size: 12px; color: #555; padding: 2px 8px; background: #eef; border-radius: 4px; }
-  #ws-status { font-size: 12px; color: #666; margin-left: auto; }
+  #ip-input { padding: 6px 8px; font-size: calc(13px * var(--ui-scale)); border: 1px solid #888; border-radius: 4px; width: 170px; font-family: monospace; }
+  #zmq-mode { font-size: calc(12px * var(--ui-scale)); color: #555; padding: 2px 8px; background: #eef; border-radius: 4px; }
+  #ws-status { font-size: calc(12px * var(--ui-scale)); color: #666; margin-left: auto; }
   #plots { display: flex; padding: 12px; gap: 12px; }
   #plots.row { flex-direction: column; }
   #plots.col { flex-direction: row; flex-wrap: wrap; }
   .plot-wrap { background: #fff; border: 1px solid #ddd; border-radius: 4px; padding: 8px; flex: 1 1 auto; min-width: 320px; }
   .plot-title { font-size: 13px; font-weight: 600; margin: 0 0 4px 4px; color: #333; }
-  :root { --ctrl-unit-h: 38px; }
+  :root { --ctrl-unit-h: 38px; --ui-scale: 1; }
   .ctrl-row { display: flex; gap: 12px; align-items: center; padding: 10px 14px; background: #fff; border: 1px solid #ddd; border-radius: 4px; flex-wrap: wrap; }
   .ctrl-item { display: flex; align-items: center; gap: 6px; }
   .ctrl-item.flex { flex: 1 1 220px; min-width: 200px; }
-  .ctrl-item label { font-size: 13px; color: #444; }
-  .ctrl-btn { padding: 8px 16px; font-size: 14px; border: 1px solid #888; background: #fff; cursor: pointer; border-radius: 4px; font-weight: 500; display: flex; align-items: center; justify-content: center; }
-  .ctrl-item-tall > .ctrl-btn { align-self: stretch; padding-top: 0; padding-bottom: 0; font-size: calc(14px + 2px); }
+  .ctrl-item label { font-size: calc(13px * var(--ui-scale)); color: #444; }
+  .ctrl-btn { padding: 8px 16px; font-size: calc(14px * var(--ui-scale)); border: 1px solid #888; background: #fff; cursor: pointer; border-radius: 4px; font-weight: 500; display: flex; align-items: center; justify-content: center; }
+  .ctrl-item-tall > .ctrl-btn { align-self: stretch; padding-top: 0; padding-bottom: 0; font-size: calc(16px * var(--ui-scale)); }
   .ctrl-item-tall > .ctrl-rangeinput,
   .ctrl-item-tall > .ctrl-dial,
   .ctrl-item-tall > .ctrl-numinput,
@@ -847,10 +910,10 @@ INDEX_HTML = """<!doctype html>
   .ctrl-btn:hover { background: #f0f0f0; }
   .ctrl-btn:active { background: #e2e2e2; }
   .ctrl-slider .ctrl-rangeinput { flex: 1; min-width: 120px; }
-  .ctrl-numinput { width: 72px; font-family: monospace; font-size: 13px; padding: 4px 6px; border: 1px solid #b8b8b8; border-radius: 3px; background: #fff; color: #222; text-align: right; -moz-appearance: textfield; }
+  .ctrl-numinput { width: 72px; font-family: monospace; font-size: calc(13px * var(--ui-scale)); padding: 4px 6px; border: 1px solid #b8b8b8; border-radius: 3px; background: #fff; color: #222; text-align: right; -moz-appearance: textfield; }
   .ctrl-numinput::-webkit-outer-spin-button,
   .ctrl-numinput::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; }
-  .ctrl-nudgebtn { width: 26px; height: 26px; font-size: 15px; font-weight: 600; line-height: 1; padding: 0; border: 1px solid #b8b8b8; background: #f7f7f7; color: #333; cursor: pointer; border-radius: 3px; }
+  .ctrl-nudgebtn { width: 26px; height: 26px; font-size: calc(15px * var(--ui-scale)); font-weight: 600; line-height: 1; padding: 0; border: 1px solid #b8b8b8; background: #f7f7f7; color: #333; cursor: pointer; border-radius: 3px; }
   .ctrl-nudgebtn:hover { background: #e9e9e9; }
   .ctrl-nudgebtn:active { background: #dcdcdc; }
   .ctrl-dial { cursor: ns-resize; flex: 0 0 auto; touch-action: none; user-select: none; }
@@ -860,9 +923,25 @@ INDEX_HTML = """<!doctype html>
   .ctrl-dial .dial-arrow { fill: #c0c0c0; pointer-events: none; user-select: none; }
   .ctrl-dial:hover .dial-track { stroke: #888; }
   .ctrl-dial:hover .dial-arrow { fill: #888; }
-  .ctrl-val { font-family: monospace; font-size: 13px; min-width: 56px; text-align: right; color: #222; }
+  .ctrl-val { font-family: monospace; font-size: calc(13px * var(--ui-scale)); min-width: 56px; text-align: right; color: #222; }
   .ctrl-display .ctrl-val { background: #f3f3f3; padding: 4px 10px; border-radius: 3px; min-width: 72px; border: 1px solid #e2e2e2; }
-  .ctrl-textval { background: #eef3ff; padding: 6px 12px; border-radius: 3px; border: 1px solid #c8d6ff; color: #1a3a7a; text-align: left; min-width: 160px; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; font-size: 14px; }
+  .ctrl-textval { background: #eef3ff; padding: 6px 12px; border-radius: 3px; border: 1px solid #c8d6ff; color: #1a3a7a; text-align: left; min-width: 160px; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; font-size: calc(14px * var(--ui-scale)); }
+  #menu-btn { margin-left: 8px; width: 34px; height: 34px; padding: 0; font-size: calc(18px * var(--ui-scale)); line-height: 1; display: flex; align-items: center; justify-content: center; }
+  #menu-panel { position: fixed; top: 56px; right: 16px; background: #fff; border: 1px solid #ccc; border-radius: 6px; box-shadow: 0 4px 14px rgba(0,0,0,0.12); padding: 16px 18px; min-width: 260px; z-index: 20; display: none; }
+  #menu-panel.open { display: block; }
+  #menu-panel h2 { margin: 0 0 10px 0; font-size: calc(14px * var(--ui-scale)); font-weight: 600; color: #333; text-transform: uppercase; letter-spacing: 0.03em; }
+  #menu-panel .menu-row { display: flex; flex-direction: column; gap: 4px; margin-bottom: 12px; }
+  #menu-panel .menu-row:last-child { margin-bottom: 0; }
+  #menu-panel label { font-size: calc(12px * var(--ui-scale)); color: #555; font-weight: 500; }
+  #menu-panel .menu-ctrl { display: flex; align-items: center; gap: 8px; }
+  #menu-panel input[type=range] { flex: 1; }
+  #menu-panel input[type=number] { width: 88px; font-family: monospace; font-size: calc(13px * var(--ui-scale)); padding: 4px 6px; border: 1px solid #b8b8b8; border-radius: 3px; text-align: right; -moz-appearance: textfield; }
+  #menu-panel input[type=number]::-webkit-outer-spin-button,
+  #menu-panel input[type=number]::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; }
+  #menu-panel .menu-val { font-family: monospace; font-size: calc(12px * var(--ui-scale)); min-width: 44px; text-align: right; color: #333; }
+  #menu-panel .menu-hint { font-size: calc(11px * var(--ui-scale)); color: #888; margin-top: 2px; }
+  #menu-panel .menu-reset { margin-top: 6px; font-size: calc(11px * var(--ui-scale)); background: transparent; border: none; color: #2a5db0; cursor: pointer; padding: 2px 0; text-align: left; }
+  #menu-panel .menu-reset:hover { text-decoration: underline; }
 </style>
 </head>
 <body>
@@ -875,6 +954,33 @@ INDEX_HTML = """<!doctype html>
     <button id=\"connect-btn\" class=\"btn\">Connect</button>
     <button id=\"bind-btn\" class=\"btn\">Bind</button>
     <div id=\"ws-status\">connecting...</div>
+    <button id=\"menu-btn\" class=\"btn\" title=\"Settings\" aria-label=\"Settings\">&#9776;</button>
+  </div>
+  <div id=\"menu-panel\" aria-hidden=\"true\">
+    <h2>Settings</h2>
+    <div class=\"menu-row\">
+      <label for=\"menu-font\">UI font scale</label>
+      <div class=\"menu-ctrl\">
+        <input id=\"menu-font\" type=\"range\" min=\"0.7\" max=\"2.0\" step=\"0.05\" value=\"1\" />
+        <span id=\"menu-font-val\" class=\"menu-val\">1.00x</span>
+      </div>
+    </div>
+    <div class=\"menu-row\">
+      <label for=\"menu-xrange\">Visible samples per plot</label>
+      <div class=\"menu-ctrl\">
+        <input id=\"menu-xrange\" type=\"number\" min=\"10\" step=\"10\" placeholder=\"auto\" />
+        <span class=\"menu-val\">samples</span>
+      </div>
+    </div>
+    <div class=\"menu-row\">
+      <label for=\"menu-maxfps\">Max plot refresh rate</label>
+      <div class=\"menu-ctrl\">
+        <input id=\"menu-maxfps\" type=\"number\" min=\"1\" step=\"1\" placeholder=\"auto\" />
+        <span class=\"menu-val\">Hz</span>
+      </div>
+      <div id=\"menu-monitor-hint\" class=\"menu-hint\">Monitor: measuring…</div>
+    </div>
+    <button id=\"menu-reset\" class=\"menu-reset\" type=\"button\">Reset to defaults</button>
   </div>
   <div id=\"plots\" class=\"row\"></div>
   <script src=\"/static/uPlot.iife.min.js\"></script>
@@ -905,6 +1011,122 @@ INDEX_HTML = """<!doctype html>
       const connectBtn = document.getElementById('connect-btn');
       const bindBtn = document.getElementById('bind-btn');
       const zmqMode = document.getElementById('zmq-mode');
+      const menuBtn = document.getElementById('menu-btn');
+      const menuPanel = document.getElementById('menu-panel');
+      const menuFontInput = document.getElementById('menu-font');
+      const menuFontVal = document.getElementById('menu-font-val');
+      const menuXrangeInput = document.getElementById('menu-xrange');
+      const menuMaxfpsInput = document.getElementById('menu-maxfps');
+      const menuMonitorHint = document.getElementById('menu-monitor-hint');
+      const menuResetBtn = document.getElementById('menu-reset');
+
+      // ---- Detect the monitor's refresh rate on page load ----
+      // Browsers deliberately don't expose the hardware refresh rate
+      // (fingerprinting), so we calibrate it by running rAF callbacks
+      // for ~500 ms and counting. requestAnimationFrame is locked to
+      // the display refresh, so frames_per_sec == monitor Hz as long
+      // as the tab is active during calibration.
+      let monitorHz = 0;
+      (function measureMonitorHz() {
+        let count = 0;
+        let start = 0;
+        function tick(t) {
+          if (start === 0) start = t;
+          count += 1;
+          const elapsed = t - start;
+          if (elapsed < 500) {
+            requestAnimationFrame(tick);
+          } else {
+            const measured = count * 1000 / elapsed;
+            // Snap to common refresh rates so users see clean numbers
+            // (60/75/90/120/144/165/240) instead of 59.8.
+            const common = [30, 48, 50, 60, 72, 75, 90, 100, 120, 144, 165, 240];
+            let best = measured;
+            let bestDiff = Infinity;
+            for (const c of common) {
+              const d = Math.abs(measured - c);
+              if (d < bestDiff && d / c < 0.05) { bestDiff = d; best = c; }
+            }
+            monitorHz = Math.round(best);
+            if (menuMonitorHint) {
+              menuMonitorHint.textContent = `Monitor: ${monitorHz} Hz (rAF cap)`;
+            }
+            menuMaxfpsInput.placeholder = `auto = ${monitorHz}`;
+          }
+        }
+        requestAnimationFrame(tick);
+      })();
+
+      // ---- Persistent client-side settings (hamburger menu) ----
+      const SETTINGS_KEY = 'rtplotSettings.v1';
+      const DEFAULT_SETTINGS = { fontScale: 1.0, visibleSamples: null, maxFps: null };
+      let settings = Object.assign({}, DEFAULT_SETTINGS);
+      try {
+        const saved = JSON.parse(localStorage.getItem(SETTINGS_KEY) || '{}');
+        settings = Object.assign(settings, saved);
+      } catch (e) {}
+      function saveSettings() {
+        try { localStorage.setItem(SETTINGS_KEY, JSON.stringify(settings)); } catch (e) {}
+      }
+      function applyFontScale() {
+        const s = Number(settings.fontScale) || 1;
+        document.documentElement.style.setProperty('--ui-scale', s);
+        menuFontInput.value = s;
+        menuFontVal.textContent = s.toFixed(2) + 'x';
+      }
+      function applyVisibleSamples() {
+        // Zoom uPlot's x scale to show only the newest N samples. If N is
+        // null/unset, or >= the plot's full xrange, show everything. This
+        // never adds data — it only hides older samples.
+        const n = settings.visibleSamples;
+        plots.forEach(p => {
+          let lo = 0, hi = p.xrange - 1;
+          if (n && Number.isFinite(n) && n > 0 && n < p.xrange) {
+            lo = p.xrange - n;
+          }
+          try { p.uplot.setScale('x', { min: lo, max: hi }); } catch (e) {}
+        });
+      }
+      function syncMenuInputs() {
+        menuFontInput.value = Number(settings.fontScale) || 1;
+        menuFontVal.textContent = (Number(settings.fontScale) || 1).toFixed(2) + 'x';
+        menuXrangeInput.value = settings.visibleSamples || '';
+        menuMaxfpsInput.value = settings.maxFps || '';
+      }
+      menuBtn.addEventListener('click', (e) => {
+        e.stopPropagation();
+        menuPanel.classList.toggle('open');
+      });
+      document.addEventListener('click', (e) => {
+        if (!menuPanel.classList.contains('open')) return;
+        if (menuPanel.contains(e.target) || menuBtn.contains(e.target)) return;
+        menuPanel.classList.remove('open');
+      });
+      menuFontInput.addEventListener('input', () => {
+        settings.fontScale = Number(menuFontInput.value);
+        applyFontScale();
+        saveSettings();
+      });
+      menuXrangeInput.addEventListener('change', () => {
+        const v = Number(menuXrangeInput.value);
+        settings.visibleSamples = (Number.isFinite(v) && v > 0) ? v : null;
+        applyVisibleSamples();
+        saveSettings();
+      });
+      menuMaxfpsInput.addEventListener('change', () => {
+        const v = Number(menuMaxfpsInput.value);
+        settings.maxFps = (Number.isFinite(v) && v > 0) ? v : null;
+        saveSettings();
+      });
+      menuResetBtn.addEventListener('click', () => {
+        settings = Object.assign({}, DEFAULT_SETTINGS);
+        saveSettings();
+        syncMenuInputs();
+        applyFontScale();
+        applyVisibleSamples();
+      });
+      applyFontScale();
+      syncMenuInputs();
 
       const HEADER_SIZE = 16;
       const MSG_SNAPSHOT = 0;
@@ -1367,29 +1589,69 @@ INDEX_HTML = """<!doctype html>
         totalTraces = traceOffset;
         applySliderValues(cfg.slider_values);
         applyDisplayValues(cfg.display_values);
+        applyVisibleSamples();
         scheduleRender();
       }
 
+      // Track render-FPS with a 1-second moving window so the status bar
+      // can show both the data rate (from the server) and the actual
+      // browser repaint rate.
+      let renderFrameCount = 0;
+      let renderFpsLastCheck = performance.now();
+      let renderFps = 0;
+
+      let lastRenderTime = 0;
+      function _doRender() {
+        pendingFrame = false;
+        // Update the render-FPS counter every repaint.
+        renderFrameCount += 1;
+        const now = performance.now();
+        if (now - renderFpsLastCheck >= 1000) {
+          renderFps = renderFrameCount * 1000 / (now - renderFpsLastCheck);
+          renderFrameCount = 0;
+          renderFpsLastCheck = now;
+          lastStatus.dirty = true;
+        }
+        lastRenderTime = now;
+        plots.forEach(p => {
+          const data = [p.xs];
+          for (let t = 0; t < p.traceCount; t++) data.push(p.buffers[t]);
+          // Default resetScales=true so y-axis auto-fits when no yrange
+          // was supplied. With explicit yrange, uPlot pins the scale and
+          // this is essentially a no-op.
+          p.uplot.setData(data);
+        });
+        if (lastStatus.dirty) {
+          const txt =
+            `Data ${lastStatus.fps.toFixed(0)} Hz  ·  Render ${renderFps.toFixed(0)} Hz` +
+            (lastStatus.nonPlot > 0 ? `  ·  non-plot ${lastStatus.nonPlot}` : '');
+          statusDiv.textContent = txt;
+          statusDiv.className = lastStatus.statusByte === 1 ? 'red' : 'green';
+          lastStatus.dirty = false;
+        }
+      }
+
       function scheduleRender() {
         if (pendingFrame) return;
         pendingFrame = true;
         requestAnimationFrame(() => {
-          pendingFrame = false;
-          plots.forEach(p => {
-            const data = [p.xs];
-            for (let t = 0; t < p.traceCount; t++) data.push(p.buffers[t]);
-            // Default resetScales=true so y-axis auto-fits when no yrange
-            // was supplied. With explicit yrange, uPlot pins the scale and
-            // this is essentially a no-op.
-            p.uplot.setData(data);
-          });
-          if (lastStatus.dirty) {
-            const txt = `Rate: ${lastStatus.fps.toFixed(0)} Hz` +
-              (lastStatus.nonPlot > 0 ? ` - Non Plot Trace: ${lastStatus.nonPlot}` : '');
-            statusDiv.textContent = txt;
-            statusDiv.className = lastStatus.statusByte === 1 ? 'red' : 'green';
-            lastStatus.dirty = false;
+          // FPS cap: if the user set a maxFps in the hamburger menu and
+          // we're within 1000/maxFps ms of the last actual repaint,
+          // reschedule ourselves a bit later via setTimeout instead of
+          // running the render now. This spaces repaints out without
+          // losing any data (the ring buffers keep accumulating).
+          const cap = Number(settings.maxFps) || 0;
+          if (cap > 0) {
+            const minInterval = 1000 / cap;
+            const now = performance.now();
+            const wait = minInterval - (now - lastRenderTime);
+            if (wait > 1) {
+              pendingFrame = false;
+              setTimeout(scheduleRender, wait);
+              return;
+            }
           }
+          _doRender();
         });
       }
 
@@ -1458,6 +1720,20 @@ INDEX_HTML = """<!doctype html>
         } else {
           zmqMode.textContent = 'ZMQ: --';
         }
+        // Color-code the two mode buttons: the currently-active mode is
+        // green and non-clickable (clicking it again would be a no-op);
+        // the other is plain white and clickable so users can see at a
+        // glance which action is available.
+        bindBtn.classList.remove('zmq-active', 'zmq-disabled');
+        connectBtn.classList.remove('zmq-active', 'zmq-disabled');
+        if (mode === 'bind') {
+          bindBtn.classList.add('zmq-active');
+          // Clear the IP field so the user can type a fresh target
+          // without having to manually erase the old value.
+          ipInput.value = '';
+        } else if (mode === 'connect') {
+          connectBtn.classList.add('zmq-active');
+        }
       }
 
       function connect() {
@@ -1497,8 +1773,14 @@ INDEX_HTML = """<!doctype html>
       });
 
       connectBtn.addEventListener('click', () => {
+        // Already in connect mode — clicking again is a no-op unless
+        // the user has typed a DIFFERENT IP into the input.
         const ip = ipInput.value.trim();
         if (!ip) { ipInput.focus(); return; }
+        if (connectBtn.classList.contains('zmq-active')) {
+          // Allow re-connecting to a different host while already in
+          // connect mode (retarget). Fall through to send the message.
+        }
         if (socket && socket.readyState === WebSocket.OPEN) {
           socket.send(JSON.stringify({ type: 'configure_ip', ip: ip }));
         }
@@ -1509,6 +1791,8 @@ INDEX_HTML = """<!doctype html>
       });
 
       bindBtn.addEventListener('click', () => {
+        // Binding twice is a no-op; skip the WS round trip.
+        if (bindBtn.classList.contains('zmq-active')) return;
         if (socket && socket.readyState === WebSocket.OPEN) {
           socket.send(JSON.stringify({ type: 'bind' }));
         }
@@ -1575,13 +1859,22 @@ async def handle_ws(request):
                     continue
                 ptype = payload.get("type")
                 if ptype == "save":
-                    save_current_plot(payload.get("name"))
+                    try:
+                        save_current_plot(payload.get("name"))
+                    except Exception as exc:  # noqa: BLE001
+                        print(f"[rtplot] save_current_plot failed: {exc}")
                 elif ptype == "configure_ip":
                     ip = payload.get("ip")
                     if ip:
-                        await reconfigure_zmq(request.app, connect_ip=ip)
+                        try:
+                            await reconfigure_zmq(request.app, connect_ip=ip)
+                        except Exception as exc:  # noqa: BLE001
+                            print(f"[rtplot] configure_ip failed: {exc}")
                 elif ptype == "bind":
-                    await reconfigure_zmq(request.app, connect_ip=None)
+                    try:
+                        await reconfigure_zmq(request.app, connect_ip=None)
+                    except Exception as exc:  # noqa: BLE001
+                        print(f"[rtplot] bind failed: {exc}")
                 elif ptype == "control_button":
                     btn_id = payload.get("id")
                     if btn_id: