Fix(seg) retrieve seg referenced instance (#256)

* fix: 🐛 IDC2733: find segmentations reference source image Ids * fix: Re #255 fix regression in retrieving segmentation frame referenced instance
cornerstonejs · Mar 24, 2022 · cb133b4 · cb133b4
1 parent f3e7101
commit cb133b4
Showing 1 changed file with 23 additions and 25 deletions.
diff --git a/packages/adapters/src/adapters/Cornerstone/Segmentation_4X.js b/packages/adapters/src/adapters/Cornerstone/Segmentation_4X.js
@@ -620,7 +620,29 @@ function findReferenceSourceImageId(
         PerFrameFunctionalGroupsSequence[frameSegment];
     let imageId = undefined;
 
-    if (ReferencedSeriesSequence) {
+    let sourceImageSequence;
+    if (SourceImageSequence) {
+        sourceImageSequence = multiframe.SourceImageSequence[frameSegment];
+    } else if (PerFrameFunctionalGroup.DerivationImageSequence) {
+        let DerivationImageSequence =
+            PerFrameFunctionalGroup.DerivationImageSequence;
+        DerivationImageSequence = Array.isArray(DerivationImageSequence)
+            ? DerivationImageSequence[0]
+            : DerivationImageSequence;
+
+        sourceImageSequence = DerivationImageSequence.SourceImageSequence;
+        sourceImageSequence = Array.isArray(sourceImageSequence)
+            ? sourceImageSequence[0]
+            : sourceImageSequence;
+    }
+
+    imageId = getImageIdOfSourceImagebySourceImageSequence(
+        sourceImageSequence,
+        imageIds,
+        metadataProvider
+    );
+
+    if (imageId === undefined && ReferencedSeriesSequence) {
         const referencedSeriesSequence = Array.isArray(ReferencedSeriesSequence)
             ? ReferencedSeriesSequence[0]
             : ReferencedSeriesSequence;
@@ -636,30 +658,6 @@ function findReferenceSourceImageId(
         );
     }
 
-    if (imageId === undefined) {
-        let sourceImageSequence;
-        if (SourceImageSequence) {
-            sourceImageSequence = multiframe.SourceImageSequence[frameSegment];
-        } else if (PerFrameFunctionalGroup.DerivationImageSequence) {
-            let DerivationImageSequence =
-                PerFrameFunctionalGroup.DerivationImageSequence;
-            DerivationImageSequence = Array.isArray(DerivationImageSequence)
-                ? DerivationImageSequence[0]
-                : DerivationImageSequence;
-
-            sourceImageSequence = DerivationImageSequence.SourceImageSequence;
-            sourceImageSequence = Array.isArray(sourceImageSequence)
-                ? sourceImageSequence[0]
-                : sourceImageSequence;
-        }
-
-        imageId = getImageIdOfSourceImagebySourceImageSequence(
-            sourceImageSequence,
-            imageIds,
-            metadataProvider
-        );
-    }
-
     return imageId;
 }