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

package/dist/{1903.bundle.f0505c6e927d0bef5589.js → 1903.bundle.9a291597f23ebaa3371c.js}

@@ -357,7 +357,7 @@ function useMeasurements({
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86326);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(62051);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _ohif_core_src_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(12505);
+/* harmony import */ var _ohif_core_src_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(37447);
 /* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(42356);
 
 
@@ -1482,7 +1482,7 @@ function getCustomizationData(customizationService) {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86326);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(62051);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _ohif_core_src_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(12505);
+/* harmony import */ var _ohif_core_src_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(37447);
 /* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(42356);
 
 
@@ -1808,8 +1808,8 @@ function destroy() {
 var ai_dist_esm = __webpack_require__(75165);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/polymorphic-segmentation/dist/esm/index.js + 14 modules
 var polymorphic_segmentation_dist_esm = __webpack_require__(56983);
-// 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/cornerstone/src/state.ts
 var state = __webpack_require__(71353);
 ;// ../../../extensions/cornerstone/src/utils/getViewportEnabledElement.ts
@@ -1922,8 +1922,8 @@ function onCompletedCalibrationLine(servicesManager, csToolsEvent) {
     });
   });
 }
-// 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/cornerstone/src/tools/OverlayPlaneModuleProvider.ts
 
 const _cachedOverlayMetadata = new Map();
@@ -6015,6 +6015,9 @@ const connectMeasurementServiceToTools = ({
     const annotationManager = dist_esm.annotation.state.getAnnotationManager();
     const newAnnotation = {
       annotationUID: measurement.uid,
+      // Not used in CS3D but stored in the CS3D state so that saving
+      // can apply the predecessor consistently.
+      predecessorImageId: measurement?.predecessorImageId,
       highlighted: false,
       isLocked: false,
       // This is used to force a re-render of the annotation to
@@ -7486,7 +7489,7 @@ const ExportSegmentationSubMenuItem = ({
   const {
     t
   } = (0,es/* useTranslation */.Bd)('SegmentationTable');
-  return /*#__PURE__*/react.createElement(react.Fragment, null, segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSub */.lvB, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSubTrigger */.nVd, {
+  return /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSub */.lvB, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSubTrigger */.nVd, {
     className: "pl-1"
   }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.Export, {
     className: "text-foreground"
@@ -7498,13 +7501,13 @@ const ExportSegmentationSubMenuItem = ({
     className: "h-5 w-5"
   }), /*#__PURE__*/react.createElement("span", {
     className: "pl-1"
-  }, t('Download'))), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
+  }, t('Download'))), 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')), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
+  }, t('CSV Report')), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
     onClick: e => {
       e.preventDefault();
       actions.onSegmentationDownload(segmentationId);
@@ -7522,23 +7525,19 @@ const ExportSegmentationSubMenuItem = ({
     className: "h-5 w-5"
   }), /*#__PURE__*/react.createElement("span", {
     className: "pl-1 pt-1"
-  }, t('Export'))), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
+  }, t('Export'))), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
     onClick: e => {
       e.preventDefault();
-      actions.storeSegmentation(segmentationId);
+      actions.storeSegmentation(segmentationId, 'SEG');
     },
     disabled: !allowExport
-  }, t('DICOM SEG'))))), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Contour && /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
+  }, t('DICOM SEG')), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
     onClick: e => {
       e.preventDefault();
-      actions.onSegmentationDownloadRTSS(segmentationId);
+      actions.storeSegmentation(segmentationId, 'RTSTRUCT');
     },
     disabled: !allowExport
-  }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.Export, {
-    className: "text-foreground"
-  }), /*#__PURE__*/react.createElement("span", {
-    className: "pl-2"
-  }, t('Download DICOM RTSS')))));
+  }, t('DICOM RTSS')))));
 };
 ;// ../../../extensions/cornerstone/src/customizations/CustomDropdownMenuContent.tsx
 
@@ -7583,21 +7582,22 @@ const CustomDropdownMenuContent = () => {
     segmentation = activeSegmentation;
     segmentationId = activeSegmentationId;
   }
+  if (!segmentation || !segmentationId) {
+    return null;
+  }
 
   // Determine if export is allowed for this segmentation
-  if (exportOptions && segmentationId) {
+  if (exportOptions) {
     const exportOption = exportOptions.find(opt => opt.segmentationId === segmentationId);
     allowExport = exportOption?.isExportable || false;
   }
-  if (!segmentation || !segmentationId) {
-    return null;
-  }
   const actions = {
-    storeSegmentation: async segmentationId => {
+    storeSegmentation: async (segmentationId, modality = 'SEG') => {
       commandsManager.run({
         commandName: 'storeSegmentation',
         commandOptions: {
-          segmentationId
+          segmentationId,
+          modality
         },
         context: 'CORNERSTONE'
       });
@@ -9441,6 +9441,10 @@ var html2canvas_esm = __webpack_require__(91037);
 
 
 
+
+const {
+  downloadUrl
+} = src/* utils */.Wp;
 const DEFAULT_SIZE = 512;
 const CornerstoneViewportDownloadForm_MAX_TEXTURE_SIZE = 10000;
 const VIEWPORT_ID = 'cornerstone-viewport-download-form';
@@ -9637,10 +9641,7 @@ const CornerstoneViewportDownloadForm = ({
       return;
     }
     const canvas = await (0,html2canvas_esm/* default */.A)(divForDownloadViewport);
-    const link = document.createElement('a');
-    link.download = `${filename}.${fileType}`;
-    link.href = canvas.toDataURL(`image/${fileType}`, 1.0);
-    link.click();
+    downloadUrl(canvas.toDataURL(`image/${fileType}`, 1.0));
   };
   const ViewportDownloadFormNew = customizationService.getCustomization('ohif.captureViewportModal');
   return /*#__PURE__*/react.createElement(ViewportDownloadFormNew, {
@@ -9818,6 +9819,10 @@ function updateSegmentBidirectionalStats({
   return null;
 }
 ;// ../../../extensions/cornerstone/src/utils/generateSegmentationCSVReport.ts
+
+const {
+  downloadCsv
+} = src/* utils */.Wp;
 function generateSegmentationCSVReport(segmentationData, info) {
   // Initialize the rows for our CSV
   const csvRows = [];
@@ -9903,19 +9908,9 @@ function generateSegmentationCSVReport(segmentationData, info) {
     });
     csvString += formattedRow.join(',') + '\n';
   }
-
-  // Create a download link and trigger the download
-  const blob = new Blob([csvString], {
-    type: 'text/csv;charset=utf-8;'
+  downloadCsv(csvString, {
+    filename: `${segmentationData.label || 'Segmentation'}_Report_${new Date().toISOString().split('T')[0]}.csv`
   });
-  const url = URL.createObjectURL(blob);
-  const link = document.createElement('a');
-  link.setAttribute('href', url);
-  link.setAttribute('download', `${segmentationData.label || 'Segmentation'}_Report_${new Date().toISOString().split('T')[0]}.csv`);
-  link.style.visibility = 'hidden';
-  document.body.appendChild(link);
-  link.click();
-  document.body.removeChild(link);
 }
 ;// ../../../extensions/cornerstone/src/utils/hydrationUtils.ts
 function getUpdatedViewportsForSegmentation({
@@ -12033,18 +12028,17 @@ function commandsModule({
      * Stores a segmentation and shows it in the viewport
      * @param props.segmentationId - The ID of the segmentation to store
      */
-    storeSegmentationCommand: async ({
-      segmentationId
-    }) => {
+    storeSegmentationCommand: async args => {
+      const {
+        segmentationId
+      } = args;
       const {
         segmentationService,
         viewportGridService
       } = servicesManager.services;
       const displaySetInstanceUIDs = await (0,default_src.createReportAsync)({
         servicesManager,
-        getReport: () => commandsManager.runCommand('storeSegmentation', {
-          segmentationId
-        }),
+        getReport: () => commandsManager.runCommand('storeSegmentation', args),
         reportType: 'Segmentation'
       });
       if (displaySetInstanceUIDs) {
@@ -19389,11 +19383,15 @@ class SegmentationService extends src/* PubSubService */.Rc {
   }
   async addSegmentationRepresentation(viewportId, {
     segmentationId,
+    predecessorImageId,
     type,
     config,
     suppressEvents = false
   }) {
     const segmentation = this.getSegmentation(segmentationId);
+    if (segmentation && !segmentation.predecessorImageId && predecessorImageId) {
+      segmentation.predecessorImageId = predecessorImageId;
+    }
     const csViewport = this.getAndValidateViewport(viewportId);
     if (!csViewport) {
       return;
@@ -22153,8 +22151,12 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     } = this.servicesManager.services;
     const segmentationId = displaySet.displaySetInstanceUID;
     const representationType = displaySet.Modality === 'SEG' ? dist_esm.Enums.SegmentationRepresentations.Labelmap : dist_esm.Enums.SegmentationRepresentations.Contour;
+    const {
+      predecessorImageId
+    } = displaySet;
     segmentationService.addSegmentationRepresentation(viewport.id, {
       segmentationId,
+      predecessorImageId,
       type: representationType
     });
 
@@ -23177,7 +23179,7 @@ const hasExportableLabelMapData = (labelmap, displaySetService) => {
   const SOPInstanceUID = instance.SOPInstanceUID || instance.SopInstanceUID;
   const SeriesInstanceUID = instance.SeriesInstanceUID;
   const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
-  return displaySet?.isReconstructable;
+  return !!displaySet;
 };
 
 /**

package/dist/{1604.bundle.4f01a6b0b8d5b1cbc294.js → 1933.bundle.a5d41c04da5425d06694.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[1604,2591],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[1933,2591],{
 
-/***/ 65090:
+/***/ 6015:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -22,8 +22,8 @@ const id = package_namespaceObject.UU;
 var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../ui-next/src/index.ts + 3073 modules
 var src = __webpack_require__(1246);
-// 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: ../../core/src/index.ts + 69 modules
 var core_src = __webpack_require__(42356);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
@@ -1582,21 +1582,6 @@ function constructSR(metadata, {
   };
   return dataset;
 }
-;// ../../../extensions/dicom-microscopy/src/utils/saveByteArray.ts
-/**
- * Trigger file download from an array buffer
- * @param buffer
- * @param filename
- */
-function saveByteArray(buffer, filename) {
-  const blob = new Blob([buffer], {
-    type: 'application/dicom'
-  });
-  const link = document.createElement('a');
-  link.href = window.URL.createObjectURL(blob);
-  link.download = filename;
-  link.click();
-}
 ;// ../../../extensions/dicom-microscopy/src/components/MicroscopyPanel/MicroscopyPanel.tsx
 
 
@@ -1606,7 +1591,9 @@ function saveByteArray(buffer, filename) {
 
 
 
-
+const {
+  downloadDicom
+} = core_src/* utils */.Wp;
 let saving = false;
 const {
   datasetToBuffer
@@ -1778,7 +1765,9 @@ function MicroscopyPanel(props) {
         if (dataSource.wadoRoot == 'saveDicom') {
           // download as DICOM file
           const part10Buffer = datasetToBuffer(dataset);
-          saveByteArray(part10Buffer, `sr-microscopy.dcm`);
+          downloadDicom(part10Buffer, {
+            filename: `sr-microscopy.dcm`
+          });
         } else {
           // Save into Web Data source
           const {
@@ -1864,16 +1853,14 @@ function MicroscopyPanel(props) {
    * @param param0
    */
   const onMeasurementItemEditHandler = ({
-    uid,
-    isActive
+    uid
   }) => {
     props.commandsManager.runCommand('setLabel', {
       uid
     }, 'MICROSCOPY');
   };
   const onMeasurementDeleteHandler = ({
-    uid,
-    isActive
+    uid
   }) => {
     const roiAnnotation = microscopyService.getAnnotation(uid);
     microscopyService.removeAnnotation(roiAnnotation);
@@ -2776,7 +2763,7 @@ const extension = {
 /* harmony export */   A: () => (/* binding */ getDicomWebClient)
 /* harmony export */ });
 /* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(42356);
-/* harmony import */ var _ohif_extension_default__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39548);
+/* harmony import */ var _ohif_extension_default__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39195);
 
 
 

package/dist/{2018.bundle.59c7c4cb3f79f63bab68.js → 2018.bundle.4527f2b0c1c8ff75f568.js}

@@ -9,7 +9,8 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "default": () => (/* binding */ segmentation_src)
+  "default": () => (/* binding */ segmentation_src),
+  toolbarButtons: () => (/* reexport */ toolbarButtons)
 });
 
 ;// ../../../modes/segmentation/package.json
@@ -1357,41 +1358,15 @@ function setUpAutoTabSwitchHandler({
     unsubscribeAutoTabSwitchEvents
   };
 }
+// EXTERNAL MODULE: ../../../modes/basic/src/index.tsx + 4 modules
+var basic_src = __webpack_require__(35485);
 ;// ../../../modes/segmentation/src/index.tsx
 
 
 
 
-const ohif = {
-  layout: '@ohif/extension-default.layoutTemplateModule.viewerLayout',
-  sopClassHandler: '@ohif/extension-default.sopClassHandlerModule.stack',
-  hangingProtocol: '@ohif/extension-default.hangingProtocolModule.default',
-  leftPanel: '@ohif/extension-default.panelModule.seriesList'
-};
-const cornerstone = {
-  viewport: '@ohif/extension-cornerstone.viewportModule.cornerstone',
-  labelMapSegmentationPanel: '@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsLabelMap',
-  contourSegmentationPanel: '@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsContour',
-  measurements: '@ohif/extension-cornerstone.panelModule.panelMeasurement'
-};
-const segmentation = {
-  sopClassHandler: '@ohif/extension-cornerstone-dicom-seg.sopClassHandlerModule.dicom-seg',
-  viewport: '@ohif/extension-cornerstone-dicom-seg.viewportModule.dicom-seg'
-};
-const dicomRT = {
-  viewport: '@ohif/extension-cornerstone-dicom-rt.viewportModule.dicom-rt',
-  sopClassHandler: '@ohif/extension-cornerstone-dicom-rt.sopClassHandlerModule.dicom-rt'
-};
-/**
- * Just two dependencies to be able to render a viewport with panels in order
- * to make sure that the mode is working.
- */
-const extensionDependencies = {
-  '@ohif/extension-default': '^3.0.0',
-  '@ohif/extension-cornerstone': '^3.0.0',
-  '@ohif/extension-cornerstone-dicom-seg': '^3.0.0',
-  '@ohif/extension-cornerstone-dicom-rt': '^3.0.0'
-};
+
+
 function modeFactory({
   modeConfiguration
 }) {
@@ -1515,41 +1490,41 @@ function modeFactory({
         servicesManager
       }) => {
         return {
-          id: ohif.layout,
+          id: basic_src.ohif.layout,
           props: {
-            leftPanels: [ohif.leftPanel],
+            leftPanels: [basic_src.ohif.thumbnailList],
             leftPanelResizable: true,
-            rightPanels: [cornerstone.labelMapSegmentationPanel, cornerstone.contourSegmentationPanel],
+            rightPanels: [basic_src.cornerstone.labelMapSegmentationPanel, basic_src.cornerstone.contourSegmentationPanel],
             rightPanelResizable: true,
             // leftPanelClosed: true,
             viewports: [{
-              namespace: cornerstone.viewport,
-              displaySetsToDisplay: [ohif.sopClassHandler]
+              namespace: basic_src.cornerstone.viewport,
+              displaySetsToDisplay: [basic_src.ohif.sopClassHandler]
             }, {
-              namespace: segmentation.viewport,
-              displaySetsToDisplay: [segmentation.sopClassHandler]
+              namespace: basic_src.segmentation.viewport,
+              displaySetsToDisplay: [basic_src.segmentation.sopClassHandler]
             }, {
-              namespace: dicomRT.viewport,
-              displaySetsToDisplay: [dicomRT.sopClassHandler]
+              namespace: basic_src.dicomRT.viewport,
+              displaySetsToDisplay: [basic_src.dicomRT.sopClassHandler]
             }]
           }
         };
       }
     }],
     /** List of extensions that are used by the mode */
-    extensions: extensionDependencies,
+    extensions: basic_src.extensionDependencies,
     /** HangingProtocol used by the mode */
     // Commented out to just use the most applicable registered hanging protocol
     // The example is used for a grid layout to specify that as a preferred layout
     hangingProtocol: ['@ohif/mnGrid'],
     /** SopClassHandlers used by the mode */
-    sopClassHandlers: [ohif.sopClassHandler, segmentation.sopClassHandler, dicomRT.sopClassHandler]
+    sopClassHandlers: [basic_src.ohif.sopClassHandler, basic_src.segmentation.sopClassHandler, basic_src.dicomRT.sopClassHandler]
   };
 }
 const mode = {
   id: id,
   modeFactory,
-  extensionDependencies
+  extensionDependencies: basic_src.extensionDependencies
 };
 /* harmony default export */ const segmentation_src = (mode);
 

package/dist/{306.bundle.f9faa2b3cdd7e86b5869.js → 306.bundle.a0af0889477845729c6a.js}

@@ -5094,6 +5094,7 @@ const projectionRadiographSOPClassUIDs = new Set([
     '1.2.840.10008.5.1.4.1.1.12.2.1',
     '1.2.840.10008.5.1.4.1.1.12.3',
 ]);
+const alreadySeenWarn = new Set();
 function calculateRadiographicPixelSpacing(instance) {
     const { PixelSpacing, ImagerPixelSpacing, EstimatedRadiographicMagnificationFactor, PixelSpacingCalibrationType, PixelSpacingCalibrationDescription, } = instance;
     const isProjection = true;
@@ -5106,7 +5107,10 @@ function calculateRadiographicPixelSpacing(instance) {
     }
     if (!PixelSpacing) {
         if (!EstimatedRadiographicMagnificationFactor) {
-            console.warn('EstimatedRadiographicMagnificationFactor was not present. Unable to correct ImagerPixelSpacing.');
+            if (!alreadySeenWarn.has(instance.SeriesInstanceUID)) {
+                console.warn('EstimatedRadiographicMagnificationFactor was not present on series', instance.SeriesInstanceUID, ' Unable to correct ImagerPixelSpacing.');
+                alreadySeenWarn.add(instance.SeriesInstanceUID);
+            }
             return {
                 PixelSpacing: ImagerPixelSpacing,
                 type: enums.CalibrationTypes.PROJECTION,
@@ -8784,6 +8788,24 @@ function defaultGetTextLines(data, targetId) {
 /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (BidirectionalTool)));
 
 
+/***/ }),
+
+/***/ 85817:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   EC: () => (/* reexport safe */ _AnnotationTool__WEBPACK_IMPORTED_MODULE_1__.A),
+/* harmony export */   oS: () => (/* reexport safe */ _BaseTool__WEBPACK_IMPORTED_MODULE_0__.A)
+/* harmony export */ });
+/* harmony import */ var _BaseTool__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(37234);
+/* harmony import */ var _AnnotationTool__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91350);
+/* harmony import */ var _AnnotationDisplayTool__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6030);
+
+
+
+
+
+
 /***/ }),
 
 /***/ 48736:

package/dist/{3461.bundle.458597198f24359ec78f.js → 3461.bundle.3cac685ef19f883a0f9d.js}

@@ -11,7 +11,7 @@
 /* harmony export */   sh: () => (/* binding */ SCOORDTypes)
 /* harmony export */ });
 /* unused harmony export RelationshipType */
-/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(53434);
+/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(14041);
 
 const {
   CodeScheme: Cornerstone3DCodeScheme
@@ -79,8 +79,8 @@ var src = __webpack_require__(42356);
 var i18n_src = __webpack_require__(68523);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 192 modules
 var cornerstone_src = __webpack_require__(71903);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 69 modules
-var esm = __webpack_require__(53434);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 70 modules
+var esm = __webpack_require__(14041);
 // 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
@@ -549,7 +549,8 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     SeriesDate,
     SeriesTime,
     ConceptNameCodeSequence,
-    SOPClassUID
+    SOPClassUID,
+    imageId: predecessorImageId
   } = instance;
   validateSameStudyUID(instance.StudyInstanceUID, instances);
   const is3DSR = SOPClassUID === sopClassDictionary.Comprehensive3DSR;
@@ -574,6 +575,7 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     isImagingMeasurementReport,
     sopClassUids,
     instance,
+    predecessorImageId,
     addInstances,
     label: SeriesDescription || `${i18n_src/* default */.A.t('Series')} ${SeriesNumber} - ${i18n_src/* default */.A.t('SR')}`
   };
@@ -626,6 +628,12 @@ async function _load(srDisplaySet, servicesManager, extensionManager) {
     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, CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
   srDisplaySet.isHydrated = false;
   srDisplaySet.isRehydratable = isRehydratable(srDisplaySet, mappings);
@@ -1364,13 +1372,20 @@ function hydrateStructuredReport({
   const codingValues = customizationService.getCustomization('codingValues');
   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(hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_NAME, hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
   if (!mappings || !mappings.length) {
     throw new Error(`Attempting to hydrate measurements service when no mappings present. This shouldn't be reached.`);
   }
-  const instance = src/* DicomMetadataStore */.H8.getInstance(displaySet.StudyInstanceUID, displaySet.SeriesInstanceUID, displaySet.SOPInstanceUID);
+  const instance = src/* DicomMetadataStore */.H8.getInstance(studyUID, seriesUID, sopUID);
   const sopInstanceUIDToImageId = {};
   displaySet.measurements.forEach(measurement => {
     const {
@@ -1487,6 +1502,7 @@ function hydrateStructuredReport({
       const annotation = {
         annotationUID: toolData.annotation.annotationUID,
         data: toolData.annotation.data,
+        predecessorImageId: toolData.predecessorImageId,
         metadata: {
           ...referenceData,
           toolName: annotationType
@@ -1620,6 +1636,9 @@ function choosePoints(points) {
 
 
 
+const {
+  downloadBlob
+} = src/* utils */.Wp;
 const {
   MeasurementReport: commandsModule_MeasurementReport
 } = esm/* adaptersSR */.QX.Cornerstone3D;
@@ -1645,7 +1664,6 @@ const _generateReport = (measurementData, additionalFindingTypes, options = {})
   if (typeof dataset.SpecificCharacterSet === 'undefined') {
     dataset.SpecificCharacterSet = 'ISO_IR 192';
   }
-  dataset.InstanceNumber = options.InstanceNumber ?? 1;
   return dataset;
 };
 const commandsModule = props => {
@@ -1696,8 +1714,9 @@ const commandsModule = props => {
       const reportBlob = dcmjs_es/* default.data */.Ay.data.datasetToBlob(srDataset);
 
       //Create a URL for the binary.
-      const objectUrl = URL.createObjectURL(reportBlob);
-      window.location.assign(objectUrl);
+      downloadBlob(reportBlob, {
+        filename: 'dicom-sr.dcm'
+      });
     },
     /**
      *

package/dist/{4019.bundle.1be1cdd0805ad2c59d65.js → 4019.bundle.03029c488a02493cb7f3.js}

@@ -2126,11 +2126,27 @@ var getContourHolesDataCanvas = __webpack_require__(15451);
 
 
 
-
 class ContourBaseTool extends AnnotationTool/* default */.A {
     constructor(toolProps, defaultToolProps) {
         super(toolProps, defaultToolProps);
     }
+    static getContourSequence(toolData, metadataProvider) {
+        const { data } = toolData;
+        const ContourData = [];
+        for (const point of data.contour.polyline) {
+            for (const v of point) {
+                ContourData.push(v.toFixed(2));
+            }
+        }
+        const { referencedImageId } = toolData.metadata;
+        const ContourImageSequence = metadataProvider.get('ImageSopInstanceReference', referencedImageId);
+        return {
+            NumberOfContourPoints: ContourData.length / 3,
+            ContourImageSequence,
+            ContourGeometricType: 'CLOSED_PLANAR',
+            ContourData,
+        };
+    }
     renderAnnotation(enabledElement, svgDrawingHelper) {
         let renderStatus = false;
         const { viewport } = enabledElement;