cloudmr-ux 4.8.6 → 4.8.8

package/dist/CmrComponents/niivue-viewer/NiivuePatcher.js

@@ -849,7 +849,15 @@ Niivue.prototype.groupLabelsFromSelection = function (sourceLabels = [], targetL
 };
 
 Niivue.prototype.resetScene = function () {
-    this.scene.pan2Dxyzmm = [0, 0, 0, 1]
+    // Reset 2D pan + zoom
+    this.scene.pan2Dxyzmm = [0, 0, 0, 1];
+    // Reset 3D camera to Niivue defaults (azimuth=110, elevation=10, scale=1)
+    if (typeof this.setRenderAzimuthElevation === "function") {
+        this.setRenderAzimuthElevation(110, 10);
+    }
+    if (typeof this.setScale === "function") {
+        this.setScale(1.0);
+    }
     this.drawScene();
 }
 
@@ -871,19 +879,19 @@ Niivue.prototype.recenter = function () {
 
 
 Niivue.prototype.resetZoom = function () {
-    // this.scene.pan2Dxyzmm[0] = 0;
-    // this.scene.pan2Dxyzmm[1] = 0;
-    // this.scene.pan2Dxyzmm[2] = 0;
-
+    // Reset 2D zoom (pan stays, only zoom component adjusted)
     const zoom = 1;
-
-    const zoomChange = this.scene.pan2Dxyzmm[3] - zoom
+    const zoomChange = this.scene.pan2Dxyzmm[3] - zoom;
     this.scene.pan2Dxyzmm[3] = zoom;
-    const mm = this.frac2mm(this.scene.crosshairPos)
-    this.scene.pan2Dxyzmm[0] += zoomChange * mm[0]
-    this.scene.pan2Dxyzmm[1] += zoomChange * mm[1]
-    this.scene.pan2Dxyzmm[2] += zoomChange * mm[2]
-    this.drawScene()
+    const mm = this.frac2mm(this.scene.crosshairPos);
+    this.scene.pan2Dxyzmm[0] += zoomChange * mm[0];
+    this.scene.pan2Dxyzmm[1] += zoomChange * mm[1];
+    this.scene.pan2Dxyzmm[2] += zoomChange * mm[2];
+    // Reset 3D zoom to default scale
+    if (typeof this.setScale === "function") {
+        this.setScale(1.0);
+    }
+    this.drawScene();
 }
 
 Niivue.prototype.setCenteredZoom = function (zoom) {
@@ -1528,6 +1536,10 @@ function clickedVoxelToolKind(nv) {
 function cloudMrTryReopenDraftOnClick(nv) {
   if (nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive) return;
   if (!isClickWithoutDrag(nv.uiData)) return;
+  // Never reopen a draft when the eraser is the active tool — the user is
+  // trying to erase, not re-select.  The eraser sets penValue to 0 with
+  // drawing enabled; that combination uniquely identifies the eraser here.
+  if (nv.opts.drawingEnabled && nv.opts.penValue === 0) return;
 
   const kind = clickedVoxelToolKind(nv);
   if (kind === 1) {

package/dist/CmrComponents/niivue-viewer/penDraftUtils.js

@@ -440,11 +440,18 @@ export function capturePolylineDraftFromClick(nv) {
         return null;
     var dx = nv.back.dims[1];
     var dy = nv.back.dims[2];
-    // Decode stored linear indices back to [x, y, z] triples.
+    // Decode stored linear indices back to [x, y, z] triples, but only include
+    // voxels that are still present in the current bitmap.  Registered indices
+    // that were cleared by the eraser must not be restored — otherwise re-opening
+    // the draft would silently undo the user's erasure.
     var strokeVoxels = [];
+    var presentIndices = new Set();
     var x1 = Infinity, y1 = Infinity, z1 = Infinity;
     var x2 = -Infinity, y2 = -Infinity, z2 = -Infinity;
     entry.voxelIndices.forEach(function (idx) {
+        if (nv.drawBitmap[idx] === 0)
+            return; // already erased — skip
+        presentIndices.add(idx);
         var z = Math.floor(idx / (dx * dy));
         var rem = idx - z * dx * dy;
         var y = Math.floor(rem / dx);
@@ -463,7 +470,9 @@ export function capturePolylineDraftFromClick(nv) {
         if (z > z2)
             z2 = z;
     });
-    var baseBitmap = eraseClusterFromBitmap(nv.drawBitmap, entry.voxelIndices);
+    if (strokeVoxels.length === 0)
+        return null;
+    var baseBitmap = eraseClusterFromBitmap(nv.drawBitmap, presentIndices);
     return {
         kind: "freehand",
         baseBitmap: baseBitmap,

package/dist/CmrComponents/niivue-viewer/polylinePenUtils.js

@@ -44,6 +44,7 @@ export function notifyPolylineChange(nv, count) {
 export function resetPolylineState(nv) {
     nv._cloudMrPolylineVertices = [];
     nv._cloudMrPolylineBaseBitmap = null;
+    nv._cloudMrPolylinePrevBaseBitmap = null;
     nv._cloudMrPolylineSessionStartBitmap = null;
     nv._cloudMrPolylineAxCorSag = -1;
     nv._cloudMrLastPolylineClickMs = null;
@@ -90,12 +91,20 @@ export function addPolylineVertex(nv) {
         now - nv._cloudMrLastPolylineClickMs <= DOUBLE_CLICK_MS;
     nv._cloudMrLastPolylineClickMs = now;
     if (isDoubleClick) {
-        // Don't add this click as a vertex — signal close instead.
+        // The first click of the double-click already placed an extra vertex.
+        // Roll it back using the snapshot saved before that click, then close.
+        if (nv._cloudMrPolylinePrevBaseBitmap) {
+            verts.pop();
+            nv._cloudMrPolylineBaseBitmap = nv._cloudMrPolylinePrevBaseBitmap;
+            nv.drawBitmap.set(nv._cloudMrPolylinePrevBaseBitmap);
+            nv.refreshDrawing(false, false);
+        }
         return POLYLINE_CLOSE;
     }
     if (verts.length === 0) {
         nv._cloudMrPolylineSessionStartBitmap = nv.drawBitmap.slice();
         nv._cloudMrPolylineBaseBitmap = nv._cloudMrPolylineSessionStartBitmap.slice();
+        nv._cloudMrPolylinePrevBaseBitmap = null;
         nv._cloudMrPolylineAxCorSag = axCorSagFromMouse(nv);
         nv.drawPenAxCorSag = nv._cloudMrPolylineAxCorSag;
         verts.push(pt);
@@ -108,6 +117,8 @@ export function addPolylineVertex(nv) {
             return false;
         }
         nv.drawPenAxCorSag = nv._cloudMrPolylineAxCorSag;
+        // Save the pre-segment bitmap so a subsequent double-click can roll back.
+        nv._cloudMrPolylinePrevBaseBitmap = nv._cloudMrPolylineBaseBitmap;
         nv.drawPenLine(pt, prev, penValue);
         verts.push(pt);
         nv._cloudMrPolylineBaseBitmap = nv.drawBitmap.slice();

package/dist/CmrComponents/tk-dualrange/TKDualRange.js

@@ -10,12 +10,71 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from "react";
 import "./tk-dual-range.css";
 var clamp = function (v, lo, hi) { return Math.max(lo, Math.min(hi, v)); };
+// Display REAL-space values; use scientific notation for small non-zero values
+// so they don't display as "0.000". Use type="text" because type="number" can
+// show "0" for very small values instead of scientific notation.
+function fmt(v, precision) {
+    if (!Number.isFinite(v))
+        return "";
+    return v !== 0 && Math.abs(v) < 0.01
+        ? Number(v).toExponential(precision)
+        : v.toFixed(precision);
+}
+function parse(s) {
+    var n = Number(s);
+    return Number.isFinite(n) ? n : NaN;
+}
+/**
+ * A text input that holds a local string draft while the user is typing,
+ * committing only on blur or Enter. This lets the user type multi-digit and
+ * decimal values without mid-entry validation snapping the field.
+ * Shows a small red "Out of range" message when the committed value falls
+ * outside [lo, hi].
+ */
+function DeferredInput(_a) {
+    var committed = _a.committed, onCommit = _a.onCommit, lo = _a.lo, hi = _a.hi, className = _a.className;
+    var _b = useState(committed), draft = _b[0], setDraft = _b[1];
+    var _c = useState(false), focused = _c[0], setFocused = _c[1];
+    var _d = useState(null), error = _d[0], setError = _d[1];
+    // Sync external changes into the field only when the user is not typing.
+    useEffect(function () {
+        if (!focused)
+            setDraft(committed);
+    }, [committed, focused]);
+    var commit = function (value) {
+        var n = Number(value);
+        if (!Number.isFinite(n)) {
+            setError("\"".concat(value, "\" is not a valid number"));
+        }
+        else if (n < lo || n > hi) {
+            setError("".concat(value.trim(), " is out of range"));
+        }
+        else {
+            setError(null);
+        }
+        onCommit(value);
+        // After commit the parent re-formats, so sync back to avoid a stale draft.
+        setDraft(committed);
+    };
+    return (_jsxs("div", __assign({ className: "tkdr__input-wrap" }, { children: [_jsx("input", { className: "".concat(className !== null && className !== void 0 ? className : "").concat(error ? " tkdr__num--error" : ""), type: "text", inputMode: "decimal", value: draft, onChange: function (e) { return setDraft(e.target.value); }, onFocus: function () {
+                    setFocused(true);
+                    setError(null);
+                }, onBlur: function (e) {
+                    setFocused(false);
+                    commit(e.target.value);
+                }, onKeyDown: function (e) {
+                    if (e.key === "Enter") {
+                        e.target.blur();
+                    }
+                } }), error && _jsx("span", __assign({ className: "tkdr__error" }, { children: error }))] })));
+}
 export default function TKDualRange(_a) {
     var _b;
     var _c = _a.name, name = _c === void 0 ? "Values" : _c, minDomain = _a.minDomain, maxDomain = _a.maxDomain, valueLow = _a.valueLow, valueHigh = _a.valueHigh, onChangeLow = _a.onChangeLow, onChangeHigh = _a.onChangeHigh, _d = _a.transform, transform = _d === void 0 ? function (x) { return x; } : _d, _e = _a.inverse, inverse = _e === void 0 ? function (y) { return y; } : _e, step = _a.step, _f = _a.precision, precision = _f === void 0 ? 3 : _f, _g = _a.accentColor, accentColor = _g === void 0 ? "#580f8b" : _g;
-    // Map domain & current values into RENDER space (like TestKarts)
+    // Map domain & current values into RENDER space
     var tMin = transform(minDomain);
     var tMax = transform(maxDomain);
     var tLow = transform(valueLow);
@@ -23,7 +82,7 @@ export default function TKDualRange(_a) {
     var span = Math.max(1e-12, tMax - tMin);
     var pct = function (t) { return ((t - tMin) / span) * 100; };
     var s = step !== null && step !== void 0 ? step : Math.max(span * 0.001, Number.EPSILON);
-    // Keep ends from crossing; clamp in REAL space against the other end
+    // Keep ends from crossing; clamp in REAL space against the other end.
     var handleLowRender = function (nextRender) {
         var nextReal = clamp(inverse(nextRender), minDomain, valueHigh);
         onChangeLow(nextReal);
@@ -32,37 +91,13 @@ export default function TKDualRange(_a) {
         var nextReal = clamp(inverse(nextRender), valueLow, maxDomain);
         onChangeHigh(nextReal);
     };
-    // Display REAL-space values (matching the color bar); use scientific notation for
-    // small non-zero values so they don't display as "0.000". Use type="text" because
-    // type="number" can show "0" for very small values instead of scientific notation.
-    var fmt = function (v) {
-        return Number.isFinite(v)
-            ? v !== 0 && Math.abs(v) < 0.01
-                ? Number(v).toExponential(precision)
-                : v.toFixed(precision)
-            : "";
-    };
-    var parse = function (s) {
-        var n = Number(s);
-        return Number.isFinite(n) ? n : NaN;
-    };
-    return (_jsxs("div", __assign({ className: "tkdr" }, { children: [_jsxs("div", __assign({ className: "tkdr__row tkdr__row--ends" }, { children: [_jsxs("div", __assign({ className: "tkdr__group" }, { children: [_jsx("span", __assign({ className: "tkdr__hint" }, { children: "Min" })), _jsx("input", { className: "tkdr__num", type: "text", inputMode: "decimal", value: fmt(valueLow), onChange: function (e) {
-                                    var n = parse(e.target.value);
-                                    if (!Number.isFinite(n))
-                                        return;
-                                    onChangeLow(clamp(n, minDomain, valueHigh));
-                                }, onBlur: function (e) {
-                                    var n = parse(e.target.value);
+    return (_jsxs("div", __assign({ className: "tkdr" }, { children: [_jsxs("div", __assign({ className: "tkdr__row tkdr__row--ends" }, { children: [_jsxs("div", __assign({ className: "tkdr__group" }, { children: [_jsx("span", __assign({ className: "tkdr__hint" }, { children: "Min" })), _jsx(DeferredInput, { className: "tkdr__num", committed: fmt(valueLow, precision), lo: minDomain, hi: valueHigh, onCommit: function (raw) {
+                                    var n = parse(raw);
                                     if (!Number.isFinite(n))
                                         return;
                                     onChangeLow(clamp(n, minDomain, valueHigh));
-                                } })] })), _jsxs("div", __assign({ className: "tkdr__group" }, { children: [_jsx("span", __assign({ className: "tkdr__hint" }, { children: "Max" })), _jsx("input", { className: "tkdr__num", type: "text", inputMode: "decimal", value: fmt(valueHigh), onChange: function (e) {
-                                    var n = parse(e.target.value);
-                                    if (!Number.isFinite(n))
-                                        return;
-                                    onChangeHigh(clamp(n, valueLow, maxDomain));
-                                }, onBlur: function (e) {
-                                    var n = parse(e.target.value);
+                                } })] })), _jsxs("div", __assign({ className: "tkdr__group" }, { children: [_jsx("span", __assign({ className: "tkdr__hint" }, { children: "Max" })), _jsx(DeferredInput, { className: "tkdr__num", committed: fmt(valueHigh, precision), lo: valueLow, hi: maxDomain, onCommit: function (raw) {
+                                    var n = parse(raw);
                                     if (!Number.isFinite(n))
                                         return;
                                     onChangeHigh(clamp(n, valueLow, maxDomain));

package/dist/CmrComponents/tk-dualrange/tk-dual-range.css

@@ -140,3 +140,25 @@
   font-weight: 400;
   font-family: 'Inter', 'Roboto', 'Helvetica', 'Arial', sans-serif;
 }
+
+/* wrapper that stacks the input + error text */
+.tkdr__input-wrap {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 2px;
+}
+
+/* red outline when the value is invalid */
+.tkdr__num--error {
+  border-color: #d32f2f;
+  outline-color: #d32f2f;
+}
+
+/* small red validation message */
+.tkdr__error {
+  font-size: 0.7rem;
+  color: #d32f2f;
+  line-height: 1;
+  white-space: nowrap;
+}

package/dist/core/common/components/NiivueTools/NiivuePatcher.js

@@ -1469,7 +1469,15 @@ Niivue.prototype.groupLabelsFromSelection = function (
 };
 
 Niivue.prototype.resetScene = function () {
+  // Reset 2D pan + zoom
   this.scene.pan2Dxyzmm = [0, 0, 0, 1];
+  // Reset 3D camera to Niivue defaults (azimuth=110, elevation=10, scale=1)
+  if (typeof this.setRenderAzimuthElevation === "function") {
+    this.setRenderAzimuthElevation(110, 10);
+  }
+  if (typeof this.setScale === "function") {
+    this.setScale(1.0);
+  }
   this.drawScene();
 };
 
@@ -1490,18 +1498,18 @@ Niivue.prototype.recenter = function () {
 };
 
 Niivue.prototype.resetZoom = function () {
-  // this.scene.pan2Dxyzmm[0] = 0;
-  // this.scene.pan2Dxyzmm[1] = 0;
-  // this.scene.pan2Dxyzmm[2] = 0;
-
+  // Reset 2D zoom (pan stays, only zoom component adjusted)
   const zoom = 1;
-
   const zoomChange = this.scene.pan2Dxyzmm[3] - zoom;
   this.scene.pan2Dxyzmm[3] = zoom;
   const mm = this.frac2mm(this.scene.crosshairPos);
   this.scene.pan2Dxyzmm[0] += zoomChange * mm[0];
   this.scene.pan2Dxyzmm[1] += zoomChange * mm[1];
   this.scene.pan2Dxyzmm[2] += zoomChange * mm[2];
+  // Reset 3D zoom to default scale
+  if (typeof this.setScale === "function") {
+    this.setScale(1.0);
+  }
   this.drawScene();
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudmr-ux",
-  "version": "4.8.6",
+  "version": "4.8.8",
   "author": "erosmontin@gmail.com",
   "license": "MIT",
   "repository": "erosmontin/cloudmr-ux",