@ohif/app 3.12.0-beta.105 → 3.12.0-beta.107

package/dist/{4019.bundle.01f63d5dd5b96ded0c00.js → 4019.bundle.cdb81fb4777792f6175d.js}

@@ -3056,7 +3056,7 @@ function removeSurfaceFromElement(element, segmentationId) {
 /* harmony export */ });
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
 /* harmony import */ var _stateManagement_segmentation_triggerSegmentationEvents__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(49906);
-/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11990);
+/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(64664);
 /* harmony import */ var _utils_getStrategyData__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(40905);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(29857);
 
@@ -3082,6 +3082,8 @@ class BrushStrategy {
         [_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.EnsureImageVolumeFor3DManipulation]: addListMethod(_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.EnsureImageVolumeFor3DManipulation),
         [_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.AddPreview]: addListMethod(_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.AddPreview),
         [_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.GetStatistics]: addSingletonMethod(_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.GetStatistics),
+        [_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.CalculateCursorGeometry]: addSingletonMethod(_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.CalculateCursorGeometry, true),
+        [_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.RenderCursor]: addSingletonMethod(_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.RenderCursor, true),
         compositions: null,
     }; }
     constructor(name, ...initializers) {
@@ -3113,6 +3115,18 @@ class BrushStrategy {
             return initializedData;
         };
         this.configurationName = name;
+        const cursorGeometryInitializer = initializers.find(init => init.hasOwnProperty(_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.CalculateCursorGeometry));
+        const renderCursorInitializer = initializers.find(init => init.hasOwnProperty(_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.RenderCursor));
+        if (!cursorGeometryInitializer) {
+            initializers.push({
+                [_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.CalculateCursorGeometry]: _compositions__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A.circularCursor.calculateCursorGeometry
+            });
+        }
+        if (!renderCursorInitializer) {
+            initializers.push({
+                [_enums__WEBPACK_IMPORTED_MODULE_4__.StrategyCallbacks.RenderCursor]: _compositions__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A.circularCursor.renderCursor
+            });
+        }
         this.compositions = initializers;
         initializers.forEach((initializer) => {
             const result = typeof initializer === 'function' ? initializer() : initializer;
@@ -3197,7 +3211,7 @@ function addSingletonMethod(name, isInitialized = true) {
 
 /***/ }),
 
-/***/ 11990:
+/***/ 64664:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 
@@ -3311,9 +3325,13 @@ var esm = __webpack_require__(3823);
     },
     [StrategyCallbacks/* default */.A.ComputeInnerCircleRadius]: (operationData) => {
         const { configuration, viewport } = operationData;
-        const { dynamicRadius = 0, isDynamic } = configuration.threshold;
+        const thresholdConfig = configuration?.threshold;
+        if (!thresholdConfig) {
+            return;
+        }
+        const { dynamicRadius = 0, isDynamic } = thresholdConfig;
         if (!isDynamic) {
-            configuration.threshold.dynamicRadiusInCanvas = 0;
+            thresholdConfig.dynamicRadiusInCanvas = 0;
             return;
         }
         if (dynamicRadius === 0) {
@@ -3333,10 +3351,10 @@ var esm = __webpack_require__(3823);
         const offSetCenterInWorld = centerCursorInWorld.map((coord) => coord + radiusInWorld);
         const offSetCenterCanvas = viewport.worldToCanvas(offSetCenterInWorld);
         const dynamicRadiusInCanvas = Math.abs(centerCanvas[0] - offSetCenterCanvas[0]);
-        if (!configuration.threshold.dynamicRadiusInCanvas) {
-            configuration.threshold.dynamicRadiusInCanvas = 0;
+        if (!thresholdConfig.dynamicRadiusInCanvas) {
+            thresholdConfig.dynamicRadiusInCanvas = 0;
         }
-        configuration.threshold.dynamicRadiusInCanvas = 3 + dynamicRadiusInCanvas;
+        thresholdConfig.dynamicRadiusInCanvas = 3 + dynamicRadiusInCanvas;
     },
 });
 
@@ -3655,6 +3673,108 @@ var getStatistics = __webpack_require__(38440);
 var ensureSegmentationVolume = __webpack_require__(38732);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/segmentation/strategies/compositions/ensureImageVolume.js
 var ensureImageVolume = __webpack_require__(62753);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/drawingSvg/index.js + 4 modules
+var drawingSvg = __webpack_require__(74347);
+;// ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/segmentation/strategies/compositions/circularCursor.js
+
+
+
+/* harmony default export */ const circularCursor = ({
+    [StrategyCallbacks/* default */.A.CalculateCursorGeometry]: function (enabledElement, operationData) {
+        if (!operationData) {
+            return;
+        }
+        const { configuration, activeStrategy, hoverData } = operationData;
+        const { viewport } = enabledElement;
+        const camera = viewport.getCamera();
+        const { brushSize } = configuration;
+        const viewUp = esm/* vec3.fromValues */.eR.fromValues(camera.viewUp[0], camera.viewUp[1], camera.viewUp[2]);
+        const viewPlaneNormal = esm/* vec3.fromValues */.eR.fromValues(camera.viewPlaneNormal[0], camera.viewPlaneNormal[1], camera.viewPlaneNormal[2]);
+        const viewRight = esm/* vec3.create */.eR.create();
+        esm/* vec3.cross */.eR.cross(viewRight, viewUp, viewPlaneNormal);
+        const { canvasToWorld } = viewport;
+        const { centerCanvas } = hoverData;
+        const centerCursorInWorld = canvasToWorld([
+            centerCanvas[0],
+            centerCanvas[1],
+        ]);
+        const bottomCursorInWorld = esm/* vec3.create */.eR.create();
+        const topCursorInWorld = esm/* vec3.create */.eR.create();
+        const leftCursorInWorld = esm/* vec3.create */.eR.create();
+        const rightCursorInWorld = esm/* vec3.create */.eR.create();
+        for (let i = 0; i <= 2; i++) {
+            bottomCursorInWorld[i] = centerCursorInWorld[i] - viewUp[i] * brushSize;
+            topCursorInWorld[i] = centerCursorInWorld[i] + viewUp[i] * brushSize;
+            leftCursorInWorld[i] = centerCursorInWorld[i] - viewRight[i] * brushSize;
+            rightCursorInWorld[i] = centerCursorInWorld[i] + viewRight[i] * brushSize;
+        }
+        if (!hoverData) {
+            return;
+        }
+        const { brushCursor } = hoverData;
+        const { data } = brushCursor;
+        if (data.handles === undefined) {
+            data.handles = {};
+        }
+        data.handles.points = [
+            bottomCursorInWorld,
+            topCursorInWorld,
+            leftCursorInWorld,
+            rightCursorInWorld,
+        ];
+        const strategy = configuration.strategies[activeStrategy];
+        if (typeof strategy?.computeInnerCircleRadius === 'function') {
+            strategy.computeInnerCircleRadius({
+                configuration,
+                viewport,
+            });
+        }
+        data.invalidated = false;
+    },
+    [StrategyCallbacks/* default */.A.RenderCursor]: function (enabledElement, operationData, svgDrawingHelper) {
+        if (!operationData) {
+            return;
+        }
+        const { configuration, hoverData } = operationData;
+        const { viewport } = enabledElement;
+        const { brushCursor } = hoverData;
+        const toolMetadata = brushCursor.metadata;
+        if (!toolMetadata) {
+            return;
+        }
+        const annotationUID = toolMetadata.brushCursorUID;
+        const data = brushCursor.data;
+        const { points } = data.handles;
+        const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
+        const bottom = canvasCoordinates[0];
+        const top = canvasCoordinates[1];
+        const center = [
+            Math.floor((bottom[0] + top[0]) / 2),
+            Math.floor((bottom[1] + top[1]) / 2),
+        ];
+        const radius = Math.abs(bottom[1] - Math.floor((bottom[1] + top[1]) / 2));
+        const color = `rgb(${toolMetadata.segmentColor?.slice(0, 3) || [0, 0, 0]})`;
+        if (!viewport.getRenderingEngine()) {
+            console.warn('Rendering Engine has been destroyed');
+            return;
+        }
+        const circleUID = '0';
+        (0,drawingSvg.drawCircle)(svgDrawingHelper, annotationUID, circleUID, center, radius, {
+            color,
+            lineDash: this.centerSegmentIndexInfo.segmentIndex === 0 ? [1, 2] : null,
+        });
+        const { dynamicRadiusInCanvas } = configuration?.threshold || {
+            dynamicRadiusInCanvas: 0,
+        };
+        if (dynamicRadiusInCanvas) {
+            const circleUID1 = '1';
+            (0,drawingSvg.drawCircle)(svgDrawingHelper, annotationUID, circleUID1, center, dynamicRadiusInCanvas, {
+                color,
+            });
+        }
+    },
+});
+
 ;// ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/segmentation/strategies/compositions/index.js
 
 
@@ -3667,6 +3787,7 @@ var ensureImageVolume = __webpack_require__(62753);
 
 
 
+
 /* harmony default export */ const compositions = ({
     determineSegmentIndex: determineSegmentIndex,
     dynamicThreshold: dynamicThreshold,
@@ -3679,6 +3800,7 @@ var ensureImageVolume = __webpack_require__(62753);
     labelmapStatistics: labelmapStatistics,
     ensureSegmentationVolumeFor3DManipulation: ensureSegmentationVolume/* default */.A,
     ensureImageVolumeFor3DManipulation: ensureImageVolume/* default */.A,
+    circularCursor: circularCursor
 });
 
 
@@ -3692,7 +3814,7 @@ var ensureImageVolume = __webpack_require__(62753);
 /* harmony export */ });
 /* harmony import */ var _BrushStrategy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55887);
 /* harmony import */ var _fillCircle__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56789);
-/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11990);
+/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(64664);
 
 
 
@@ -3711,7 +3833,7 @@ const eraseInsideCircle = ERASE_CIRCLE_STRATEGY.strategyFunction;
 /* harmony export */ });
 /* harmony import */ var _BrushStrategy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55887);
 /* harmony import */ var _fillSphere__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(17492);
-/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11990);
+/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(64664);
 
 
 
@@ -3735,7 +3857,7 @@ const eraseInsideSphere = ERASE_SPHERE_STRATEGY.strategyFunction;
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3823);
 /* harmony import */ var _BrushStrategy__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(55887);
-/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11990);
+/* harmony import */ var _compositions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(64664);
 /* harmony import */ var _enums_StrategyCallbacks__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(84093);
 /* harmony import */ var _fillCircle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(56789);
 /* harmony import */ var _utilities_getSphereBoundsInfo__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(4296);

package/dist/{4775.bundle.16fc2ed5bd3c9fc90001.js → 4775.bundle.3ac5a927447b149ba482.js}

@@ -109,6 +109,8 @@ var SegmentationRepresentations;
 /* harmony export */ });
 var StrategyCallbacks;
 (function (StrategyCallbacks) {
+    StrategyCallbacks["CalculateCursorGeometry"] = "calculateCursorGeometry";
+    StrategyCallbacks["RenderCursor"] = "renderCursor";
     StrategyCallbacks["OnInteractionStart"] = "onInteractionStart";
     StrategyCallbacks["OnInteractionEnd"] = "onInteractionEnd";
     StrategyCallbacks["Preview"] = "preview";

package/dist/{5400.bundle.de97508611da1c00d58a.js → 5400.bundle.be4bdac337da734fdcd3.js}

@@ -2141,6 +2141,7 @@ class LabelmapBaseTool extends _base__WEBPACK_IMPORTED_MODULE_1__/* .BaseTool */
             previewColor,
             previewSegmentIndex,
             createMemo: this.createMemo.bind(this),
+            hoverData: this._hoverData,
         };
         return operationData;
     }

package/dist/{5448.bundle.9a36e001169ea3bfeb6c.js → 5448.bundle.2a82fcfac24d62355154.js}

@@ -19767,12 +19767,16 @@ class BaseStreamingImageVolume extends _ImageVolume__WEBPACK_IMPORTED_MODULE_9__
 
 
 class ImageVolume {
+    get numTimePoints() {
+        return typeof this.numDimensionGroups === 'number'
+            ? this.numDimensionGroups
+            : 1;
+    }
     constructor(props) {
         this._imageIdsIndexMap = new Map();
         this._imageURIsIndexMap = new Map();
         this.cornerstoneImageMetaData = null;
         this.isPreScaled = false;
-        this.numTimePoints = null;
         this.numFrames = null;
         const { imageIds, scaling, dimensions, spacing, origin, direction, dataType, volumeId, referencedVolumeId, metadata, referencedImageIds, additionalDetails, voxelManager, numberOfComponents, } = props;
         if (!dataType) {
@@ -19852,7 +19856,10 @@ class ImageVolume {
         });
     }
     isDynamicVolume() {
-        return this.numTimePoints > 1;
+        if (this.numTimePoints) {
+            return this.numTimePoints > 1;
+        }
+        return false;
     }
     getImageIdIndex(imageId) {
         return this._imageIdsIndexMap.get(imageId);
@@ -34214,7 +34221,7 @@ class VoxelManager {
         this._set = options._set;
         this._id = options._id || '';
         this._getConstructor = options._getConstructor;
-        this.numberOfComponents = this.numberOfComponents || 1;
+        this.numberOfComponents = options.numberOfComponents || 1;
         this.scalarData = options.scalarData;
         this._getScalarData = options._getScalarData;
         this._updateScalarData = options._updateScalarData;
@@ -35282,7 +35289,7 @@ function uuidv4() {
 
 "use strict";
 /* unused harmony export version */
-const version = '4.12.6';
+const version = '4.14.4';
 
 
 /***/ }),
@@ -36686,6 +36693,8 @@ var SegmentationRepresentations;
 /* harmony export */ });
 var StrategyCallbacks;
 (function (StrategyCallbacks) {
+    StrategyCallbacks["CalculateCursorGeometry"] = "calculateCursorGeometry";
+    StrategyCallbacks["RenderCursor"] = "renderCursor";
     StrategyCallbacks["OnInteractionStart"] = "onInteractionStart";
     StrategyCallbacks["OnInteractionEnd"] = "onInteractionEnd";
     StrategyCallbacks["Preview"] = "preview";
@@ -38139,6 +38148,9 @@ function getColorLUT(index) {
 
 function getCurrentLabelmapImageIdForViewport(viewportId, segmentationId) {
     const imageIds = getCurrentLabelmapImageIdsForViewport(viewportId, segmentationId);
+    if (!imageIds?.length) {
+        return;
+    }
     return imageIds[0];
 }
 function getCurrentLabelmapImageIdsForViewport(viewportId, segmentationId) {
@@ -39002,9 +39014,11 @@ class ToolGroup_ToolGroup {
                 const cursor = MouseCursor.getDefinedCursor('default');
                 this._setCursorForViewports(cursor);
             }
+            toolInstance.isPrimary = false;
         }
         else {
             this.setViewportsCursorByToolName(toolName);
+            toolInstance.isPrimary = true;
         }
         if (this._hasMousePrimaryButtonBinding(toolBindingsOptions)) {
             if (this.prevActivePrimaryToolName === null) {
@@ -39051,6 +39065,7 @@ class ToolGroup_ToolGroup {
         }
         this.toolOptions[toolName] = toolOptions;
         toolInstance.mode = mode;
+        toolInstance.isPrimary = false;
         if (typeof toolInstance.onSetToolPassive === 'function') {
             toolInstance.onSetToolPassive();
         }
@@ -39580,6 +39595,7 @@ class BaseTool {
         },
     }; }
     constructor(toolProps, defaultToolProps) {
+        this.isPrimary = false;
         const mergedDefaults = BaseTool.mergeDefaultProps(BaseTool.defaults, defaultToolProps);
         const initialProps = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.deepMerge(mergedDefaults, toolProps);
         const { configuration = {}, supportedInteractionTypes, toolGroupId, } = initialProps;
@@ -44316,7 +44332,7 @@ function createMergedLabelmapForIndex(labelmaps, segmentIndex = 1, volumeId = 'm
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
 
 function getOrCreateImageVolume(referencedImageIds) {
-    if (!referencedImageIds || referencedImageIds.length <= 1) {
+    if (!referencedImageIds?.length) {
         return;
     }
     const isValidVolume = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.isValidVolume(referencedImageIds);
@@ -44359,7 +44375,7 @@ function getOrCreateSegmentationVolume(segmentationId) {
     }
     const { imageIds: labelmapImageIds } = representationData.Labelmap;
     volumeId = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.cache.generateVolumeId(labelmapImageIds);
-    if (!labelmapImageIds || labelmapImageIds.length === 1) {
+    if (!labelmapImageIds || labelmapImageIds.length === 0) {
         return;
     }
     const isValidVolume = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.isValidVolume(labelmapImageIds);

package/dist/{5462.bundle.a81a691eeef782ab95b9.js → 5462.bundle.21beddaca145b7465c72.js}

@@ -112,6 +112,8 @@ var SegmentationRepresentations;
 /* harmony export */ });
 var StrategyCallbacks;
 (function (StrategyCallbacks) {
+    StrategyCallbacks["CalculateCursorGeometry"] = "calculateCursorGeometry";
+    StrategyCallbacks["RenderCursor"] = "renderCursor";
     StrategyCallbacks["OnInteractionStart"] = "onInteractionStart";
     StrategyCallbacks["OnInteractionEnd"] = "onInteractionEnd";
     StrategyCallbacks["Preview"] = "preview";