@cornerstonejs/core 3.9.3 → 3.9.4

package/dist/esm/RenderingEngine/StackViewport.js

@@ -1842,7 +1842,9 @@ class StackViewport extends Viewport {
     _getImagePlaneModule(imageId) {
         const imagePlaneModule = getImagePlaneModule(imageId);
         this.hasPixelSpacing =
-            !imagePlaneModule.usingDefaultValues || this.calibration?.scale > 0;
+            !imagePlaneModule.usingDefaultValues ||
+                this.calibration?.scale > 0 ||
+                this.calibration?.rowPixelSpacing > 0;
         this.calibration ||= imagePlaneModule.calibration;
         return imagePlaneModule;
     }

package/dist/esm/enums/CalibrationTypes.d.ts

@@ -5,6 +5,8 @@ export declare enum CalibrationTypes {
     PROJECTION = "Proj",
     REGION = "Region",
     ERROR = "Error",
-    UNCALIBRATED = "Uncalibrated"
+    UNCALIBRATED = "Uncalibrated",
+    CALIBRATED = "Calibrated",
+    UNKNOWN = "Unknown"
 }
 export default CalibrationTypes;

package/dist/esm/enums/CalibrationTypes.js

@@ -7,5 +7,7 @@ export var CalibrationTypes;
     CalibrationTypes["REGION"] = "Region";
     CalibrationTypes["ERROR"] = "Error";
     CalibrationTypes["UNCALIBRATED"] = "Uncalibrated";
+    CalibrationTypes["CALIBRATED"] = "Calibrated";
+    CalibrationTypes["UNKNOWN"] = "Unknown";
 })(CalibrationTypes || (CalibrationTypes = {}));
 export default CalibrationTypes;

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

@@ -0,0 +1,16 @@
+import { CalibrationTypes } from '../enums';
+export default function getPixelSpacingInformation(instance: any): {
+    PixelSpacing: any;
+    type: CalibrationTypes;
+    isProjection: boolean;
+    PixelSpacingCalibrationType?: undefined;
+    PixelSpacingCalibrationDescription?: undefined;
+} | {
+    PixelSpacing: any;
+    type: CalibrationTypes;
+    isProjection: boolean;
+    PixelSpacingCalibrationType: any;
+    PixelSpacingCalibrationDescription: any;
+} | {
+    PixelSpacing: number[];
+};

package/dist/esm/utilities/getPixelSpacingInformation.js

@@ -0,0 +1,94 @@
+import { isEqual } from './isEqual';
+import { CalibrationTypes } from '../enums';
+const projectionRadiographSOPClassUIDs = new Set([
+    '1.2.840.10008.5.1.4.1.1.1',
+    '1.2.840.10008.5.1.4.1.1.1.1',
+    '1.2.840.10008.5.1.4.1.1.1.1.1',
+    '1.2.840.10008.5.1.4.1.1.1.2',
+    '1.2.840.10008.5.1.4.1.1.1.2.1',
+    '1.2.840.10008.5.1.4.1.1.1.3',
+    '1.2.840.10008.5.1.4.1.1.1.3.1',
+    '1.2.840.10008.5.1.4.1.1.12.1',
+    '1.2.840.10008.5.1.4.1.1.12.1.1',
+    '1.2.840.10008.5.1.4.1.1.12.2',
+    '1.2.840.10008.5.1.4.1.1.12.2.1',
+    '1.2.840.10008.5.1.4.1.1.12.3',
+]);
+function calculateRadiographicPixelSpacing(instance) {
+    const { PixelSpacing, ImagerPixelSpacing, EstimatedRadiographicMagnificationFactor, PixelSpacingCalibrationType, PixelSpacingCalibrationDescription, } = instance;
+    const isProjection = true;
+    if (!ImagerPixelSpacing) {
+        return {
+            PixelSpacing,
+            type: CalibrationTypes.UNKNOWN,
+            isProjection,
+        };
+    }
+    if (!PixelSpacing) {
+        if (!EstimatedRadiographicMagnificationFactor) {
+            console.warn('EstimatedRadiographicMagnificationFactor was not present. Unable to correct ImagerPixelSpacing.');
+            return {
+                PixelSpacing: ImagerPixelSpacing,
+                type: CalibrationTypes.PROJECTION,
+                isProjection,
+            };
+        }
+        const correctedPixelSpacing = ImagerPixelSpacing.map((pixelSpacing) => pixelSpacing / EstimatedRadiographicMagnificationFactor);
+        return {
+            PixelSpacing: correctedPixelSpacing,
+            type: CalibrationTypes.ERMF,
+            isProjection,
+        };
+    }
+    if (isEqual(PixelSpacing, ImagerPixelSpacing)) {
+        return {
+            PixelSpacing,
+            type: CalibrationTypes.PROJECTION,
+            isProjection,
+        };
+    }
+    if (PixelSpacingCalibrationType || PixelSpacingCalibrationDescription) {
+        return {
+            PixelSpacing,
+            type: CalibrationTypes.CALIBRATED,
+            isProjection,
+            PixelSpacingCalibrationType,
+            PixelSpacingCalibrationDescription,
+        };
+    }
+    return {
+        PixelSpacing,
+        type: CalibrationTypes.UNKNOWN,
+        isProjection,
+    };
+}
+function calculateUSPixelSpacing(instance) {
+    const { SequenceOfUltrasoundRegions } = instance;
+    const isArrayOfSequences = Array.isArray(SequenceOfUltrasoundRegions);
+    if (isArrayOfSequences && SequenceOfUltrasoundRegions.length > 1) {
+        console.warn('Sequence of Ultrasound Regions > one entry. This is not yet implemented, all measurements will be shown in pixels.');
+        return;
+    }
+    const { PhysicalDeltaX, PhysicalDeltaY } = isArrayOfSequences
+        ? SequenceOfUltrasoundRegions[0]
+        : SequenceOfUltrasoundRegions;
+    const USPixelSpacing = [PhysicalDeltaX * 10, PhysicalDeltaY * 10];
+    return {
+        PixelSpacing: USPixelSpacing,
+    };
+}
+export default function getPixelSpacingInformation(instance) {
+    const { PixelSpacing, SOPClassUID, SequenceOfUltrasoundRegions } = instance;
+    if (SequenceOfUltrasoundRegions) {
+        return calculateUSPixelSpacing(instance);
+    }
+    const isProjection = projectionRadiographSOPClassUIDs.has(SOPClassUID);
+    if (isProjection) {
+        return calculateRadiographicPixelSpacing(instance);
+    }
+    return {
+        PixelSpacing,
+        type: CalibrationTypes.NOT_APPLICABLE,
+        isProjection: false,
+    };
+}

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

@@ -93,5 +93,6 @@ import getVolumeDirectionVectors from './getVolumeDirectionVectors';
 import calculateSpacingBetweenImageIds from './calculateSpacingBetweenImageIds';
 export * as logger from './logger';
 import { calculateNeighborhoodStats } from './calculateNeighborhoodStats';
+import getPixelSpacingInformation from './getPixelSpacingInformation';
 declare const getViewportModality: (viewport: IViewport, volumeId?: string) => string;
-export { FrameRange, eventListener, csUtils as invertRgbTransferFunction, createSigmoidRGBTransferFunction, getVoiFromSigmoidRGBTransferFunction, createLinearRGBTransferFunction, scaleRgbTransferFunction, triggerEvent, imageIdToURI, fnv1aHash, calibratedPixelSpacingMetadataProvider, clamp, uuidv4, getMinMax, getRuntimeId, isEqual, isEqualAbs, isEqualNegative, isOpposite, getViewportModality, windowLevel, convertToGrayscale, getClosestImageId, getSpacingInNormalDirection, getTargetVolumeAndSpacingInNormalDir, getVolumeActorCorners, indexWithinDimensions, getVolumeViewportsContainingSameVolumes, getViewportsWithVolumeId, transformWorldToIndex, transformIndexToWorld, loadImageToCanvas, renderToCanvasCPU, renderToCanvasGPU, worldToImageCoords, imageToWorldCoords, getVolumeSliceRangeInfo, getVolumeViewportScrollInfo, getSliceRange, snapFocalPointToSlice, getImageSliceDataForVolumeViewport, isImageActor, isPTPrescaledWithSUV, actorIsA, getViewportsWithImageURI, getClosestStackImageIndexForPoint, getCurrentVolumeViewportSlice, calculateViewportsSpatialRegistration, spatialRegistrationMetadataProvider, getViewportImageCornersInWorld, hasNaNValues, applyPreset, deepMerge, PointsManager, getScalingParameters, colormap, getImageLegacy, ProgressiveIterator, decimate, imageRetrieveMetadataProvider, transferFunctionUtils, updateVTKImageDataWithCornerstoneImage, sortImageIdsAndGetSpacing, makeVolumeMetadata, isValidVolume, genericMetadataProvider, isVideoTransferSyntax, HistoryMemo, generateVolumePropsFromImageIds, getBufferConfiguration, VoxelManager, RLEVoxelMap, convertStackToVolumeViewport, convertVolumeToStackViewport, roundNumber, roundToPrecision, getViewportImageIds, getRandomSampleFromArray, getVolumeId, color, hasFloatScalingParameters, getDynamicVolumeInfo, autoLoad, scaleArray, deepClone, splitImageIdsBy4DTags, pointInShapeCallback, deepEqual, jumpToSlice, scroll, clip, transformWorldToIndexContinuous, createSubVolume, getVolumeDirectionVectors, calculateSpacingBetweenImageIds, getImageDataMetadata, buildMetadata, calculateNeighborhoodStats, };
+export { FrameRange, eventListener, csUtils as invertRgbTransferFunction, createSigmoidRGBTransferFunction, getVoiFromSigmoidRGBTransferFunction, createLinearRGBTransferFunction, scaleRgbTransferFunction, triggerEvent, imageIdToURI, fnv1aHash, calibratedPixelSpacingMetadataProvider, clamp, uuidv4, getMinMax, getRuntimeId, isEqual, isEqualAbs, isEqualNegative, isOpposite, getViewportModality, windowLevel, convertToGrayscale, getClosestImageId, getSpacingInNormalDirection, getTargetVolumeAndSpacingInNormalDir, getVolumeActorCorners, indexWithinDimensions, getVolumeViewportsContainingSameVolumes, getViewportsWithVolumeId, transformWorldToIndex, transformIndexToWorld, loadImageToCanvas, renderToCanvasCPU, renderToCanvasGPU, worldToImageCoords, imageToWorldCoords, getVolumeSliceRangeInfo, getVolumeViewportScrollInfo, getSliceRange, snapFocalPointToSlice, getImageSliceDataForVolumeViewport, isImageActor, isPTPrescaledWithSUV, actorIsA, getViewportsWithImageURI, getClosestStackImageIndexForPoint, getCurrentVolumeViewportSlice, calculateViewportsSpatialRegistration, spatialRegistrationMetadataProvider, getViewportImageCornersInWorld, hasNaNValues, applyPreset, deepMerge, PointsManager, getScalingParameters, colormap, getImageLegacy, ProgressiveIterator, decimate, imageRetrieveMetadataProvider, transferFunctionUtils, updateVTKImageDataWithCornerstoneImage, sortImageIdsAndGetSpacing, makeVolumeMetadata, isValidVolume, genericMetadataProvider, isVideoTransferSyntax, HistoryMemo, generateVolumePropsFromImageIds, getBufferConfiguration, VoxelManager, RLEVoxelMap, convertStackToVolumeViewport, convertVolumeToStackViewport, roundNumber, roundToPrecision, getViewportImageIds, getRandomSampleFromArray, getVolumeId, color, hasFloatScalingParameters, getDynamicVolumeInfo, autoLoad, scaleArray, deepClone, splitImageIdsBy4DTags, pointInShapeCallback, deepEqual, jumpToSlice, scroll, clip, transformWorldToIndexContinuous, createSubVolume, getVolumeDirectionVectors, calculateSpacingBetweenImageIds, getImageDataMetadata, buildMetadata, calculateNeighborhoodStats, getPixelSpacingInformation, };

package/dist/esm/utilities/index.js

@@ -94,5 +94,6 @@ import getVolumeDirectionVectors from './getVolumeDirectionVectors';
 import calculateSpacingBetweenImageIds from './calculateSpacingBetweenImageIds';
 export * as logger from './logger';
 import { calculateNeighborhoodStats } from './calculateNeighborhoodStats';
+import getPixelSpacingInformation from './getPixelSpacingInformation';
 const getViewportModality = (viewport, volumeId) => _getViewportModality(viewport, volumeId, cache.getVolume);
-export { FrameRange, eventListener, csUtils as invertRgbTransferFunction, createSigmoidRGBTransferFunction, getVoiFromSigmoidRGBTransferFunction, createLinearRGBTransferFunction, scaleRgbTransferFunction, triggerEvent, imageIdToURI, fnv1aHash, calibratedPixelSpacingMetadataProvider, clamp, uuidv4, getMinMax, getRuntimeId, isEqual, isEqualAbs, isEqualNegative, isOpposite, getViewportModality, windowLevel, convertToGrayscale, getClosestImageId, getSpacingInNormalDirection, getTargetVolumeAndSpacingInNormalDir, getVolumeActorCorners, indexWithinDimensions, getVolumeViewportsContainingSameVolumes, getViewportsWithVolumeId, transformWorldToIndex, transformIndexToWorld, loadImageToCanvas, renderToCanvasCPU, renderToCanvasGPU, worldToImageCoords, imageToWorldCoords, getVolumeSliceRangeInfo, getVolumeViewportScrollInfo, getSliceRange, snapFocalPointToSlice, getImageSliceDataForVolumeViewport, isImageActor, isPTPrescaledWithSUV, actorIsA, getViewportsWithImageURI, getClosestStackImageIndexForPoint, getCurrentVolumeViewportSlice, calculateViewportsSpatialRegistration, spatialRegistrationMetadataProvider, getViewportImageCornersInWorld, hasNaNValues, applyPreset, deepMerge, PointsManager, getScalingParameters, colormap, getImageLegacy, ProgressiveIterator, decimate, imageRetrieveMetadataProvider, transferFunctionUtils, updateVTKImageDataWithCornerstoneImage, sortImageIdsAndGetSpacing, makeVolumeMetadata, isValidVolume, genericMetadataProvider, isVideoTransferSyntax, HistoryMemo, generateVolumePropsFromImageIds, getBufferConfiguration, VoxelManager, RLEVoxelMap, convertStackToVolumeViewport, convertVolumeToStackViewport, roundNumber, roundToPrecision, getViewportImageIds, getRandomSampleFromArray, getVolumeId, color, hasFloatScalingParameters, getDynamicVolumeInfo, autoLoad, scaleArray, deepClone, splitImageIdsBy4DTags, pointInShapeCallback, deepEqual, jumpToSlice, scroll, clip, transformWorldToIndexContinuous, createSubVolume, getVolumeDirectionVectors, calculateSpacingBetweenImageIds, getImageDataMetadata, buildMetadata, calculateNeighborhoodStats, };
+export { FrameRange, eventListener, csUtils as invertRgbTransferFunction, createSigmoidRGBTransferFunction, getVoiFromSigmoidRGBTransferFunction, createLinearRGBTransferFunction, scaleRgbTransferFunction, triggerEvent, imageIdToURI, fnv1aHash, calibratedPixelSpacingMetadataProvider, clamp, uuidv4, getMinMax, getRuntimeId, isEqual, isEqualAbs, isEqualNegative, isOpposite, getViewportModality, windowLevel, convertToGrayscale, getClosestImageId, getSpacingInNormalDirection, getTargetVolumeAndSpacingInNormalDir, getVolumeActorCorners, indexWithinDimensions, getVolumeViewportsContainingSameVolumes, getViewportsWithVolumeId, transformWorldToIndex, transformIndexToWorld, loadImageToCanvas, renderToCanvasCPU, renderToCanvasGPU, worldToImageCoords, imageToWorldCoords, getVolumeSliceRangeInfo, getVolumeViewportScrollInfo, getSliceRange, snapFocalPointToSlice, getImageSliceDataForVolumeViewport, isImageActor, isPTPrescaledWithSUV, actorIsA, getViewportsWithImageURI, getClosestStackImageIndexForPoint, getCurrentVolumeViewportSlice, calculateViewportsSpatialRegistration, spatialRegistrationMetadataProvider, getViewportImageCornersInWorld, hasNaNValues, applyPreset, deepMerge, PointsManager, getScalingParameters, colormap, getImageLegacy, ProgressiveIterator, decimate, imageRetrieveMetadataProvider, transferFunctionUtils, updateVTKImageDataWithCornerstoneImage, sortImageIdsAndGetSpacing, makeVolumeMetadata, isValidVolume, genericMetadataProvider, isVideoTransferSyntax, HistoryMemo, generateVolumePropsFromImageIds, getBufferConfiguration, VoxelManager, RLEVoxelMap, convertStackToVolumeViewport, convertVolumeToStackViewport, roundNumber, roundToPrecision, getViewportImageIds, getRandomSampleFromArray, getVolumeId, color, hasFloatScalingParameters, getDynamicVolumeInfo, autoLoad, scaleArray, deepClone, splitImageIdsBy4DTags, pointInShapeCallback, deepEqual, jumpToSlice, scroll, clip, transformWorldToIndexContinuous, createSubVolume, getVolumeDirectionVectors, calculateSpacingBetweenImageIds, getImageDataMetadata, buildMetadata, calculateNeighborhoodStats, getPixelSpacingInformation, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "3.9.3",
+  "version": "3.9.4",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -91,5 +91,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "2f5fb013e50c6ac1f9a683ed32e67c28227c6333"
+  "gitHead": "d3d666e4bde971cb15d188ec1adc1f588d3db186"
 }