@cornerstonejs/tools 1.32.3 → 1.33.0

package/dist/cjs/tools/segmentation/strategies/fillCircle.d.ts

@@ -1,15 +1,7 @@
 import type { Types } from '@cornerstonejs/core';
-declare type OperationData = {
-    segmentationId: string;
-    imageVolume: Types.IImageVolume;
-    points: any;
-    volume: Types.IImageVolume;
-    segmentIndex: number;
-    segmentsLocked: number[];
-    viewPlaneNormal: number[];
-    viewUp: number[];
-    strategySpecificConfiguration: any;
-    constraintFn: () => boolean;
+import { LabelmapToolOperationData } from '../../../types';
+declare type OperationData = LabelmapToolOperationData & {
+    points: [Types.Point3, Types.Point3, Types.Point3, Types.Point3];
 };
 export declare function fillInsideCircle(enabledElement: Types.IEnabledElement, operationData: OperationData): void;
 export declare function thresholdInsideCircle(enabledElement: Types.IEnabledElement, operationData: OperationData): void;

package/dist/cjs/tools/segmentation/strategies/fillCircle.js

@@ -6,37 +6,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fillOutsideCircle = exports.thresholdInsideCircle = exports.fillInsideCircle = void 0;
 const gl_matrix_1 = require("gl-matrix");
 const core_1 = require("@cornerstonejs/core");
+const core_2 = require("@cornerstonejs/core");
 const ellipse_1 = require("../../../utilities/math/ellipse");
 const boundingBox_1 = require("../../../utilities/boundingBox");
 const triggerSegmentationEvents_1 = require("../../../stateManagement/segmentation/triggerSegmentationEvents");
 const utilities_1 = require("../../../utilities");
 const isWithinThreshold_1 = __importDefault(require("./utils/isWithinThreshold"));
-const { transformWorldToIndex } = core_1.utilities;
+const getStrategyData_1 = require("./utils/getStrategyData");
+const stackVolumeCheck_1 = require("./utils/stackVolumeCheck");
+const { transformWorldToIndex } = core_2.utilities;
 function fillCircle(enabledElement, operationData, threshold = false) {
-    const { volume: segmentationVolume, imageVolume, points, segmentsLocked, segmentIndex, segmentationId, strategySpecificConfiguration, } = operationData;
-    const { imageData, dimensions } = segmentationVolume;
-    const scalarData = segmentationVolume.getScalarData();
+    const { points, segmentsLocked, segmentIndex, segmentationId, strategySpecificConfiguration, } = operationData;
     const { viewport } = enabledElement;
-    const center = gl_matrix_1.vec3.fromValues(0, 0, 0);
-    points.forEach((point) => {
-        gl_matrix_1.vec3.add(center, center, point);
-    });
-    gl_matrix_1.vec3.scale(center, center, 1 / points.length);
-    const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
-    const [topLeftCanvas, bottomRightCanvas] = (0, ellipse_1.getCanvasEllipseCorners)(canvasCoordinates);
-    const topLeftWorld = viewport.canvasToWorld(topLeftCanvas);
-    const bottomRightWorld = viewport.canvasToWorld(bottomRightCanvas);
-    const ellipsoidCornersIJK = [
-        transformWorldToIndex(imageData, topLeftWorld),
-        transformWorldToIndex(imageData, bottomRightWorld),
-    ];
-    const boundsIJK = (0, boundingBox_1.getBoundingBoxAroundShape)(ellipsoidCornersIJK, dimensions);
-    const ellipseObj = {
-        center: center,
-        xRadius: Math.abs(topLeftWorld[0] - bottomRightWorld[0]) / 2,
-        yRadius: Math.abs(topLeftWorld[1] - bottomRightWorld[1]) / 2,
-        zRadius: Math.abs(topLeftWorld[2] - bottomRightWorld[2]) / 2,
-    };
+    const data = (0, getStrategyData_1.getStrategyData)({ operationData, viewport });
+    if (!data) {
+        console.warn('No data found for fillCircle');
+        return;
+    }
+    const { imageScalarData, segmentationImageData, segmentationScalarData } = data;
+    const { ellipseObj, boundsIJK } = getEllipse(viewport, segmentationImageData, points);
     const modifiedSlicesToUse = new Set();
     let callback;
     if (threshold) {
@@ -44,8 +32,8 @@ function fillCircle(enabledElement, operationData, threshold = false) {
             if (segmentsLocked.includes(value)) {
                 return;
             }
-            if ((0, isWithinThreshold_1.default)(index, imageVolume, strategySpecificConfiguration)) {
-                scalarData[index] = segmentIndex;
+            if ((0, isWithinThreshold_1.default)(index, imageScalarData, strategySpecificConfiguration)) {
+                segmentationScalarData[index] = segmentIndex;
                 modifiedSlicesToUse.add(pointIJK[2]);
             }
         };
@@ -55,11 +43,13 @@ function fillCircle(enabledElement, operationData, threshold = false) {
             if (segmentsLocked.includes(value)) {
                 return;
             }
-            scalarData[index] = segmentIndex;
+            segmentationScalarData[index] = segmentIndex;
             modifiedSlicesToUse.add(pointIJK[2]);
         };
     }
-    (0, utilities_1.pointInShapeCallback)(imageData, (pointLPS, pointIJK) => (0, ellipse_1.pointInEllipse)(ellipseObj, pointLPS), callback, boundsIJK);
+    (0, utilities_1.pointInShapeCallback)(segmentationImageData, (pointLPS) => (0, ellipse_1.pointInEllipse)(ellipseObj, pointLPS, {
+        fast: true,
+    }), callback, boundsIJK);
     const arrayOfSlices = Array.from(modifiedSlicesToUse);
     (0, triggerSegmentationEvents_1.triggerSegmentationDataModified)(segmentationId, arrayOfSlices);
 }
@@ -68,10 +58,14 @@ function fillInsideCircle(enabledElement, operationData) {
 }
 exports.fillInsideCircle = fillInsideCircle;
 function thresholdInsideCircle(enabledElement, operationData) {
-    const { volume, imageVolume } = operationData;
-    if (!core_1.utilities.isEqual(volume.dimensions, imageVolume.dimensions) ||
-        !core_1.utilities.isEqual(volume.direction, imageVolume.direction)) {
-        throw new Error('Only source data the same dimensions/size/orientation as the segmentation currently supported.');
+    if ((0, stackVolumeCheck_1.isVolumeSegmentation)(operationData)) {
+        const { referencedVolumeId, volumeId } = operationData;
+        const imageVolume = core_1.cache.getVolume(referencedVolumeId);
+        const segmentation = core_1.cache.getVolume(volumeId);
+        if (!core_2.utilities.isEqual(segmentation.dimensions, imageVolume.dimensions) ||
+            !core_2.utilities.isEqual(segmentation.direction, imageVolume.direction)) {
+            throw new Error('Only source data the same dimensions/size/orientation as the segmentation currently supported.');
+        }
     }
     fillCircle(enabledElement, operationData, true);
 }
@@ -80,4 +74,35 @@ function fillOutsideCircle(enabledElement, operationData) {
     throw new Error('Not yet implemented');
 }
 exports.fillOutsideCircle = fillOutsideCircle;
+function getCenter(points) {
+    const center = gl_matrix_1.vec3.fromValues(0, 0, 0);
+    points.forEach((point) => {
+        gl_matrix_1.vec3.add(center, center, point);
+    });
+    gl_matrix_1.vec3.scale(center, center, 1 / points.length);
+    return center;
+}
+function getEllipse(viewport, imageData, points) {
+    const center = getCenter(points);
+    const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
+    const dimensions = imageData.getDimensions();
+    const [topLeftCanvas, bottomRightCanvas] = (0, ellipse_1.getCanvasEllipseCorners)(canvasCoordinates);
+    const topLeftWorld = viewport.canvasToWorld(topLeftCanvas);
+    const bottomRightWorld = viewport.canvasToWorld(bottomRightCanvas);
+    const ellipsoidCornersIJK = [
+        transformWorldToIndex(imageData, topLeftWorld),
+        transformWorldToIndex(imageData, bottomRightWorld),
+    ];
+    const boundsIJK = (0, boundingBox_1.getBoundingBoxAroundShape)(ellipsoidCornersIJK, dimensions);
+    if (boundsIJK.every(([min, max]) => min !== max)) {
+        throw new Error('Oblique segmentation tools are not supported yet');
+    }
+    const ellipseObj = {
+        center: center,
+        xRadius: Math.abs(topLeftWorld[0] - bottomRightWorld[0]) / 2,
+        yRadius: Math.abs(topLeftWorld[1] - bottomRightWorld[1]) / 2,
+        zRadius: Math.abs(topLeftWorld[2] - bottomRightWorld[2]) / 2,
+    };
+    return { ellipseObj, boundsIJK };
+}
 //# sourceMappingURL=fillCircle.js.map

package/dist/cjs/tools/segmentation/strategies/fillCircle.js.map

@@ -1 +1 @@
-{"version":3,"file":"fillCircle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillCircle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fillCircle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillCircle.ts"],"names":[],"mappings":"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"}

package/dist/cjs/tools/segmentation/strategies/fillRectangle.d.ts

@@ -1,12 +1,7 @@
-import { ImageVolume } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
-declare type OperationData = {
-    segmentationId: string;
+import { LabelmapToolOperationData } from '../../../types';
+declare type OperationData = LabelmapToolOperationData & {
     points: [Types.Point3, Types.Point3, Types.Point3, Types.Point3];
-    volume: ImageVolume;
-    constraintFn: (x: [number, number, number]) => boolean;
-    segmentIndex: number;
-    segmentsLocked: number[];
 };
 export declare function fillInsideRectangle(enabledElement: Types.IEnabledElement, operationData: OperationData): void;
 export declare function fillOutsideRectangle(enabledElement: Types.IEnabledElement, operationData: OperationData): void;

package/dist/cjs/tools/segmentation/strategies/fillRectangle.js

@@ -5,34 +5,42 @@ const core_1 = require("@cornerstonejs/core");
 const boundingBox_1 = require("../../../utilities/boundingBox");
 const utilities_1 = require("../../../utilities");
 const triggerSegmentationEvents_1 = require("../../../stateManagement/segmentation/triggerSegmentationEvents");
+const getStrategyData_1 = require("./utils/getStrategyData");
 const { transformWorldToIndex } = core_1.utilities;
 function fillRectangle(enabledElement, operationData, inside = true) {
-    const { volume: segmentation, points, segmentsLocked, segmentIndex, segmentationId, constraintFn, } = operationData;
-    const { imageData, dimensions } = segmentation;
-    const scalarData = segmentation.getScalarData();
+    const { points, segmentsLocked, segmentIndex, segmentationId, constraintFn } = operationData;
+    const strategyData = (0, getStrategyData_1.getStrategyData)({
+        operationData,
+        viewport: enabledElement.viewport,
+    });
+    if (!strategyData) {
+        console.warn('No data found for fillRectangle');
+        return;
+    }
+    const { segmentationImageData, segmentationScalarData } = strategyData;
     let rectangleCornersIJK = points.map((world) => {
-        return transformWorldToIndex(imageData, world);
+        return transformWorldToIndex(segmentationImageData, world);
     });
     rectangleCornersIJK = rectangleCornersIJK.map((point) => {
         return point.map((coord) => {
             return Math.round(coord);
         });
     });
-    const boundsIJK = (0, boundingBox_1.getBoundingBoxAroundShape)(rectangleCornersIJK, dimensions);
+    const boundsIJK = (0, boundingBox_1.getBoundingBoxAroundShape)(rectangleCornersIJK, segmentationImageData.getDimensions());
     const pointInRectangle = () => true;
     const callback = ({ value, index, pointIJK }) => {
         if (segmentsLocked.includes(value)) {
             return;
         }
         if (!constraintFn) {
-            scalarData[index] = segmentIndex;
+            segmentationScalarData[index] = segmentIndex;
             return;
         }
         if (constraintFn(pointIJK)) {
-            scalarData[index] = segmentIndex;
+            segmentationScalarData[index] = segmentIndex;
         }
     };
-    (0, utilities_1.pointInShapeCallback)(imageData, pointInRectangle, callback, boundsIJK);
+    (0, utilities_1.pointInShapeCallback)(segmentationImageData, pointInRectangle, callback, boundsIJK);
     (0, triggerSegmentationEvents_1.triggerSegmentationDataModified)(segmentationId);
 }
 function fillInsideRectangle(enabledElement, operationData) {

package/dist/cjs/tools/segmentation/strategies/fillRectangle.js.map

@@ -1 +1 @@
-{"version":3,"file":"fillRectangle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillRectangle.ts"],"names":[],"mappings":";;;AAAA,8CAAwE;AAGxE,gEAA2E;AAC3E,kDAA0D;AAC1D,+GAAkH;AAElH,MAAM,EAAE,qBAAqB,EAAE,GAAG,gBAAO,CAAC;AAoB1C,SAAS,aAAa,CACpB,cAAqC,EACrC,aAA4B,EAC5B,MAAM,GAAG,IAAI;IAEb,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,MAAM,EACN,cAAc,EACd,YAAY,EACZ,cAAc,EACd,YAAY,GACb,GAAG,aAAa,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAC/C,MAAM,UAAU,GAAG,YAAY,CAAC,aAAa,EAAE,CAAC;IAEhD,IAAI,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7C,OAAO,qBAAqB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAGH,mBAAmB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACtD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAA,uCAAyB,EAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAG7E,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;IAEpC,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC9C,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAClC,OAAO;SACR;QAED,IAAI,CAAC,YAAY,EAAE;YACjB,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;YACjC,OAAO;SACR;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1B,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;SAClC;IACH,CAAC,CAAC;IAEF,IAAA,gCAAoB,EAAC,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEvE,IAAA,2DAA+B,EAAC,cAAc,CAAC,CAAC;AAClD,CAAC;AASD,SAAgB,mBAAmB,CACjC,cAAqC,EACrC,aAA4B;IAE5B,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AALD,kDAKC;AASD,SAAgB,oBAAoB,CAClC,cAAqC,EACrC,aAA4B;IAE5B,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC;AALD,oDAKC"}
+{"version":3,"file":"fillRectangle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillRectangle.ts"],"names":[],"mappings":";;;AAAA,8CAA2D;AAG3D,gEAA2E;AAC3E,kDAA0D;AAC1D,+GAAkH;AAElH,6DAA0D;AAE1D,MAAM,EAAE,qBAAqB,EAAE,GAAG,gBAAO,CAAC;AAe1C,SAAS,aAAa,CACpB,cAAqC,EACrC,aAA4B,EAC5B,MAAM,GAAG,IAAI;IAEb,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,GAC1E,aAAa,CAAC;IAEhB,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC;QACnC,aAAa;QACb,QAAQ,EAAE,cAAc,CAAC,QAAQ;KAClC,CAAC,CAAC;IAEH,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAChD,OAAO;KACR;IAED,MAAM,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,GAAG,YAAY,CAAC;IAEvE,IAAI,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7C,OAAO,qBAAqB,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAGH,mBAAmB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACtD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAA,uCAAyB,EACzC,mBAAmB,EACnB,qBAAqB,CAAC,aAAa,EAAE,CACtC,CAAC;IAGF,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;IAEpC,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC9C,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAClC,OAAO;SACR;QAED,IAAI,CAAC,YAAY,EAAE;YACjB,sBAAsB,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;YAC7C,OAAO;SACR;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1B,sBAAsB,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;SAC9C;IACH,CAAC,CAAC;IAEF,IAAA,gCAAoB,EAClB,qBAAqB,EACrB,gBAAgB,EAChB,QAAQ,EACR,SAAS,CACV,CAAC;IAEF,IAAA,2DAA+B,EAAC,cAAc,CAAC,CAAC;AAClD,CAAC;AASD,SAAgB,mBAAmB,CACjC,cAAqC,EACrC,aAA4B;IAE5B,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AALD,kDAKC;AASD,SAAgB,oBAAoB,CAClC,cAAqC,EACrC,aAA4B;IAE5B,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC;AALD,oDAKC"}

package/dist/cjs/tools/segmentation/strategies/fillSphere.d.ts

@@ -1,15 +1,7 @@
 import type { Types } from '@cornerstonejs/core';
-declare type OperationData = {
+import { LabelmapToolOperationData } from '../../../types';
+declare type OperationData = LabelmapToolOperationData & {
     points: [Types.Point3, Types.Point3, Types.Point3, Types.Point3];
-    volume: Types.IImageVolume;
-    imageVolume: Types.IImageVolume;
-    segmentIndex: number;
-    segmentationId: string;
-    segmentsLocked: number[];
-    viewPlaneNormal: Types.Point3;
-    viewUp: Types.Point3;
-    strategySpecificConfiguration: any;
-    constraintFn: () => boolean;
 };
 export declare function fillInsideSphere(enabledElement: Types.IEnabledElement, operationData: OperationData): void;
 export declare function thresholdInsideSphere(enabledElement: Types.IEnabledElement, operationData: OperationData): void;

package/dist/cjs/tools/segmentation/strategies/fillSphere.js

@@ -8,20 +8,26 @@ const core_1 = require("@cornerstonejs/core");
 const triggerSegmentationEvents_1 = require("../../../stateManagement/segmentation/triggerSegmentationEvents");
 const utilities_1 = require("../../../utilities");
 const isWithinThreshold_1 = __importDefault(require("./utils/isWithinThreshold"));
+const getStrategyData_1 = require("./utils/getStrategyData");
+const stackVolumeCheck_1 = require("./utils/stackVolumeCheck");
 function fillSphere(enabledElement, operationData, _inside = true, threshold = false) {
     const { viewport } = enabledElement;
-    const { volume: segmentation, segmentsLocked, segmentIndex, imageVolume, strategySpecificConfiguration, segmentationId, points, } = operationData;
-    const { imageData, dimensions } = segmentation;
-    const scalarData = segmentation.getScalarData();
+    const { segmentsLocked, segmentIndex, strategySpecificConfiguration, points, } = operationData;
+    const strategyData = (0, getStrategyData_1.getStrategyData)({ operationData, viewport });
+    if (!strategyData) {
+        console.warn('No data found for fillSphere');
+        return;
+    }
+    const { imageScalarData, segmentationImageData, segmentationScalarData } = strategyData;
     const scalarIndex = [];
     let callback;
     if (threshold) {
-        callback = ({ value, index, pointIJK }) => {
+        callback = ({ value, index }) => {
             if (segmentsLocked.includes(value)) {
                 return;
             }
-            if ((0, isWithinThreshold_1.default)(index, imageVolume, strategySpecificConfiguration)) {
-                scalarData[index] = segmentIndex;
+            if ((0, isWithinThreshold_1.default)(index, imageScalarData, strategySpecificConfiguration)) {
+                segmentationScalarData[index] = segmentIndex;
                 scalarIndex.push(index);
             }
         };
@@ -31,26 +37,34 @@ function fillSphere(enabledElement, operationData, _inside = true, threshold = f
             if (segmentsLocked.includes(value)) {
                 return;
             }
-            scalarData[index] = segmentIndex;
+            segmentationScalarData[index] = segmentIndex;
             scalarIndex.push(index);
         };
     }
-    (0, utilities_1.pointInSurroundingSphereCallback)(imageData, [points[0], points[1]], callback, viewport);
-    const zMultiple = dimensions[0] * dimensions[1];
-    const minSlice = Math.floor(scalarIndex[0] / zMultiple);
-    const maxSlice = Math.floor(scalarIndex[scalarIndex.length - 1] / zMultiple);
-    const sliceArray = Array.from({ length: maxSlice - minSlice + 1 }, (v, k) => k + minSlice);
-    (0, triggerSegmentationEvents_1.triggerSegmentationDataModified)(segmentationId, sliceArray);
+    (0, utilities_1.pointInSurroundingSphereCallback)(segmentationImageData, [points[0], points[1]], callback, viewport);
+    const dimensions = segmentationImageData.getDimensions();
+    let sliceArray;
+    if ((0, stackVolumeCheck_1.isVolumeSegmentation)(operationData)) {
+        const zMultiple = dimensions[0] * dimensions[1];
+        const minSlice = Math.floor(scalarIndex[0] / zMultiple);
+        const maxSlice = Math.floor(scalarIndex[scalarIndex.length - 1] / zMultiple);
+        sliceArray = Array.from({ length: maxSlice - minSlice + 1 }, (v, k) => k + minSlice);
+        (0, triggerSegmentationEvents_1.triggerSegmentationDataModified)(operationData.volumeId, sliceArray);
+    }
 }
 function fillInsideSphere(enabledElement, operationData) {
     fillSphere(enabledElement, operationData, true);
 }
 exports.fillInsideSphere = fillInsideSphere;
 function thresholdInsideSphere(enabledElement, operationData) {
-    const { volume, imageVolume } = operationData;
-    if (!core_1.utilities.isEqual(volume.dimensions, imageVolume.dimensions) ||
-        !core_1.utilities.isEqual(volume.direction, imageVolume.direction)) {
-        throw new Error('Only source data the same dimensions/size/orientation as the segmentation currently supported.');
+    if ((0, stackVolumeCheck_1.isVolumeSegmentation)(operationData)) {
+        const { referencedVolumeId, volumeId } = operationData;
+        const imageVolume = core_1.cache.getVolume(referencedVolumeId);
+        const segmentation = core_1.cache.getVolume(volumeId);
+        if (!core_1.utilities.isEqual(segmentation.dimensions, imageVolume.dimensions) ||
+            !core_1.utilities.isEqual(segmentation.direction, imageVolume.direction)) {
+            throw new Error('Only source data the same dimensions/size/orientation as the segmentation currently supported.');
+        }
     }
     fillSphere(enabledElement, operationData, true, true);
 }

package/dist/cjs/tools/segmentation/strategies/fillSphere.js.map

@@ -1 +1 @@
-{"version":3,"file":"fillSphere.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillSphere.ts"],"names":[],"mappings":";;;;;;AACA,8CAA2D;AAE3D,+GAAkH;AAClH,kDAAsE;AACtE,kFAA0D;AAe1D,SAAS,UAAU,CACjB,cAAqC,EACrC,aAA4B,EAC5B,OAAO,GAAG,IAAI,EACd,SAAS,GAAG,KAAK;IAEjB,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IACpC,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,cAAc,EACd,YAAY,EACZ,WAAW,EACX,6BAA6B,EAC7B,cAAc,EACd,MAAM,GACP,GAAG,aAAa,CAAC;IAElB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAC/C,MAAM,UAAU,GAAG,YAAY,CAAC,aAAa,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,IAAI,QAAQ,CAAC;IAEb,IAAI,SAAS,EAAE;QACb,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;YACxC,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAClC,OAAO;aACR;YAED,IACE,IAAA,2BAAiB,EAAC,KAAK,EAAE,WAAW,EAAE,6BAA6B,CAAC,EACpE;gBACA,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;gBACjC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACzB;QACH,CAAC,CAAC;KACH;SAAM;QACL,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;YAC9B,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAClC,OAAO;aACR;YACD,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;YACjC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC,CAAC;KACH;IAED,IAAA,4CAAgC,EAC9B,SAAS,EACT,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EACtB,QAAQ,EACR,QAAiC,CAClC,CAAC;IAKF,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAC3B,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,CAAC,EAAE,EACnC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,CACvB,CAAC;IAEF,IAAA,2DAA+B,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAC9D,CAAC;AAQD,SAAgB,gBAAgB,CAC9B,cAAqC,EACrC,aAA4B;IAE5B,UAAU,CAAC,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC;AALD,4CAKC;AAQD,SAAgB,qBAAqB,CACnC,cAAqC,EACrC,aAA4B;IAE5B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC;IAE9C,IACE,CAAC,gBAAO,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC;QAC3D,CAAC,gBAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,EACzD;QACA,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;KACH;IAED,UAAU,CAAC,cAAc,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC;AAhBD,sDAgBC;AAQD,SAAgB,iBAAiB,CAC/B,cAAqC,EACrC,aAA4B;IAE5B,UAAU,CAAC,cAAc,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC;AALD,8CAKC"}
+{"version":3,"file":"fillSphere.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillSphere.ts"],"names":[],"mappings":"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"}

package/dist/cjs/tools/segmentation/strategies/utils/getStrategyData.d.ts

@@ -0,0 +1,9 @@
+declare function getStrategyData({ operationData, viewport }: {
+    operationData: any;
+    viewport: any;
+}): {
+    segmentationImageData: any;
+    segmentationScalarData: any;
+    imageScalarData: any;
+};
+export { getStrategyData };

package/dist/cjs/tools/segmentation/strategies/utils/getStrategyData.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStrategyData = void 0;
+const core_1 = require("@cornerstonejs/core");
+const stackVolumeCheck_1 = require("./stackVolumeCheck");
+function getStrategyData({ operationData, viewport }) {
+    let segmentationImageData, segmentationScalarData, imageScalarData;
+    if ((0, stackVolumeCheck_1.isVolumeSegmentation)(operationData)) {
+        const { volumeId, referencedVolumeId } = operationData;
+        const segmentationVolume = core_1.cache.getVolume(volumeId);
+        const imageVolume = core_1.cache.getVolume(referencedVolumeId);
+        if (!segmentationVolume || !imageVolume) {
+            return;
+        }
+        ({ imageData: segmentationImageData } = segmentationVolume);
+        segmentationScalarData = segmentationVolume.getScalarData();
+        imageScalarData = imageVolume.getScalarData();
+    }
+    else {
+        const { imageIdReferenceMap, segmentationRepresentationUID } = operationData;
+        if (!imageIdReferenceMap) {
+            return;
+        }
+        const currentImageId = viewport.getCurrentImageId();
+        if (!currentImageId) {
+            return;
+        }
+        const actor = viewport.getActor(segmentationRepresentationUID);
+        segmentationImageData = actor.actor.getMapper().getInputData();
+        const currentSegmentationImageId = imageIdReferenceMap.get(currentImageId);
+        const segmentationImage = core_1.cache.getImage(currentSegmentationImageId);
+        segmentationScalarData = segmentationImage.getPixelData();
+        const image = core_1.cache.getImage(currentImageId);
+        imageScalarData = image.getPixelData();
+    }
+    return {
+        segmentationImageData,
+        segmentationScalarData,
+        imageScalarData,
+    };
+}
+exports.getStrategyData = getStrategyData;
+//# sourceMappingURL=getStrategyData.js.map

package/dist/cjs/tools/segmentation/strategies/utils/getStrategyData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getStrategyData.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/utils/getStrategyData.ts"],"names":[],"mappings":";;;AAAA,8CAA4C;AAC5C,yDAA0D;AAG1D,SAAS,eAAe,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE;IAClD,IAAI,qBAAqB,EAAE,sBAAsB,EAAE,eAAe,CAAC;IACnE,IAAI,IAAA,uCAAoB,EAAC,aAAa,CAAC,EAAE;QACvC,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC;QAEvD,MAAM,kBAAkB,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,WAAW,GAAG,YAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAExD,IAAI,CAAC,kBAAkB,IAAI,CAAC,WAAW,EAAE;YACvC,OAAO;SACR;QAED,CAAC,EAAE,SAAS,EAAE,qBAAqB,EAAE,GAAG,kBAAkB,CAAC,CAAC;QAC5D,sBAAsB,GAAG,kBAAkB,CAAC,aAAa,EAAE,CAAC;QAC5D,eAAe,GAAG,WAAW,CAAC,aAAa,EAAE,CAAC;KAC/C;SAAM;QACL,MAAM,EAAE,mBAAmB,EAAE,6BAA6B,EAAE,GAC1D,aAA+C,CAAC;QAElD,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAO;SACR;QAED,MAAM,cAAc,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QACpD,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO;SACR;QAKD,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;QAC/D,qBAAqB,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,YAAY,EAAE,CAAC;QAC/D,MAAM,0BAA0B,GAAG,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE3E,MAAM,iBAAiB,GAAG,YAAK,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC;QACrE,sBAAsB,GAAG,iBAAiB,CAAC,YAAY,EAAE,CAAC;QAE1D,MAAM,KAAK,GAAG,YAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAK7C,eAAe,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;KACxC;IAED,OAAO;QACL,qBAAqB;QACrB,sBAAsB;QACtB,eAAe;KAChB,CAAC;AACJ,CAAC;AAEQ,0CAAe"}

package/dist/cjs/tools/segmentation/strategies/utils/isWithinThreshold.d.ts

@@ -1,3 +1,3 @@
-import { Types } from '@cornerstonejs/core';
-declare function isWithinThreshold(index: number, imageVolume: Types.IImageVolume, strategySpecificConfiguration: any): boolean;
+import { TypedArray } from '@kitware/vtk.js/types';
+declare function isWithinThreshold(index: number, imageScalarData: TypedArray, strategySpecificConfiguration: any): boolean;
 export default isWithinThreshold;

package/dist/cjs/tools/segmentation/strategies/utils/isWithinThreshold.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function isWithinThreshold(index, imageVolume, strategySpecificConfiguration) {
+function isWithinThreshold(index, imageScalarData, strategySpecificConfiguration) {
     const { THRESHOLD_INSIDE_CIRCLE } = strategySpecificConfiguration;
-    const voxelValue = imageVolume.getScalarData()[index];
+    const voxelValue = imageScalarData[index];
     const { threshold } = THRESHOLD_INSIDE_CIRCLE;
     return threshold[0] <= voxelValue && voxelValue <= threshold[1];
 }

package/dist/cjs/tools/segmentation/strategies/utils/isWithinThreshold.js.map

@@ -1 +1 @@
-{"version":3,"file":"isWithinThreshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/utils/isWithinThreshold.ts"],"names":[],"mappings":";;AAEA,SAAS,iBAAiB,CACxB,KAAa,EACb,WAA+B,EAC/B,6BAAkC;IAElC,MAAM,EAAE,uBAAuB,EAAE,GAAG,6BAA6B,CAAC;IAElE,MAAM,UAAU,GAAG,WAAW,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,EAAE,SAAS,EAAE,GAAG,uBAAuB,CAAC;IAE9C,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,kBAAe,iBAAiB,CAAC"}
+{"version":3,"file":"isWithinThreshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/utils/isWithinThreshold.ts"],"names":[],"mappings":";;AAGA,SAAS,iBAAiB,CACxB,KAAa,EACb,eAA2B,EAC3B,6BAAkC;IAElC,MAAM,EAAE,uBAAuB,EAAE,GAAG,6BAA6B,CAAC;IAElE,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,EAAE,SAAS,EAAE,GAAG,uBAAuB,CAAC;IAE9C,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,kBAAe,iBAAiB,CAAC"}

package/dist/cjs/tools/segmentation/strategies/utils/stackVolumeCheck.d.ts

@@ -0,0 +1,5 @@
+import { LabelmapSegmentationData, LabelmapSegmentationDataStack, LabelmapSegmentationDataVolume } from '../../../../types/LabelmapTypes';
+import { LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume } from '../../../../types';
+declare function isStackSegmentation(operationData: LabelmapToolOperationData | LabelmapSegmentationData): operationData is LabelmapToolOperationDataStack | LabelmapSegmentationDataStack;
+declare function isVolumeSegmentation(operationData: LabelmapToolOperationData | LabelmapSegmentationData): operationData is LabelmapToolOperationDataVolume | LabelmapSegmentationDataVolume;
+export { isStackSegmentation, isVolumeSegmentation };

package/dist/cjs/tools/segmentation/strategies/utils/stackVolumeCheck.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVolumeSegmentation = exports.isStackSegmentation = void 0;
+function isStackSegmentation(operationData) {
+    return (operationData.imageIdReferenceMap !==
+        undefined);
+}
+exports.isStackSegmentation = isStackSegmentation;
+function isVolumeSegmentation(operationData) {
+    return (operationData.volumeId !== undefined);
+}
+exports.isVolumeSegmentation = isVolumeSegmentation;
+//# sourceMappingURL=stackVolumeCheck.js.map

package/dist/cjs/tools/segmentation/strategies/utils/stackVolumeCheck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stackVolumeCheck.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/utils/stackVolumeCheck.ts"],"names":[],"mappings":";;;AAWA,SAAS,mBAAmB,CAC1B,aAAmE;IAInE,OAAO,CACJ,aAAgD,CAAC,mBAAmB;QACrE,SAAS,CACV,CAAC;AACJ,CAAC;AAYQ,kDAAmB;AAV5B,SAAS,oBAAoB,CAC3B,aAAmE;IAInE,OAAO,CACJ,aAAiD,CAAC,QAAQ,KAAK,SAAS,CAC1E,CAAC;AACJ,CAAC;AAE6B,oDAAoB"}

package/dist/cjs/types/LabelmapToolOperationData.d.ts

@@ -0,0 +1,14 @@
+import { LabelmapSegmentationDataStack, LabelmapSegmentationDataVolume } from './LabelmapTypes';
+declare type LabelmapToolOperationData = {
+    segmentationId: string;
+    segmentIndex: number;
+    segmentsLocked: number[];
+    viewPlaneNormal: number[];
+    viewUp: number[];
+    strategySpecificConfiguration: any;
+    constraintFn: (pointIJK: number) => boolean;
+    segmentationRepresentationUID: string;
+};
+declare type LabelmapToolOperationDataStack = LabelmapToolOperationData & LabelmapSegmentationDataStack;
+declare type LabelmapToolOperationDataVolume = LabelmapToolOperationData & LabelmapSegmentationDataVolume;
+export { LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume, };

package/dist/cjs/types/LabelmapToolOperationData.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=LabelmapToolOperationData.js.map

package/dist/cjs/types/LabelmapToolOperationData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LabelmapToolOperationData.js","sourceRoot":"","sources":["../../../src/types/LabelmapToolOperationData.ts"],"names":[],"mappings":""}

package/dist/cjs/types/LabelmapTypes.d.ts

@@ -15,7 +15,11 @@ export declare type LabelmapRenderingConfig = {
     cfun?: vtkColorTransferFunction;
     ofun?: vtkPiecewiseFunction;
 };
-export declare type LabelmapSegmentationData = {
+export declare type LabelmapSegmentationDataVolume = {
     volumeId: string;
     referencedVolumeId?: string;
 };
+export declare type LabelmapSegmentationDataStack = {
+    imageIdReferenceMap: Map<string, string>;
+};
+export declare type LabelmapSegmentationData = LabelmapSegmentationDataVolume | LabelmapSegmentationDataStack;

package/dist/cjs/types/index.d.ts

@@ -28,4 +28,5 @@ import type { ContourSegmentationData } from './ContourTypes';
 import type IAnnotationManager from './IAnnotationManager';
 import type AnnotationGroupSelector from './AnnotationGroupSelector';
 import type { Statistics } from './CalculatorTypes';
-export type { Annotation, Annotations, IAnnotationManager, GroupSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, JumpToSliceOptions, AnnotationGroupSelector, PlanarBoundingBox, ToolProps, PublicToolProps, ToolConfiguration, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, ToolAction, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificContourRepresentation, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, Statistics, };
+import { LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume } from './LabelmapToolOperationData';
+export type { Annotation, Annotations, IAnnotationManager, GroupSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, JumpToSliceOptions, AnnotationGroupSelector, PlanarBoundingBox, ToolProps, PublicToolProps, ToolConfiguration, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, ToolAction, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificContourRepresentation, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, Statistics, LabelmapToolOperationData, LabelmapToolOperationDataStack, LabelmapToolOperationDataVolume, };

package/dist/cjs/utilities/math/ellipse/pointInEllipse.d.ts

@@ -1,10 +1,8 @@
-import type { Types } from '@cornerstonejs/core';
-import { vec3 } from 'gl-matrix';
-declare type Ellipse = {
-    center: Types.Point3;
-    xRadius: number;
-    yRadius: number;
-    zRadius: number;
-};
-export default function pointInEllipse(ellipse: Ellipse, pointLPS: vec3): boolean;
+interface Inverts {
+    invXRadiusSq?: number;
+    invYRadiusSq?: number;
+    invZRadiusSq?: number;
+    fast?: boolean;
+}
+export default function pointInEllipse(ellipse: any, pointLPS: any, inverts?: Inverts): boolean;
 export {};

package/dist/cjs/utilities/math/ellipse/pointInEllipse.js

@@ -1,19 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function pointInEllipse(ellipse, pointLPS) {
-    const { center: circleCenterWorld, xRadius, yRadius, zRadius } = ellipse;
-    const [x, y, z] = pointLPS;
-    const [x0, y0, z0] = circleCenterWorld;
-    let inside = 0;
-    if (xRadius !== 0) {
-        inside += ((x - x0) * (x - x0)) / (xRadius * xRadius);
+function pointInEllipse(ellipse, pointLPS, inverts = {}) {
+    const { center, xRadius, yRadius, zRadius } = ellipse;
+    if (inverts.invXRadiusSq === undefined ||
+        inverts.invYRadiusSq === undefined ||
+        inverts.invZRadiusSq === undefined) {
+        inverts.invXRadiusSq = xRadius !== 0 ? 1 / Math.pow(xRadius, 2) : 0;
+        inverts.invYRadiusSq = yRadius !== 0 ? 1 / Math.pow(yRadius, 2) : 0;
+        inverts.invZRadiusSq = zRadius !== 0 ? 1 / Math.pow(zRadius, 2) : 0;
     }
-    if (yRadius !== 0) {
-        inside += ((y - y0) * (y - y0)) / (yRadius * yRadius);
+    let inside = 0;
+    const dx = pointLPS[0] - center[0];
+    inside += dx * dx * inverts.invXRadiusSq;
+    if (inside > 1) {
+        return false;
     }
-    if (zRadius !== 0) {
-        inside += ((z - z0) * (z - z0)) / (zRadius * zRadius);
+    const dy = pointLPS[1] - center[1];
+    inside += dy * dy * inverts.invYRadiusSq;
+    if (inside > 1) {
+        return false;
     }
+    const dz = pointLPS[2] - center[2];
+    inside += dz * dz * inverts.invZRadiusSq;
     return inside <= 1;
 }
 exports.default = pointInEllipse;