fix(adapters): Measurement reports can throw exceptions that prevent …

…loading (#458)
cornerstonejs · Mar 3, 2023 · 7bc7d8a · 7bc7d8a
1 parent eadd901
commit 7bc7d8a
Showing 1 changed file with 42 additions and 33 deletions.
diff --git a/packages/adapters/src/adapters/Cornerstone3D/MeasurementReport.ts b/packages/adapters/src/adapters/Cornerstone3D/MeasurementReport.ts
@@ -376,43 +376,52 @@ export default class MeasurementReport {
         });
 
         measurementGroups.forEach(measurementGroup => {
-            const measurementGroupContentSequence = toArray(
-                measurementGroup.ContentSequence
-            );
-
-            const TrackingIdentifierGroup =
-                measurementGroupContentSequence.find(
-                    contentItem =>
-                        contentItem.ConceptNameCodeSequence.CodeMeaning ===
-                        TRACKING_IDENTIFIER
+            try {
+                const measurementGroupContentSequence = toArray(
+                    measurementGroup.ContentSequence
                 );
 
-            const TrackingIdentifierValue = TrackingIdentifierGroup.TextValue;
-
-            const toolClass =
-                hooks?.getToolClass?.(
-                    measurementGroup,
-                    dataset,
-                    registeredToolClasses
-                ) ||
-                registeredToolClasses.find(tc =>
-                    tc.isValidCornerstoneTrackingIdentifier(
-                        TrackingIdentifierValue
-                    )
-                );
-
-            if (toolClass) {
-                const measurement = toolClass.getMeasurementData(
+                const TrackingIdentifierGroup =
+                    measurementGroupContentSequence.find(
+                        contentItem =>
+                            contentItem.ConceptNameCodeSequence.CodeMeaning ===
+                            TRACKING_IDENTIFIER
+                    );
+
+                const TrackingIdentifierValue =
+                    TrackingIdentifierGroup.TextValue;
+
+                const toolClass =
+                    hooks?.getToolClass?.(
+                        measurementGroup,
+                        dataset,
+                        registeredToolClasses
+                    ) ||
+                    registeredToolClasses.find(tc =>
+                        tc.isValidCornerstoneTrackingIdentifier(
+                            TrackingIdentifierValue
+                        )
+                    );
+
+                if (toolClass) {
+                    const measurement = toolClass.getMeasurementData(
+                        measurementGroup,
+                        sopInstanceUIDToImageIdMap,
+                        imageToWorldCoords,
+                        metadata
+                    );
+
+                    console.log(`=== ${toolClass.toolType} ===`);
+                    console.log(measurement);
+
+                    measurementData[toolClass.toolType].push(measurement);
+                }
+            } catch (e) {
+                console.warn(
+                    "Unable to generate tool state for",
                     measurementGroup,
-                    sopInstanceUIDToImageIdMap,
-                    imageToWorldCoords,
-                    metadata
+                    e
                 );
-
-                console.log(`=== ${toolClass.toolType} ===`);
-                console.log(measurement);
-
-                measurementData[toolClass.toolType].push(measurement);
             }
         });