simview 6.1.0__tar.gz → 6.1.2__tar.gz

{simview-6.1.0/simview.egg-info → simview-6.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simview
-Version: 6.1.0
+Version: 6.1.2
 Summary: THREE.js-based simulation visualization tool
 Author-email: Jan Vlk <vlkjan6@fel.cvut.cz>, Ales Kucera <kuceral4@fel.cvut.cz>, David Korcak <david.korcak@gmail.com>
 License-Expression: BSD-3-Clause

{simview-6.1.0 → simview-6.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simview"
-version = "6.1.0"
+version = "6.1.2"
 readme = "README.md"
 requires-python = ">=3.12"
 license = "BSD-3-Clause"

{simview-6.1.0 → simview-6.1.2}/simview/static/js/SimView.js

@@ -602,6 +602,9 @@ export class SimView {
             // actually flips body/terrain visuals) stay in sync instead of
             // uiState silently drifting out from under the displayed panel.
             if (this.uiControls) {
+                if (Number.isFinite(state.playbackSpeed) && this.animationController) {
+                    this.animationController.setSpeed(state.playbackSpeed);
+                }
                 this.uiControls.applyViewState(state);
             }
         } catch (e) {
@@ -623,6 +626,10 @@ export class SimView {
             bodyVisualizationMode: this.uiState.bodyVisualizationMode,
             terrainColorMode: this.uiState.terrainColorMode,
             toggles: toggleMapFromUiState(this.uiState),
+            pointCloudsVisible: this.uiState.pointCloudsVisible,
+            trackBody: this.uiState.trackBody,
+            terrainColorMap: this.uiState.terrainColorMap,
+            playbackSpeed: this.animationController ? this.animationController.playbackSpeed : undefined,
         };
     }
 
@@ -750,8 +757,11 @@ export class SimView {
                         const currentBodyPos = new THREE.Vector3(pos.x + offset.x, pos.y + offset.y, pos.z + offset.z);
                         
                         try {
-                            if (this._lastTrackedBody !== this.uiState.trackBody) {
-                                // On first tracking or switch, center the target on the body, preserving the viewing angle
+                            if (
+                                this._lastTrackedBody !== this.uiState.trackBody ||
+                                this._lastTrackedBatch !== activeBatch
+                            ) {
+                                // On first tracking or a body/batch switch, center the target on the body, preserving the viewing angle
                                 const delta = currentBodyPos.clone().sub(this.scene.controls.target);
                                 this.scene.camera.position.add(delta);
                                 this.scene.controls.target.copy(currentBodyPos);
@@ -772,11 +782,13 @@ export class SimView {
                         }
                         
                         this._lastTrackedBody = this.uiState.trackBody;
+                        this._lastTrackedBatch = activeBatch;
                         this._lastTrackedPosition = currentBodyPos.clone();
                     }
                 }
             } else {
                 this._lastTrackedBody = null;
+                this._lastTrackedBatch = null;
                 this._lastTrackedPosition = null;
             }
             this.scene.animate(now);

{simview-6.1.0 → simview-6.1.2}/simview/static/js/components/AnimationController.js

@@ -126,6 +126,10 @@ export class AnimationController {
 
     setSpeed(speed) {
         this.playbackSpeed = speed;
+        // Keep the playback bar's dropdown in step with programmatic callers.
+        if (this.playbackControls && this.playbackControls.speedSelect) {
+            this.playbackControls.speedSelect.value = String(speed);
+        }
     }
 
     setRecordingFormat(format) {

{simview-6.1.0 → simview-6.1.2}/simview/static/js/components/BatchManager.js

@@ -152,12 +152,19 @@ export class BatchManager {
         return { x: 0, y: 0, z: 0 };
     }
 
-    changeFocusOnBatchByIndex(batchIndex) {
+    // Moves camera and target by the offset between the two batches' grid
+    // cells, so the view keeps its place relative to the scene. Snapping the
+    // target to the cell origin instead lost the view on every chart click
+    // (which re-selects the closest batch) and broke body tracking.
+    changeFocusOnBatchByIndex(batchIndex, fromBatchIndex) {
         const { camera, controls } = this.app.scene;
-        const { x, y, z } = this.getBatchOffset(batchIndex);
-        const newCameraTarget = new THREE.Vector3(x, y, z);
-        camera.position.add(newCameraTarget.clone().sub(controls.target));
-        controls.target = newCameraTarget;
+        const to = this.getBatchOffset(batchIndex);
+        const from = this.getBatchOffset(fromBatchIndex);
+        const shift = new THREE.Vector3(to.x - from.x, to.y - from.y, to.z - from.z);
+        if (shift.lengthSq() === 0) return;
+        camera.position.add(shift);
+        controls.target.add(shift);
+        controls.update();
     }
 
     setActiveBatch(batchIndex) {
@@ -167,8 +174,9 @@ export class BatchManager {
             console.warn("Invalid batch index:", batchIndex);
             return;
         }
+        const previousBatch = this.currentlyActiveBatch;
         this.currentlyActiveBatch = batchIndex;
-        this.changeFocusOnBatchByIndex(batchIndex);
+        this.changeFocusOnBatchByIndex(batchIndex, previousBatch);
         // In focused mode the newly-active batch is (probably) not the one
         // currently built/drawn, so refresh before the panels read from it.
         this._recomputeVisibleBatches();

{simview-6.1.0 → simview-6.1.2}/simview/static/js/ui/Controls.js

@@ -607,6 +607,21 @@ export class UIControls {
             if (ctrl) ctrl.setValue(state.terrainColorMode);
         }
 
+        if (typeof state.terrainColorMap === "string") {
+            const known = Array.isArray(colorMapOptions) ? colorMapOptions : Object.keys(colorMapOptions);
+            const ctrl = this.findController("colorMap");
+            if (ctrl && known.includes(state.terrainColorMap)) ctrl.setValue(state.terrainColorMap);
+        }
+
+        if (typeof state.pointCloudsVisible === "boolean") {
+            const ctrl = this.findController("showPointClouds");
+            if (ctrl) ctrl.setValue(state.pointCloudsVisible);
+        }
+
+        if (typeof state.trackBody === "string" && this.trackBodyCtrl) {
+            if (this.trackableBodyNames().includes(state.trackBody)) this.trackBodyCtrl.setValue(state.trackBody);
+        }
+
         if (state.toggles && typeof state.toggles === "object") {
             const propertyForKey = {
                 axesVisible: "showAxes",

{simview-6.1.0 → simview-6.1.2}/simview/static/js/ui/ScalarPlotter.js

@@ -7,7 +7,7 @@ import {
     normalizeEpisodes,
 } from "../utils/episodes.js";
 import { makeChart, yIncrements } from "../utils/uplot.js";
-import { batchColumnsCsv, closestSeries, exportBar } from "./chartControls.js";
+import { batchColumnsCsv, closestSeries, exportBar, finiteBounds } from "./chartControls.js";
 
 export class ScalarPlotter {
     constructor(app, scalarNames) {
@@ -35,7 +35,7 @@ export class ScalarPlotter {
         // {scalarName -> per-batch array of per-episode aggregates}, rebuilt
         // only when the episodes or the underlying series change.
         this.episodeAggregateCache = new Map();
-        this.seriesRenderCallback = null;
+        this.markerDirty = false;
         this.opacityRenderCallback = null;
         this.minRenderDelay = 1000 / FREQ_CONFIG.scalarPlotter;
         this.lastRenderTime = Number.NEGATIVE_INFINITY;
@@ -140,16 +140,7 @@ export class ScalarPlotter {
             // scalar as one whole-trajectory Float32Array.
             const series = store.getScalarSeries(scalarName, batchSize);
             this.scalarSeries.set(scalarName, series);
-
-            let min = Number.MAX_VALUE;
-            let max = Number.MIN_VALUE;
-            for (const batchSeries of series) {
-                for (const { y } of batchSeries) {
-                    min = Math.min(min, y);
-                    max = Math.max(max, y);
-                }
-            }
-            this.scalarBounds.set(scalarName, [min, max]);
+            this.scalarBounds.set(scalarName, finiteBounds(series));
         }
 
         this._initializePlots();
@@ -314,6 +305,7 @@ export class ScalarPlotter {
                         },
                     ],
                     tooltip: (u, idx) => this._tooltipHtml(u, idx, name),
+                    markerTime: () => this.times[this.currentEndIndex] ?? null,
                     hooks: {
                         draw: [
                             (u) => {
@@ -331,7 +323,16 @@ export class ScalarPlotter {
                         }
                     },
                 },
-                [[], ...new Array(this.app.batchManager.simBatches).fill([])],
+                // The whole timeline, plotted once; playback only moves the
+                // marker. NaN (a gap in the source) becomes null, uPlot's gap.
+                [
+                    this.times,
+                    ...this.scalarSeries
+                        .get(name)
+                        .map((batchSeries) =>
+                            batchSeries.map(({ y }) => (Number.isFinite(y) ? y : null))
+                        ),
+                ],
                 this.app
             );
 
@@ -354,6 +355,7 @@ export class ScalarPlotter {
     }
 
     setEndIndex(newEndIndex, force = false) {
+        if (this.times.length === 0) return; // store not loaded yet (initFromStore pending)
         if (newEndIndex < 0 || newEndIndex >= this.times.length) {
             console.warn(
                 "Invalid end index. Must be within the range of time values."
@@ -364,27 +366,7 @@ export class ScalarPlotter {
             return;
         }
         this.currentEndIndex = newEndIndex;
-        const activeChart = this.charts.get(this.activeScalar);
-        if (!activeChart) {
-            console.warn(`No chart found for scalar "${this.activeScalar}".`);
-            return;
-        }
-
-        const scalarData = this.scalarSeries.get(this.activeScalar);
-        if (!scalarData) {
-            console.warn(`No data points found for scalar "${this.activeScalar}".`);
-            return;
-        }
-
-        this.seriesRenderCallback = () => {
-            const numPoints = this.currentEndIndex + 1;
-            const xValues = this.times.slice(0, numPoints);
-            const data = [xValues];
-            for (let i = 0; i < this.app.batchManager.simBatches; i++) {
-                data.push(scalarData[i].slice(0, numPoints).map((p) => p.y));
-            }
-            activeChart.setData(data, false);
-        };
+        this.markerDirty = true;
     }
 
     setFocusedBatch(batchIndex, force = false) {
@@ -436,9 +418,8 @@ export class ScalarPlotter {
         }
 
         var needRender = false;
-        if (this.seriesRenderCallback) {
-            this.seriesRenderCallback();
-            this.seriesRenderCallback = null;
+        if (this.markerDirty) {
+            this.markerDirty = false;
             needRender = true;
         }
         if (this.opacityRenderCallback) {
@@ -448,10 +429,9 @@ export class ScalarPlotter {
         }
 
         if (!needRender) return;
-        // rebuildPaths must be true: the series data changes on every frame of
-        // playback, and redrawing without rebuilding just repaints the paths
-        // built for whatever data the chart first saw.
-        activeChart.redraw(true, true);
+        // The data never changes after init, so the cached paths stay valid;
+        // strokes (focus opacity) are re-read on every draw anyway.
+        activeChart.redraw(false);
     }
 
     animate(now) {

{simview-6.1.0 → simview-6.1.2}/simview/static/js/ui/chartControls.js

@@ -20,6 +20,21 @@ export function closestSeries(u, dataIdx, yVal) {
     return best;
 }
 
+// [min, max] over the finite y of every batch's {x, y} points; [0, 1] when
+// there are none, so a chart never gets NaN/Infinity bounds.
+export function finiteBounds(seriesPerBatch) {
+    let min = Infinity;
+    let max = -Infinity;
+    for (const batchSeries of seriesPerBatch) {
+        for (const { y } of batchSeries) {
+            if (!Number.isFinite(y)) continue;
+            if (y < min) min = y;
+            if (y > max) max = y;
+        }
+    }
+    return min <= max ? [min, max] : [0, 1];
+}
+
 // CSV with a time column, then one column per batch (named after the batch's
 // display name); `seriesPerBatch[b][i]` is an {x, y} point or missing.
 export function batchColumnsCsv(batchManager, times, seriesPerBatch) {

{simview-6.1.0 → simview-6.1.2}/simview/static/js/utils/viewState.js

@@ -30,11 +30,9 @@ const BOOLEAN_FLAG_KEYS = [
     "terrainVisualizationModes.normals",
 ];
 
-// Deliberately NOT in the list above: `pointCloudsVisible`. Appending only
-// works for flags that default off -- a link made before the flag existed has
-// no bit for it, which decodes as false, so a default-on flag would arrive
-// switched off and hide point clouds on every old link. Adding it needs a
-// format version that can tell "absent" from "false".
+// Deliberately NOT in the list above: `pointCloudsVisible`. It defaults on,
+// so a bit would decode old links (bit absent) as off; it travels as the
+// named `pc=0|1` key instead, where absent means "leave alone".
 
 function getPath(obj, path) {
     return path.split(".").reduce((o, k) => (o && typeof o === "object" ? o[k] : undefined), obj);
@@ -87,6 +85,11 @@ function decodeFlags(mask) {
 //   bodyVisualizationMode: string,
 //   terrainColorMode: string,
 //   toggles: { [key in BOOLEAN_FLAG_KEYS]?: boolean },
+//   pointCloudsVisible: boolean,   // `pc=0|1` -- a named key, not a flag bit,
+//                                  // so "absent" (leave alone) != false
+//   trackBody: string,             // `track=`
+//   terrainColorMap: string,       // `cmap=`
+//   playbackSpeed: number,         // `speed=`
 // }
 export function serializeViewState(state) {
     if (!state || typeof state !== "object") return "";
@@ -116,6 +119,18 @@ export function serializeViewState(state) {
     if (state.toggles && typeof state.toggles === "object") {
         params.push(`flags=${encodeFlags(state.toggles)}`);
     }
+    if (typeof state.pointCloudsVisible === "boolean") {
+        params.push(`pc=${state.pointCloudsVisible ? 1 : 0}`);
+    }
+    if (typeof state.trackBody === "string" && state.trackBody) {
+        params.push(`track=${encodeURIComponent(state.trackBody)}`);
+    }
+    if (typeof state.terrainColorMap === "string" && state.terrainColorMap) {
+        params.push(`cmap=${encodeURIComponent(state.terrainColorMap)}`);
+    }
+    if (Number.isFinite(state.playbackSpeed) && state.playbackSpeed > 0) {
+        params.push(`speed=${fmtNum(state.playbackSpeed)}`);
+    }
 
     return `#${params.join("&")}`;
 }
@@ -155,6 +170,15 @@ export function parseViewState(hash) {
     const mask = parseInt(params.get("flags"), 10);
     if (Number.isInteger(mask)) state.toggles = decodeFlags(mask);
 
+    const pc = params.get("pc");
+    if (pc === "0" || pc === "1") state.pointCloudsVisible = pc === "1";
+    const track = params.get("track");
+    if (track) state.trackBody = track;
+    const cmap = params.get("cmap");
+    if (cmap) state.terrainColorMap = cmap;
+    const speed = num("speed");
+    if (Number.isFinite(speed) && speed > 0) state.playbackSpeed = speed;
+
     return state;
 }
 

{simview-6.1.0 → simview-6.1.2}/simview/view.py

@@ -47,6 +47,10 @@ def view_hash(
     body_mode: str | None = None,
     terrain_color_mode: str | None = None,
     flags: Mapping[str, bool] | None = None,
+    point_clouds: bool | None = None,
+    track: str | None = None,
+    color_map: str | None = None,
+    speed: float | None = None,
     data: str | None = None,
     ui: bool | None = None,
 ) -> str:
@@ -55,6 +59,9 @@ def view_hash(
     `t` is the playback time in seconds, `cam`/`tgt` the camera position and
     orbit target, `batch` the focused batch index, `flags` a map of the dotted
     toggle names in `BOOLEAN_FLAG_KEYS` (unlisted ones default to off).
+    `point_clouds`, `track` (a body name, or ``"None"``), `color_map` and
+    `speed` are carried as named keys; leaving one ``None`` leaves the
+    viewer's current setting alone.
     `data` (base URL of a static bundle, see `SimulationScene.save_static`) and
     `ui=False` (hide all panels) are startup options, not view state.
     """
@@ -81,6 +88,16 @@ def view_hash(
             )
         mask = sum(1 << i for i, k in enumerate(BOOLEAN_FLAG_KEYS) if flags.get(k))
         params.append(f"flags={mask}")
+    if point_clouds is not None:
+        params.append(f"pc={int(bool(point_clouds))}")
+    if track:
+        params.append(f"track={quote(track, safe='')}")
+    if color_map:
+        params.append(f"cmap={quote(color_map, safe='')}")
+    if speed is not None:
+        if speed <= 0:
+            raise ValueError(f"speed must be positive; got {speed!r}")
+        params.append(f"speed={_num(speed)}")
     if params:
         params.insert(0, "v=1")
     if data is not None:

{simview-6.1.0 → simview-6.1.2/simview.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simview
-Version: 6.1.0
+Version: 6.1.2
 Summary: THREE.js-based simulation visualization tool
 Author-email: Jan Vlk <vlkjan6@fel.cvut.cz>, Ales Kucera <kuceral4@fel.cvut.cz>, David Korcak <david.korcak@gmail.com>
 License-Expression: BSD-3-Clause

{simview-6.1.0 → simview-6.1.2}/tests/test_view.py

@@ -35,6 +35,13 @@ def test_view_hash():
     assert view_hash(ui=False, data="http://h/x") == "#data=http%3A%2F%2Fh%2Fx&ui=0"
     with pytest.raises(ValueError):
         view_hash(flags={"nope": True})
+    # Named carry-over keys, in the JS serializer's order; absent means "leave alone".
+    assert (
+        view_hash(point_clouds=False, track="robot 1", color_map="viridis", speed=0.25)
+        == "#v=1&pc=0&track=robot%201&cmap=viridis&speed=0.25"
+    )
+    with pytest.raises(ValueError):
+        view_hash(speed=0)
 
 
 def _urls(o):