@ohif/app 3.13.0-beta.41 → 3.13.0-beta.43

package/dist/{3461.bundle.52c93e30f9c5a31f00cd.js → 3461.bundle.829d07239cde6238db7b.js}

@@ -10,7 +10,7 @@
 /* harmony export */   sh: () => (/* binding */ SCOORDTypes)
 /* harmony export */ });
 /* unused harmony export RelationshipType */
-/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80581);
+/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28963);
 
 const {
   CodeScheme: Cornerstone3DCodeScheme
@@ -74,8 +74,8 @@ var src = __webpack_require__(42356);
 var i18n_src = __webpack_require__(89010);
 // 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 + 75 modules
-var esm = __webpack_require__(80581);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 76 modules
+var esm = __webpack_require__(28963);
 // 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
@@ -980,16 +980,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);
       }
@@ -1190,8 +1199,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
 
 
@@ -1680,10 +1687,6 @@ function choosePoints(points) {
 
 
 
-
-const {
-  downloadBlob
-} = src/* utils */.Wp;
 const {
   MeasurementReport: commandsModule_MeasurementReport
 } = esm/* adaptersSR */.QX.Cornerstone3D;
@@ -1745,29 +1748,8 @@ const commandsModule = props => {
     /**
      *
      * @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
@@ -1778,23 +1760,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');
         }
@@ -1810,15 +1793,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);
@@ -1841,7 +1819,6 @@ const commandsModule = props => {
     }
   };
   const definitions = {
-    downloadReport: actions.downloadReport,
     storeMeasurements: actions.storeMeasurements,
     hydrateStructuredReport: actions.hydrateStructuredReport
   };

package/dist/{4688.bundle.52e744585c7aa54e9133.js → 4688.bundle.4e3a2e7fe6353e18fc9d.js}

@@ -7442,37 +7442,13 @@ const ExportSegmentationSubMenuItem = ({
     className: "text-foreground"
   }), /*#__PURE__*/react.createElement("span", {
     className: "pl-2"
-  }, t('Download & Export'))), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuPortal */.dce, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSubContent */.M56, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuLabel */.lpj, {
-    className: "flex items-center pl-0"
-  }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.Download, {
-    className: "h-5 w-5"
-  }), /*#__PURE__*/react.createElement("span", {
-    className: "pl-1"
-  }, t('Download'))), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
+  }, t('Export'))), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuPortal */.dce, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSubContent */.M56, null, segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
     onClick: e => {
       e.preventDefault();
       actions.downloadCSVSegmentationReport(segmentationId);
     },
     disabled: !allowExport
   }, t('CSV Report')), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
-    onClick: e => {
-      e.preventDefault();
-      actions.onSegmentationDownload(segmentationId);
-    },
-    disabled: !allowExport
-  }, t('DICOM SEG')), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
-    onClick: e => {
-      e.preventDefault();
-      actions.onSegmentationDownloadRTSS(segmentationId);
-    },
-    disabled: !allowExport
-  }, t('DICOM RTSS')), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSeparator */.mBJ, null), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuLabel */.lpj, {
-    className: "flex items-center pl-0"
-  }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.Export, {
-    className: "h-5 w-5"
-  }), /*#__PURE__*/react.createElement("span", {
-    className: "pl-1 pt-1"
-  }, t('Export'))), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
     onClick: e => {
       e.preventDefault();
       actions.storeSegmentation(segmentationId, 'SEG');
@@ -7549,16 +7525,6 @@ const CustomDropdownMenuContent = () => {
         context: 'CORNERSTONE'
       });
     },
-    onSegmentationDownloadRTSS: segmentationId => {
-      commandsManager.run('downloadRTSS', {
-        segmentationId
-      });
-    },
-    onSegmentationDownload: segmentationId => {
-      commandsManager.run('downloadSegmentation', {
-        segmentationId
-      });
-    },
     downloadCSVSegmentationReport: segmentationId => {
       commandsManager.run('downloadCSVSegmentationReport', {
         segmentationId

package/dist/{4819.bundle.85d2cece5960a09eb6f9.js → 4819.bundle.cdf38c8daa32fe3750a1.js}

@@ -803,8 +803,9 @@ function TrackedMeasurementsContextProvider({
       });
     },
     showStructuredReportDisplaySetInActiveViewport: (ctx, evt) => {
-      if (evt.data.createdDisplaySetInstanceUIDs.length > 0) {
-        const StructuredReportDisplaySetInstanceUID = evt.data.createdDisplaySetInstanceUIDs[0];
+      const uids = evt.data?.createdDisplaySetInstanceUIDs;
+      if (uids?.length > 0) {
+        const StructuredReportDisplaySetInstanceUID = uids[0];
         viewportGridService.setDisplaySetsForViewport({
           viewportId: evt.data.viewportId,
           displaySetInstanceUIDs: [StructuredReportDisplaySetInstanceUID]

package/dist/{5028.bundle.54c161dd7e0b8c17a860.js → 5028.bundle.8760e2ac53c879ec1691.js}

@@ -26,8 +26,8 @@ var src = __webpack_require__(42356);
 var i18n_src = __webpack_require__(89010);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
 var esm = __webpack_require__(15327);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 75 modules
-var dist_esm = __webpack_require__(80581);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 76 modules
+var dist_esm = __webpack_require__(28963);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 194 modules
 var cornerstone_src = __webpack_require__(24688);
 ;// ../../../extensions/cornerstone-dicom-pmap/src/getSopClassHandlerModule.ts

package/dist/{7537.bundle.b784154ebd4c85946642.js → 7537.bundle.1c612642a1e8a96179ed.js}

@@ -4134,7 +4134,7 @@ class StackViewport extends Viewport/* default */.A {
         this.modality = null;
         this.useCPURendering = (0,init/* getShouldUseCPURendering */.LH)();
         this._configureRenderingPipeline();
-        const result = this.useCPURendering
+        this.useCPURendering
             ? this._resetCPUFallbackElement()
             : this._resetGPUViewport();
         this.currentImageIdIndex = 0;
@@ -36328,7 +36328,7 @@ function uuidv4() {
 
 "use strict";
 /* unused harmony export version */
-const version = '4.19.0';
+const version = '4.20.0';
 
 
 /***/ },

package/dist/{8305.bundle.5260535be3da37de460a.js → 8305.bundle.ac779a289cb3546a1c6f.js}

@@ -28,8 +28,8 @@ var i18n_src = __webpack_require__(89010);
 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 + 75 modules
-var adapters_dist_esm = __webpack_require__(80581);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 76 modules
+var adapters_dist_esm = __webpack_require__(28963);
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
 var dcmjs_es = __webpack_require__(5842);
 ;// ../../../extensions/cornerstone-dicom-seg/src/utils/dicomlabToRGB.ts
@@ -363,7 +363,6 @@ var PROMPT_RESPONSES = __webpack_require__(96357);
 
 
 
-
 const getTargetViewport = ({
   viewportId,
   viewportGridService
@@ -390,12 +389,10 @@ const {
     }
   }
 } = adapters_dist_esm/* adaptersRT */.f_;
-const {
-  /* downloadDICOMData */ "vk": downloadDICOMData
-} = adapters_dist_esm/* helpers */._$;
 const commandsModule = ({
   servicesManager,
-  extensionManager
+  extensionManager,
+  commandsManager
 }) => {
   const {
     segmentationService,
@@ -548,7 +545,11 @@ const commandsModule = ({
       const generatedSegmentation = actions.generateSegmentation({
         segmentationId
       });
-      downloadDICOMData(generatedSegmentation.dataset, `${segmentationInOHIF.label}`);
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource: 'download',
+        defaultFileName: `${segmentationInOHIF.label}.dcm`
+      });
+      storeFn(generatedSegmentation.dataset);
     },
     /**
      * Stores a segmentation based on the provided segmentationId into a specified data source.
@@ -575,10 +576,9 @@ const commandsModule = ({
         label,
         predecessorImageId
       } = segmentation;
-      const defaultDataSource = dataSource ?? extensionManager.getActiveDataSource()[0];
       const {
         value: reportName,
-        dataSourceName: selectedDataSource,
+        dataSourceName,
         series,
         priorSeriesNumber,
         action
@@ -587,42 +587,47 @@ const commandsModule = ({
         extensionManager,
         predecessorImageId,
         title: 'Store Segmentation',
-        modality
+        modality,
+        enableDownload: true
       });
-      if (action === PROMPT_RESPONSES/* default */.A.CREATE_REPORT) {
-        try {
-          const selectedDataSourceConfig = selectedDataSource ? extensionManager.getDataSources(selectedDataSource)[0] : defaultDataSource;
-          const args = {
-            segmentationId,
-            options: {
-              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');
-          }
-          const {
-            dataset: naturalizedReport
-          } = generatedData;
-
-          // DCMJS assigns a dummy study id during creation, and this can cause problems, so clearing it out
-          if (naturalizedReport.StudyID === 'No Study ID') {
-            naturalizedReport.StudyID = '';
+      if (action !== PROMPT_RESPONSES/* default */.A.CREATE_REPORT) {
+        return;
+      }
+      const defaultFileName = modality === 'RTSTRUCT' ? `rtss-${segmentationId}.dcm` : `${label || 'segmentation'}.dcm`;
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource: dataSourceName,
+        defaultFileName
+      });
+      if (!storeFn) {
+        throw new Error(`No valid store for dataSource: ${dataSourceName}`);
+      }
+      try {
+        const args = {
+          segmentationId,
+          options: {
+            SeriesDescription: series ? undefined : reportName || label || 'Contour Series',
+            SeriesNumber: series ? undefined : 1 + priorSeriesNumber,
+            predecessorImageId: series
           }
-          await selectedDataSourceConfig.store.dicom(naturalizedReport);
+        };
+        const generatedDataAsync = modality === 'SEG' && actions.generateSegmentation(args) || modality === 'RTSTRUCT' && actions.generateContour(args);
+        const generatedData = await generatedDataAsync;
+        if (!generatedData?.dataset) {
+          throw new Error('Error during segmentation generation');
+        }
+        const {
+          dataset: naturalizedReport
+        } = generatedData;
 
-          // add the information for where we stored it to the instance as well
-          naturalizedReport.wadoRoot = selectedDataSourceConfig.getConfig().wadoRoot;
-          src/* DicomMetadataStore */.H8.addInstances([naturalizedReport], true);
-          return naturalizedReport;
-        } catch (error) {
-          console.debug('Error storing segmentation:', error);
-          throw error;
+        // DCMJS assigns a dummy study id during creation, and this can cause problems, so clearing it out
+        if (naturalizedReport.StudyID === 'No Study ID') {
+          naturalizedReport.StudyID = '';
         }
+        await storeFn(naturalizedReport, {});
+        return naturalizedReport;
+      } catch (error) {
+        console.debug('Error storing segmentation:', error);
+        throw error;
       }
     },
     generateContour: async args => {
@@ -658,13 +663,11 @@ const commandsModule = ({
         InstanceNumber: instanceNumber = 1,
         SeriesInstanceUID: seriesUID
       } = dataset;
-      try {
-        //Create a URL for the binary.
-        const filename = `rtss-${seriesUID}-${instanceNumber}.dcm`;
-        downloadDICOMData(dataset, filename);
-      } catch (e) {
-        console.warn(e);
-      }
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource: 'download',
+        defaultFileName: `rtss-${seriesUID}-${instanceNumber}.dcm`
+      });
+      await storeFn(dataset);
     },
     toggleActiveSegmentationUtility: ({
       itemId: buttonId

package/dist/{8583.bundle.ac554a60bcdf3730e301.js → 8583.bundle.e80cd615ebfc5ee5c18a.js}

@@ -1471,8 +1471,8 @@ function createAndDownloadTMTVReport(segReport, additionalReportRows, options =
 }
 // 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 + 75 modules
-var adapters_dist_esm = __webpack_require__(80581);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 76 modules
+var adapters_dist_esm = __webpack_require__(28963);
 ;// ../../../extensions/tmtv/src/utils/dicomRTAnnotationExport/RTStructureSet/dicomRTAnnotationExport.js