cloudmr-ux 4.6.1 → 4.6.3

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

@@ -832,6 +832,12 @@ export default function CloudMrNiivueViewer(props) {
             (_a = nv.cloudMrCancelPolyline) === null || _a === void 0 ? void 0 : _a.call(nv);
         }
     }
+    function syncActiveShapeDraftRef() {
+        nv._cloudMrActiveShapeDraft = shapeDraftRef.current;
+    }
+    function clearActiveShapeDraftRef() {
+        nv._cloudMrActiveShapeDraft = null;
+    }
     function cancelPenDraftHandler() {
         var _a;
         var draft = penDraftRef.current;
@@ -920,6 +926,7 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(null);
         shapeDraftRef.current = null;
         nv._cloudMrShapeDraftActive = false;
+        clearActiveShapeDraftRef();
         if (drawShapeToolRef.current) {
             nvSetDrawingEnabled(true);
         }
@@ -932,6 +939,7 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(null);
         shapeDraftRef.current = null;
         nv._cloudMrShapeDraftActive = false;
+        clearActiveShapeDraftRef();
         if (drawShapeToolRef.current) {
             nvSetDrawingEnabled(true);
         }
@@ -940,11 +948,13 @@ export default function CloudMrNiivueViewer(props) {
     function onShapeDraftChange(draft) {
         setShapeDraft(draft);
         shapeDraftRef.current = draft;
+        syncActiveShapeDraftRef();
     }
     nv.onShapeDraftReady = function (draft) {
         setShapeDraft(draft);
         shapeDraftRef.current = draft;
         nv._cloudMrShapeDraftActive = true;
+        syncActiveShapeDraftRef();
         nvSetDrawingEnabled(false);
     };
     nv.onApplyActiveDraft = function () {

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

@@ -6,6 +6,7 @@ import {
   captureDeferredShapeDraft,
   captureShapeDraftFromClick,
   isDraftTooSmall,
+  isVoxelPartOfDraft,
   redrawDraftShape,
   shouldDeferShapeCommit,
 } from "./shapeDraftUtils.js";
@@ -1472,27 +1473,28 @@ function cloudMrHasApplyableDraft(nv) {
   return !!(nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive);
 }
 
-/**
- * When no draft is active and the user clicks an existing ROI voxel while the
- * rectangle or ellipse tool is selected, reconstruct a ShapeDraft from the
- * clicked cluster so the bounding-box overlay reappears for re-editing.
- */
-function cloudMrTryReopenShapeDraftOnClick(nv) {
+function isClickOnActiveShapeDraft(nv) {
+  const draft = nv._cloudMrActiveShapeDraft;
+  if (!draft || !nv._cloudMrShapeDraftActive) return false;
+  const vox = voxFromMouse(nv);
+  if (!vox) return false;
+  return isVoxelPartOfDraft(nv, draft, vox);
+}
+
+function canReopenShapeDraftOnClick(nv) {
   const penType = nv.opts.penType;
-  if (
-    !nv.opts.deferShapeCommit ||
-    !nv.opts.drawingEnabled ||
-    nv._cloudMrShapeDraftActive ||
-    nv._cloudMrPenDraftActive ||
-    !isClickWithoutDrag(nv.uiData) ||
-    (penType !== NI_PEN_TYPE.RECTANGLE && penType !== NI_PEN_TYPE.ELLIPSE)
-  ) {
-    return false;
-  }
+  return (
+    nv.opts.deferShapeCommit &&
+    nv.opts.drawingEnabled &&
+    !nv._cloudMrShapeDraftActive &&
+    !nv._cloudMrPenDraftActive &&
+    (penType === NI_PEN_TYPE.RECTANGLE || penType === NI_PEN_TYPE.ELLIPSE)
+  );
+}
 
+function cloudMrOpenShapeDraftFromClick(nv) {
   const reopenDraft = captureShapeDraftFromClick(nv);
   if (!reopenDraft) return false;
-
   redrawDraftShape(nv, reopenDraft);
   nv._cloudMrSuppressDrawingChangedMouseUp = true;
   if (typeof nv.onShapeDraftReady === "function") {
@@ -1501,8 +1503,53 @@ function cloudMrTryReopenShapeDraftOnClick(nv) {
   return true;
 }
 
+/**
+ * Re-enter rectangle/ellipse edit mode when clicking an existing shape ROI.
+ */
+function cloudMrTryReopenShapeDraftOnClick(nv) {
+  if (!isClickWithoutDrag(nv.uiData) || !canReopenShapeDraftOnClick(nv)) {
+    return false;
+  }
+  return cloudMrOpenShapeDraftFromClick(nv);
+}
+
+/**
+ * While editing one shape, mousedown on another shape applies the current
+ * draft immediately and opens the clicked shape for editing.
+ */
+function cloudMrTrySwitchShapeDraftOnMouseDown(nv) {
+  if (!nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive) {
+    return false;
+  }
+  if (!nv.opts.deferShapeCommit || !nv.opts.drawingEnabled) {
+    return false;
+  }
+
+  const vox = voxFromMouse(nv);
+  if (!vox || isClickOnActiveShapeDraft(nv)) {
+    return false;
+  }
+
+  const dims = nv.back?.dims;
+  if (!dims || !nv.drawBitmap) return false;
+  const dx = dims[1];
+  const dy = dims[2];
+  const idx = vox[0] + vox[1] * dx + vox[2] * dx * dy;
+  if (!nv.drawBitmap[idx]) {
+    return false;
+  }
+
+  if (typeof nv.onApplyActiveDraft === "function") {
+    nv.onApplyActiveDraft();
+  }
+  return cloudMrOpenShapeDraftFromClick(nv);
+}
+
 const _mouseDownListener = Niivue.prototype.mouseDownListener;
 Niivue.prototype.mouseDownListener = function cloudMrMouseDownListener(e) {
+  if (e.button === 0 && cloudMrTrySwitchShapeDraftOnMouseDown(this)) {
+    return;
+  }
   if (shouldDeferFreehandCommit(this) && this.drawBitmap) {
     this._cloudMrFreehandSessionStartBitmap = this.drawBitmap.slice();
     this._cloudMrFreehandAxCorSag = -1;
@@ -1571,7 +1618,6 @@ Niivue.prototype.mouseUpListener = function cloudMrMouseUpListener() {
   }
 
   if (!pendingDraft?.baseBitmap) {
-    // No new draft drawn — check if user clicked an existing ROI to re-edit it
     cloudMrTryReopenShapeDraftOnClick(this);
     return;
   }
@@ -1579,7 +1625,6 @@ Niivue.prototype.mouseUpListener = function cloudMrMouseUpListener() {
     this.drawBitmap.set(pendingDraft.baseBitmap);
     this.refreshDrawing(true, false);
     this.drawScene();
-    // Tiny drag treated as a click — also try to reopen an existing ROI
     cloudMrTryReopenShapeDraftOnClick(this);
     return;
   }

package/dist/CmrComponents/niivue-viewer/shapeDraftUtils.d.ts

@@ -49,6 +49,21 @@ export function captureDeferredShapeDraft(nv: any): {
     baseBitmap: Uint8Array | null;
 };
 export function shouldDeferShapeCommit(nv: any): any;
+/**
+ * Flood-fill a connected voxel cluster from a seed.
+ * @returns {{ label: number, visited: Set<number>, voxels: [number,number,number][], bounds: object } | null}
+ */
+export function floodFillClusterFromVox(nv: any, seedVox: any): {
+    label: number;
+    visited: Set<number>;
+    voxels: [number, number, number][];
+    bounds: object;
+} | null;
+/** True when a voxel belongs to the live draft overlay (drawn on top of baseBitmap). */
+export function isVoxelPartOfDraft(nv: any, draft: any, seedVox: any): boolean;
+export function eraseClusterFromBitmap(bitmap: any, visited: any): Uint8Array;
+/** Guess rectangle vs ellipse from the filled voxel pattern, not the active tool. */
+export function inferShapePenTypeFromCluster(cluster: any, axCorSag: any): 1 | 2;
 /**
  * When the user clicks on an existing filled ROI while the rectangle/ellipse tool
  * is active (but no draft is currently open), flood-fill the clicked cluster to
@@ -57,11 +72,11 @@ export function shouldDeferShapeCommit(nv: any): any;
  * Returns null if the click didn't land on a labeled voxel.
  */
 export function captureShapeDraftFromClick(nv: any): {
-    ptA: number[];
-    ptB: number[];
-    penValue: any;
+    ptA: any[];
+    ptB: any[];
+    penValue: number;
     axCorSag: number;
-    penType: any;
+    penType: 1 | 2;
     baseBitmap: Uint8Array;
 } | null;
 export type ShapeDraftKind = 'rectangle' | 'ellipse';

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

@@ -203,27 +203,21 @@ function inferAxCorSagFromBounds(x1, y1, z1, x2, y2, z2, fallback) {
     var spanY = y2 - y1;
     var spanZ = z2 - z1;
     if (spanZ <= spanX && spanZ <= spanY)
-        return 0; // axial — flat in Z
+        return 0;
     if (spanY <= spanX && spanY <= spanZ)
-        return 1; // coronal — flat in Y
+        return 1;
     if (spanX <= spanY && spanX <= spanZ)
-        return 2; // sagittal — flat in X
+        return 2;
     return fallback;
 }
 /**
- * When the user clicks on an existing filled ROI while the rectangle/ellipse tool
- * is active (but no draft is currently open), flood-fill the clicked cluster to
- * reconstruct a ShapeDraft so the bounding-box overlay reappears for re-editing.
- *
- * Returns null if the click didn't land on a labeled voxel.
+ * Flood-fill a connected voxel cluster from a seed.
+ * @returns {{ label: number, visited: Set<number>, voxels: [number,number,number][], bounds: object } | null}
  */
-export function captureShapeDraftFromClick(nv) {
+export function floodFillClusterFromVox(nv, seedVox) {
     var _a;
     var dims = (_a = nv.back) === null || _a === void 0 ? void 0 : _a.dims;
-    if (!dims || !nv.drawBitmap)
-        return null;
-    var seedVox = voxFromMouse(nv);
-    if (!seedVox)
+    if (!dims || !nv.drawBitmap || !seedVox)
         return null;
     var dx = dims[1];
     var dy = dims[2];
@@ -232,15 +226,20 @@ export function captureShapeDraftFromClick(nv) {
     var label = nv.drawBitmap[seedIdx];
     if (!label)
         return null;
-    // BFS flood-fill to find connected cluster of the same label
     var visited = new Set();
     var queue = [seedIdx];
     visited.add(seedIdx);
-    var x1 = Infinity, y1 = Infinity, z1 = Infinity;
-    var x2 = -Infinity, y2 = -Infinity, z2 = -Infinity;
+    var voxels = [];
+    var x1 = Infinity;
+    var y1 = Infinity;
+    var z1 = Infinity;
+    var x2 = -Infinity;
+    var y2 = -Infinity;
+    var z2 = -Infinity;
     while (queue.length > 0) {
         var idx = queue.shift();
         var _b = decodeVoxelIndex(idx, dx, dy), x = _b[0], y = _b[1], z = _b[2];
+        voxels.push([x, y, z]);
         x1 = Math.min(x1, x);
         y1 = Math.min(y1, y);
         z1 = Math.min(z1, z);
@@ -248,9 +247,12 @@ export function captureShapeDraftFromClick(nv) {
         y2 = Math.max(y2, y);
         z2 = Math.max(z2, z);
         var neighbors = [
-            [x + 1, y, z], [x - 1, y, z],
-            [x, y + 1, z], [x, y - 1, z],
-            [x, y, z + 1], [x, y, z - 1],
+            [x + 1, y, z],
+            [x - 1, y, z],
+            [x, y + 1, z],
+            [x, y - 1, z],
+            [x, y, z + 1],
+            [x, y, z - 1],
         ];
         for (var _i = 0, neighbors_1 = neighbors; _i < neighbors_1.length; _i++) {
             var _c = neighbors_1[_i], nx = _c[0], ny = _c[1], nz = _c[2];
@@ -265,16 +267,116 @@ export function captureShapeDraftFromClick(nv) {
     }
     if (!Number.isFinite(x1))
         return null;
-    // baseBitmap is the bitmap with this cluster erased (so re-applying restores it)
-    var baseBitmap = new Uint8Array(nv.drawBitmap);
-    visited.forEach(function (idx) { baseBitmap[idx] = 0; });
+    return {
+        label: label,
+        visited: visited,
+        voxels: voxels,
+        bounds: { x1: x1, y1: y1, z1: z1, x2: x2, y2: y2, z2: z2 }
+    };
+}
+/** True when a voxel belongs to the live draft overlay (drawn on top of baseBitmap). */
+export function isVoxelPartOfDraft(nv, draft, seedVox) {
+    var _a;
+    if (!(draft === null || draft === void 0 ? void 0 : draft.baseBitmap) || !(nv === null || nv === void 0 ? void 0 : nv.drawBitmap) || !seedVox)
+        return false;
+    var dims = (_a = nv.back) === null || _a === void 0 ? void 0 : _a.dims;
+    if (!dims)
+        return false;
+    var dx = dims[1];
+    var dy = dims[2];
+    var idx = voxelIndex(seedVox[0], seedVox[1], seedVox[2], dx, dy);
+    return (nv.drawBitmap[idx] === draft.penValue &&
+        draft.baseBitmap[idx] !== draft.penValue);
+}
+export function eraseClusterFromBitmap(bitmap, visited) {
+    var next = new Uint8Array(bitmap);
+    visited.forEach(function (idx) {
+        next[idx] = 0;
+    });
+    return next;
+}
+function sliceKey(axCorSag, x, y, z) {
+    if (axCorSag === 0)
+        return "".concat(x, ",").concat(y);
+    if (axCorSag === 1)
+        return "".concat(x, ",").concat(z);
+    return "".concat(y, ",").concat(z);
+}
+/** Guess rectangle vs ellipse from the filled voxel pattern, not the active tool. */
+export function inferShapePenTypeFromCluster(cluster, axCorSag) {
+    var bounds = cluster.bounds, voxels = cluster.voxels;
+    var x1 = bounds.x1, y1 = bounds.y1, z1 = bounds.z1, x2 = bounds.x2, y2 = bounds.y2, z2 = bounds.z2;
+    var filled = new Set();
+    for (var _i = 0, voxels_1 = voxels; _i < voxels_1.length; _i++) {
+        var _a = voxels_1[_i], x = _a[0], y = _a[1], z = _a[2];
+        filled.add(sliceKey(axCorSag, x, y, z));
+    }
+    var uMin;
+    var uMax;
+    var vMin;
+    var vMax;
+    if (axCorSag === 0) {
+        uMin = x1;
+        uMax = x2;
+        vMin = y1;
+        vMax = y2;
+    }
+    else if (axCorSag === 1) {
+        uMin = x1;
+        uMax = x2;
+        vMin = z1;
+        vMax = z2;
+    }
+    else {
+        uMin = y1;
+        uMax = y2;
+        vMin = z1;
+        vMax = z2;
+    }
+    if (uMax <= uMin || vMax <= vMin) {
+        return NI_PEN_TYPE.RECTANGLE;
+    }
+    var cu = (uMin + uMax) / 2;
+    var cv = (vMin + vMax) / 2;
+    var ru = Math.max(0.5, (uMax - uMin) / 2);
+    var rv = Math.max(0.5, (vMax - vMin) / 2);
+    var rectScore = 0;
+    var ellipseScore = 0;
+    for (var u = uMin; u <= uMax; u++) {
+        for (var v = vMin; v <= vMax; v++) {
+            var has = filled.has("".concat(u, ",").concat(v));
+            var inEllipse = Math.pow(((u - cu) / ru), 2) + Math.pow(((v - cv) / rv), 2) <= 1.05;
+            if (has)
+                rectScore++;
+            if (has === inEllipse)
+                ellipseScore++;
+        }
+    }
+    return ellipseScore > rectScore ? NI_PEN_TYPE.ELLIPSE : NI_PEN_TYPE.RECTANGLE;
+}
+/**
+ * When the user clicks on an existing filled ROI while the rectangle/ellipse tool
+ * is active (but no draft is currently open), flood-fill the clicked cluster to
+ * reconstruct a ShapeDraft so the bounding-box overlay reappears for re-editing.
+ *
+ * Returns null if the click didn't land on a labeled voxel.
+ */
+export function captureShapeDraftFromClick(nv) {
+    var seedVox = voxFromMouse(nv);
+    var cluster = floodFillClusterFromVox(nv, seedVox);
+    if (!cluster)
+        return null;
+    var label = cluster.label, visited = cluster.visited, bounds = cluster.bounds;
+    var x1 = bounds.x1, y1 = bounds.y1, z1 = bounds.z1, x2 = bounds.x2, y2 = bounds.y2, z2 = bounds.z2;
+    var baseBitmap = eraseClusterFromBitmap(nv.drawBitmap, visited);
     var axCorSag = inferAxCorSagFromBounds(x1, y1, z1, x2, y2, z2, nv.drawPenAxCorSag >= 0 ? nv.drawPenAxCorSag : 0);
+    var penType = inferShapePenTypeFromCluster(cluster, axCorSag);
     return {
         ptA: [x1, y1, z1],
         ptB: [x2, y2, z2],
         penValue: label,
         axCorSag: axCorSag,
-        penType: nv.opts.penType,
+        penType: penType,
         baseBitmap: baseBitmap
     };
 }

package/package.json

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