simview 6.1.1__tar.gz → 6.1.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simview
-Version: 6.1.1
+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.1 → simview-6.1.2}/pyproject.toml

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

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

@@ -757,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);
@@ -779,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.1 → 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.1 → 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
             );
 
@@ -365,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) {
@@ -437,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) {
@@ -449,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.1 → 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.1 → simview-6.1.2/simview.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simview
-Version: 6.1.1
+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