@cornerstonejs/dicom-image-loader 3.14.2 → 3.14.3

package/dist/esm/decodeImageFrameWorker.js

@@ -50,10 +50,9 @@ function postProcessDecodedPixels(imageFrame, options, start, decodeConfig) {
     const disableScale = !options.preScale.enabled || (!canRenderFloat && hasFloatRescale);
     const type = options.targetBuffer?.type;
     if (type && options.preScale.enabled && !disableScale) {
-        const { rescaleSlope, rescaleIntercept } = options.preScale.scalingParameters;
-        const minAfterScale = rescaleSlope * minBeforeScale + rescaleIntercept;
-        const maxAfterScale = rescaleSlope * maxBeforeScale + rescaleIntercept;
-        invalidType = !validatePixelDataType(minAfterScale, maxAfterScale, typedArrayConstructors[type]);
+        const scalingParameters = options.preScale.scalingParameters;
+        const scaledValues = _calculateScaledMinMax(minBeforeScale, maxBeforeScale, scalingParameters);
+        invalidType = !validatePixelDataType(scaledValues.min, scaledValues.max, typedArrayConstructors[type]);
     }
     if (type && !invalidType) {
         pixelDataArray = _handleTargetBuffer(options, imageFrame, typedArrayConstructors, pixelDataArray);
@@ -69,7 +68,6 @@ function postProcessDecodedPixels(imageFrame, options, start, decodeConfig) {
     if (options.preScale.enabled && !disableScale) {
         const scalingParameters = options.preScale.scalingParameters;
         _validateScalingParameters(scalingParameters);
-        const { rescaleSlope, rescaleIntercept } = scalingParameters;
         const isRequiredScaling = _isRequiredScaling(scalingParameters);
         if (isRequiredScaling) {
             applyModalityLUT(pixelDataArray, scalingParameters);
@@ -77,13 +75,9 @@ function postProcessDecodedPixels(imageFrame, options, start, decodeConfig) {
                 ...options.preScale,
                 scaled: true,
             };
-            const { rescaleIntercept, rescaleSlope, suvbw } = scalingParameters;
-            minAfterScale = rescaleSlope * minBeforeScale + rescaleIntercept;
-            maxAfterScale = rescaleSlope * maxBeforeScale + rescaleIntercept;
-            if (suvbw) {
-                minAfterScale = minAfterScale * suvbw;
-                maxAfterScale = maxAfterScale * suvbw;
-            }
+            const scaledValues = _calculateScaledMinMax(minBeforeScale, maxBeforeScale, scalingParameters);
+            minAfterScale = scaledValues.min;
+            maxAfterScale = scaledValues.max;
         }
     }
     else if (disableScale) {
@@ -136,15 +130,8 @@ function _handleTargetBuffer(options, imageFrame, typedArrayConstructors, pixelD
 function _handlePreScaleSetup(options, minBeforeScale, maxBeforeScale, imageFrame) {
     const scalingParameters = options.preScale.scalingParameters;
     _validateScalingParameters(scalingParameters);
-    const { rescaleSlope, rescaleIntercept } = scalingParameters;
-    const areSlopeAndInterceptNumbers = typeof rescaleSlope === 'number' && typeof rescaleIntercept === 'number';
-    let scaledMin = minBeforeScale;
-    let scaledMax = maxBeforeScale;
-    if (areSlopeAndInterceptNumbers) {
-        scaledMin = rescaleSlope * minBeforeScale + rescaleIntercept;
-        scaledMax = rescaleSlope * maxBeforeScale + rescaleIntercept;
-    }
-    return _getDefaultPixelDataArray(scaledMin, scaledMax, imageFrame);
+    const scaledValues = _calculateScaledMinMax(minBeforeScale, maxBeforeScale, scalingParameters);
+    return _getDefaultPixelDataArray(scaledValues.min, scaledValues.max, imageFrame);
 }
 function _getDefaultPixelDataArray(min, max, imageFrame) {
     const TypedArrayConstructor = getPixelDataTypeFromMinMax(min, max);
@@ -152,6 +139,36 @@ function _getDefaultPixelDataArray(min, max, imageFrame) {
     typedArray.set(imageFrame.pixelData, 0);
     return typedArray;
 }
+function _calculateScaledMinMax(minValue, maxValue, scalingParameters) {
+    const { rescaleSlope, rescaleIntercept, modality, doseGridScaling, suvbw } = scalingParameters;
+    if (modality === 'PT' && typeof suvbw === 'number' && !isNaN(suvbw)) {
+        return {
+            min: suvbw * (minValue * rescaleSlope + rescaleIntercept),
+            max: suvbw * (maxValue * rescaleSlope + rescaleIntercept),
+        };
+    }
+    else if (modality === 'RTDOSE' &&
+        typeof doseGridScaling === 'number' &&
+        !isNaN(doseGridScaling)) {
+        return {
+            min: minValue * doseGridScaling,
+            max: maxValue * doseGridScaling,
+        };
+    }
+    else if (typeof rescaleSlope === 'number' &&
+        typeof rescaleIntercept === 'number') {
+        return {
+            min: rescaleSlope * minValue + rescaleIntercept,
+            max: rescaleSlope * maxValue + rescaleIntercept,
+        };
+    }
+    else {
+        return {
+            min: minValue,
+            max: maxValue,
+        };
+    }
+}
 function _validateScalingParameters(scalingParameters) {
     if (!scalingParameters) {
         throw new Error('options.preScale.scalingParameters must be defined if preScale.enabled is true, and scalingParameters cannot be derived from the metadata providers.');

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.14.2";
+export declare const version = "3.14.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.14.2';
+export const version = '3.14.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/dicom-image-loader",
-  "version": "3.14.2",
+  "version": "3.14.3",
   "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file",
   "keywords": [
     "DICOM",
@@ -116,7 +116,7 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.14.2",
+    "@cornerstonejs/core": "^3.14.3",
     "dicom-parser": "^1.8.9"
   },
   "lint-staged": {
@@ -131,5 +131,5 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "gitHead": "ea902cb312d7de54c8e2a199cbed690dfe543019"
+  "gitHead": "902ff8c03f0bb19963532fcf6286155ecbdd2d98"
 }