@ohif/app 3.13.0-beta.6 → 3.13.0-beta.60

package/dist/{3461.bundle.7024d5e66d12b4069031.js → 3461.bundle.54f8d64ed1965c14ec4c.js}

@@ -1,17 +1,16 @@
 "use strict";
 (globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[3461],{
 
-/***/ 74137:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 74137
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   Ay: () => (__WEBPACK_DEFAULT_EXPORT__),
 /* harmony export */   bY: () => (/* binding */ CodingSchemeDesignators),
 /* harmony export */   n7: () => (/* binding */ CodeNameCodeSequenceValues),
 /* harmony export */   sh: () => (/* binding */ SCOORDTypes)
 /* harmony export */ });
 /* unused harmony export RelationshipType */
-/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22031);
+/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(64579);
 
 const {
   CodeScheme: Cornerstone3DCodeScheme
@@ -51,36 +50,32 @@ const enums = {
   RelationshipType,
   SCOORDTypes
 };
-/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (enums);
+/* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (enums)));
 
-/***/ }),
+/***/ },
 
-/***/ 93461:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 93461
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-// ESM COMPAT FLAG
-__webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  Enums: () => (/* reexport */ enums/* default */.Ay),
-  createReferencedImageDisplaySet: () => (/* reexport */ createReferencedImageDisplaySet/* default */.A),
   "default": () => (/* binding */ cornerstone_dicom_sr_src),
-  hydrateStructuredReport: () => (/* reexport */ hydrateStructuredReport),
-  srProtocol: () => (/* reexport */ srProtocol),
-  toolNames: () => (/* reexport */ tools_toolNames)
+  $F: () => (/* reexport */ hydrateStructuredReport)
 });
 
+// UNUSED EXPORTS: Enums, createReferencedImageDisplaySet, srProtocol, toolNames
+
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../core/src/index.ts + 69 modules
 var src = __webpack_require__(42356);
 // EXTERNAL MODULE: ../../i18n/src/index.js + 286 modules
 var i18n_src = __webpack_require__(89010);
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 193 modules
-var cornerstone_src = __webpack_require__(63081);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 71 modules
-var esm = __webpack_require__(22031);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 194 modules
+var cornerstone_src = __webpack_require__(24688);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 72 modules
+var esm = __webpack_require__(64579);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js
 var dist_esm = __webpack_require__(4667);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
@@ -477,7 +472,7 @@ const {
 const {
   CORNERSTONE_3D_TOOLS_SOURCE_NAME,
   CORNERSTONE_3D_TOOLS_SOURCE_VERSION
-} = cornerstone_src.Enums;
+} = cornerstone_src/* Enums */.fX;
 const {
   MetadataProvider: metadataProvider
 } = src/* classes */.Ly;
@@ -639,8 +634,13 @@ async function _load(srDisplaySet, servicesManager, extensionManager) {
   srDisplaySet.isRehydratable = isRehydratable(srDisplaySet, mappings);
   srDisplaySet.isLoaded = true;
 
-  /** Check currently added displaySets and add measurements if the sources exist */
-  displaySetService.activeDisplaySets.forEach(activeDisplaySet => {
+  /** Check currently added displaySets and add measurements if the sources exist.
+   *  Walk the SR's study first in default series order (not load order) so SCOORD3D
+   *  FrameOfReference matching picks a stable series when several share FOR. */
+  const displaySetsForSRPass = src/* utils */.Wp.sortDisplaySetsCopy(displaySetService.activeDisplaySets, {
+    studyInstanceUIDFirst: srDisplaySet.StudyInstanceUID
+  });
+  displaySetsForSRPass.forEach(activeDisplaySet => {
     _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, activeDisplaySet, dataSource, servicesManager);
   });
 
@@ -985,16 +985,25 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
       MeasuredValueSequence
     } = item;
 
-    // Handle spatial reference ONLY if ContentSequence exists
+    // Handle spatial reference ONLY if ContentSequence exists.
+    // ContentSequence may be a scalar SCOORD or an array when additional named
+    // SCOORDs (e.g. control points) are nested alongside the primary geometry.
+    // Pick the primary geometry entry: prefer the SCOORD without a
+    // ConceptNameCodeSequence (plain polyline), falling back to the first SCOORD.
     if (ContentSequence) {
+      const scoordItem = Array.isArray(ContentSequence) ? ContentSequence.find(cs => (cs.ValueType === 'SCOORD' || cs.ValueType === 'SCOORD3D') && !cs.ConceptNameCodeSequence) ?? ContentSequence.find(cs => cs.ValueType === 'SCOORD' || cs.ValueType === 'SCOORD3D') : ContentSequence;
+      if (!scoordItem) {
+        console.warn('ContentSequence array contains no SCOORD or SCOORD3D entry, skipping annotation.');
+        return;
+      }
       const {
         ValueType
-      } = ContentSequence;
+      } = scoordItem;
       if (ValueType !== 'SCOORD' && ValueType !== 'SCOORD3D') {
         console.warn(`Graphic ${ValueType} not currently supported, skipping annotation.`);
         return;
       }
-      const coords = _getCoordsFromSCOORDOrSCOORD3D(ContentSequence);
+      const coords = _getCoordsFromSCOORDOrSCOORD3D(scoordItem);
       if (coords) {
         measurement.coords.push(coords);
       }
@@ -1195,8 +1204,6 @@ function onModeEnter({
     ds.isHydrated = false;
   });
 }
-// EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
-var dcmjs_es = __webpack_require__(5842);
 ;// ../../../extensions/cornerstone-dicom-sr/src/utils/getFilteredCornerstoneToolState.ts
 
 
@@ -1326,7 +1333,7 @@ const {
 const {
   CORNERSTONE_3D_TOOLS_SOURCE_NAME: hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_NAME,
   CORNERSTONE_3D_TOOLS_SOURCE_VERSION: hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_VERSION
-} = cornerstone_src.Enums;
+} = cornerstone_src/* Enums */.fX;
 const convertCode = (codingValues, code) => {
   if (!code || code.CodingSchemeDesignator === 'CORNERSTONEJS') {
     return;
@@ -1398,7 +1405,7 @@ function hydrateStructuredReport({
       frameNumber = 1
     } = measurement;
     const key = `${ReferencedSOPInstanceUID}:${frameNumber}`;
-    if (!sopInstanceUIDToImageId[key]) {
+    if (imageId && !sopInstanceUIDToImageId[key]) {
       sopInstanceUIDToImageId[key] = imageId;
     }
   });
@@ -1429,32 +1436,12 @@ function hydrateStructuredReport({
       hydratableMeasurementsInSR[key] = storedMeasurementByAnnotationType[key];
     }
   });
-
-  // Set the series touched as tracked.
-  const imageIds = [];
-
-  // TODO: notification if no hydratable?
-  Object.keys(hydratableMeasurementsInSR).forEach(annotationType => {
-    const toolDataForAnnotationType = hydratableMeasurementsInSR[annotationType];
-    toolDataForAnnotationType.forEach(toolData => {
-      // Add the measurement to toolState
-      // dcmjs and Cornerstone3D has structural defect in supporting multi-frame
-      // files, and looking up the imageId from sopInstanceUIDToImageId results
-      // in the wrong value.
-      const frameNumber = toolData.annotation.data?.frameNumber || 1;
-      const imageId = sopInstanceUIDToImageId[`${toolData.sopInstanceUid}:${frameNumber}`];
-      if (!imageIds.includes(imageId)) {
-        imageIds.push(imageId);
-      }
-    });
-  });
   let targetStudyInstanceUID;
   const SeriesInstanceUIDs = [];
-  for (let i = 0; i < imageIds.length; i++) {
-    const imageId = imageIds[i];
-    if (!imageId) {
-      continue;
-    }
+
+  // Set the series touched as tracked.
+  const imageIds = getImageIds(hydratableMeasurementsInSR, sopInstanceUIDToImageId);
+  for (const imageId of imageIds) {
     const {
       SeriesInstanceUID,
       StudyInstanceUID
@@ -1469,6 +1456,25 @@ function hydrateStructuredReport({
     }
   }
 
+  // For 3d annotations there are no image IDs,
+  // so we need to find the display sets by frame of reference to get the SeriesInstanceUIDs
+  const frameOfReferenceUIDs = getFrameOfReferenceUIDs(hydratableMeasurementsInSR, sopInstanceUIDToImageId);
+  for (const FrameOfReferenceUID of frameOfReferenceUIDs) {
+    const displaySetsFOR = displaySetService.getDisplaySetsBy(ds => ds.FrameOfReferenceUID === FrameOfReferenceUID && !ds.isDerivedDisplaySet);
+    const ds = chooseDisplaySet(displaySetsFOR, FrameOfReferenceUID);
+    if (!ds) {
+      continue;
+    }
+    if (!SeriesInstanceUIDs.includes(ds.SeriesInstanceUID)) {
+      SeriesInstanceUIDs.push(ds.SeriesInstanceUID);
+    }
+    if (!targetStudyInstanceUID) {
+      targetStudyInstanceUID = ds.StudyInstanceUID;
+    } else if (targetStudyInstanceUID !== ds.StudyInstanceUID) {
+      console.warn('NO SUPPORT FOR SRs THAT HAVE MEASUREMENTS FROM MULTIPLE STUDIES.');
+    }
+  }
+
   /**
    * Gets reference data for what frame of reference and the referenced
    * image id, or for 3d measurements, the volumeId to apply this annotation to.
@@ -1501,7 +1507,7 @@ function hydrateStructuredReport({
       toolData.uid = guid();
       const referenceData = getReferenceData(toolData);
       const {
-        imageId
+        referencedImageId
       } = referenceData;
       const annotation = {
         annotationUID: toolData.annotation.annotationUID,
@@ -1533,8 +1539,8 @@ function hydrateStructuredReport({
       if (disableEditing) {
         locking.setAnnotationLocked(newAnnotationUID, true);
       }
-      if (imageId && !imageIds.includes(imageId)) {
-        imageIds.push(imageId);
+      if (referencedImageId && !imageIds.includes(referencedImageId)) {
+        imageIds.push(referencedImageId);
       }
     });
   });
@@ -1545,15 +1551,62 @@ function hydrateStructuredReport({
   };
 }
 
+/**
+ * Gets the unique imageIds from hydratable measurements that have an imageId reference
+ * (i.e., 2D/SCOORD annotations).
+ */
+function getImageIds(hydratableMeasurementsInSR, sopInstanceUIDToImageId) {
+  const imageIds = [];
+  Object.keys(hydratableMeasurementsInSR).forEach(annotationType => {
+    const toolDataForAnnotationType = hydratableMeasurementsInSR[annotationType];
+    toolDataForAnnotationType.forEach(toolData => {
+      // Add the measurement to toolState
+      // dcmjs and Cornerstone3D has structural defect in supporting multi-frame
+      // files, and looking up the imageId from sopInstanceUIDToImageId results
+      // in the wrong value.
+      const frameNumber = toolData.annotation.data?.frameNumber || 1;
+      const imageId = sopInstanceUIDToImageId[`${toolData.sopInstanceUid}:${frameNumber}`];
+      if (imageId && !imageIds.includes(imageId)) {
+        imageIds.push(imageId);
+      }
+    });
+  });
+  return imageIds;
+}
+
+/**
+ * Gets the unique FrameOfReferenceUIDs from hydratable measurements that have no imageId reference
+ * (i.e., 3D/SCOORD3D annotations). This excludes annotations handled by the getImageIds function.
+ */
+function getFrameOfReferenceUIDs(hydratableMeasurementsInSR, sopInstanceUIDToImageId) {
+  const frameOfReferenceUIDs = [];
+  Object.keys(hydratableMeasurementsInSR).forEach(annotationType => {
+    const toolDataForAnnotationType = hydratableMeasurementsInSR[annotationType];
+    toolDataForAnnotationType.forEach(toolData => {
+      const frameNumber = toolData.annotation.data?.frameNumber || 1;
+      const imageId = sopInstanceUIDToImageId[`${toolData.sopInstanceUid}:${frameNumber}`];
+      if (!imageId) {
+        const {
+          FrameOfReferenceUID
+        } = toolData.annotation.metadata;
+        if (FrameOfReferenceUID && !frameOfReferenceUIDs.includes(FrameOfReferenceUID)) {
+          frameOfReferenceUIDs.push(FrameOfReferenceUID);
+        }
+      }
+    });
+  });
+  return frameOfReferenceUIDs;
+}
+
 /**
  * For 3d annotations, there are often several display sets which could
  * be used to display the annotation.  Choose the first annotation with the
  * same frame of reference that is reconstructable, or the first display set
  * otherwise.
  */
-function chooseDisplaySet(displaySets, annotation) {
+function chooseDisplaySet(displaySets, reference) {
   if (!displaySets?.length) {
-    console.warn('No display set found for', annotation);
+    console.warn('No display set found for', reference);
     return;
   }
   if (displaySets.length === 1) {
@@ -1639,10 +1692,6 @@ function choosePoints(points) {
 
 
 
-
-const {
-  downloadBlob
-} = src/* utils */.Wp;
 const {
   MeasurementReport: commandsModule_MeasurementReport
 } = esm/* adaptersSR */.QX.Cornerstone3D;
@@ -1701,32 +1750,11 @@ const commandsModule = props => {
       // segmentationService.setSegmentColor(viewportId, segmentationId, segmentIndex, color);
       // });
     },
-    /**
-     *
-     * @param measurementData An array of measurements from the measurements service
-     * @param additionalFindingTypes toolTypes that should be stored with labels as Findings
-     * @param options Naturalized DICOM JSON headers to merge into the displaySet.
-     * as opposed to Finding Sites.
-     * that you wish to serialize.
-     */
-    downloadReport: ({
-      measurementData,
-      additionalFindingTypes,
-      options = {}
-    }) => {
-      const srDataset = _generateReport(measurementData, additionalFindingTypes, options);
-      const reportBlob = dcmjs_es/* default.data */.Ay.data.datasetToBlob(srDataset);
-
-      //Create a URL for the binary.
-      downloadBlob(reportBlob, {
-        filename: 'dicom-sr.dcm'
-      });
-    },
     /**
      *
      * @param measurementData An array of measurements from the measurements service
      * that you wish to serialize.
-     * @param dataSource The dataSource that you wish to use to persist the data.
+     * @param dataSource The data source name ('download', 'copyToClipboard', or a named data source).
      * @param additionalFindingTypes toolTypes that should be stored with labels as Findings
      * @param options Naturalized DICOM JSON headers to merge into the displaySet.
      * @return The naturalized report
@@ -1737,23 +1765,24 @@ const commandsModule = props => {
       additionalFindingTypes,
       options = {}
     }) => {
-      // Use the @cornerstonejs adapter for converting to/from DICOM
-      // But it is good enough for now whilst we only have cornerstone as a datasource.
       log.info('[DICOMSR] storeMeasurements');
-      if (!dataSource || !dataSource.store || !dataSource.store.dicom) {
-        log.error('[DICOMSR] datasource has no dataSource.store.dicom endpoint!');
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource,
+        defaultFileName: 'dicom-sr.dcm'
+      });
+      if (!storeFn) {
+        log.error('[DICOMSR] No valid store for dataSource:', dataSource);
         return Promise.reject({});
       }
       try {
         const naturalizedReport = _generateReport(measurementData, additionalFindingTypes, options);
         const {
-          StudyInstanceUID,
           ContentSequence
         } = naturalizedReport;
         // The content sequence has 5 or more elements, of which
         // the `[4]` element contains the annotation data, so this is
         // checking that there is some annotation data present.
-        if (!ContentSequence?.[4].ContentSequence?.length) {
+        if (!ContentSequence?.[4]?.ContentSequence?.length) {
           console.log('naturalizedReport missing imaging content', naturalizedReport);
           throw new Error('Invalid report, no content');
         }
@@ -1769,15 +1798,10 @@ const commandsModule = props => {
             naturalizedReport
           });
         }
-        await dataSource.store.dicom(naturalizedReport, null, dicomDict);
-        if (StudyInstanceUID) {
-          dataSource.deleteStudyMetadataPromise(StudyInstanceUID);
-        }
-
-        // The "Mode" route listens for DicomMetadataStore changes
-        // When a new instance is added, it listens and
-        // automatically calls makeDisplaySets
-        src/* DicomMetadataStore */.H8.addInstances([naturalizedReport], true);
+        await storeFn(naturalizedReport, {
+          measurementData,
+          dicomDict
+        });
         return naturalizedReport;
       } catch (error) {
         console.warn(error);
@@ -1800,7 +1824,6 @@ const commandsModule = props => {
     }
   };
   const definitions = {
-    downloadReport: actions.downloadReport,
     storeMeasurements: actions.storeMeasurements,
     hydrateStructuredReport: actions.hydrateStructuredReport
   };
@@ -2210,16 +2233,17 @@ const dicomSRExtension = {
 // Put static exports here so they can be type checked
 
 
-/***/ }),
+/***/ },
 
-/***/ 76654:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 76654
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   eF: () => (/* binding */ getTrackingUniqueIdentifiersForElement),
 /* harmony export */   m1: () => (/* binding */ setTrackingUniqueIdentifiersForElement)
 /* harmony export */ });
 /* unused harmony export setActiveTrackingUniqueIdentifierForElement */
+/* unused harmony import specifier */ var getEnabledElement;
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
 
 const state = {
@@ -2270,10 +2294,10 @@ function getTrackingUniqueIdentifiersForElement(element) {
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ 92643:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 92643
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
@@ -2367,6 +2391,6 @@ const createReferencedImageDisplaySet = (displaySetService, displaySet) => {
 };
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (createReferencedImageDisplaySet);
 
-/***/ })
+/***/ }
 
 }]);

package/dist/{4202.bundle.5a0f8e4004c5d8a68548.js → 4202.bundle.850a7c7c011800b3daea.js}

@@ -1,8 +1,8 @@
 "use strict";
 (globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[4202],{
 
-/***/ 74202:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 74202
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -11,8 +11,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(97598);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(86326);
-/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(12517);
-/* harmony import */ var _ohif_extension_cornerstone__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(63081);
+/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15953);
+/* harmony import */ var _ohif_extension_cornerstone__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(24688);
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 
 
@@ -106,7 +106,7 @@ function OHIFCornerstonePMAPViewport(props) {
       type: 'warning',
       message: 'The values are multiplied by 100 in the viewport for better visibility'
     });
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_extension_cornerstone__WEBPACK_IMPORTED_MODULE_3__.OHIFCornerstoneViewport, _extends({}, props, {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_extension_cornerstone__WEBPACK_IMPORTED_MODULE_3__/* .OHIFCornerstoneViewport */ .R9, _extends({}, props, {
       // Referenced + PMAP displaySets must be passed as parameter in this order
       displaySets: [referencedDisplaySet, pmapDisplaySet],
       viewportOptions: {
@@ -191,6 +191,6 @@ function _getReferencedDisplaySetMetadata(referencedDisplaySet, pmapDisplaySet)
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (OHIFCornerstonePMAPViewport);
 
-/***/ })
+/***/ }
 
 }]);