@cornerstonejs/core 4.13.6 → 4.14.2

package/dist/esm/utilities/VoxelManager.d.ts

@@ -7,7 +7,7 @@ export default class VoxelManager<T> {
     sourceVoxelManager: IVoxelManager<T>;
     isInObject: (pointLPS: any, pointIJK: any) => boolean;
     readonly dimensions: Point3;
-    readonly numberOfComponents: any;
+    readonly numberOfComponents: number;
     getCompleteScalarDataArray?: () => ArrayLike<number>;
     setCompleteScalarDataArray?: (scalarData: ArrayLike<number>) => void;
     getRange: () => [number, number];

package/dist/esm/utilities/VoxelManager.js

@@ -178,7 +178,7 @@ export default class VoxelManager {
         this._set = options._set;
         this._id = options._id || '';
         this._getConstructor = options._getConstructor;
-        this.numberOfComponents = this.numberOfComponents || 1;
+        this.numberOfComponents = options.numberOfComponents || 1;
         this.scalarData = options.scalarData;
         this._getScalarData = options._getScalarData;
         this._updateScalarData = options._updateScalarData;

package/dist/esm/utilities/calculateSpacingBetweenImageIds.js

@@ -1,8 +1,40 @@
 import { vec3 } from 'gl-matrix';
 import * as metaData from '../metaData';
 import { getConfiguration } from '../init';
+const DEFAULT_THICKNESS_SINGLE_SLICE = 1;
+function getPixelSpacingForCubicVoxel(metadata) {
+    if (metadata.columnPixelSpacing !== undefined) {
+        return metadata.columnPixelSpacing;
+    }
+    if (metadata.rowPixelSpacing !== undefined) {
+        return metadata.rowPixelSpacing;
+    }
+    if (metadata.pixelSpacing?.[1] !== undefined) {
+        return metadata.pixelSpacing[1];
+    }
+    if (metadata.pixelSpacing?.[0] !== undefined) {
+        return metadata.pixelSpacing[0];
+    }
+    return undefined;
+}
 export default function calculateSpacingBetweenImageIds(imageIds) {
     const { imagePositionPatient: referenceImagePositionPatient, imageOrientationPatient, } = metaData.get('imagePlaneModule', imageIds[0]);
+    if (imageIds.length === 1) {
+        const { sliceThickness, spacingBetweenSlices, columnPixelSpacing, rowPixelSpacing, pixelSpacing, } = metaData.get('imagePlaneModule', imageIds[0]);
+        if (sliceThickness)
+            return sliceThickness;
+        if (spacingBetweenSlices)
+            return spacingBetweenSlices;
+        const pixelSpacingValue = getPixelSpacingForCubicVoxel({
+            columnPixelSpacing,
+            rowPixelSpacing,
+            pixelSpacing,
+        });
+        if (pixelSpacingValue !== undefined) {
+            return pixelSpacingValue;
+        }
+        return DEFAULT_THICKNESS_SINGLE_SLICE;
+    }
     const rowCosineVec = vec3.fromValues(imageOrientationPatient[0], imageOrientationPatient[1], imageOrientationPatient[2]);
     const colCosineVec = vec3.fromValues(imageOrientationPatient[3], imageOrientationPatient[4], imageOrientationPatient[5]);
     const scanAxisNormal = vec3.create();
@@ -37,8 +69,6 @@ export default function calculateSpacingBetweenImageIds(imageIds) {
             imageIds[0],
             imageIds[Math.floor(imageIds.length / 2)],
         ];
-        const firstImageDistance = getDistance(prefetchedImageIds[0]);
-        const middleImageDistance = getDistance(prefetchedImageIds[1]);
         const metadataForMiddleImage = metaData.get('imagePlaneModule', prefetchedImageIds[1]);
         if (!metadataForMiddleImage) {
             throw new Error('Incomplete metadata required for volume construction.');
@@ -51,7 +81,7 @@ export default function calculateSpacingBetweenImageIds(imageIds) {
             Math.abs(distanceBetweenFirstAndMiddleImages) /
                 Math.floor(imageIds.length / 2);
     }
-    const { sliceThickness, spacingBetweenSlices } = metaData.get('imagePlaneModule', imageIds[0]);
+    const { sliceThickness, spacingBetweenSlices, columnPixelSpacing, rowPixelSpacing, pixelSpacing, } = metaData.get('imagePlaneModule', imageIds[0]);
     const { strictZSpacingForVolumeViewport } = getConfiguration().rendering;
     if ((spacing === 0 || isNaN(spacing)) && !strictZSpacingForVolumeViewport) {
         if (spacingBetweenSlices) {
@@ -63,8 +93,18 @@ export default function calculateSpacingBetweenImageIds(imageIds) {
             spacing = sliceThickness;
         }
         else {
-            console.debug('Could not calculate spacing. The VolumeViewport visualization is compromised. Setting spacing to 1 to render');
-            spacing = 1;
+            const pixelSpacingValue = getPixelSpacingForCubicVoxel({
+                columnPixelSpacing,
+                rowPixelSpacing,
+                pixelSpacing,
+            });
+            if (pixelSpacingValue) {
+                spacing = pixelSpacingValue;
+            }
+            else {
+                console.debug(`Could not calculate spacing and no pixel spacing found. Using default thickness (${DEFAULT_THICKNESS_SINGLE_SLICE} mm)`);
+                spacing = DEFAULT_THICKNESS_SINGLE_SLICE;
+            }
         }
     }
     return spacing;

package/dist/esm/utilities/getClosestImageId.js

@@ -7,7 +7,7 @@ const log = coreLog.getLogger('utilities', 'getClosestImageId');
 export default function getClosestImageId(imageVolume, worldPos, viewPlaneNormal, options) {
     const { direction, spacing, imageIds } = imageVolume;
     const { ignoreSpacing = false } = options || {};
-    if (!imageIds?.length) {
+    if (imageIds?.length) {
         return;
     }
     const kVector = direction.slice(6, 9);

package/dist/esm/utilities/isValidVolume.js

@@ -1,7 +1,7 @@
 import * as metaData from '../metaData';
 import isEqual from './isEqual';
 function isValidVolume(imageIds) {
-    if (imageIds.length <= 1) {
+    if (!imageIds.length) {
         return false;
     }
     const imageId0 = imageIds[0];

package/dist/esm/utilities/scroll.js

@@ -35,6 +35,8 @@ export default function scroll(viewport, options) {
 export function scrollVolume(viewport, volumeId, delta, scrollSlabs = false) {
     const useSlabThickness = scrollSlabs;
     const { numScrollSteps, currentStepIndex, sliceRangeInfo } = getVolumeViewportScrollInfo(viewport, volumeId, useSlabThickness);
+    if (numScrollSteps === 0)
+        return;
     if (!sliceRangeInfo) {
         return;
     }

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.13.6";
+export declare const version = "4.14.2";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.13.6';
+export const version = '4.14.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "4.13.6",
+  "version": "4.14.2",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -97,5 +97,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "43c0ed69005cdd74ceb4a2bb436a7d1b583b935d"
+  "gitHead": "3f4519a6cd7f13a7e0564263cae4c7f821b6f35b"
 }