Add unit to draw quantification, fixes #1489

ivmartel · Sep 5, 2023 · dccddce · dccddce
1 parent 9592c8a
commit dccddce
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 29 deletions.
diff --git a/src/image/imageFactory.js b/src/image/imageFactory.js
@@ -200,18 +200,22 @@ export class ImageFactory {
     }
 
     // PET SUV
-    let intensityFactor = 1;
+    let isPetWithSuv = false;
     if (modality.value[0] === 'PT') {
       const warn = canGetSuvFactor(dataElements);
       if (warn.length === 0) {
-        intensityFactor = getSuvFactor(dataElements);
-        logger.info('Applying PET SUV calibration: ' + intensityFactor);
-        slope *= intensityFactor;
-        intercept *= intensityFactor;
+        isPetWithSuv = true;
       } else {
         logger.warn(warn);
       }
     }
+    let intensityFactor = 1;
+    if (isPetWithSuv) {
+      intensityFactor = getSuvFactor(dataElements);
+      logger.info('Applying PET SUV calibration: ' + intensityFactor);
+      slope *= intensityFactor;
+      intercept *= intensityFactor;
+    }
     const rsi = new RescaleSlopeAndIntercept(slope, intercept);
     image.setRescaleSlopeAndIntercept(rsi);
 
@@ -238,9 +242,13 @@ export class ImageFactory {
     // PixelRepresentation -> is signed
     meta.IsSigned = meta.PixelRepresentation === 1;
     // local pixel unit
-    const pixelUnit = getPixelUnit(dataElements);
-    if (typeof pixelUnit !== 'undefined') {
-      meta.pixelUnit = pixelUnit;
+    if (isPetWithSuv) {
+      meta.pixelUnit = 'SUV';
+    } else {
+      const pixelUnit = getPixelUnit(dataElements);
+      if (typeof pixelUnit !== 'undefined') {
+        meta.pixelUnit = pixelUnit;
+      }
     }
     // FrameOfReferenceUID (optional)
     const frameOfReferenceUID = dataElements['00200052'];

diff --git a/src/math/circle.js b/src/math/circle.js
@@ -167,19 +167,20 @@ export class Circle {
       const regions = this.getRound();
       if (regions.length !== 0) {
         const values = viewController.getImageVariableRegionValues(regions);
+        const unit = viewController.getPixelUnit();
         const quantif = getStats(values, flags);
-        quant.min = {value: quantif.min, unit: ''};
-        quant.max = {value: quantif.max, unit: ''};
-        quant.mean = {value: quantif.mean, unit: ''};
-        quant.stdDev = {value: quantif.stdDev, unit: ''};
+        quant.min = {value: quantif.min, unit: unit};
+        quant.max = {value: quantif.max, unit: unit};
+        quant.mean = {value: quantif.mean, unit: unit};
+        quant.stdDev = {value: quantif.stdDev, unit: unit};
         if (typeof quantif.median !== 'undefined') {
-          quant.median = {value: quantif.median, unit: ''};
+          quant.median = {value: quantif.median, unit: unit};
         }
         if (typeof quantif.p25 !== 'undefined') {
-          quant.p25 = {value: quantif.p25, unit: ''};
+          quant.p25 = {value: quantif.p25, unit: unit};
         }
         if (typeof quantif.p75 !== 'undefined') {
-          quant.p75 = {value: quantif.p75, unit: ''};
+          quant.p75 = {value: quantif.p75, unit: unit};
         }
       }
     }

diff --git a/src/math/ellipse.js b/src/math/ellipse.js
@@ -192,19 +192,20 @@ export class Ellipse {
       const regions = this.getRound();
       if (regions.length !== 0) {
         const values = viewController.getImageVariableRegionValues(regions);
+        const unit = viewController.getPixelUnit();
         const quantif = getStats(values, flags);
-        quant.min = {value: quantif.min, unit: ''};
-        quant.max = {value: quantif.max, unit: ''};
-        quant.mean = {value: quantif.mean, unit: ''};
-        quant.stdDev = {value: quantif.stdDev, unit: ''};
+        quant.min = {value: quantif.min, unit: unit};
+        quant.max = {value: quantif.max, unit: unit};
+        quant.mean = {value: quantif.mean, unit: unit};
+        quant.stdDev = {value: quantif.stdDev, unit: unit};
         if (typeof quantif.median !== 'undefined') {
-          quant.median = {value: quantif.median, unit: ''};
+          quant.median = {value: quantif.median, unit: unit};
         }
         if (typeof quantif.p25 !== 'undefined') {
-          quant.p25 = {value: quantif.p25, unit: ''};
+          quant.p25 = {value: quantif.p25, unit: unit};
         }
         if (typeof quantif.p75 !== 'undefined') {
-          quant.p75 = {value: quantif.p75, unit: ''};
+          quant.p75 = {value: quantif.p75, unit: unit};
         }
       }
     }

diff --git a/src/math/rectangle.js b/src/math/rectangle.js
@@ -190,19 +190,20 @@ export class Rectangle {
     if (viewController.canQuantifyImage()) {
       const round = this.getRound();
       const values = viewController.getImageRegionValues(round.min, round.max);
+      const unit = viewController.getPixelUnit();
       const quantif = getStats(values, flags);
-      quant.min = {value: quantif.min, unit: ''};
-      quant.max = {value: quantif.max, unit: ''};
-      quant.mean = {value: quantif.mean, unit: ''};
-      quant.stdDev = {value: quantif.stdDev, unit: ''};
+      quant.min = {value: quantif.min, unit: unit};
+      quant.max = {value: quantif.max, unit: unit};
+      quant.mean = {value: quantif.mean, unit: unit};
+      quant.stdDev = {value: quantif.stdDev, unit: unit};
       if (typeof quantif.median !== 'undefined') {
-        quant.median = {value: quantif.median, unit: ''};
+        quant.median = {value: quantif.median, unit: unit};
       }
       if (typeof quantif.p25 !== 'undefined') {
-        quant.p25 = {value: quantif.p25, unit: ''};
+        quant.p25 = {value: quantif.p25, unit: unit};
       }
       if (typeof quantif.p75 !== 'undefined') {
-        quant.p75 = {value: quantif.p75, unit: ''};
+        quant.p75 = {value: quantif.p75, unit: unit};
       }
     }
 

diff --git a/tests/math/circle.test.js b/tests/math/circle.test.js
@@ -59,6 +59,9 @@ QUnit.test('Test Circle quantify.', function (assert) {
     },
     getImageVariableRegionValues: function () {
       return [0, 1, 1, 0, 0, 1, 1, 0];
+    },
+    getPixelUnit: function () {
+      return '';
     }
   };
   const theoQuant0 = {

diff --git a/tests/math/ellipse.test.js b/tests/math/ellipse.test.js
@@ -64,6 +64,9 @@ QUnit.test('Test Ellipse quantify.', function (assert) {
     },
     getImageVariableRegionValues: function () {
       return [0, 1, 1, 0, 0, 1, 1, 0];
+    },
+    getPixelUnit: function () {
+      return '';
     }
   };
   const theoQuant0 = {

diff --git a/tests/math/rectangle.test.js b/tests/math/rectangle.test.js
@@ -69,6 +69,9 @@ QUnit.test('Test Rectangle quantify.', function (assert) {
     },
     getImageRegionValues: function () {
       return [0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0];
+    },
+    getPixelUnit: function () {
+      return '';
     }
   };
   const theoQuant0 = {