PyPI - better-rtplot - Versions diffs - 0.4.14__tar.gz → 0.4.15__tar.gz - Mend

better-rtplot 0.4.14tar.gz → 0.4.15tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

{better_rtplot-0.4.14 → better_rtplot-0.4.15}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-rtplot
-Version: 0.4.14
+Version: 0.4.15
 Summary:
 License: MIT
 Author: jmontp
@@ -67,6 +67,11 @@ Sender and server don't have to be on the same machine — see the
 No Python needed on the viewing machine. On Windows the binary opens
 a small Tk status window showing the listening URL.
+To arrange several plots side by side, start the server with
+`./rtplot-server --columns 2` (or `--columns 3`). The Python server accepts
+the same option: `python -m rtplot.server_browser --columns 2`. See the
+[multi-column example](examples/05_multi_column/).
 **Client** — pip install in the env that runs your script:
 ```bash

{better_rtplot-0.4.14 → better_rtplot-0.4.15}/README.md RENAMED Viewed

@@ -43,6 +43,11 @@ Sender and server don't have to be on the same machine — see the
 No Python needed on the viewing machine. On Windows the binary opens
 a small Tk status window showing the listening URL.
+To arrange several plots side by side, start the server with
+`./rtplot-server --columns 2` (or `--columns 3`). The Python server accepts
+the same option: `python -m rtplot.server_browser --columns 2`. See the
+[multi-column example](examples/05_multi_column/).
 **Client** — pip install in the env that runs your script:
 ```bash

{better_rtplot-0.4.14 → better_rtplot-0.4.15}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "better-rtplot"
-version = "0.4.14"
+version = "0.4.15"
 description = ""
 authors = ["jmontp <jmontp@umich.edu>"]
 license = "MIT"

{better_rtplot-0.4.14 → better_rtplot-0.4.15}/rtplot/server_browser.py RENAMED Viewed

@@ -98,8 +98,17 @@ parser.add_argument(
 parser.add_argument(
     "-c",
     "--column",
-    help="Create new plots in separate columns instead of rows",
-    action="store_false",
+    dest="columns",
+    help="Shortcut for --columns 2",
+    action="store_const",
+    const=2,
+)
+parser.add_argument(
+    "--columns",
+    type=int,
+    metavar="N",
+    help="Arrange plots in N columns (default: 1)",
 )
 parser.add_argument(
@@ -180,7 +189,9 @@ parser.add_argument(
 args = parser.parse_args()
-NEW_SUBPLOT_IN_ROW = args.column
+PLOT_COLUMNS = args.columns if args.columns is not None else 1
+if PLOT_COLUMNS < 1:
+    parser.error("--columns must be at least 1")
 DEBUG_TEXT_ENABLED = args.debug
 SKIP_PLOT_DATAPOINTS = args.skip
 ADAPT_SKIP_PLOT_DATAPOINTS = args.adaptable
@@ -607,7 +618,8 @@ def build_config_message(tab: Tab, config_dict) -> dict:
         "slider_values": dict(tab.slider_values),
         "text_values": dict(tab.text_values),
         "display_values": dict(tab.display_values),
-        "row_layout": bool(NEW_SUBPLOT_IN_ROW),
+        "columns": PLOT_COLUMNS,
+        "row_layout": PLOT_COLUMNS == 1,
     }
@@ -1517,9 +1529,9 @@ _SNAPSHOT_TEMPLATE = """<!doctype html>
 <style>
   html, body { margin: 0; padding: 0; background: #fafafa; color: #222;
                font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; }
-  #plots { display: flex; flex-direction: column; gap: 12px;
-           max-width: 900px; margin: 0 auto; padding: 20px 16px; }
-  .plot-wrap { background: #fff; border: 1px solid #ddd; border-radius: 4px; padding: 8px; }
+  #plots { display: grid; grid-template-columns: repeat(var(--plot-columns, 1), minmax(320px, 1fr));
+           gap: 12px; overflow-x: auto; max-width: 900px; margin: 0 auto; padding: 20px 16px; }
+  .plot-wrap { background: #fff; border: 1px solid #ddd; border-radius: 4px; padding: 8px; min-width: 0; }
   .snap-footer { text-align: center; font-size: 12px; color: #999; padding: 8px 0 20px; }
   .snap-footer a { color: #2a5db0; text-decoration: none; }
   .snap-footer a:hover { text-decoration: underline; }
@@ -1539,6 +1551,8 @@ _SNAPSHOT_TEMPLATE = """<!doctype html>
 (function () {
   const SNAP = __SNAPSHOT_JSON__;
   const plotsDiv = document.getElementById('plots');
+  plotsDiv.style.setProperty('--plot-columns', SNAP.columns || 1);
+  plotsDiv.style.maxWidth = `${900 * (SNAP.columns || 1)}px`;
   const COLOR_MAP = { r:'rgb(255,0,0)', g:'rgb(0,200,0)', b:'rgb(0,0,255)',
                       c:'rgb(0,200,200)', m:'rgb(200,0,200)',
                       y:'rgb(200,200,0)', k:'rgb(0,0,0)' };
@@ -1578,7 +1592,7 @@ _SNAPSHOT_TEMPLATE = """<!doctype html>
       data.push(Float64Array.from(src));
     }
     const opts = {
-      width: Math.max(640, plotsDiv.clientWidth - 40),
+      width: Math.max(240, wrap.clientWidth - 16),
       height: 260,
       title: pcfg.title || '',
       scales: {
@@ -1591,7 +1605,7 @@ _SNAPSHOT_TEMPLATE = """<!doctype html>
       cursor: { drag: { x: true, y: false } },
     };
     const u = new uPlot(opts, data, wrap);
-    plots.push({ uplot: u, data: data, xs: xs, xrange: xrange,
+    plots.push({ uplot: u, wrap: wrap, data: data, xs: xs, xrange: xrange,
                  traceCount: traceCount, startIdx: traceOffset });
     traceOffset += traceCount;
   });
@@ -1625,7 +1639,7 @@ _SNAPSHOT_TEMPLATE = """<!doctype html>
   window.addEventListener('resize', function () {
     plots.forEach(function (p) {
       p.uplot.setSize({
-        width: Math.max(640, plotsDiv.clientWidth - 40),
+        width: Math.max(240, p.wrap.clientWidth - 16),
         height: 260,
       });
     });
@@ -1707,6 +1721,7 @@ def _build_snapshot_html(tab: Tab, animate: bool) -> str:
     payload = {
         "plots": plots,
+        "columns": PLOT_COLUMNS,
         "num_samples": int(hi - lo),
         "trace_data": trace_data,
         "animate": bool(animate),

{better_rtplot-0.4.14 → better_rtplot-0.4.15}/rtplot/static/index.html RENAMED Viewed

@@ -62,10 +62,9 @@
   #ws-status { font-size: calc(12px * var(--ui-scale)); color: #666; margin-left: auto; }
   /* -------- Plots + controls (existing) -------- */
-  #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; }
+  #plots { display: grid; grid-template-columns: repeat(var(--plot-columns, 1), minmax(320px, 1fr)); padding: 12px; gap: 12px; overflow-x: auto; }
+  .plot-wrap { background: #fff; border: 1px solid #ddd; border-radius: 4px; padding: 8px; min-width: 0; }
+  #plots .ctrl-row, #plots #empty-state { grid-column: 1 / -1; }
   .plot-title { font-size: 13px; font-weight: 600; margin: 0 0 4px 4px; color: #333; }
   #empty-state { padding: 28px 32px; color: #888; font-size: calc(14px * var(--ui-scale)); font-style: italic; }
   /* Persistent banner the server raises when a client-supplied plot
@@ -853,8 +852,12 @@
         const plotHeight = (Number.isFinite(heightMul) && heightMul > 0)
           ? Math.round(baseHeight * heightMul)
           : baseHeight;
+        const wrap = document.createElement('div');
+        wrap.className = 'plot-wrap';
+        plotsDiv.appendChild(wrap);
         const opts = {
-          width: Math.max(640, plotsDiv.clientWidth - 40),
+          width: Math.max(240, wrap.clientWidth - 16),
           height: plotHeight,
           title: pcfg.title || '',
           scales: {
@@ -870,10 +873,6 @@
           cursor: { drag: { x: false, y: false } },
         };
-        const wrap = document.createElement('div');
-        wrap.className = 'plot-wrap';
-        plotsDiv.appendChild(wrap);
         const buffers = [];
         for (let t = 0; t < traceCount; t++) {
           const buf = new Float32Array(xrange);
@@ -887,6 +886,7 @@
         const u = new uPlot(opts, initialData, wrap);
         plots.push({
           uplot: u,
+          wrap: wrap,
           xs: xs,
           traceCount: traceCount,
           startIdx: traceOffset,
@@ -899,8 +899,8 @@
       function buildPlots(cfg) {
         destroyPlots();
-        plotsDiv.classList.toggle('row', cfg.row_layout);
-        plotsDiv.classList.toggle('col', !cfg.row_layout);
+        const columns = Number(cfg.columns) || (cfg.row_layout === false ? 2 : 1);
+        plotsDiv.style.setProperty('--plot-columns', Math.max(1, Math.floor(columns)));
         const controls = cfg.controls || [];
         const layout = (cfg.layout && cfg.layout.length)
@@ -913,7 +913,7 @@
           if (entry.kind === 'plot') {
             const pcfg = cfg.plots[entry.index];
             if (!pcfg) return;
-            traceOffset += buildOnePlot(pcfg, cfg.row_layout, traceOffset);
+            traceOffset += buildOnePlot(pcfg, columns === 1, traceOffset);
           } else if (entry.kind === 'controls') {
             const row = controls[entry.index];
             if (!row) return;
@@ -1366,7 +1366,7 @@
       window.addEventListener('resize', () => {
         plots.forEach(p => {
           p.uplot.setSize({
-            width: Math.max(640, plotsDiv.clientWidth - 40),
+            width: Math.max(240, p.wrap.clientWidth - 16),
             height: p.height,
           });
         });