@cornerstonejs/tools 0.57.0 → 0.58.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "0.57.0",
+  "version": "0.58.0",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -26,7 +26,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^0.37.0",
+    "@cornerstonejs/core": "^0.38.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -52,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "1e40104275742f14a7a48b076f244610f90e8657"
+  "gitHead": "9a2711ca032949079e7b96ba332b6e01b3316da8"
 }

package/src/utilities/cine/playClip.ts

@@ -5,6 +5,7 @@ import {
   StackViewport,
   VolumeViewport,
   cache,
+  BaseVolumeViewport,
 } from '@cornerstonejs/core';
 
 import { Types } from '@cornerstonejs/core';
@@ -301,7 +302,7 @@ function _getVolumeFromViewport(viewport): Types.IImageVolume {
   const actorEntry = viewport.getDefaultActor();
 
   if (!actorEntry) {
-    console.warn('No actor found');
+    // This can happen during setup/teardown of viewports.
     return;
   }
 

package/src/utilities/dynamicVolume/generateImageFromTimeData.ts

@@ -0,0 +1,68 @@
+import { Enums, Types } from '@cornerstonejs/core';
+
+/**
+ * Gets the scalar data for a series of time frames from a 4D volume, returns an
+ * array of scalar data after performing AVERAGE, SUM or SUBTRACT to be used to
+ * create a 3D volume
+ *
+ * @param dynamicVolume4D: volume to compute time frame data from
+ * @param operation: operation to perform on time frame data, operations include
+ * SUM, AVERAGE, and SUBTRACT (can only be used with 2 time frames provided)
+ * @param frameNumbers: an array of frame indexs to perform the operation on, if
+ * left empty, all frames will be used
+ * @returns
+ */
+function generateImageFromTimeData(
+  dynamicVolume: Types.IDynamicImageVolume,
+  operation: string,
+  frameNumbers?: number[]
+) {
+  // If no time frames provided, use all time frames
+  const frames = frameNumbers || [...Array(dynamicVolume.numTimePoints).keys()];
+  const numFrames = frames.length;
+
+  if (frames.length <= 1) {
+    throw new Error('Please provide two or more time points');
+  }
+
+  // Gets scalar data for all time frames
+  const typedArrays = dynamicVolume.getScalarDataArrays();
+
+  const arrayLength = typedArrays[0].length;
+  const finalArray = new Float32Array(arrayLength);
+
+  if (operation === Enums.DynamicOperatorType.SUM) {
+    for (let i = 0; i < numFrames; i++) {
+      const currentArray = typedArrays[frames[i]];
+      for (let j = 0; j < arrayLength; j++) {
+        finalArray[j] += currentArray[j];
+      }
+    }
+    return finalArray;
+  }
+
+  if (operation === Enums.DynamicOperatorType.SUBTRACT) {
+    if (frames.length > 2) {
+      throw new Error('Please provide only 2 time points for subtraction.');
+    }
+    for (let j = 0; j < arrayLength; j++) {
+      finalArray[j] += typedArrays[frames[0]][j] - typedArrays[frames[1]][j];
+    }
+    return finalArray;
+  }
+
+  if (operation === Enums.DynamicOperatorType.AVERAGE) {
+    for (let i = 0; i < numFrames; i++) {
+      const currentArray = typedArrays[frames[i]];
+      for (let j = 0; j < arrayLength; j++) {
+        finalArray[j] += currentArray[j];
+      }
+    }
+    for (let k = 0; k < arrayLength; k++) {
+      finalArray[k] = finalArray[k] / numFrames;
+    }
+    return finalArray;
+  }
+}
+
+export default generateImageFromTimeData;

package/src/utilities/dynamicVolume/getDataInTime.ts

@@ -83,11 +83,11 @@ function _getTimePointDataCoordinate(frames, coordinate, volume) {
   const allScalarData = volume.getScalarDataArrays();
   const value = [];
 
-  for (let i = frames[0]; i < frames[0] + frames.length; i++) {
-    const activeScalarData = allScalarData[i];
+  frames.forEach((frame) => {
+    const activeScalarData = allScalarData[frame];
     const scalarIndex = index[2] * zMultiple + index[1] * yMultiple + index[0];
     value.push(activeScalarData[scalarIndex]);
-  }
+  });
 
   return value;
 }
@@ -98,10 +98,10 @@ function _getTimePointDataMask(frames, indexArray, volume) {
 
   for (let i = 0; i < indexArray.length; i++) {
     const indexValues = [];
-    for (let j = frames[0]; j < frames[0] + frames.length; j++) {
-      const activeScalarData = allScalarData[j];
+    frames.forEach((frame) => {
+      const activeScalarData = allScalarData[frame];
       indexValues.push(activeScalarData[indexArray[i]]);
-    }
+    });
     value.push(indexValues);
   }
   return value;

package/src/utilities/dynamicVolume/index.ts

@@ -1,2 +1,5 @@
 import getDataInTime from './getDataInTime';
+import generateImageFromTimeData from './generateImageFromTimeData';
+
 export { getDataInTime };
+export { generateImageFromTimeData };

package/src/utilities/planar/filterAnnotationsWithinSlice.ts

@@ -1,7 +1,8 @@
 import { vec3 } from 'gl-matrix';
-import { CONSTANTS } from '@cornerstonejs/core';
+import { CONSTANTS, metaData } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 import { Annotations, Annotation } from '../../types';
+import { debug } from 'console';
 
 const { EPSILON } = CONSTANTS;
 
@@ -33,8 +34,33 @@ export default function filterAnnotationsWithinSlice(
   // logic down below.
   const annotationsWithParallelNormals = annotations.filter(
     (td: Annotation) => {
-      const annotationViewPlaneNormal = td.metadata.viewPlaneNormal;
-
+      let annotationViewPlaneNormal = td.metadata.viewPlaneNormal;
+
+      if (!annotationViewPlaneNormal) {
+        // This code is run to set the annotation view plane normal
+        // for historical data which was saved without the normal.
+        const { referencedImageId } = td.metadata;
+        const { imageOrientationPatient } = metaData.get(
+          'imagePlaneModule',
+          referencedImageId
+        );
+        const rowCosineVec = vec3.fromValues(
+          imageOrientationPatient[0],
+          imageOrientationPatient[1],
+          imageOrientationPatient[2]
+        );
+
+        const colCosineVec = vec3.fromValues(
+          imageOrientationPatient[3],
+          imageOrientationPatient[4],
+          imageOrientationPatient[5]
+        );
+
+        annotationViewPlaneNormal = vec3.create() as Types.Point3;
+
+        vec3.cross(annotationViewPlaneNormal, rowCosineVec, colCosineVec);
+        td.metadata.viewPlaneNormal = annotationViewPlaneNormal;
+      }
       const isParallel =
         Math.abs(vec3.dot(viewPlaneNormal, annotationViewPlaneNormal)) >
         PARALLEL_THRESHOLD;