@cornerstonejs/tools 2.1.6 → 2.1.7

package/dist/esm/utilities/cine/playClip.js

@@ -22,6 +22,7 @@ function playClip(element, playClipOptions) {
     playClipOptions.dynamicCineEnabled =
         playClipOptions.dynamicCineEnabled ?? true;
     const { viewport } = enabledElement;
+    const volume = _getVolumeFromViewport(viewport);
     const playClipContext = _createCinePlayContext(viewport, playClipOptions);
     let playClipData = getToolState(element);
     const isDynamicCinePlaying = playClipOptions.dynamicCineEnabled;
@@ -211,17 +212,11 @@ function _stopClipWithData(playClipData) {
         }
     }
 }
-function _getVolumesFromViewport(viewport) {
-    if (!viewport || !viewport.getVolumeId) {
-        return [];
-    }
-    const volumeId = viewport.getVolumeId();
-    return [cache.getVolume(volumeId)];
-}
 function _getVolumeFromViewport(viewport) {
-    const volumes = _getVolumesFromViewport(viewport);
-    const dynamicVolume = volumes.find((volume) => volume.isDynamicVolume());
-    return dynamicVolume ?? volumes[0];
+    const volumeIds = viewport.getAllVolumeIds();
+    const dynamicVolumeId = volumeIds.find((volumeId) => cache.getVolume(volumeId)?.isDynamicVolume());
+    const volumeId = dynamicVolumeId ?? volumeIds[0];
+    return cache.getVolume(volumeId);
 }
 function _createStackViewportCinePlayContext(viewport, waitForRendered) {
     const imageIds = viewport.getImageIds();

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

@@ -13,6 +13,9 @@ function getDataInTime(dynamicVolume, options) {
     }
     if (options.maskVolumeId) {
         const segmentationVolume = cache.getVolume(options.maskVolumeId);
+        if (!segmentationVolume) {
+            throw new Error('Segmentation volume not found');
+        }
         const [dataInTime, ijkCoords] = _getTimePointDataMask(frames, dynamicVolume, segmentationVolume);
         return [dataInTime, ijkCoords];
     }
@@ -33,12 +36,10 @@ function _getTimePointDataCoordinate(frames, coordinate, volume) {
     }
     const yMultiple = dimensions[0];
     const zMultiple = dimensions[0] * dimensions[1];
-    const allScalarData = volume.getScalarDataArrays();
     const value = [];
     frames.forEach((frame) => {
-        const activeScalarData = allScalarData[frame];
         const scalarIndex = index[2] * zMultiple + index[1] * yMultiple + index[0];
-        value.push(activeScalarData[scalarIndex]);
+        value.push(volume.voxelManager.getAtIndexAndTimePoint(scalarIndex, frame));
     });
     return value;
 }
@@ -48,35 +49,29 @@ function _getTimePointDataMask(frames, dynamicVolume, segmentationVolume) {
     const scalarDataLength = segVoxelManager.getScalarDataLength();
     const nonZeroVoxelIndices = [];
     nonZeroVoxelIndices.length = scalarDataLength;
-    const ijkCoords = [];
-    const dimensions = segmentationVolume.dimensions;
     let actualLen = 0;
     for (let i = 0, len = scalarDataLength; i < len; i++) {
         if (segVoxelManager.getAtIndex(i) !== 0) {
-            ijkCoords.push([
-                i % dimensions[0],
-                Math.floor((i / dimensions[0]) % dimensions[1]),
-                Math.floor(i / (dimensions[0] * dimensions[1])),
-            ]);
             nonZeroVoxelIndices[actualLen++] = i;
         }
     }
     nonZeroVoxelIndices.length = actualLen;
-    const dynamicVolumeScalarDataArray = dynamicVolume.getScalarDataArrays();
-    const values = [];
-    const isSameVolume = dynamicVolumeScalarDataArray[0].length === scalarDataLength &&
+    const nonZeroVoxelValuesInTime = [];
+    const isSameVolume = dynamicVolume.voxelManager.getScalarDataLength() === scalarDataLength &&
         JSON.stringify(dynamicVolume.spacing) ===
             JSON.stringify(segmentationVolume.spacing);
+    const ijkCoords = [];
     if (isSameVolume) {
         for (let i = 0; i < nonZeroVoxelIndices.length; i++) {
-            const indexValues = [];
-            frames.forEach((frame) => {
-                const activeScalarData = dynamicVolumeScalarDataArray[frame];
-                indexValues.push(activeScalarData[nonZeroVoxelIndices[i]]);
-            });
-            values.push(indexValues);
+            const valuesInTime = [];
+            const index = nonZeroVoxelIndices[i];
+            for (let j = 0; j < frames.length; j++) {
+                valuesInTime.push(dynamicVolume.voxelManager.getAtIndexAndTimePoint(index, frames[j]));
+            }
+            nonZeroVoxelValuesInTime.push(valuesInTime);
+            ijkCoords.push(segVoxelManager.toIJK(index));
         }
-        return [values, ijkCoords];
+        return [nonZeroVoxelValuesInTime, ijkCoords];
     }
     const callback = ({ pointLPS: segPointLPS, value: segValue, pointIJK: segPointIJK, }) => {
         if (segValue === 0) {
@@ -88,7 +83,7 @@ function _getTimePointDataMask(frames, dynamicVolume, segmentationVolume) {
         frames.forEach((frame) => perFrameSum.set(frame, 0));
         const averageCallback = ({ index }) => {
             for (let i = 0; i < frames.length; i++) {
-                const value = dynamicVolumeScalarDataArray[i][index];
+                const value = dynamicVolume.voxelManager.getAtIndexAndTimePoint(index, frames[i]);
                 const frame = frames[i];
                 perFrameSum.set(frame, perFrameSum.get(frame) + value);
             }
@@ -103,12 +98,11 @@ function _getTimePointDataMask(frames, dynamicVolume, segmentationVolume) {
             averageValues.push(sum / count);
         });
         ijkCoords.push(segPointIJK);
-        values.push(averageValues);
+        nonZeroVoxelValuesInTime.push(averageValues);
     };
-    const { voxelManager } = maskImageData.get('voxelManager');
-    voxelManager.forEach(callback, {
+    segmentationVolume.voxelManager.forEach(callback, {
         imageData: maskImageData,
     });
-    return [values, ijkCoords];
+    return [nonZeroVoxelValuesInTime, ijkCoords];
 }
 export default getDataInTime;

package/dist/esm/utilities/segmentation/utilities.js

@@ -4,21 +4,33 @@ const equalsCheck = (a, b) => {
     return JSON.stringify(a) === JSON.stringify(b);
 };
 export function getVoxelOverlap(imageData, dimensions, voxelSpacing, voxelCenter) {
-    const voxelCornersWorld = [];
-    for (let i = 0; i < 2; i++) {
-        for (let j = 0; j < 2; j++) {
-            for (let k = 0; k < 2; k++) {
-                const point = [...voxelCenter];
-                point[0] = point[0] + ((i * 2 - 1) * voxelSpacing[0]) / 2;
-                point[1] = point[1] + ((j * 2 - 1) * voxelSpacing[1]) / 2;
-                point[2] = point[2] + ((k * 2 - 1) * voxelSpacing[2]) / 2;
-                voxelCornersWorld.push(point);
-            }
-        }
+    const halfSpacingX = voxelSpacing[0] / 2;
+    const halfSpacingY = voxelSpacing[1] / 2;
+    const halfSpacingZ = voxelSpacing[2] / 2;
+    const voxelCornersIJK = new Array(8);
+    voxelCornersIJK[0] = csUtils.transformWorldToIndex(imageData, [
+        voxelCenter[0] - halfSpacingX,
+        voxelCenter[1] - halfSpacingY,
+        voxelCenter[2] - halfSpacingZ,
+    ]);
+    const offsets = [
+        [1, -1, -1],
+        [-1, 1, -1],
+        [1, 1, -1],
+        [-1, -1, 1],
+        [1, -1, 1],
+        [-1, 1, 1],
+        [1, 1, 1],
+    ];
+    for (let i = 0; i < 7; i++) {
+        const [xOff, yOff, zOff] = offsets[i];
+        voxelCornersIJK[i + 1] = csUtils.transformWorldToIndex(imageData, [
+            voxelCenter[0] + xOff * halfSpacingX,
+            voxelCenter[1] + yOff * halfSpacingY,
+            voxelCenter[2] + zOff * halfSpacingZ,
+        ]);
     }
-    const voxelCornersIJK = voxelCornersWorld.map((world) => csUtils.transformWorldToIndex(imageData, world));
-    const overlapBounds = getBoundingBoxAroundShapeIJK(voxelCornersIJK, dimensions);
-    return overlapBounds;
+    return getBoundingBoxAroundShapeIJK(voxelCornersIJK, dimensions);
 }
 export function processVolumes(segmentationVolume, thresholdVolumeInformation) {
     const { spacing: segmentationSpacing } = segmentationVolume;

package/dist/esm/utilities/voi/colorbar/ViewportColorbar.js

@@ -1,4 +1,4 @@
-import { eventTarget, VolumeViewport, StackViewport, Enums, utilities, getEnabledElement, } from '@cornerstonejs/core';
+import { eventTarget, VolumeViewport, StackViewport, Enums, utilities, getEnabledElement, cache, } from '@cornerstonejs/core';
 import { Colorbar } from './Colorbar';
 import { getVOIMultipliers } from '../../getVOIMultipliers';
 const { Events } = Enums;
@@ -88,14 +88,24 @@ class ViewportColorbar extends Colorbar {
     static _getImageRange(element, volumeId) {
         const enabledElement = getEnabledElement(element);
         const { viewport } = enabledElement;
-        const actor = volumeId
-            ? viewport.getActor(volumeId)
-            : viewport.getDefaultActor();
+        const actor = viewport.getImageActor(volumeId);
         if (!actor) {
             return defaultImageRange;
         }
-        const imageData = actor.actor.getMapper().getInputData();
-        const imageRange = imageData.getPointData().getScalars().getRange();
+        const imageData = actor.getMapper().getInputData();
+        const scalarData = imageData.getPointData().getScalars();
+        let imageRange;
+        if (!scalarData) {
+            if (!volumeId) {
+                throw new Error('volumeId is required when scalarData is not available');
+            }
+            const volume = cache.getVolume(volumeId);
+            const [minValue, maxValue] = volume.voxelManager.getRange();
+            imageRange = [minValue, maxValue];
+        }
+        else {
+            imageRange = scalarData.getRange();
+        }
         return imageRange[0] === 0 && imageRange[1] === 0
             ? defaultImageRange
             : { lower: imageRange[0], upper: imageRange[1] };
@@ -103,16 +113,11 @@ class ViewportColorbar extends Colorbar {
     static _getVOIRange(element, volumeId) {
         const enabledElement = getEnabledElement(element);
         const { viewport } = enabledElement;
-        const volumeActor = volumeId
-            ? viewport.getActor(volumeId)
-            : viewport.getDefaultActor();
-        if (!volumeActor || !utilities.isImageActor(volumeActor)) {
+        const actor = viewport.getImageActor(volumeId);
+        if (!actor) {
             return defaultImageRange;
         }
-        const voiRange = volumeActor.actor
-            .getProperty()
-            .getRGBTransferFunction(0)
-            .getRange();
+        const voiRange = actor.getProperty().getRGBTransferFunction(0).getRange();
         return voiRange[0] === 0 && voiRange[1] === 0
             ? defaultImageRange
             : { lower: voiRange[0], upper: voiRange[1] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "Cornerstone3D Tools",
   "main": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -105,7 +105,7 @@
     "canvas": "^2.11.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^2.1.6",
+    "@cornerstonejs/core": "^2.1.7",
     "@kitware/vtk.js": "32.1.0",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -124,5 +124,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "a3934ba53f46d7cb5d23151d83f69bea9fe90009"
+  "gitHead": "079eb63faace4c72556559fc1ce272c2a9a910ca"
 }