@cornerstonejs/tools 3.9.0 → 3.9.2

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

@@ -29,6 +29,7 @@ class CircleROITool extends AnnotationTool {
             preventHandleOutsideImage: false,
             storePointData: false,
             centerPointRadius: 0,
+            calculateStats: true,
             getTextLines: defaultGetTextLines,
             statsCalculator: BasicStatsCalculator,
         },
@@ -462,6 +463,9 @@ class CircleROITool extends AnnotationTool {
             return renderStatus;
         };
         this._calculateCachedStats = (annotation, viewport, renderingEngine, enabledElement) => {
+            if (!this.configuration.calculateStats) {
+                return;
+            }
             const data = annotation.data;
             const { element } = viewport;
             const wasInvalidated = annotation.invalidated;

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

@@ -28,6 +28,7 @@ class EllipticalROITool extends AnnotationTool {
             preventHandleOutsideImage: false,
             storePointData: false,
             centerPointRadius: 0,
+            calculateStats: true,
             getTextLines: defaultGetTextLines,
             statsCalculator: BasicStatsCalculator,
         },
@@ -539,6 +540,9 @@ class EllipticalROITool extends AnnotationTool {
             return renderStatus;
         };
         this._calculateCachedStats = (annotation, viewport, renderingEngine) => {
+            if (!this.configuration.calculateStats) {
+                return;
+            }
             const data = annotation.data;
             const { element } = viewport;
             const { points } = data.handles;

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

@@ -27,6 +27,7 @@ class RectangleROITool extends AnnotationTool {
             storePointData: false,
             shadow: true,
             preventHandleOutsideImage: false,
+            calculateStats: true,
             getTextLines: defaultGetTextLines,
             statsCalculator: BasicStatsCalculator,
         },
@@ -59,6 +60,7 @@ class RectangleROITool extends AnnotationTool {
                             },
                         },
                     },
+                    cachedStats: {},
                 },
             });
             addAnnotation(annotation, element);
@@ -437,6 +439,9 @@ class RectangleROITool extends AnnotationTool {
             };
         };
         this._calculateCachedStats = (annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement) => {
+            if (!this.configuration.calculateStats) {
+                return;
+            }
             const { data } = annotation;
             const { viewport } = enabledElement;
             const { element } = viewport;
@@ -555,7 +560,7 @@ class RectangleROITool extends AnnotationTool {
 function defaultGetTextLines(data, targetId) {
     const cachedVolumeStats = data.cachedStats[targetId];
     const { area, mean, max, stdDev, areaUnit, modalityUnit } = cachedVolumeStats;
-    if (mean === undefined) {
+    if (mean === undefined || mean === null) {
         return;
     }
     const textLines = [];

package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js

@@ -172,10 +172,11 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
                 let endCoord = endCoordinate;
                 if (Array.isArray(startCoordinate)) {
                     startCoord = this._getCoordinateForViewplaneNormal(startCoord, viewplaneNormal);
+                    const indexOfDirection = this._getIndexOfCoordinatesForViewplaneNormal(viewplaneNormal);
+                    data.handles.points.forEach((point) => {
+                        point[indexOfDirection] = startCoord;
+                    });
                     data.startCoordinate = startCoord;
-                    data.handles.points[0][this._getIndexOfCoordinatesForViewplaneNormal(viewplaneNormal)] = startCoord;
-                    data.startCoordinate = startCoord;
-                    data.handles.points[0][this._getIndexOfCoordinatesForViewplaneNormal(viewplaneNormal)] = startCoord;
                 }
                 if (Array.isArray(endCoordinate)) {
                     endCoord = this._getCoordinateForViewplaneNormal(endCoord, viewplaneNormal);

package/dist/esm/types/CalculatorTypes.d.ts

@@ -51,6 +51,9 @@ type NamedStatistics = {
     minLPS?: Statistics & {
         name: 'minLPS';
     };
+    center?: Statistics & {
+        name: 'center';
+    };
     maxIJKs?: Array<{
         value: number;
         pointIJK: Types.Point3;

package/dist/esm/utilities/math/basic/BasicStatsCalculator.js

@@ -17,6 +17,7 @@ function createBasicStatsState(storePointData) {
         m4: [0],
         allValues: [[]],
         pointsInShape: storePointData ? PointsManager.create3(1024) : null,
+        sumLPS: [0, 0, 0],
     };
 }
 function basicStatsCallback(state, newValue, pointLPS = null, pointIJK = null) {
@@ -37,6 +38,11 @@ function basicStatsCallback(state, newValue, pointLPS = null, pointIJK = null) {
     }
     const newArray = Array.isArray(newValue) ? newValue : [newValue];
     state.count += 1;
+    if (pointLPS) {
+        state.sumLPS[0] += pointLPS[0];
+        state.sumLPS[1] += pointLPS[1];
+        state.sumLPS[2] += pointLPS[2];
+    }
     state.max.forEach((it, idx) => {
         const value = newArray[idx];
         state.allValues[idx].push(value);
@@ -84,6 +90,7 @@ function calculateMedian(values) {
 function basicGetStatistics(state, unit) {
     const mean = state.sum.map((sum) => sum / state.count);
     const stdDev = state.m2.map((squaredDiffSum) => Math.sqrt(squaredDiffSum / state.count));
+    const center = state.sumLPS.map((sum) => sum / state.count);
     const skewness = state.m3.map((m3, idx) => {
         const variance = state.m2[idx] / state.count;
         if (variance === 0) {
@@ -165,9 +172,18 @@ function basicGetStatistics(state, unit) {
             unit: null,
         },
         pointsInShape: state.pointsInShape,
+        center: {
+            name: 'center',
+            label: 'Center',
+            value: center ? [...center] : null,
+            unit: null,
+        },
         array: [],
     };
     named.array.push(named.min, named.max, named.mean, named.stdDev, named.median, named.skewness, named.kurtosis, named.count, named.maxLPS, named.minLPS);
+    if (named.center.value) {
+        named.array.push(named.center);
+    }
     const store = state.pointsInShape !== null;
     const freshState = createBasicStatsState(store);
     state.max = freshState.max;
@@ -184,6 +200,7 @@ function basicGetStatistics(state, unit) {
     state.m4 = freshState.m4;
     state.allValues = freshState.allValues;
     state.pointsInShape = freshState.pointsInShape;
+    state.sumLPS = freshState.sumLPS;
     return named;
 }
 export class BasicStatsCalculator extends Calculator {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.9.0",
+  "version": "3.9.2",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -103,7 +103,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.9.0",
+    "@cornerstonejs/core": "^3.9.2",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -122,5 +122,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "e44475d4c419201d7042d4648c0335d1b2eebe41"
+  "gitHead": "7fdba50da86956a4c35e45dbdc21ab3b8decea72"
 }