cloudmr-ux 4.6.1 → 4.6.2

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

@@ -832,6 +832,14 @@ export default function CloudMrNiivueViewer(props) {
             (_a = nv.cloudMrCancelPolyline) === null || _a === void 0 ? void 0 : _a.call(nv);
         }
     }
+    function syncActiveDraftRefs() {
+        nv._cloudMrActiveShapeDraft = shapeDraftRef.current;
+        nv._cloudMrActivePenDraft = penDraftRef.current;
+    }
+    function clearActiveDraftRefs() {
+        nv._cloudMrActiveShapeDraft = null;
+        nv._cloudMrActivePenDraft = null;
+    }
     function cancelPenDraftHandler() {
         var _a;
         var draft = penDraftRef.current;
@@ -845,6 +853,7 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(null);
         penDraftRef.current = null;
         nv._cloudMrPenDraftActive = false;
+        clearActiveDraftRefs();
         if (drawShapeToolRef.current === "pen") {
             nvSetDrawingEnabled(true);
         }
@@ -862,6 +871,7 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(null);
         penDraftRef.current = null;
         nv._cloudMrPenDraftActive = false;
+        clearActiveDraftRefs();
         setDrawingChanged(true);
         if (drawShapeToolRef.current === "pen") {
             nvSetDrawingEnabled(true);
@@ -878,6 +888,7 @@ export default function CloudMrNiivueViewer(props) {
     function onPenDraftChange(draft) {
         setPenDraft(draft);
         penDraftRef.current = draft;
+        syncActiveDraftRefs();
         if (draft.kind === "polyline") {
             syncPolylineDraftToNv(nv, draft);
         }
@@ -889,6 +900,7 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(draft);
         penDraftRef.current = draft;
         nv._cloudMrPenDraftActive = true;
+        syncActiveDraftRefs();
         nvSetDrawingEnabled(false);
     };
     nv.onPolylineChange = function (count) {
@@ -903,11 +915,13 @@ export default function CloudMrNiivueViewer(props) {
             if (draft) {
                 setPenDraft(draft);
                 penDraftRef.current = draft;
+                syncActiveDraftRefs();
             }
         }
         else if (((_b = penDraftRef.current) === null || _b === void 0 ? void 0 : _b.kind) === "polyline") {
             setPenDraft(null);
             penDraftRef.current = null;
+            syncActiveDraftRefs();
         }
     };
     function cancelShapeDraft() {
@@ -920,6 +934,7 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(null);
         shapeDraftRef.current = null;
         nv._cloudMrShapeDraftActive = false;
+        clearActiveDraftRefs();
         if (drawShapeToolRef.current) {
             nvSetDrawingEnabled(true);
         }
@@ -932,6 +947,7 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(null);
         shapeDraftRef.current = null;
         nv._cloudMrShapeDraftActive = false;
+        clearActiveDraftRefs();
         if (drawShapeToolRef.current) {
             nvSetDrawingEnabled(true);
         }
@@ -940,11 +956,13 @@ export default function CloudMrNiivueViewer(props) {
     function onShapeDraftChange(draft) {
         setShapeDraft(draft);
         shapeDraftRef.current = draft;
+        syncActiveDraftRefs();
     }
     nv.onShapeDraftReady = function (draft) {
         setShapeDraft(draft);
         shapeDraftRef.current = draft;
         nv._cloudMrShapeDraftActive = true;
+        syncActiveDraftRefs();
         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";
@@ -22,6 +23,9 @@ import {
 } from "./polylinePenUtils.js";
 import {
   captureFreehandDraft,
+  capturePenDraftFromClick,
+  isPenDrawToolActive,
+  redrawFreehandDraft,
   shouldDeferFreehandCommit,
 } from "./penDraftUtils.js";
 
@@ -1472,31 +1476,83 @@ function cloudMrHasApplyableDraft(nv) {
   return !!(nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive);
 }
 
+function getActiveDraft(nv) {
+  if (nv._cloudMrPenDraftActive && nv._cloudMrActivePenDraft) {
+    return nv._cloudMrActivePenDraft;
+  }
+  if (nv._cloudMrShapeDraftActive && nv._cloudMrActiveShapeDraft) {
+    return nv._cloudMrActiveShapeDraft;
+  }
+  return null;
+}
+
+function isClickOnActiveDraft(nv) {
+  const draft = getActiveDraft(nv);
+  if (!draft) return false;
+  const vox = voxFromMouse(nv);
+  if (!vox) return false;
+  return isVoxelPartOfDraft(nv, draft, vox);
+}
+
+/** Commit the active draft when the user clicks outside the ROI being edited. */
+function cloudMrTryApplyDraftOnClickAway(nv) {
+  if (!cloudMrHasApplyableDraft(nv) || !isClickWithoutDrag(nv.uiData)) {
+    return false;
+  }
+  if (isClickOnActiveDraft(nv)) {
+    return false;
+  }
+  if (typeof nv.onApplyActiveDraft === "function") {
+    nv._cloudMrSuppressDrawingChangedMouseUp = true;
+    nv.onApplyActiveDraft();
+  }
+  return true;
+}
+
 /**
- * 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.
+ * When no draft is active and the user clicks an existing ROI, reconstruct a
+ * shape or pen draft so the bounding-box overlay reappears for re-editing.
  */
-function cloudMrTryReopenShapeDraftOnClick(nv) {
-  const penType = nv.opts.penType;
+function cloudMrTryReopenDraftOnClick(nv) {
   if (
-    !nv.opts.deferShapeCommit ||
-    !nv.opts.drawingEnabled ||
     nv._cloudMrShapeDraftActive ||
     nv._cloudMrPenDraftActive ||
-    !isClickWithoutDrag(nv.uiData) ||
-    (penType !== NI_PEN_TYPE.RECTANGLE && penType !== NI_PEN_TYPE.ELLIPSE)
+    !isClickWithoutDrag(nv.uiData)
   ) {
     return false;
   }
 
-  const reopenDraft = captureShapeDraftFromClick(nv);
-  if (!reopenDraft) return false;
+  const penType = nv.opts.penType;
+  const isShapeTool =
+    nv.opts.deferShapeCommit &&
+    nv.opts.drawingEnabled &&
+    (penType === NI_PEN_TYPE.RECTANGLE || penType === NI_PEN_TYPE.ELLIPSE);
+  const isPenTool = isPenDrawToolActive(nv);
+
+  if (!isShapeTool && !isPenTool) {
+    return false;
+  }
+
+  if (isShapeTool) {
+    const reopenDraft = captureShapeDraftFromClick(nv);
+    if (!reopenDraft) return false;
+    redrawDraftShape(nv, reopenDraft);
+    nv._cloudMrSuppressDrawingChangedMouseUp = true;
+    if (typeof nv.onShapeDraftReady === "function") {
+      nv.onShapeDraftReady(reopenDraft);
+    }
+    return true;
+  }
 
-  redrawDraftShape(nv, reopenDraft);
+  const reopenDraft = capturePenDraftFromClick(nv);
+  if (!reopenDraft) return false;
+  redrawFreehandDraft(nv, reopenDraft);
   nv._cloudMrSuppressDrawingChangedMouseUp = true;
-  if (typeof nv.onShapeDraftReady === "function") {
-    nv.onShapeDraftReady(reopenDraft);
+  if (typeof nv.onPenDraftReady === "function") {
+    nv.onPenDraftReady(reopenDraft);
+  }
+  if (nv.opts.polylinePenMode) {
+    resetPolylineState(nv);
   }
   return true;
 }
@@ -1566,21 +1622,30 @@ Niivue.prototype.mouseUpListener = function cloudMrMouseUpListener() {
   _mouseUpListener.call(this);
 
   if (polylineClick) {
+    if (cloudMrTryReopenDraftOnClick(this)) return;
     addPolylineVertex(this);
     return;
   }
 
+  if (cloudMrHasApplyableDraft(this) && isClickWithoutDrag(this.uiData)) {
+    if (cloudMrTryApplyDraftOnClickAway(this)) {
+      cloudMrTryReopenDraftOnClick(this);
+      return;
+    }
+    if (isClickOnActiveDraft(this)) {
+      return;
+    }
+  }
+
   if (!pendingDraft?.baseBitmap) {
-    // No new draft drawn — check if user clicked an existing ROI to re-edit it
-    cloudMrTryReopenShapeDraftOnClick(this);
+    cloudMrTryReopenDraftOnClick(this);
     return;
   }
   if (isDraftTooSmall(pendingDraft.ptA, pendingDraft.ptB)) {
     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);
+    cloudMrTryReopenDraftOnClick(this);
     return;
   }
   this._cloudMrSuppressDrawingChangedMouseUp = true;

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

@@ -13,6 +13,27 @@
 export function isEraserActive(nv: any): any;
 export function isFreehandPenActive(nv: any): any;
 export function shouldDeferFreehandCommit(nv: any): any;
+export function isPenDrawToolActive(nv: any): any;
+/**
+ * Re-enter pen edit mode when clicking an existing freehand/polyline ROI.
+ * Reopens as a freehand draft (move via bounding box) since vertex data is
+ * not stored in the bitmap alone.
+ */
+export function capturePenDraftFromClick(nv: any): {
+    kind: string;
+    baseBitmap: Uint8Array;
+    axCorSag: any;
+    penValue: number;
+    strokeVoxels: [number, number, number][];
+    bounds: {
+        x1: any;
+        y1: any;
+        z1: any;
+        x2: any;
+        y2: any;
+        z2: any;
+    };
+} | null;
 export function redrawPolylineDraft(nv: any, draft: any): void;
 export function translatePolylineVertices(vertices: any, delta: any): any;
 export function updatePolylineVertex(vertices: any, index: any, newVox: any): any;

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

@@ -18,7 +18,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { translatePt } from "./shapeDraftUtils";
+import { translatePt, floodFillClusterFromVox, eraseClusterFromBitmap, } from "./shapeDraftUtils";
+import { axCorSagFromMouse, voxFromMouse } from "./polylinePenUtils";
 import { NI_PEN_TYPE } from "./niivuePenType";
 /** @typedef {'polyline' | 'freehand'} PenDraftKind */
 /**
@@ -47,6 +48,34 @@ export function isFreehandPenActive(nv) {
 export function shouldDeferFreehandCommit(nv) {
     return !!nv.opts.deferFreehandCommit && isFreehandPenActive(nv);
 }
+export function isPenDrawToolActive(nv) {
+    return (nv.opts.drawingEnabled &&
+        nv.opts.penType === NI_PEN_TYPE.PEN &&
+        nv.opts.penValue > 0 &&
+        (nv.opts.deferFreehandCommit || nv.opts.polylinePenMode));
+}
+/**
+ * Re-enter pen edit mode when clicking an existing freehand/polyline ROI.
+ * Reopens as a freehand draft (move via bounding box) since vertex data is
+ * not stored in the bitmap alone.
+ */
+export function capturePenDraftFromClick(nv) {
+    var seedVox = voxFromMouse(nv);
+    var cluster = floodFillClusterFromVox(nv, seedVox);
+    if (!cluster)
+        return null;
+    var label = cluster.label, visited = cluster.visited, voxels = cluster.voxels, bounds = cluster.bounds;
+    var x1 = bounds.x1, y1 = bounds.y1, z1 = bounds.z1, x2 = bounds.x2, y2 = bounds.y2, z2 = bounds.z2;
+    var axCorSag = nv.drawPenAxCorSag >= 0 ? nv.drawPenAxCorSag : axCorSagFromMouse(nv);
+    return {
+        kind: "freehand",
+        baseBitmap: eraseClusterFromBitmap(nv.drawBitmap, visited),
+        axCorSag: axCorSag,
+        penValue: label,
+        strokeVoxels: voxels,
+        bounds: { x1: x1, y1: y1, z1: z1, x2: x2, y2: y2, z2: z2 }
+    };
+}
 export function redrawPolylineDraft(nv, draft) {
     var _a;
     if (!((_a = draft === null || draft === void 0 ? void 0 : draft.vertices) === null || _a === void 0 ? void 0 : _a.length) || !draft.baseBitmap)

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

@@ -49,6 +49,19 @@ 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;
 /**
  * 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,9 +70,9 @@ 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;
     baseBitmap: Uint8Array;

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,9 +267,49 @@ 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;
+}
+/**
+ * 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);
     return {
         ptA: [x1, y1, z1],

package/package.json

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