cloudmr-ux 4.8.4 → 4.8.6

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

@@ -636,20 +636,9 @@ export default function CloudMrNiivueViewer(props) {
                 if (next.kind === "polyline") {
                     var count = (_c = (_b = next.vertices) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0;
                     if (count >= 2) {
-                        // Redraw segments in the new color, then update the base so the
-                        // rubber-band preview also uses the new color.
                         redrawPolylineDraft(nv, __assign(__assign({}, next), { filled: false }));
                         if (nv.drawBitmap)
                             nv._cloudMrPolylineBaseBitmap = nv.drawBitmap.slice();
-                        // Re-apply fill on top when polygon is closeable (base stays segments-only).
-                        if (count >= 3) {
-                            nv.drawPenAxCorSag = next.axCorSag;
-                            nv.drawPenFillPts = next.vertices.map(function (v) { return __spreadArray([], v, true); });
-                            nv._cloudMrSkipNextUndoBitmap = true;
-                            nv.drawPenFilled();
-                            nv.refreshDrawing(false, false);
-                            nv.drawScene();
-                        }
                     }
                 }
                 else if (next.kind === "freehand") {
@@ -943,8 +932,8 @@ export default function CloudMrNiivueViewer(props) {
         }
     }
     function applyPenDraftHandler(_a) {
-        var _b, _c, _d, _e, _f;
-        var _g = _a === void 0 ? {} : _a, _h = _g.keepTool, keepTool = _h === void 0 ? false : _h;
+        var _b, _c, _d, _e, _f, _g;
+        var _h = _a === void 0 ? {} : _a, _j = _h.keepTool, keepTool = _j === void 0 ? false : _j;
         var draft = penDraftRef.current;
         if (!draft)
             return;
@@ -973,9 +962,37 @@ export default function CloudMrNiivueViewer(props) {
             setPolylineVertexCount(0);
         }
         else if (draft._registryId && nv._cloudMrPolylineRegistry) {
-            // Was a committed polyline reopened as a freehand draft (move-only).
-            // Remove the stale registry entry so it is not matched on future clicks.
-            nv._cloudMrPolylineRegistry = nv._cloudMrPolylineRegistry.filter(function (e) { return e.id !== draft._registryId; });
+            // Was a committed polyline reopened as a freehand draft (move-only, possibly recolored).
+            // Re-register with the current penValue and voxel positions so future clicks
+            // open it with the correct (possibly changed) color.
+            var entryIdx = nv._cloudMrPolylineRegistry.findIndex(function (e) { return e.id === draft._registryId; });
+            if (entryIdx >= 0) {
+                var old = nv._cloudMrPolylineRegistry[entryIdx];
+                // Collect the newly committed voxel positions using the draft's current penValue.
+                var newIndices = new Set();
+                if (nv.drawBitmap && draft.baseBitmap) {
+                    var pv = draft.penValue;
+                    for (var i = 0; i < nv.drawBitmap.length; i++) {
+                        if (nv.drawBitmap[i] === pv && draft.baseBitmap[i] !== pv)
+                            newIndices.add(i);
+                    }
+                }
+                // Fall back to stroke voxel positions if bitmap diff returned nothing.
+                if (newIndices.size === 0 && draft.strokeVoxels && ((_g = nv.back) === null || _g === void 0 ? void 0 : _g.dims)) {
+                    var dx = nv.back.dims[1];
+                    var dy = nv.back.dims[2];
+                    for (var _i = 0, _k = draft.strokeVoxels; _i < _k.length; _i++) {
+                        var _l = _k[_i], x = _l[0], y = _l[1], z = _l[2];
+                        newIndices.add(x + y * dx + z * dx * dy);
+                    }
+                }
+                if (newIndices.size > 0) {
+                    nv._cloudMrPolylineRegistry[entryIdx] = __assign(__assign({}, old), { penValue: draft.penValue, voxelIndices: newIndices });
+                }
+                else {
+                    nv._cloudMrPolylineRegistry = nv._cloudMrPolylineRegistry.filter(function (e) { return e.id !== draft._registryId; });
+                }
+            }
         }
         setPenDraft(null);
         penDraftRef.current = null;
@@ -1051,27 +1068,23 @@ export default function CloudMrNiivueViewer(props) {
         nv.opts.deferFreehandCommit = false;
         nv.opts.polylinePenMode = false;
         nvSetDrawingEnabled(false);
+        // Sync palette to the reopened ROI's color so the user can change it.
+        if (draft.penValue != null) {
+            setDrawPen(draft.penValue);
+            nv.setPenValue(draft.penValue, false);
+        }
     };
     nv.onPolylineChange = function (count) {
-        var _a, _b;
+        var _a;
         setPolylineVertexCount(count);
         if (drawShapeToolRef.current === "polyline" && count >= 2) {
-            var draft = polylineDraftFromNv(nv, { filled: count >= 3 });
+            var draft = polylineDraftFromNv(nv, { filled: false });
             if (draft) {
-                if (count >= 3) {
-                    // Show fill live on canvas after each vertex commit.
-                    // Save/restore _cloudMrPolylineBaseBitmap (segments-only) so the
-                    // rubber-band preview still works correctly on mouse move.
-                    var savedBase = (_a = nv._cloudMrPolylineBaseBitmap) === null || _a === void 0 ? void 0 : _a.slice();
-                    redrawPolylineDraft(nv, draft);
-                    if (savedBase)
-                        nv._cloudMrPolylineBaseBitmap = savedBase;
-                }
                 setPenDraft(draft);
                 penDraftRef.current = draft;
             }
         }
-        else if (((_b = penDraftRef.current) === null || _b === void 0 ? void 0 : _b.kind) === "polyline") {
+        else if (((_a = penDraftRef.current) === null || _a === void 0 ? void 0 : _a.kind) === "polyline") {
             setPenDraft(null);
             penDraftRef.current = null;
         }
@@ -1294,6 +1307,11 @@ export default function CloudMrNiivueViewer(props) {
         nv.opts.penType = draft.penType;
         nv.opts.deferShapeCommit = true;
         nvSetDrawingEnabled(false);
+        // Sync palette to the reopened shape's color so the user can change it.
+        if (draft.penValue != null) {
+            setDrawPen(draft.penValue);
+            nv.setPenValue(draft.penValue, false);
+        }
     };
     nv.onApplyActiveDraft = function () {
         applyActiveDraftIfAny();

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

@@ -12,6 +12,7 @@ import {
 import { NI_PEN_TYPE } from "./niivuePenType.js";
 import {
   addPolylineVertex,
+  POLYLINE_CLOSE,
   axCorSagFromMouse,
   cancelPolyline,
   finishPolyline,
@@ -1664,7 +1665,11 @@ Niivue.prototype.mouseUpListener = function cloudMrMouseUpListener() {
   _mouseUpListener.call(this);
 
   if (polylineClick) {
-    addPolylineVertex(this);
+    const result = addPolylineVertex(this);
+    if (result === POLYLINE_CLOSE && typeof this.onApplyActiveDraft === "function") {
+      // Double-click detected — connect last vertex back to first, fill, and commit.
+      this.onApplyActiveDraft();
+    }
     return;
   }
 

package/dist/CmrComponents/niivue-viewer/mro-draw-toolkit/DrawColorPlatte.js

@@ -92,7 +92,9 @@ export default function DrawColorPlatte(_a) {
                                 })
                             }
                         } }, { children: _jsx(FiberManualRecordIcon, { className: "color-swatch", sx: color.sx }) }), index));
-                }) })), isPolylineTool && expanded && (_jsx(Typography, __assign({ sx: { px: 1, pb: 0.5, fontSize: "0.68rem", color: "#aaa", userSelect: "none" } }, { children: "Click to add vertices \u00B7 Right-click to fill" }))), penDraftActive &&
+                }) })), isPolylineTool && expanded && (_jsx(Typography, __assign({ sx: { px: 1, pb: 0.5, fontSize: "0.68rem", color: "#aaa", userSelect: "none" } }, { children: polylineVertexCount >= 3
+                    ? "Double-click to close & fill · Right-click to cancel"
+                    : "Click to add vertices" }))), penDraftActive &&
                 expanded &&
                 ((isFreehandTool && penDraftKind === "freehand") ||
                     (isPolylineTool && penDraftKind === "polyline")) && (_jsxs(Stack, __assign({ direction: "row", alignItems: "center", justifyContent: "space-between", sx: { px: 1, py: 0.5, borderTop: "1px solid #555", width: "100%" } }, { children: [_jsx(Tooltip, __assign({ title: "Delete this ROI drawing" }, { children: _jsx(Button, __assign({ size: "small", "aria-label": "delete pen draft", onClick: function () { return onDeletePenDraft === null || onDeletePenDraft === void 0 ? void 0 : onDeletePenDraft(); }, startIcon: _jsx(DeleteOutlineIcon, { sx: { fontSize: ACTION_ICON_SIZE } }), sx: {

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

@@ -6,7 +6,12 @@ export function notifyPolylineChange(nv: any, count: any): void;
 export function resetPolylineState(nv: any): void;
 export function cancelPolyline(nv: any): void;
 export function previewPolylineSegment(nv: any): void;
-export function addPolylineVertex(nv: any): boolean;
+export function addPolylineVertex(nv: any): boolean | typeof POLYLINE_CLOSE;
 export function finishPolyline(nv: any, { fillClosed }?: {
     fillClosed?: boolean | undefined;
 }): boolean;
+/**
+ * Sentinel returned by addPolylineVertex when a double-click is detected with
+ * ≥3 existing vertices.  The caller should close the polygon and auto-commit.
+ */
+export const POLYLINE_CLOSE: unique symbol;

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

@@ -46,6 +46,7 @@ export function resetPolylineState(nv) {
     nv._cloudMrPolylineBaseBitmap = null;
     nv._cloudMrPolylineSessionStartBitmap = null;
     nv._cloudMrPolylineAxCorSag = -1;
+    nv._cloudMrLastPolylineClickMs = null;
     notifyPolylineChange(nv, 0);
 }
 export function cancelPolyline(nv) {
@@ -69,12 +70,29 @@ export function previewPolylineSegment(nv) {
     nv.refreshDrawing(false, false);
     nv.drawScene();
 }
+/** Max ms between two clicks to be considered a double-click. */
+var DOUBLE_CLICK_MS = 400;
+/**
+ * Sentinel returned by addPolylineVertex when a double-click is detected with
+ * ≥3 existing vertices.  The caller should close the polygon and auto-commit.
+ */
+export var POLYLINE_CLOSE = Symbol("POLYLINE_CLOSE");
 export function addPolylineVertex(nv) {
     var pt = voxFromMouse(nv);
     if (!pt)
         return false;
     var penValue = nv.opts.penValue;
     var verts = nv._cloudMrPolylineVertices || (nv._cloudMrPolylineVertices = []);
+    // Double-click detection: two clicks within DOUBLE_CLICK_MS on ≥3 vertices.
+    var now = Date.now();
+    var isDoubleClick = verts.length >= 3 &&
+        nv._cloudMrLastPolylineClickMs != null &&
+        now - nv._cloudMrLastPolylineClickMs <= DOUBLE_CLICK_MS;
+    nv._cloudMrLastPolylineClickMs = now;
+    if (isDoubleClick) {
+        // Don't add this click as a vertex — signal close instead.
+        return POLYLINE_CLOSE;
+    }
     if (verts.length === 0) {
         nv._cloudMrPolylineSessionStartBitmap = nv.drawBitmap.slice();
         nv._cloudMrPolylineBaseBitmap = nv._cloudMrPolylineSessionStartBitmap.slice();

package/package.json

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