Make canGetSuvFactor return undef if ok

ivmartel · Dec 15, 2023 · 48b4a15 · 48b4a15
1 parent 770ae24
commit 48b4a15
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/dicom/dicomElementsWrapper.js b/src/dicom/dicomElementsWrapper.js
@@ -577,7 +577,8 @@ function checkTag(element, name, values) {
  * Do the input elements allow for PET SUV calculation.
  *
  * @param {object} elements The DICOM elements to check.
- * @returns {string} A warning if the elements are not as expected.
+ * @returns {string|undefined} A warning if the elements are not as expected,
+ *    undefined if all good.
  */
 export function canGetSuvFactor(elements) {
   let warning = '';
@@ -648,10 +649,11 @@ export function canGetSuvFactor(elements) {
     }
   }
 
+  let res;
   if (warning.length !== 0) {
-    warning = 'Cannot calculate PET SUV:' + warning;
+    res = 'Cannot calculate PET SUV:' + warning;
   }
-  return warning;
+  return res;
 }
 
 /**

diff --git a/src/image/imageFactory.js b/src/image/imageFactory.js
@@ -219,7 +219,7 @@ export class ImageFactory {
     if (typeof meta.Modality !== 'undefined' &&
       meta.Modality === 'PT') {
       const warn = canGetSuvFactor(dataElements);
-      if (warn.length === 0) {
+      if (typeof warn === 'undefined') {
         isPetWithSuv = true;
       } else {
         logger.warn(warn);