@ohif/app 3.12.0-beta.90 → 3.12.0-beta.92

package/dist/{7412.bundle.34fe5e72833e857edc0a.js → 7412.bundle.dfe01ae3e53107abe53d.js}

@@ -6809,7 +6809,7 @@ function updateLabelmapSegmentationImageReferences(viewportId, segmentationId) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (/* binding */ convertContourHoles)
 /* harmony export */ });
-/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6936);
+/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19111);
 /* harmony import */ var _annotation_annotationState__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(82056);
 /* harmony import */ var _getSegmentation__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33283);
 /* harmony import */ var _extractSegmentPolylines__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(96629);
@@ -7250,7 +7250,7 @@ function removeCompleteContourAnnotation(annotation) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (/* binding */ removeContourHoles)
 /* harmony export */ });
-/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6936);
+/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19111);
 /* harmony import */ var _annotation_annotationState__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(82056);
 /* harmony import */ var _getSegmentation__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33283);
 /* harmony import */ var _extractSegmentPolylines__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(96629);
@@ -23579,6 +23579,8 @@ function defaultGetTextLines(data, targetId) {
 /* harmony import */ var _stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(44049);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(99737);
 /* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(74347);
+/* harmony import */ var _utilities_contours_AnnotationToPointData__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(29632);
+
 
 
 
@@ -23666,6 +23668,9 @@ class LivewireContourSegmentationTool extends _LivewireContourTool__WEBPACK_IMPO
     isContourSegmentationTool() {
         return true;
     }
+    static {
+        _utilities_contours_AnnotationToPointData__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .A.register(this);
+    }
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (LivewireContourSegmentationTool);
 
@@ -29680,14 +29685,20 @@ function _checkContourGeometryMatchViewport(geometryIds, viewportNormal) {
         return false;
     }
     const contours = geometryData.contours;
-    const points = contours[0].points;
-    const point1 = points[0];
-    const point2 = points[1];
-    const point3 = points[2];
-    let normal = gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.cross */ .eR.cross(gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create(), gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.sub */ .eR.sub(gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create(), point2, point1), gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.sub */ .eR.sub(gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create(), point3, point1));
-    normal = gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.normalize */ .eR.normalize(gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create(), normal);
-    const dotProduct = gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.dot */ .eR.dot(normal, viewportNormal);
-    return Math.abs(dotProduct) > 0.9;
+    const { points } = contours[0];
+    const [point] = points;
+    const delta = gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create();
+    const { length } = points;
+    const increment = Math.ceil(length / 25);
+    for (let i = 1; i < length; i += increment) {
+        const point2 = points[i];
+        gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.sub */ .eR.sub(delta, point, point2);
+        gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.normalize */ .eR.normalize(delta, delta);
+        if (gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.dot */ .eR.dot(viewportNormal, delta) > 0.1) {
+            return false;
+        }
+    }
+    return true;
 }
 function _checkContourNormalsMatchViewport(annotationUIDsMap, viewportNormal) {
     const annotationUIDs = Array.from(annotationUIDsMap.values())
@@ -36563,6 +36574,58 @@ function cleanupPolylines(polylines) {
 }
 
 
+/***/ }),
+
+/***/ 29632:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+/* harmony import */ var _RectangleROIStartEndThreshold__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(109);
+
+function validateAnnotation(annotation) {
+    if (!annotation?.data) {
+        throw new Error('Tool data is empty');
+    }
+    if (!annotation.metadata || !annotation.metadata.referencedImageId) {
+        throw new Error('Tool data is not associated with any imageId');
+    }
+}
+class AnnotationToPointData {
+    static { this.TOOL_NAMES = {}; }
+    constructor() {
+    }
+    static convert(annotation, segment, metadataProvider) {
+        validateAnnotation(annotation);
+        const { toolName } = annotation.metadata;
+        const toolClass = AnnotationToPointData.TOOL_NAMES[toolName];
+        if (!toolClass) {
+            throw new Error(`Unknown tool type: ${toolName}, cannot convert to RTSSReport`);
+        }
+        const contourSequence = toolClass.getContourSequence(annotation, metadataProvider);
+        const color = segment.color?.slice(0, 3) || [
+            Math.floor(Math.random() * 255),
+            Math.floor(Math.random() * 255),
+            Math.floor(Math.random() * 255),
+        ];
+        return {
+            ReferencedROINumber: segment.segmentIndex,
+            ROIDisplayColor: color,
+            ContourSequence: Array.isArray(contourSequence)
+                ? contourSequence
+                : [contourSequence],
+        };
+    }
+    static register(toolClass) {
+        AnnotationToPointData.TOOL_NAMES[toolClass.toolName] = toolClass;
+    }
+}
+AnnotationToPointData.register(_RectangleROIStartEndThreshold__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A);
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (AnnotationToPointData);
+
+
 /***/ }),
 
 /***/ 93843:
@@ -36849,7 +36912,7 @@ function getDeduplicatedVTKPolyDataPoints(polyData, bypass = false) {
 
 /***/ }),
 
-/***/ 6936:
+/***/ 19111:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -36858,7 +36921,7 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  AnnotationToPointData: () => (/* reexport */ contours_AnnotationToPointData),
+  AnnotationToPointData: () => (/* reexport */ AnnotationToPointData/* default */.A),
   acceptAutogeneratedInterpolations: () => (/* reexport */ acceptAutogeneratedInterpolations),
   areCoplanarContours: () => (/* reexport */ areCoplanarContours),
   calculatePerimeter: () => (/* reexport */ calculatePerimeter/* default */.A),
@@ -37124,48 +37187,8 @@ async function generateContourSetsFromLabelmap({ segmentations }) {
 }
 
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/RectangleROIStartEndThreshold.js
-var RectangleROIStartEndThreshold = __webpack_require__(109);
-;// ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/AnnotationToPointData.js
-
-function validateAnnotation(annotation) {
-    if (!annotation?.data) {
-        throw new Error('Tool data is empty');
-    }
-    if (!annotation.metadata || annotation.metadata.referencedImageId) {
-        throw new Error('Tool data is not associated with any imageId');
-    }
-}
-class AnnotationToPointData {
-    static { this.TOOL_NAMES = {}; }
-    constructor() {
-    }
-    static convert(annotation, index, metadataProvider) {
-        validateAnnotation(annotation);
-        const { toolName } = annotation.metadata;
-        const toolClass = AnnotationToPointData.TOOL_NAMES[toolName];
-        if (!toolClass) {
-            throw new Error(`Unknown tool type: ${toolName}, cannot convert to RTSSReport`);
-        }
-        const ContourSequence = toolClass.getContourSequence(annotation, metadataProvider);
-        const color = [
-            Math.floor(Math.random() * 255),
-            Math.floor(Math.random() * 255),
-            Math.floor(Math.random() * 255),
-        ];
-        return {
-            ReferencedROINumber: index + 1,
-            ROIDisplayColor: color,
-            ContourSequence,
-        };
-    }
-    static register(toolClass) {
-        AnnotationToPointData.TOOL_NAMES[toolClass.toolName] = toolClass;
-    }
-}
-AnnotationToPointData.register(RectangleROIStartEndThreshold/* default */.A);
-/* harmony default export */ const contours_AnnotationToPointData = (AnnotationToPointData);
-
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/AnnotationToPointData.js
+var AnnotationToPointData = __webpack_require__(29632);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/getContourHolesDataWorld.js
 var getContourHolesDataWorld = __webpack_require__(55659);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/getContourHolesDataCanvas.js
@@ -38006,7 +38029,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _AnnotationMultiSlice__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(16678);
 /* harmony import */ var _getViewportForAnnotation__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(40133);
 /* harmony import */ var _annotationHydration__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(64485);
-/* harmony import */ var _contours__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(6936);
+/* harmony import */ var _contours__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(19111);
 /* harmony import */ var _segmentation__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(93759);
 /* harmony import */ var _drawing__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(473);
 /* harmony import */ var _math__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(95527);
@@ -39658,7 +39681,7 @@ async function calculateForVolume({ segmentationIds, segmentIndex }) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (/* binding */ contourAndFindLargestBidirectional)
 /* harmony export */ });
-/* harmony import */ var _contours__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6936);
+/* harmony import */ var _contours__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19111);
 /* harmony import */ var _findLargestBidirectional__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(60199);
 /* harmony import */ var _getOrCreateSegmentationVolume__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30722);
 
@@ -44472,7 +44495,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   r: () => (/* binding */ version)
 /* harmony export */ });
-const version = '4.11.2';
+const version = '4.11.3';
 
 
 /***/ }),

package/dist/{8305.bundle.8ea926425cdffaf84fe3.js → 8305.bundle.08ba73235df90e099838.js}

@@ -30,8 +30,8 @@ var i18n_src = __webpack_require__(68523);
 var esm = __webpack_require__(15327);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js
 var dist_esm = __webpack_require__(4667);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 69 modules
-var adapters_dist_esm = __webpack_require__(53434);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 70 modules
+var adapters_dist_esm = __webpack_require__(14041);
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
 var dcmjs_es = __webpack_require__(5842);
 ;// ../../../extensions/cornerstone-dicom-seg/src/utils/dicomlabToRGB.ts
@@ -58,18 +58,23 @@ function dicomlabToRGB(cielab) {
 const sopClassUids = ['1.2.840.10008.5.1.4.1.1.66.4', '1.2.840.10008.5.1.4.1.1.66.7'];
 const loadPromises = {};
 function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager) {
-  const instance = instances[0];
+  src/* utils */.Wp.sortStudyInstances(instances);
+
+  // Choose the LAST instance in the list as the most recently created one.
+  const instance = instances[instances.length - 1];
   const {
     StudyInstanceUID,
     SeriesInstanceUID,
     SOPInstanceUID,
-    SeriesDescription,
+    SeriesDescription = '',
     SeriesNumber,
     SeriesDate,
+    StructureSetDate,
     SOPClassUID,
     wadoRoot,
     wadoUri,
-    wadoUriRoot
+    wadoUriRoot,
+    imageId: predecessorImageId
   } = instance;
   const displaySet = {
     Modality: 'SEG',
@@ -78,7 +83,7 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     displaySetInstanceUID: src/* utils */.Wp.guid(),
     SeriesDescription,
     SeriesNumber,
-    SeriesDate,
+    SeriesDate: SeriesDate || StructureSetDate || '',
     SOPInstanceUID,
     SeriesInstanceUID,
     StudyInstanceUID,
@@ -93,6 +98,7 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     segments: {},
     sopClassUids,
     instance,
+    predecessorImageId,
     instances: [instance],
     wadoRoot,
     wadoUriRoot,
@@ -111,7 +117,10 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
   const {
     displaySetService
   } = servicesManager.services;
-  const referencedDisplaySets = displaySetService.getDisplaySetsForSeries(displaySet.referencedSeriesInstanceUID);
+  const referencedDisplaySets = displaySetService.getDisplaySetsForReferences(instance.ReferencedSeriesSequence);
+  if (referencedDisplaySets?.length > 1) {
+    console.warn('Segmentation does not currently handle references to multiple series, defaulting to first series');
+  }
   const referencedDisplaySet = referencedDisplaySets[0];
   if (!referencedDisplaySet) {
     // subscribe to display sets added which means at some point it will be available
@@ -345,8 +354,8 @@ function getHangingProtocolModule() {
 }
 /* harmony default export */ const src_getHangingProtocolModule = (getHangingProtocolModule);
 
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 141 modules
-var default_src = __webpack_require__(39548);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 139 modules
+var default_src = __webpack_require__(39195);
 // EXTERNAL MODULE: ../../../extensions/default/src/utils/_shared/PROMPT_RESPONSES.ts
 var PROMPT_RESPONSES = __webpack_require__(96357);
 ;// ../../../extensions/cornerstone-dicom-seg/src/commandsModule.ts
@@ -357,10 +366,6 @@ var PROMPT_RESPONSES = __webpack_require__(96357);
 
 
 
-
-const {
-  datasetToBlob
-} = dcmjs_es/* default.data */.Ay.data;
 const getTargetViewport = ({
   viewportId,
   viewportGridService
@@ -383,7 +388,7 @@ const {
 const {
   Cornerstone3D: {
     RTSS: {
-      generateRTSSFromSegmentations
+      generateRTSSFromRepresentation
     }
   }
 } = adapters_dist_esm/* adaptersRT */.f_;
@@ -454,6 +459,7 @@ const commandsModule = ({
       options = {}
     }) => {
       const segmentation = dist_esm.segmentation.state.getSegmentation(segmentationId);
+      const predecessorImageId = options.predecessorImageId ?? segmentation.predecessorImageId;
       const {
         imageIds
       } = segmentation.representationData.Labelmap;
@@ -521,7 +527,10 @@ const commandsModule = ({
         };
         labelmap3D.metadata[segmentIndex] = segmentMetadata;
       });
-      const generatedSegmentation = generateSegmentation(referencedImages, labelmap3D, esm.metaData, options);
+      const generatedSegmentation = generateSegmentation(referencedImages, labelmap3D, esm.metaData, {
+        predecessorImageId,
+        ...options
+      });
       return generatedSegmentation;
     },
     /**
@@ -557,34 +566,44 @@ const commandsModule = ({
      */
     storeSegmentation: async ({
       segmentationId,
-      dataSource
+      dataSource,
+      modality = 'SEG'
     }) => {
       const segmentation = segmentationService.getSegmentation(segmentationId);
       if (!segmentation) {
         throw new Error('No segmentation found');
       }
       const {
-        label
+        label,
+        predecessorImageId
       } = segmentation;
       const defaultDataSource = dataSource ?? extensionManager.getActiveDataSource()[0];
       const {
         value: reportName,
         dataSourceName: selectedDataSource,
+        series,
+        priorSeriesNumber,
         action
       } = await (0,default_src.createReportDialogPrompt)({
         servicesManager,
         extensionManager,
-        title: 'Store Segmentation'
+        predecessorImageId,
+        title: 'Store Segmentation',
+        modality
       });
       if (action === PROMPT_RESPONSES/* default */.A.CREATE_REPORT) {
         try {
           const selectedDataSourceConfig = selectedDataSource ? extensionManager.getDataSources(selectedDataSource)[0] : defaultDataSource;
-          const generatedData = actions.generateSegmentation({
+          const args = {
             segmentationId,
             options: {
-              SeriesDescription: reportName || label || 'Research Derived Series'
+              SeriesDescription: series ? undefined : reportName || label || 'Contour Series',
+              SeriesNumber: series ? undefined : 1 + priorSeriesNumber,
+              predecessorImageId: series
             }
-          });
+          };
+          const generatedDataAsync = modality === 'SEG' && actions.generateSegmentation(args) || modality === 'RTSTRUCT' && actions.generateContour(args);
+          const generatedData = await generatedDataAsync;
           if (!generatedData || !generatedData.dataset) {
             throw new Error('Error during segmentation generation');
           }
@@ -608,30 +627,43 @@ const commandsModule = ({
         }
       }
     },
-    /**
-     * Converts segmentations into RTSS for download.
-     * This sample function retrieves all segentations and passes to
-     * cornerstone tool adapter to convert to DICOM RTSS format. It then
-     * converts dataset to downloadable blob.
-     *
-     */
-    downloadRTSS: async ({
-      segmentationId
-    }) => {
+    generateContour: async args => {
+      const {
+        segmentationId,
+        options
+      } = args;
       const segmentations = segmentationService.getSegmentation(segmentationId);
 
       // inject colors to the segmentIndex
       const firstRepresentation = segmentationService.getRepresentationsForSegmentation(segmentationId)[0];
       Object.entries(segmentations.segments).forEach(([segmentIndex, segment]) => {
-        segment.color = segmentationService.getSegmentColor(firstRepresentation.viewportId, segmentationId, segmentIndex);
+        segment.color = segmentationService.getSegmentColor(firstRepresentation.viewportId, segmentationId, Number(segmentIndex));
       });
-      const RTSS = await generateRTSSFromSegmentations(segmentations, src/* classes */.Ly.MetadataProvider, src/* DicomMetadataStore */.H8);
+      const predecessorImageId = options?.predecessorImageId ?? segmentations.predecessorImageId;
+      const dataset = await generateRTSSFromRepresentation(segmentations, {
+        predecessorImageId,
+        ...options
+      });
+      return {
+        dataset
+      };
+    },
+    /**
+     * Downloads an RTSS instance from a segmentation or contour
+     * representation.
+     */
+    downloadRTSS: async args => {
+      const {
+        dataset
+      } = await actions.generateContour(args);
+      const {
+        InstanceNumber: instanceNumber = 1,
+        SeriesInstanceUID: seriesUID
+      } = dataset;
       try {
-        const reportBlob = datasetToBlob(RTSS);
-
         //Create a URL for the binary.
-        const objectUrl = URL.createObjectURL(reportBlob);
-        window.location.assign(objectUrl);
+        const filename = `rtss-${seriesUID}-${instanceNumber}.dcm`;
+        downloadDICOMData(dataset, filename);
       } catch (e) {
         console.warn(e);
       }
@@ -654,24 +686,12 @@ const commandsModule = ({
     }
   };
   const definitions = {
-    loadSegmentationsForViewport: {
-      commandFn: actions.loadSegmentationsForViewport
-    },
-    generateSegmentation: {
-      commandFn: actions.generateSegmentation
-    },
-    downloadSegmentation: {
-      commandFn: actions.downloadSegmentation
-    },
-    storeSegmentation: {
-      commandFn: actions.storeSegmentation
-    },
-    downloadRTSS: {
-      commandFn: actions.downloadRTSS
-    },
-    toggleActiveSegmentationUtility: {
-      commandFn: actions.toggleActiveSegmentationUtility
-    }
+    loadSegmentationsForViewport: actions.loadSegmentationsForViewport,
+    generateSegmentation: actions.generateSegmentation,
+    downloadSegmentation: actions.downloadSegmentation,
+    storeSegmentation: actions.storeSegmentation,
+    downloadRTSS: actions.downloadRTSS,
+    toggleActiveSegmentationUtility: actions.toggleActiveSegmentationUtility
   };
   return {
     actions,

package/dist/{8558.bundle.c9ffb4f942dbbbff1849.js → 8558.bundle.705446f4883e84021bf4.js}

@@ -392,9 +392,9 @@ async function checkAndLoadContourData({
         ROIContour.ContourSequence.forEach((Contour, index) => {
           const promise = resolvedPromises[index];
           if (promise.status === 'fulfilled') {
-            if (Array.isArray(promise.value) && promise.value.every(Number.isFinite)) {
+            if (Array.isArray(promise.value) && promise.value.every(it => Number.isFinite(Number(it)))) {
               // If promise.value is already an array of numbers, use it directly
-              Contour.ContourData = promise.value;
+              Contour.ContourData = promise.value.map(Number);
             } else {
               // If the resolved promise value is a byte array (Blob), it needs to be decoded
               const uint8Array = new Uint8Array(promise.value);
@@ -647,18 +647,24 @@ const sopClassUids = [sopClassDictionary.RTStructureSetStorage];
 const cachedRTStructsSEG = new Set();
 const loadPromises = {};
 function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager) {
-  const instance = instances[0];
+  src/* utils */.Wp.sortStudyInstances(instances);
+  // Choose the LAST instance in the list as the most recently created one.
+  const instance = instances[instances.length - 1];
   const {
     StudyInstanceUID,
     SeriesInstanceUID,
     SOPInstanceUID,
-    SeriesDescription,
+    SeriesDescription = '',
     SeriesNumber,
     SeriesDate,
+    SeriesTime,
+    StructureSetDate,
+    StructureSetTime,
     SOPClassUID,
     wadoRoot,
     wadoUri,
-    wadoUriRoot
+    wadoUriRoot,
+    imageId: predecessorImageId
   } = instance;
   const displaySet = {
     Modality: 'RTSTRUCT',
@@ -667,7 +673,13 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     displaySetInstanceUID: src/* utils */.Wp.guid(),
     SeriesDescription,
     SeriesNumber,
-    SeriesDate,
+    /**
+     * The "SeriesDate" for a display set is really the display set date, which
+     * should be the date of the instance being used, which will be the structure
+     * set date in this case.
+     */
+    SeriesDate: StructureSetDate || SeriesDate,
+    SeriesTime: StructureSetTime || SeriesTime,
     SOPInstanceUID,
     SeriesInstanceUID,
     StudyInstanceUID,
@@ -682,6 +694,8 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     structureSet: null,
     sopClassUids,
     instance,
+    instances,
+    predecessorImageId,
     wadoRoot,
     wadoUriRoot,
     wadoUri,
@@ -689,12 +703,13 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     label: SeriesDescription || `${i18n_src/* default */.A.t('Series')} ${SeriesNumber} - ${i18n_src/* default */.A.t('RTSTRUCT')}`
   };
   let referencedSeriesSequence = instance.ReferencedSeriesSequence;
-  if (instance.ReferencedFrameOfReferenceSequence && !instance.ReferencedSeriesSequence) {
+  if (instance.ReferencedFrameOfReferenceSequence?.RTReferencedStudySequence && !instance.ReferencedSeriesSequence) {
     instance.ReferencedSeriesSequence = _deriveReferencedSeriesSequenceFromFrameOfReferenceSequence(instance.ReferencedFrameOfReferenceSequence);
     referencedSeriesSequence = instance.ReferencedSeriesSequence;
   }
   if (!referencedSeriesSequence) {
-    throw new Error('ReferencedSeriesSequence is missing for the RTSTRUCT');
+    console.error('ReferencedSeriesSequence is missing for the RTSTRUCT');
+    return;
   }
   const referencedSeries = referencedSeriesSequence[0];
   displaySet.referencedImages = instance.ReferencedSeriesSequence.ReferencedInstanceSequence;
@@ -702,7 +717,10 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
   const {
     displaySetService
   } = servicesManager.services;
-  const referencedDisplaySets = displaySetService.getDisplaySetsForSeries(displaySet.referencedSeriesInstanceUID);
+  const referencedDisplaySets = displaySetService.getDisplaySetsForReferences(referencedSeriesSequence);
+  if (referencedDisplaySets?.length > 1) {
+    console.warn('Reference applies to more than 1 display set for Contours, applying only to first display set');
+  }
   if (!referencedDisplaySets || referencedDisplaySets.length === 0) {
     // Instead of throwing error, subscribe to display sets added
     const {
@@ -718,7 +736,7 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
       }
     });
   } else {
-    const referencedDisplaySet = referencedDisplaySets[0];
+    const [referencedDisplaySet] = referencedDisplaySets;
     displaySet.referencedDisplaySetInstanceUID = referencedDisplaySet.displaySetInstanceUID;
     displaySet.isReconstructable = referencedDisplaySet.isReconstructable;
   }
@@ -879,7 +897,7 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return Promise.all(/* import() */[__webpack_require__.e(4019), __webpack_require__.e(319), __webpack_require__.e(5400), __webpack_require__.e(7412), __webpack_require__.e(2108), __webpack_require__.e(7431), __webpack_require__.e(9548), __webpack_require__.e(1903), __webpack_require__.e(1608)]).then(__webpack_require__.bind(__webpack_require__, 88414));
+  return Promise.all(/* import() */[__webpack_require__.e(4019), __webpack_require__.e(319), __webpack_require__.e(5400), __webpack_require__.e(7412), __webpack_require__.e(2108), __webpack_require__.e(7431), __webpack_require__.e(9195), __webpack_require__.e(1903), __webpack_require__.e(1608)]).then(__webpack_require__.bind(__webpack_require__, 88414));
 });
 const OHIFCornerstoneRTViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {

package/dist/{8583.bundle.7715397a42e8f00a9e3e.js → 8583.bundle.0288cadf5cf8401446b1.js}

@@ -998,8 +998,8 @@ const handleROIThresholding = async ({
     segmentationService.addOrUpdateSegmentation(segmentation);
   });
 };
-// EXTERNAL MODULE: ../../core/src/utils/index.ts + 31 modules
-var utils = __webpack_require__(12505);
+// EXTERNAL MODULE: ../../core/src/utils/index.ts + 33 modules
+var utils = __webpack_require__(37447);
 ;// ../../../extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdExport.tsx
 
 
@@ -1096,8 +1096,8 @@ function PanelRoiThresholdSegmentation() {
 
 
 
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 141 modules
-var default_src = __webpack_require__(39548);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 139 modules
+var default_src = __webpack_require__(39195);
 ;// ../../../extensions/tmtv/src/Panels/PanelTMTV.tsx
 
 
@@ -1433,6 +1433,10 @@ function _getStrategyFn(statistic) {
 }
 /* harmony default export */ const getThresholdValue = (getThresholdValues);
 ;// ../../../extensions/tmtv/src/utils/createAndDownloadTMTVReport.js
+
+const {
+  downloadCsv
+} = src/* utils */.Wp;
 function createAndDownloadTMTVReport(segReport, additionalReportRows, options = {}) {
   const firstReport = segReport[Object.keys(segReport)[0]];
   const columns = Object.keys(firstReport);
@@ -1463,19 +1467,14 @@ function createAndDownloadTMTVReport(segReport, additionalReportRows, options =
     });
     csv.push(temp.join(','));
   });
-  const blob = new Blob([csv.join('\n')], {
-    type: 'text/csv;charset=utf-8'
+  downloadCsv(csv.join('\n'), {
+    filename: options.filename ?? `${firstReport.PatientID}_tmtv.csv`
   });
-  const url = URL.createObjectURL(blob);
-  const a = document.createElement('a');
-  a.href = url;
-  a.download = options.filename ?? `${firstReport.PatientID}_tmtv.csv`;
-  a.click();
 }
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
 var dcmjs_es = __webpack_require__(5842);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 69 modules
-var adapters_dist_esm = __webpack_require__(53434);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 70 modules
+var adapters_dist_esm = __webpack_require__(14041);
 ;// ../../../extensions/tmtv/src/utils/dicomRTAnnotationExport/RTStructureSet/dicomRTAnnotationExport.js