@cornerstonejs/tools 2.0.0-beta.28 → 2.0.0-beta.29

package/dist/esm/utilities/dynamicVolume/generateImageFromTimeData.js

@@ -1,40 +1,40 @@
 import { Enums } from '@cornerstonejs/core';
 const operationFunctions = {
-    [Enums.GenerateImageType.SUM]: (voxelManager, frames, arrayLength) => {
-        const finalArray = new Float32Array(arrayLength);
-        for (const timepoint of frames) {
-            for (let j = 0; j < arrayLength; j++) {
-                finalArray[j] += voxelManager.getAtIndexAndTimePoint(j, timepoint);
+    [Enums.GenerateImageType.SUM]: (voxelManager, frames, callback) => {
+        const arrayLength = voxelManager.getScalarDataLength();
+        for (let j = 0; j < arrayLength; j++) {
+            let sum = 0;
+            for (const timepoint of frames) {
+                sum += voxelManager.getAtIndexAndTimePoint(j, timepoint);
             }
+            callback(j, sum);
         }
-        return finalArray;
     },
-    [Enums.GenerateImageType.SUBTRACT]: (voxelManager, frames, arrayLength) => {
+    [Enums.GenerateImageType.SUBTRACT]: (voxelManager, frames, callback) => {
         if (frames.length !== 2) {
             throw new Error('Please provide only 2 time points for subtraction.');
         }
-        const finalArray = new Float32Array(arrayLength);
+        const arrayLength = voxelManager.getScalarDataLength();
         for (let j = 0; j < arrayLength; j++) {
-            finalArray[j] =
-                voxelManager.getAtIndexAndTimePoint(j, frames[0]) -
-                    voxelManager.getAtIndexAndTimePoint(j, frames[1]);
+            const difference = voxelManager.getAtIndexAndTimePoint(j, frames[0]) -
+                voxelManager.getAtIndexAndTimePoint(j, frames[1]);
+            callback(j, difference);
         }
-        return finalArray;
     },
-    [Enums.GenerateImageType.AVERAGE]: (voxelManager, frames, arrayLength) => {
-        const finalArray = new Float32Array(arrayLength);
-        for (const timepoint of frames) {
-            for (let j = 0; j < arrayLength; j++) {
-                finalArray[j] += voxelManager.getAtIndexAndTimePoint(j, timepoint);
+    [Enums.GenerateImageType.AVERAGE]: (voxelManager, frames, callback) => {
+        const arrayLength = voxelManager.getScalarDataLength();
+        for (let j = 0; j < arrayLength; j++) {
+            let sum = 0;
+            for (const timepoint of frames) {
+                sum += voxelManager.getAtIndexAndTimePoint(j, timepoint);
             }
+            const average = sum / frames.length;
+            callback(j, average);
         }
-        for (let k = 0; k < arrayLength; k++) {
-            finalArray[k] /= frames.length;
-        }
-        return finalArray;
     },
 };
-function generateImageFromTimeData(dynamicVolume, operation, frameNumbers) {
+function generateImageFromTimeData(dynamicVolume, operation, options) {
+    const { frameNumbers } = options;
     const frames = frameNumbers || [...Array(dynamicVolume.numTimePoints).keys()];
     if (frames.length <= 1) {
         throw new Error('Please provide two or more time points');
@@ -45,6 +45,33 @@ function generateImageFromTimeData(dynamicVolume, operation, frameNumbers) {
     if (!operationFunction) {
         throw new Error(`Unsupported operation: ${operation}`);
     }
-    return operationFunction(voxelManager, frames, arrayLength);
+    const resultArray = new Float32Array(arrayLength);
+    operationFunction(voxelManager, frames, (index, value) => {
+        resultArray[index] = value;
+    });
+    return resultArray;
+}
+function updateVolumeFromTimeData(dynamicVolume, operation, options) {
+    const { frameNumbers, targetVolume } = options;
+    if (!targetVolume) {
+        throw new Error('A target volume must be provided');
+    }
+    const frames = frameNumbers || [...Array(dynamicVolume.numTimePoints).keys()];
+    if (frames.length <= 1) {
+        throw new Error('Please provide two or more time points');
+    }
+    const voxelManager = dynamicVolume.voxelManager;
+    const targetVoxelManager = targetVolume.voxelManager;
+    const operationFunction = operationFunctions[operation];
+    if (!operationFunction) {
+        throw new Error(`Unsupported operation: ${operation}`);
+    }
+    operationFunction(voxelManager, frames, (index, value) => {
+        targetVoxelManager.setAtIndex(index, value);
+    });
+    targetVoxelManager.resetModifiedSlices();
+    for (let k = 0; k < targetVolume.dimensions[2]; k++) {
+        targetVoxelManager.modifiedSlices.add(k);
+    }
 }
-export default generateImageFromTimeData;
+export { generateImageFromTimeData, updateVolumeFromTimeData };

package/dist/esm/utilities/dynamicVolume/index.d.ts

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

package/dist/esm/utilities/dynamicVolume/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.0.0-beta.28",
+  "version": "2.0.0-beta.29",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -97,7 +97,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^2.0.0-beta.28",
+    "@cornerstonejs/core": "^2.0.0-beta.29",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
     "lodash.get": "^4.4.2"
@@ -124,5 +124,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "f07f340e5b63d3afdda66bfe35c9cef729a5b69d"
+  "gitHead": "fd9316cac241522bc5c43d267e41c7a4e36bec96"
 }