WIP fix(SR): Fix/sr SCOORD3D not loading

extensions/cornerstone-dicom-sr/src/getSopClassHandlerModule.ts

@@ -3,7 +3,6 @@ import { utils, classes, DisplaySetService, Types } from '@ohif/core';
 import addMeasurement from './utils/addMeasurement';
 import isRehydratable from './utils/isRehydratable';
 import { adaptersSR } from '@cornerstonejs/adapters';
-
 type InstanceMetadata = Types.InstanceMetadata;
 
 const { CodeScheme: Cornerstone3DCodeScheme } = adaptersSR.Cornerstone3D;
@@ -155,9 +154,31 @@ function _load(displaySet, servicesManager, extensionManager) {
   const dataSources = extensionManager.getDataSources();
   const dataSource = dataSources[0];
 
+  const { customizationService } = servicesManager.services;
+
   const { ContentSequence } = displaySet.instance;
 
-  displaySet.referencedImages = _getReferencedImagesList(ContentSequence);
+  // get the dicomSRExtensionCustomizations object, if exists
+  const dicomSrExtensionCustomizations = customizationService.getModeCustomization(
+    'dicomSrExtensionCustomizations'
+  );
+
+  if (
+    dicomSrExtensionCustomizations?.convertAnnotations &&
+    typeof dicomSrExtensionCustomizations?.convertAnnotations === 'function'
+  ) {
+    const referencedImages = dicomSrExtensionCustomizations.convertAnnotations(
+      displaySet.instance,
+      displaySetService
+    );
+    if (referencedImages && referencedImages.length) {
+      displaySet.referencedImages = referencedImages;
+    }
+  }
+
+  if (!displaySet.referencedImages) {
+    displaySet.referencedImages = _getReferencedImagesList(ContentSequence);
+  }
   displaySet.measurements = _getMeasurements(ContentSequence);
 
   const mappings = measurementService.getSourceMappings(

extensions/cornerstone/src/initMeasurementService.js

@@ -358,7 +358,7 @@ const connectMeasurementServiceToTools = (
       }
 
       const annotationManager = annotation.state.getAnnotationManager();
-      annotationManager.addAnnotation({
+      const newAnnotation = {
         annotationUID: measurement.uid,
         highlighted: false,
         isLocked: false,
@@ -369,13 +369,19 @@ const connectMeasurementServiceToTools = (
           referencedImageId: imageId,
         },
         data: {
+          ...data.annotation.data,
           text: data.annotation.data.text,
           handles: { ...data.annotation.data.handles },
           cachedStats: { ...data.annotation.data.cachedStats },
           label: data.annotation.data.label,
           frameNumber: frameNumber,
         },
-      });
+      };
+      if (data.annotation.data?.polyline) {
+        newAnnotation.data.polyline = data.annotation.data.polyline;
+      }
+
+      annotationManager.addAnnotation(newAnnotation);
     }
   );
 

platform/core/src/services/MeasurementService/MeasurementService.ts

@@ -27,6 +27,7 @@ import { PubSubService } from '../_shared/pubSubServiceInterface';
  * @property {Array} points -
  * @property {MeasurementSource} source -
  * @property {boolean} selected -
+ * @property {string} text -
  */
 
 /* Measurement schema keys for object validation. */
@@ -58,6 +59,7 @@ const MEASUREMENT_SCHEMA_KEYS = [
   'longestDiameter',
   'cachedStats',
   'selected',
+  'text',
 ];
 
 const EVENTS = {

platform/ui/src/contextProviders/ViewportGridProvider.tsx

@@ -153,16 +153,16 @@ export function ViewportGridProvider({ children, service }) {
           );
 
           const displaySetOptions = updatedViewport.displaySetOptions || [];
-          if (!displaySetOptions.length) {
+          if (!displaySetOptions.length && previousViewport?.displaySetOptions) {
             // Copy all the display set options, assuming a full set of displaySet UID's is provided.
-            displaySetOptions.push(...previousViewport.displaySetOptions);
+            displaySetOptions.push(...previousViewport?.displaySetOptions);
             if (!displaySetOptions.length) {
               displaySetOptions.push({});
             }
           }
 
           const newViewport = {
-            ...previousViewport,
+            ...previousViewport || {},
             displaySetInstanceUIDs,
             viewportOptions,
             displaySetOptions,