cloudmr-ux 4.8.7 → 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/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.7",
+  "version": "4.8.8",
   "author": "erosmontin@gmail.com",
   "license": "MIT",
   "repository": "erosmontin/cloudmr-ux",