Fix contour annotations RTSS saving (#5545)

* [WIP] Fix contour annotations RTSS saving

* fix: Export image sop image reference provider

* Fixes for download with filename

* Updates to fix metadata issues with CS3D

* Updates to save menu

* Fixing some additional re-save metadata

* Add support for saving with predecessor image sequence

* PR comment fixes

* fix: Load RTSS after save

* fix segmentation save

* fix load of mixed seg/rt studies

* Use frame module to get information on the frame shown

* Fix study browser to use instances.length when numImageFrames not present

* fix: Load of display set split from multiple non-FOR referenes

* Fix RT and SEG applying to wrong series because of using
referenced series sequence without checkout sop instances

* Fix save seg

* Update to released CS3D versions

* test: Add revokeObjectURL to test download blob

* Add hard dependency on mode-basic to fix build order issues

* fix: build

* Try to fix build segmentation

* PR comments

* PR comment update

extensions/cornerstone-dicom-sr/package.json

@@ -38,7 +38,7 @@
     "@ohif/extension-cornerstone": "3.12.0-beta.90",
     "@ohif/extension-measurement-tracking": "3.12.0-beta.90",
     "@ohif/ui": "3.12.0-beta.90",
-    "dcmjs": "0.43.1",
+    "dcmjs": "0.45.0",
     "dicom-parser": "1.8.21",
     "hammerjs": "2.0.8",
     "prop-types": "15.8.1",
@@ -46,9 +46,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@cornerstonejs/adapters": "4.11.2",
-    "@cornerstonejs/core": "4.11.2",
-    "@cornerstonejs/tools": "4.11.2",
+    "@cornerstonejs/adapters": "4.11.3",
+    "@cornerstonejs/core": "4.11.3",
+    "@cornerstonejs/tools": "4.11.3",
     "classnames": "2.5.1"
   }
 }

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

@@ -1,12 +1,14 @@
-import { metaData, utilities } from '@cornerstonejs/core';
+import { metaData } from '@cornerstonejs/core';
 
-import OHIF, { DicomMetadataStore } from '@ohif/core';
+import OHIF, { DicomMetadataStore, utils } from '@ohif/core';
 import dcmjs from 'dcmjs';
 import { adaptersSR } from '@cornerstonejs/adapters';
 
 import getFilteredCornerstoneToolState from './utils/getFilteredCornerstoneToolState';
 import hydrateStructuredReport from './utils/hydrateStructuredReport';
 
+const { downloadBlob } = utils;
+
 const { MeasurementReport } = adaptersSR.Cornerstone3D;
 const { log } = OHIF;
 
@@ -42,8 +44,6 @@ const _generateReport = (measurementData, additionalFindingTypes, options: Optio
     dataset.SpecificCharacterSet = 'ISO_IR 192';
   }
 
-  dataset.InstanceNumber = options.InstanceNumber ?? 1;
-
   return dataset;
 };
 
@@ -85,8 +85,7 @@ const commandsModule = (props: withAppTypes) => {
       const reportBlob = dcmjs.data.datasetToBlob(srDataset);
 
       //Create a URL for the binary.
-      const objectUrl = URL.createObjectURL(reportBlob);
-      window.location.assign(objectUrl);
+      downloadBlob(reportBlob, { filename: 'dicom-sr.dcm' });
     },
 
     /**

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

@@ -100,6 +100,7 @@ function _getDisplaySetsFromSeries(
     SeriesTime,
     ConceptNameCodeSequence,
     SOPClassUID,
+    imageId: predecessorImageId,
   } = instance;
   validateSameStudyUID(instance.StudyInstanceUID, instances);
 
@@ -128,6 +129,7 @@ function _getDisplaySetsFromSeries(
     isImagingMeasurementReport,
     sopClassUids,
     instance,
+    predecessorImageId,
     addInstances,
     label: SeriesDescription || `${i18n.t('Series')} ${SeriesNumber} - ${i18n.t('SR')}`,
   };
@@ -184,6 +186,10 @@ async function _load(
     srDisplaySet.referencedImages = [];
     srDisplaySet.measurements = [];
   }
+  const { predecessorImageId } = srDisplaySet;
+  for (const measurement of srDisplaySet.measurements) {
+    measurement.predecessorImageId = predecessorImageId;
+  }
 
   const mappings = measurementService.getSourceMappings(
     CORNERSTONE_3D_TOOLS_SOURCE_NAME,

extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts

@@ -54,6 +54,11 @@ export default function hydrateStructuredReport(
   const disableEditing = customizationService.getCustomization('panelMeasurement.disableEditing');
 
   const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
+  const {
+    StudyInstanceUID: studyUID,
+    SeriesInstanceUID: seriesUID,
+    instance: { SOPInstanceUID: sopUID },
+  } = displaySet;
 
   // TODO -> We should define a strict versioning somewhere.
   const mappings = measurementService.getSourceMappings(
@@ -67,16 +72,12 @@ export default function hydrateStructuredReport(
     );
   }
 
-  const instance = DicomMetadataStore.getInstance(
-    displaySet.StudyInstanceUID,
-    displaySet.SeriesInstanceUID,
-    displaySet.SOPInstanceUID
-  );
+  const instance = DicomMetadataStore.getInstance(studyUID, seriesUID, sopUID);
 
   const sopInstanceUIDToImageId = {};
 
   displaySet.measurements.forEach(measurement => {
-    const { ReferencedSOPInstanceUID, imageId, frameNumber=1 } = measurement;
+    const { ReferencedSOPInstanceUID, imageId, frameNumber = 1 } = measurement;
     const key = `${ReferencedSOPInstanceUID}:${frameNumber}`;
 
     if (!sopInstanceUIDToImageId[key]) {
@@ -200,6 +201,7 @@ export default function hydrateStructuredReport(
       const annotation = {
         annotationUID: toolData.annotation.annotationUID,
         data: toolData.annotation.data,
+        predecessorImageId: toolData.predecessorImageId,
         metadata: {
           ...referenceData,
           toolName: annotationType,