cloudmr-ux 4.6.2 → 4.6.3

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

@@ -832,13 +832,11 @@ export default function CloudMrNiivueViewer(props) {
             (_a = nv.cloudMrCancelPolyline) === null || _a === void 0 ? void 0 : _a.call(nv);
         }
     }
-    function syncActiveDraftRefs() {
+    function syncActiveShapeDraftRef() {
         nv._cloudMrActiveShapeDraft = shapeDraftRef.current;
-        nv._cloudMrActivePenDraft = penDraftRef.current;
     }
-    function clearActiveDraftRefs() {
+    function clearActiveShapeDraftRef() {
         nv._cloudMrActiveShapeDraft = null;
-        nv._cloudMrActivePenDraft = null;
     }
     function cancelPenDraftHandler() {
         var _a;
@@ -853,7 +851,6 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(null);
         penDraftRef.current = null;
         nv._cloudMrPenDraftActive = false;
-        clearActiveDraftRefs();
         if (drawShapeToolRef.current === "pen") {
             nvSetDrawingEnabled(true);
         }
@@ -871,7 +868,6 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(null);
         penDraftRef.current = null;
         nv._cloudMrPenDraftActive = false;
-        clearActiveDraftRefs();
         setDrawingChanged(true);
         if (drawShapeToolRef.current === "pen") {
             nvSetDrawingEnabled(true);
@@ -888,7 +884,6 @@ export default function CloudMrNiivueViewer(props) {
     function onPenDraftChange(draft) {
         setPenDraft(draft);
         penDraftRef.current = draft;
-        syncActiveDraftRefs();
         if (draft.kind === "polyline") {
             syncPolylineDraftToNv(nv, draft);
         }
@@ -900,7 +895,6 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(draft);
         penDraftRef.current = draft;
         nv._cloudMrPenDraftActive = true;
-        syncActiveDraftRefs();
         nvSetDrawingEnabled(false);
     };
     nv.onPolylineChange = function (count) {
@@ -915,13 +909,11 @@ 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() {
@@ -934,7 +926,7 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(null);
         shapeDraftRef.current = null;
         nv._cloudMrShapeDraftActive = false;
-        clearActiveDraftRefs();
+        clearActiveShapeDraftRef();
         if (drawShapeToolRef.current) {
             nvSetDrawingEnabled(true);
         }
@@ -947,7 +939,7 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(null);
         shapeDraftRef.current = null;
         nv._cloudMrShapeDraftActive = false;
-        clearActiveDraftRefs();
+        clearActiveShapeDraftRef();
         if (drawShapeToolRef.current) {
             nvSetDrawingEnabled(true);
         }
@@ -956,13 +948,13 @@ export default function CloudMrNiivueViewer(props) {
     function onShapeDraftChange(draft) {
         setShapeDraft(draft);
         shapeDraftRef.current = draft;
-        syncActiveDraftRefs();
+        syncActiveShapeDraftRef();
     }
     nv.onShapeDraftReady = function (draft) {
         setShapeDraft(draft);
         shapeDraftRef.current = draft;
         nv._cloudMrShapeDraftActive = true;
-        syncActiveDraftRefs();
+        syncActiveShapeDraftRef();
         nvSetDrawingEnabled(false);
     };
     nv.onApplyActiveDraft = function () {

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

@@ -23,9 +23,6 @@ import {
 } from "./polylinePenUtils.js";
 import {
   captureFreehandDraft,
-  capturePenDraftFromClick,
-  isPenDrawToolActive,
-  redrawFreehandDraft,
   shouldDeferFreehandCommit,
 } from "./penDraftUtils.js";
 
@@ -1476,89 +1473,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;
+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);
 }
 
-/** 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();
+function canReopenShapeDraftOnClick(nv) {
+  const penType = nv.opts.penType;
+  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") {
+    nv.onShapeDraftReady(reopenDraft);
   }
   return true;
 }
 
 /**
- * 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.
+ * Re-enter rectangle/ellipse edit mode when clicking an existing shape ROI.
  */
-function cloudMrTryReopenDraftOnClick(nv) {
-  if (
-    nv._cloudMrShapeDraftActive ||
-    nv._cloudMrPenDraftActive ||
-    !isClickWithoutDrag(nv.uiData)
-  ) {
+function cloudMrTryReopenShapeDraftOnClick(nv) {
+  if (!isClickWithoutDrag(nv.uiData) || !canReopenShapeDraftOnClick(nv)) {
     return false;
   }
+  return cloudMrOpenShapeDraftFromClick(nv);
+}
 
-  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) {
+/**
+ * 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;
   }
 
-  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;
+  const vox = voxFromMouse(nv);
+  if (!vox || isClickOnActiveShapeDraft(nv)) {
+    return false;
   }
 
-  const reopenDraft = capturePenDraftFromClick(nv);
-  if (!reopenDraft) return false;
-  redrawFreehandDraft(nv, reopenDraft);
-  nv._cloudMrSuppressDrawingChangedMouseUp = true;
-  if (typeof nv.onPenDraftReady === "function") {
-    nv.onPenDraftReady(reopenDraft);
+  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 (nv.opts.polylinePenMode) {
-    resetPolylineState(nv);
+
+  if (typeof nv.onApplyActiveDraft === "function") {
+    nv.onApplyActiveDraft();
   }
-  return true;
+  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;
@@ -1622,30 +1613,19 @@ 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) {
-    cloudMrTryReopenDraftOnClick(this);
+    cloudMrTryReopenShapeDraftOnClick(this);
     return;
   }
   if (isDraftTooSmall(pendingDraft.ptA, pendingDraft.ptB)) {
     this.drawBitmap.set(pendingDraft.baseBitmap);
     this.refreshDrawing(true, false);
     this.drawScene();
-    cloudMrTryReopenDraftOnClick(this);
+    cloudMrTryReopenShapeDraftOnClick(this);
     return;
   }
   this._cloudMrSuppressDrawingChangedMouseUp = true;

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

@@ -13,27 +13,6 @@
 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,8 +18,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { translatePt, floodFillClusterFromVox, eraseClusterFromBitmap, } from "./shapeDraftUtils";
-import { axCorSagFromMouse, voxFromMouse } from "./polylinePenUtils";
+import { translatePt } from "./shapeDraftUtils";
 import { NI_PEN_TYPE } from "./niivuePenType";
 /** @typedef {'polyline' | 'freehand'} PenDraftKind */
 /**
@@ -48,34 +47,6 @@ 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

@@ -62,6 +62,8 @@ export function floodFillClusterFromVox(nv: any, seedVox: any): {
 /** 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
@@ -74,7 +76,7 @@ export function captureShapeDraftFromClick(nv: 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

@@ -295,6 +295,65 @@ export function eraseClusterFromBitmap(bitmap, visited) {
     });
     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
@@ -311,12 +370,13 @@ export function captureShapeDraftFromClick(nv) {
     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.2",
+  "version": "4.6.3",
   "author": "erosmontin@gmail.com",
   "license": "MIT",
   "repository": "erosmontin/cloudmr-ux",