@ohif/app 3.7.0-beta.4 → 3.7.0-beta.40

package/dist/{707.bundle.fec5dc4210086c7f617d.js → 625.bundle.7e4bece1b4ef5dc300a8.js}

@@ -1,6 +1,6 @@
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[707],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[625],{
 
-/***/ 31197:
+/***/ 39501:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -26,7 +26,6 @@ __webpack_require__.r(utils_namespaceObject);
 __webpack_require__.d(utils_namespaceObject, {
   getFirstAnnotationSelected: () => (getFirstAnnotationSelected),
   getHandlesFromPoints: () => (getHandlesFromPoints),
-  getModalityUnit: () => (utils_getModalityUnit),
   getSOPInstanceAttributes: () => (getSOPInstanceAttributes/* default */.Z),
   isAnnotationSelected: () => (isAnnotationSelected),
   setAnnotationSelected: () => (setAnnotationSelected)
@@ -34,12 +33,12 @@ __webpack_require__.d(utils_namespaceObject, {
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(32735);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
-var esm = __webpack_require__(77331);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 336 modules
+var esm = __webpack_require__(58389);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 321 modules
 var dist_esm = __webpack_require__(57270);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../core/src/index.ts + 103 modules
+var src = __webpack_require__(87754);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 13 modules
 var streaming_image_volume_loader_dist_esm = __webpack_require__(28909);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/dynamic-import/cornerstoneDICOMImageLoader.min.js
@@ -76,7 +75,7 @@ function initWebWorkers(appConfig) {
     initialized = true;
   }
 }
-function initWADOImageLoader(userAuthenticationService, appConfig) {
+function initWADOImageLoader(userAuthenticationService, appConfig, extensionManager) {
   (cornerstoneDICOMImageLoader_min_default()).external.cornerstone = esm;
   (cornerstoneDICOMImageLoader_min_default()).external.dicomParser = (dicomParser_min_default());
   registerVolumeLoader('cornerstoneStreamingImageVolume', streaming_image_volume_loader_dist_esm/* cornerstoneStreamingImageVolumeLoader */.IU);
@@ -90,18 +89,13 @@ function initWADOImageLoader(userAuthenticationService, appConfig) {
       convertFloatPixelDataToInt: false
     },
     beforeSend: function (xhr) {
+      //TODO should be removed in the future and request emitted by DicomWebDataSource
+      const sourceConfig = extensionManager.getActiveDataSource()?.[0].getConfig() ?? {};
       const headers = userAuthenticationService.getAuthorizationHeader();
-
-      // Request:
-      // JPEG-LS Lossless (1.2.840.10008.1.2.4.80) if available, otherwise accept
-      // whatever transfer-syntax the origin server provides.
-      // For now we use image/jls and image/x-jls because some servers still use the old type
-      // http://dicom.nema.org/medical/dicom/current/output/html/part18.html
+      const acceptHeader = src.utils.generateAcceptHeader(sourceConfig.acceptHeader, sourceConfig.requestTransferSyntaxUID, sourceConfig.omitQuotationForMultipartRequest);
       const xhrRequestHeaders = {
-        Accept: appConfig.omitQuotationForMultipartRequest ? 'multipart/related; type=application/octet-stream' : 'multipart/related; type="application/octet-stream"'
-        // 'multipart/related; type="image/x-jls", multipart/related; type="image/jls"; transfer-syntax="1.2.840.10008.1.2.4.80", multipart/related; type="image/x-jls", multipart/related; type="application/octet-stream"; transfer-syntax=*',
+        Accept: acceptHeader
       };
-
       if (headers) {
         Object.assign(xhrRequestHeaders, headers);
       }
@@ -122,8 +116,8 @@ function destroy() {
   }
   webWorkers.length = 0;
 }
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/callInputDialog.tsx
 
 
@@ -187,11 +181,11 @@ function callInputDialog(uiDialogService, data, callback) {
         actions: [{
           id: 'cancel',
           text: 'Cancel',
-          type: 'primary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.secondary
         }, {
           id: 'save',
           text: 'Save',
-          type: 'secondary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.primary
         }],
         onSubmit: onSubmitHandler,
         body: _ref2 => {
@@ -791,22 +785,10 @@ function Bidirectional_getDisplayText(mappedAnnotations, displaySet) {
   return displayText;
 }
 /* harmony default export */ const measurementServiceMappings_Bidirectional = (Bidirectional);
-;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/utils/getModalityUnit.js
-function getModalityUnit(modality) {
-  if (modality === 'CT') {
-    return 'HU';
-  } else if (modality === 'PT') {
-    return 'SUV';
-  } else {
-    return '';
-  }
-}
-/* harmony default export */ const utils_getModalityUnit = (getModalityUnit);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/EllipticalROI.ts
 
 
 
-
 const EllipticalROI = {
   toAnnotation: measurement => {},
   toMeasurement: (csToolsEventDetail, displaySetService, cornerstoneViewportService, getValueTypeFromToolType) => {
@@ -904,16 +886,16 @@ function EllipticalROI_getMappedAnnotations(annotation, displaySetService) {
       stdDev,
       max,
       area,
-      Modality
+      Modality,
+      modalityUnit
     } = targetStats;
-    const unit = utils_getModalityUnit(Modality);
     annotations.push({
       SeriesInstanceUID,
       SOPInstanceUID,
       SeriesNumber,
       frameNumber,
       Modality,
-      unit,
+      unit: modalityUnit,
       mean,
       stdDev,
       max,
@@ -1013,7 +995,6 @@ function EllipticalROI_getDisplayText(mappedAnnotations, displaySet) {
 
 
 
-
 const CircleROI = {
   toAnnotation: measurement => {},
   toMeasurement: (csToolsEventDetail, DisplaySetService, CornerstoneViewportService, getValueTypeFromToolType) => {
@@ -1111,16 +1092,16 @@ function CircleROI_getMappedAnnotations(annotation, DisplaySetService) {
       stdDev,
       max,
       area,
-      Modality
+      Modality,
+      modalityUnit
     } = targetStats;
-    const unit = utils_getModalityUnit(Modality);
     annotations.push({
       SeriesInstanceUID,
       SOPInstanceUID,
       SeriesNumber,
       frameNumber,
       Modality,
-      unit,
+      unit: modalityUnit,
       mean,
       stdDev,
       max,
@@ -1839,7 +1820,6 @@ function PlanarFreehandROI_getDisplayText(mappedAnnotations) {
 
 
 
-
 const RectangleROI = {
   toAnnotation: measurement => {},
   toMeasurement: (csToolsEventDetail, DisplaySetService, CornerstoneViewportService, getValueTypeFromToolType) => {
@@ -1937,16 +1917,16 @@ function RectangleROI_getMappedAnnotations(annotation, DisplaySetService) {
       stdDev,
       max,
       area,
-      Modality
+      Modality,
+      modalityUnit
     } = targetStats;
-    const unit = utils_getModalityUnit(Modality);
     annotations.push({
       SeriesInstanceUID,
       SOPInstanceUID,
       SeriesNumber,
       frameNumber,
       Modality,
-      unit,
+      unit: modalityUnit,
       mean,
       stdDev,
       max,
@@ -3154,7 +3134,6 @@ function initDoubleClick(_ref) {
 
 
 
-
 // TODO: Cypress tests are currently grabbing this from the window?
 window.cornerstone = esm;
 window.cornerstoneTools = dist_esm;
@@ -3189,10 +3168,7 @@ async function init(_ref) {
   esm.Settings.getRuntimeSettings().set('useCursors', Boolean(appConfig.useCursors));
   const {
     userAuthenticationService,
-    measurementService,
     customizationService,
-    displaySetService,
-    uiDialogService,
     uiModalService,
     uiNotificationService,
     cineService,
@@ -3254,7 +3230,7 @@ async function init(_ref) {
     thumbnail: appConfig?.maxNumRequests?.thumbnail || 75,
     prefetch: appConfig?.maxNumRequests?.prefetch || 10
   };
-  initWADOImageLoader(userAuthenticationService, appConfig);
+  initWADOImageLoader(userAuthenticationService, appConfig, extensionManager);
 
   /* Measurement Service */
   this.measurementServiceSource = connectToolsToMeasurementService(servicesManager);
@@ -3560,7 +3536,6 @@ const DicomUploadProgressItem = /*#__PURE__*/(0,react.memo)(_ref => {
   const [percentComplete, setPercentComplete] = (0,react.useState)(dicomFileUploader.getPercentComplete());
   const [failedReason, setFailedReason] = (0,react.useState)('');
   const [status, setStatus] = (0,react.useState)(dicomFileUploader.getStatus());
-  console.info(`${dicomFileUploader.getFileId()}`);
   const isComplete = (0,react.useCallback)(() => {
     return status === UploadStatus.Failed || status === UploadStatus.Cancelled || status === UploadStatus.Success;
   }, [status]);
@@ -3850,8 +3825,6 @@ function DicomUploadProgress(_ref) {
     }, numFilesCompleted === dicomFileUploaderArr.length ? /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("span", {
       className: NO_WRAP_ELLIPSIS_CLASS_NAMES
     }, `${dicomFileUploaderArr.length} ${dicomFileUploaderArr.length > 1 ? 'files' : 'file'} completed.`), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-      variant: "contained",
-      color: "primary",
       disabled: false,
       className: "ml-auto",
       onClick: onComplete
@@ -3959,8 +3932,6 @@ function DicomUpload(_ref) {
           getInputProps
         } = _ref3;
         return /*#__PURE__*/react.createElement("div", getRootProps(), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-          variant: "contained",
-          color: "primary",
           disabled: false,
           onClick: () => {}
         }, 'Add files', /*#__PURE__*/react.createElement("input", getInputProps())));
@@ -3973,9 +3944,7 @@ function DicomUpload(_ref) {
           getInputProps
         } = _ref4;
         return /*#__PURE__*/react.createElement("div", getRootProps(), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-          variant: "contained",
-          color: "primaryDark",
-          border: "primaryActive",
+          type: ui_src/* ButtonEnums.type */.LZ.U.secondary,
           disabled: false,
           onClick: () => {}
         }, 'Add folder', /*#__PURE__*/react.createElement("input", _extends({}, getInputProps(), {
@@ -4888,15 +4857,13 @@ function commandsModule(_ref) {
       const {
         viewport
       } = enabledElement;
-      if (viewport instanceof esm.StackViewport) {
-        const {
-          invert
-        } = viewport.getProperties();
-        viewport.setProperties({
-          invert: !invert
-        });
-        viewport.render();
-      }
+      const {
+        invert
+      } = viewport.getProperties();
+      viewport.setProperties({
+        invert: !invert
+      });
+      viewport.render();
     },
     resetViewport: () => {
       const enabledElement = _getActiveViewportEnabledElement();
@@ -5795,7 +5762,7 @@ class SyncGroupService {
    * @param type is the type of the synchronizer to create
    * @param creator
    */
-  setSynchronizer(type, creator) {
+  addSynchronizerType(type, creator) {
     this.synchronizerCreators[type.toLowerCase()] = creator;
   }
   _getOrCreateSynchronizer(type, id, options) {
@@ -6721,6 +6688,7 @@ class SegmentationService extends src/* PubSubService */.hC {
       id: segmentationId,
       displaySetInstanceUID: segDisplaySet.displaySetInstanceUID,
       type: representationType,
+      label: segDisplaySet.SeriesDescription,
       representationData: {
         [LABELMAP]: {
           volumeId: segmentationId,
@@ -6917,6 +6885,7 @@ class SegmentationService extends src/* PubSubService */.hC {
       id: segmentationId,
       displaySetInstanceUID: rtDisplaySetUID,
       type: representationType,
+      label: rtDisplaySet.SeriesDescription,
       representationData: {
         [CONTOUR]: {
           geometryIds
@@ -6942,41 +6911,47 @@ class SegmentationService extends src/* PubSubService */.hC {
         segmentIndex,
         geometryId
       } = rtStructData;
-      const geometry = await esm.geometryLoader.createAndCacheGeometry(geometryId, {
-        geometryData: {
-          data,
-          id,
-          color,
-          frameOfReferenceUID: structureSet.frameOfReferenceUID,
-          segmentIndex
-        },
-        type: esm.Enums.GeometryType.CONTOUR
-      });
-      const contourSet = geometry.data;
-      const centroid = contourSet.getCentroid();
-      segmentsCachedStats[segmentIndex] = {
-        center: {
-          world: centroid
-        },
-        modifiedTime: rtDisplaySet.SeriesDate // we use the SeriesDate as the modifiedTime since this is the first time we are creating the segmentation
-      };
 
-      segmentation.segments[segmentIndex] = {
-        label: id,
-        segmentIndex,
-        color,
-        ...SEGMENT_CONSTANT
-      };
-      const numInitialized = Object.keys(segmentsCachedStats).length;
+      // catch error instead of failing to allow loading to continue
+      try {
+        const geometry = await esm.geometryLoader.createAndCacheGeometry(geometryId, {
+          geometryData: {
+            data,
+            id,
+            color,
+            frameOfReferenceUID: structureSet.frameOfReferenceUID,
+            segmentIndex
+          },
+          type: esm.Enums.GeometryType.CONTOUR
+        });
+        const contourSet = geometry.data;
+        const centroid = contourSet.getCentroid();
+        segmentsCachedStats[segmentIndex] = {
+          center: {
+            world: centroid
+          },
+          modifiedTime: rtDisplaySet.SeriesDate // we use the SeriesDate as the modifiedTime since this is the first time we are creating the segmentation
+        };
 
-      // Calculate percentage completed
-      const percentComplete = Math.round(numInitialized / allRTStructData.length * 100);
-      this._broadcastEvent(SegmentationService_EVENTS.SEGMENT_LOADING_COMPLETE, {
-        percentComplete,
-        // Note: this is not the geometryIds length since there might be
-        // some missing ROINumbers
-        numSegments: allRTStructData.length
-      });
+        segmentation.segments[segmentIndex] = {
+          label: id,
+          segmentIndex,
+          color,
+          ...SEGMENT_CONSTANT
+        };
+        const numInitialized = Object.keys(segmentsCachedStats).length;
+
+        // Calculate percentage completed
+        const percentComplete = Math.round(numInitialized / allRTStructData.length * 100);
+        this._broadcastEvent(SegmentationService_EVENTS.SEGMENT_LOADING_COMPLETE, {
+          percentComplete,
+          // Note: this is not the geometryIds length since there might be
+          // some missing ROINumbers
+          numSegments: allRTStructData.length
+        });
+      } catch (e) {
+        console.warn(e);
+      }
     };
     const promiseArray = [];
     for (let i = 0; i < allRTStructData.length; i++) {
@@ -7825,7 +7800,7 @@ class ViewportInfo {
     // Since SEG and other derived displaySets are loaded in a different way, and not
     // via cornerstoneViewportService
     let viewportData = this.getViewportData();
-    if (viewportData.viewportType === esm.Enums.ViewportType.ORTHOGRAPHIC) {
+    if (viewportData.viewportType === esm.Enums.ViewportType.ORTHOGRAPHIC || viewportData.viewportType === esm.Enums.ViewportType.VOLUME_3D) {
       viewportData = viewportData;
       return viewportData.data.some(_ref => {
         let {
@@ -8493,7 +8468,7 @@ class CornerstoneViewportService extends src/* PubSubService */.hC {
     const viewportId = viewportInfo.getViewportId();
     const viewport = this.getCornerstoneViewport(viewportId);
     const viewportCamera = viewport.getCamera();
-    if (viewport instanceof esm.VolumeViewport) {
+    if (viewport instanceof esm.VolumeViewport || viewport instanceof esm.VolumeViewport3D) {
       this._setVolumeViewport(viewport, viewportData, viewportInfo).then(() => {
         if (keepCamera) {
           viewport.setCamera(viewportCamera);
@@ -8824,7 +8799,6 @@ function getHandlesFromPoints(points) {
 
 
 
-
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/index.ts
 
 
@@ -8853,7 +8827,7 @@ function src_extends() { src_extends = Object.assign ? Object.assign.bind() : fu
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return Promise.all(/* import() */[__webpack_require__.e(664), __webpack_require__.e(351)]).then(__webpack_require__.bind(__webpack_require__, 30351));
+  return Promise.all(/* import() */[__webpack_require__.e(664), __webpack_require__.e(468)]).then(__webpack_require__.bind(__webpack_require__, 31468));
 });
 const OHIFCornerstoneViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -9006,7 +8980,7 @@ const reset = () => {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   Z: () => (/* binding */ getSOPInstanceAttributes)
 /* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(77331);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58389);
 
 
 /**

package/dist/{642.bundle.478ce6f500f977507924.js → 642.bundle.ac0c06c27fc4366de343.js}

@@ -21,8 +21,8 @@ const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-dicom-pdf"}')
 const id = package_namespaceObject.u2;
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-pdf`;
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../core/src/index.ts + 103 modules
+var src = __webpack_require__(87754);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-pdf/src/getSopClassHandlerModule.js
 
 

package/dist/{728.bundle.d13856835357400fef82.js → 728.bundle.5bef7c8643b42d70a79f.js}

@@ -12,8 +12,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // UNUSED EXPORTS: StreamingDynamicImageVolume, StreamingImageVolume, cornerstoneStreamingDynamicImageVolumeLoader, helpers
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
-var esm = __webpack_require__(77331);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 336 modules
+var esm = __webpack_require__(58389);
 // EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
 var gl_matrix_esm = __webpack_require__(88256);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/helpers/makeVolumeMetadata.js
@@ -580,7 +580,7 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
                 }
                 const isSlopeAndInterceptNumbers = typeof scalingParameters.rescaleSlope === 'number' &&
                     typeof scalingParameters.rescaleIntercept === 'number';
-                this.isPrescaled = isSlopeAndInterceptNumbers;
+                this.isPreScaled = isSlopeAndInterceptNumbers;
                 const options = {
                     targetBuffer: {
                         arrayBuffer: arrayBuffer instanceof ArrayBuffer ? undefined : arrayBuffer,
@@ -660,6 +660,7 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
             windowCenter,
             windowWidth,
             color,
+            rgba: false,
             spacing: this.spacing,
             dimensions: this.dimensions,
             PhotometricInterpretation,
@@ -763,7 +764,7 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
         if (suvbw) {
             petScaling.suvbw = suvbw;
         }
-        this.scaling = { PET: petScaling };
+        this.scaling = { PT: petScaling };
     }
     _removeFromCache() {
         esm.cache.removeVolumeLoadObject(this.volumeId);
@@ -796,9 +797,10 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
             windowWidth,
             voiLUTFunction,
             color,
+            rgba: false,
             numComps: numComponents,
-            rows: dimensions[0],
-            columns: dimensions[1],
+            rows: dimensions[1],
+            columns: dimensions[0],
             sizeInBytes: imageScalarData.byteLength,
             getPixelData: () => imageScalarData,
             minPixelValue: minMax.min,
@@ -809,7 +811,6 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
             getCanvas: undefined,
             height: dimensions[0],
             width: dimensions[1],
-            rgba: undefined,
             columnPixelSpacing: spacing[0],
             rowPixelSpacing: spacing[1],
             invert,
@@ -937,11 +938,11 @@ function cornerstoneStreamingImageVolumeLoader(volumeId, options) {
                 if (signed) {
                     throw new Error('8 Bit signed images are not yet supported by this plugin.');
                 }
-                sizeInBytes = length;
+                sizeInBytes = length * numComponents;
                 handleCache(sizeInBytes);
                 scalarData = useSharedArrayBuffer
-                    ? cornerstoneStreamingImageVolumeLoader_createUint8SharedArray(length)
-                    : new Uint8Array(length);
+                    ? cornerstoneStreamingImageVolumeLoader_createUint8SharedArray(length * numComponents)
+                    : new Uint8Array(length * numComponents);
                 break;
             case 16:
                 if (!use16BitDataType) {