fix: data type view after scaling

cornerstonejs · Mar 6, 2023 · 0ae607b · 0ae607b
1 parent e9a7f9d
commit 0ae607b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/dicomImageLoader/src/imageLoader/createImage.ts b/packages/dicomImageLoader/src/imageLoader/createImage.ts
@@ -62,11 +62,17 @@ function convertToIntPixelData(floatPixelData) {
  * can transfer array buffers but not typed arrays
  * @param imageFrame
  */
-function setPixelDataType(imageFrame: ImageFrame) {
+function setPixelDataType(imageFrame, preScale) {
+  const isScaled = preScale?.scaled;
+  const scalingParmeters = preScale?.scalingParameters;
+  const rescaleSlope = scalingParmeters?.rescaleSlope;
+  const rescaleIntercept = scalingParmeters?.rescaleIntercept;
+  const isNegative = rescaleSlope < 0 || rescaleIntercept < 0;
+
   if (imageFrame.bitsAllocated === 32) {
     imageFrame.pixelData = new Float32Array(imageFrame.pixelData);
   } else if (imageFrame.bitsAllocated === 16) {
-    if (imageFrame.pixelRepresentation === 0) {
+    if (imageFrame.pixelRepresentation === 0 && !(isScaled && isNegative)) {
       imageFrame.pixelData = new Uint16Array(imageFrame.pixelData);
     } else {
       imageFrame.pixelData = new Int16Array(imageFrame.pixelData);
@@ -240,7 +246,7 @@ function createImage(
       }
 
       if (!alreadyTyped) {
-        setPixelDataType(imageFrame);
+        setPixelDataType(imageFrame, imageFrame.preScale);
       }
 
       const imagePlaneModule: MetadataImagePlaneModule =

diff --git a/packages/dicomImageLoader/src/imageLoader/wadors/metaData/metaDataProvider.ts b/packages/dicomImageLoader/src/imageLoader/wadors/metaData/metaDataProvider.ts
@@ -202,6 +202,11 @@ function metaDataProvider(type, imageId) {
         radiopharmaceuticalStartTime: dicomParser.parseTM(
           getValue(radiopharmaceuticalInfo['00181072'], 0, '')
         ),
+        radiopharmaceuticalStartDateTime: getValue(
+          radiopharmaceuticalInfo['00181078'],
+          0,
+          ''
+        ),
         radionuclideTotalDose: getNumberValue(
           radiopharmaceuticalInfo['00181074']
         ),