@cornerstonejs/tools 3.17.0 → 3.18.0

package/dist/esm/tools/annotation/CircleROITool.js

@@ -533,12 +533,15 @@ class CircleROITool extends AnnotationTool {
                         isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
                     };
                     const modalityUnit = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
-                    const pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
-                        isInObject: (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }),
-                        boundsIJK,
-                        imageData,
-                        returnPoints: this.configuration.storePointData,
-                    });
+                    let pointsInShape;
+                    if (voxelManager) {
+                        pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
+                            isInObject: (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }),
+                            boundsIJK,
+                            imageData,
+                            returnPoints: this.configuration.storePointData,
+                        });
+                    }
                     const stats = this.configuration.statsCalculator.getStatistics();
                     cachedStats[targetId] = {
                         Modality: metadata.Modality,
@@ -624,28 +627,28 @@ function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
     const { radius, radiusUnit, area, mean, stdDev, max, min, isEmptyArea, areaUnit, modalityUnit, } = cachedVolumeStats;
     const textLines = [];
-    if (radius) {
+    if (csUtils.isNumber(radius)) {
         const radiusLine = isEmptyArea
             ? `Radius: Oblique not supported`
             : `Radius: ${csUtils.roundNumber(radius)} ${radiusUnit}`;
         textLines.push(radiusLine);
     }
-    if (area) {
+    if (csUtils.isNumber(area)) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
             : `Area: ${csUtils.roundNumber(area)} ${areaUnit}`;
         textLines.push(areaLine);
     }
-    if (mean) {
+    if (csUtils.isNumber(mean)) {
         textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`);
     }
-    if (max) {
+    if (csUtils.isNumber(max)) {
         textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`);
     }
-    if (min) {
+    if (csUtils.isNumber(min)) {
         textLines.push(`Min: ${csUtils.roundNumber(min)} ${modalityUnit}`);
     }
-    if (stdDev) {
+    if (csUtils.isNumber(stdDev)) {
         textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`);
     }
     return textLines;

package/dist/esm/tools/annotation/EllipticalROITool.js

@@ -609,12 +609,15 @@ class EllipticalROITool extends AnnotationTool {
                     isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
                 };
                 const modalityUnit = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
-                const pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
-                    boundsIJK,
-                    imageData,
-                    isInObject: (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }),
-                    returnPoints: this.configuration.storePointData,
-                });
+                let pointsInShape;
+                if (voxelManager) {
+                    const pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
+                        boundsIJK,
+                        imageData,
+                        isInObject: (pointLPS) => pointInEllipse(ellipseObj, pointLPS, { fast: true }),
+                        returnPoints: this.configuration.storePointData,
+                    });
+                }
                 const stats = this.configuration.statsCalculator.getStatistics();
                 cachedStats[targetId] = {
                     Modality: metadata.Modality,
@@ -702,22 +705,22 @@ function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
     const { area, mean, stdDev, max, isEmptyArea, areaUnit, modalityUnit, min } = cachedVolumeStats;
     const textLines = [];
-    if (area) {
+    if (csUtils.isNumber(area)) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
             : `Area: ${csUtils.roundNumber(area)} ${areaUnit}`;
         textLines.push(areaLine);
     }
-    if (mean) {
+    if (csUtils.isNumber(mean)) {
         textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`);
     }
-    if (max) {
+    if (csUtils.isNumber(max)) {
         textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`);
     }
-    if (min) {
+    if (csUtils.isNumber(min)) {
         textLines.push(`Min: ${csUtils.roundNumber(min)} ${modalityUnit}`);
     }
-    if (stdDev) {
+    if (csUtils.isNumber(stdDev)) {
         textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`);
     }
     return textLines;

package/dist/esm/tools/annotation/PlanarFreehandROITool.js

@@ -1,3 +1,4 @@
+import { AnnotationTool } from '../base';
 import { CONSTANTS, getEnabledElement, VolumeViewport, utilities as csUtils, metaData, } from '@cornerstonejs/core';
 import { vec3 } from 'gl-matrix';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
@@ -471,37 +472,40 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
         let curRow = 0;
         let intersections = [];
         let intersectionCounter = 0;
-        const pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
-            imageData,
-            isInObject: (pointLPS, _pointIJK) => {
-                let result = true;
-                const point = viewport.worldToCanvas(pointLPS);
-                if (point[1] != curRow) {
-                    intersectionCounter = 0;
-                    curRow = point[1];
-                    intersections = getLineSegmentIntersectionsCoordinates(canvasCoordinates, point, [canvasPosEnd[0], point[1]]);
-                    intersections.sort((function (index) {
-                        return function (a, b) {
-                            return a[index] === b[index]
-                                ? 0
-                                : a[index] < b[index]
-                                    ? -1
-                                    : 1;
-                        };
-                    })(0));
-                }
-                if (intersections.length && point[0] > intersections[0][0]) {
-                    intersections.shift();
-                    intersectionCounter++;
-                }
-                if (intersectionCounter % 2 === 0) {
-                    result = false;
-                }
-                return result;
-            },
-            boundsIJK,
-            returnPoints: this.configuration.storePointData,
-        });
+        let pointsInShape;
+        if (voxelManager) {
+            pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
+                imageData,
+                isInObject: (pointLPS, _pointIJK) => {
+                    let result = true;
+                    const point = viewport.worldToCanvas(pointLPS);
+                    if (point[1] != curRow) {
+                        intersectionCounter = 0;
+                        curRow = point[1];
+                        intersections = getLineSegmentIntersectionsCoordinates(canvasCoordinates, point, [canvasPosEnd[0], point[1]]);
+                        intersections.sort((function (index) {
+                            return function (a, b) {
+                                return a[index] === b[index]
+                                    ? 0
+                                    : a[index] < b[index]
+                                        ? -1
+                                        : 1;
+                            };
+                        })(0));
+                    }
+                    if (intersections.length && point[0] > intersections[0][0]) {
+                        intersections.shift();
+                        intersectionCounter++;
+                    }
+                    if (intersectionCounter % 2 === 0) {
+                        result = false;
+                    }
+                    return result;
+                },
+                boundsIJK,
+                returnPoints: this.configuration.storePointData,
+            });
+        }
         const stats = this.configuration.statsCalculator.getStatistics();
         cachedStats[targetId] = {
             Modality: metadata.Modality,
@@ -532,28 +536,28 @@ function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
     const { area, mean, stdDev, length, perimeter, max, min, isEmptyArea, unit, areaUnit, modalityUnit, } = cachedVolumeStats || {};
     const textLines = [];
-    if (area) {
+    if (csUtils.isNumber(area)) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
             : `Area: ${csUtils.roundNumber(area)} ${areaUnit}`;
         textLines.push(areaLine);
     }
-    if (mean) {
+    if (csUtils.isNumber(mean)) {
         textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`);
     }
-    if (Number.isFinite(max)) {
+    if (csUtils.isNumber(max)) {
         textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`);
     }
-    if (Number.isFinite(min)) {
+    if (csUtils.isNumber(min)) {
         textLines.push(`Min: ${csUtils.roundNumber(min)} ${modalityUnit}`);
     }
-    if (stdDev) {
+    if (csUtils.isNumber(stdDev)) {
         textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`);
     }
-    if (perimeter) {
+    if (csUtils.isNumber(perimeter)) {
         textLines.push(`Perimeter: ${csUtils.roundNumber(perimeter)} ${unit}`);
     }
-    if (length) {
+    if (csUtils.isNumber(length)) {
         textLines.push(`${csUtils.roundNumber(length)} ${unit}`);
     }
     return textLines;

package/dist/esm/tools/annotation/RectangleROITool.js

@@ -486,11 +486,14 @@ class RectangleROITool extends AnnotationTool {
                         isSuvScaled: this.isSuvScaled(viewport, targetId, annotation.metadata.referencedImageId),
                     };
                     const modalityUnit = getPixelValueUnits(metadata.Modality, annotation.metadata.referencedImageId, pixelUnitsOptions);
-                    const pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
-                        boundsIJK,
-                        imageData,
-                        returnPoints: this.configuration.storePointData,
-                    });
+                    let pointsInShape;
+                    if (voxelManager) {
+                        pointsInShape = voxelManager.forEach(this.configuration.statsCalculator.statsCallback, {
+                            boundsIJK,
+                            imageData,
+                            returnPoints: this.configuration.storePointData,
+                        });
+                    }
                     const stats = this.configuration.statsCalculator.getStatistics();
                     cachedStats[targetId] = {
                         Modality: metadata.Modality,
@@ -566,11 +569,21 @@ function defaultGetTextLines(data, targetId) {
         return;
     }
     const textLines = [];
-    textLines.push(`Area: ${csUtils.roundNumber(area)} ${areaUnit}`);
-    textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`);
-    textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`);
-    textLines.push(`Min: ${csUtils.roundNumber(min)} ${modalityUnit}`);
-    textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`);
+    if (csUtils.isNumber(area)) {
+        textLines.push(`Area: ${csUtils.roundNumber(area)} ${areaUnit}`);
+    }
+    if (csUtils.isNumber(mean)) {
+        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`);
+    }
+    if (csUtils.isNumber(max)) {
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`);
+    }
+    if (csUtils.isNumber(min)) {
+        textLines.push(`Max: ${csUtils.roundNumber(min)} ${modalityUnit}`);
+    }
+    if (csUtils.isNumber(stdDev)) {
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`);
+    }
     return textLines;
 }
 export default RectangleROITool;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.17.0";
+export declare const version = "3.18.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.17.0';
+export const version = '3.18.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.17.0",
+  "version": "3.18.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.17.0",
+    "@cornerstonejs/core": "^3.18.0",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "2aaea4759f5efd508a96551cc4d5ed53cde138d3"
+  "gitHead": "409f2bb8fe3755f4451f884c85ddf29c7a03749c"
 }