fix: catch errors in getPTImageIdInstanceMetadata

OHIF · Jan 15, 2024 · 893ebe4 · 893ebe4
1 parent 9c553fd
commit 893ebe4
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/extensions/default/src/init.ts b/extensions/default/src/init.ts
@@ -63,30 +63,29 @@ const handlePETImageMetadata = ({ SeriesInstanceUID, StudyInstanceUID }) => {
 
   const imageIds = instances.map(instance => instance.imageId);
   const instanceMetadataArray = [];
-  imageIds.forEach(imageId => {
-    const instanceMetadata = getPTImageIdInstanceMetadata(imageId);
-    if (instanceMetadata) {
-      instanceMetadataArray.push(instanceMetadata);
-    }
-  });
-
-  if (!instanceMetadataArray.length) {
-    return;
-  }
 
   // try except block to prevent errors when the metadata is not correct
-  let suvScalingFactors;
   try {
-    suvScalingFactors = calculateSUVScalingFactors(instanceMetadataArray);
+    imageIds.forEach(imageId => {
+      const instanceMetadata = getPTImageIdInstanceMetadata(imageId);
+      if (instanceMetadata) {
+        instanceMetadataArray.push(instanceMetadata);
+      }
+    });
+
+    if (!instanceMetadataArray.length) {
+      return;
+    }
+
+    const suvScalingFactors = calculateSUVScalingFactors(instanceMetadataArray);
+    instanceMetadataArray.forEach((instanceMetadata, index) => {
+      metadataProvider.addCustomMetadata(
+        imageIds[index],
+        'scalingModule',
+        suvScalingFactors[index]
+      );
+    });
   } catch (error) {
     console.log(error);
   }
-
-  if (!suvScalingFactors) {
-    return;
-  }
-
-  instanceMetadataArray.forEach((instanceMetadata, index) => {
-    metadataProvider.addCustomMetadata(imageIds[index], 'scalingModule', suvScalingFactors[index]);
-  });
 };