@ohif/app 3.8.0-beta.2 → 3.8.0-beta.20

package/dist/{663.bundle.e23c4e894c0792804c6f.js → 663.bundle.b77384121d325382a7ca.js}

@@ -29,10 +29,10 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 var src = __webpack_require__(71771);
 // EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
 var esm = __webpack_require__(45451);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 348 modules
-var dist_esm = __webpack_require__(14957);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
-var core_dist_esm = __webpack_require__(3743);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 391 modules
+var dist_esm = __webpack_require__(28082);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 344 modules
+var core_dist_esm = __webpack_require__(62231);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/tools/modules/dicomSRModule.js
 var dicomSRModule = __webpack_require__(64035);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/constants/scoordTypes.js
@@ -724,9 +724,11 @@ function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dat
     // This also filters out _this_ displaySet, as it is not an ImageSet.
     return;
   }
+  if (newDisplaySet.unsupported) {
+    return;
+  }
   const {
-    sopClassUids,
-    images
+    sopClassUids
   } = newDisplaySet;
 
   // Check if any have the newDisplaySet is the correct SOPClass.
@@ -1531,7 +1533,7 @@ const dicomSRExtension = {
 /* harmony export */   yR: () => (/* binding */ getTrackingUniqueIdentifiersForElement)
 /* harmony export */ });
 /* unused harmony export setActiveTrackingUniqueIdentifierForElement */
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3743);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(62231);
 
 const state = {
   TrackingUniqueIdentifier: null,
@@ -1594,8 +1596,8 @@ __webpack_require__.d(__webpack_exports__, {
   Z: () => (/* binding */ hydrateStructuredReport)
 });
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
-var esm = __webpack_require__(3743);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 344 modules
+var esm = __webpack_require__(62231);
 // EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
 var src = __webpack_require__(71771);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getLabelFromDCMJSImportedToolData.js
@@ -1622,8 +1624,8 @@ function getLabelFromDCMJSImportedToolData(toolData) {
 }
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
 var adapters_es = __webpack_require__(91202);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 348 modules
-var dist_esm = __webpack_require__(14957);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 391 modules
+var dist_esm = __webpack_require__(28082);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js
 
 

package/dist/{82.bundle.48e08e39193f3f74377d.js → 776.bundle.07fe077a28c531430a21.js}

@@ -1,4 +1,4 @@
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[82],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[776],{
 
 /***/ 78227:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -34,14 +34,14 @@ __webpack_require__.r(types_namespaceObject);
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(43001);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
-var esm = __webpack_require__(3743);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 348 modules
-var dist_esm = __webpack_require__(14957);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 344 modules
+var esm = __webpack_require__(62231);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 391 modules
+var dist_esm = __webpack_require__(28082);
 // EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
 var src = __webpack_require__(71771);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 13 modules
-var streaming_image_volume_loader_dist_esm = __webpack_require__(7087);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 15 modules
+var streaming_image_volume_loader_dist_esm = __webpack_require__(32483);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/dynamic-import/cornerstoneDICOMImageLoader.min.js
 var cornerstoneDICOMImageLoader_min = __webpack_require__(61539);
 var cornerstoneDICOMImageLoader_min_default = /*#__PURE__*/__webpack_require__.n(cornerstoneDICOMImageLoader_min);
@@ -88,7 +88,7 @@ function initWADOImageLoader(userAuthenticationService, appConfig, extensionMana
       // Until the default is set to true (which is the case for cornerstone3D),
       // we should set this flag to false.
       convertFloatPixelDataToInt: false,
-      use16BitDataType: Boolean(appConfig.use16BitDataType)
+      use16BitDataType: Boolean(appConfig.useNorm16Texture) || Boolean(appConfig.preferSizeOverAccuracy)
     },
     beforeSend: function (xhr) {
       //TODO should be removed in the future and request emitted by DicomWebDataSource
@@ -118,8 +118,8 @@ function destroy() {
   }
   webWorkers.length = 0;
 }
-// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
-var ui_src = __webpack_require__(71783);
+// EXTERNAL MODULE: ../../ui/src/index.js + 486 modules
+var ui_src = __webpack_require__(22582);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/callInputDialog.tsx
 
 
@@ -350,8 +350,8 @@ function onCompletedCalibrationLine(servicesManager, csToolsEvent) {
     });
   });
 }
-// EXTERNAL MODULE: ../../core/src/utils/index.js + 25 modules
-var utils = __webpack_require__(77250);
+// EXTERNAL MODULE: ../../core/src/utils/index.js + 26 modules
+var utils = __webpack_require__(3225);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/tools/ImageOverlayViewerTool.tsx
 
 
@@ -397,6 +397,12 @@ class ImageOverlayViewerTool extends dist_esm.AnnotationDisplayTool {
       if (!overlays?.length) {
         return;
       }
+
+      // Fix the x, y positions
+      overlays.forEach(overlay => {
+        overlay.x ||= 0;
+        overlay.y ||= 0;
+      });
       this._cachedOverlayMetadata.set(imageId, overlays);
       this._getCachedStat(imageId, overlays, this.configuration.fillColor).then(cachedStat => {
         cachedStat.overlays.forEach(overlay => {
@@ -1554,7 +1560,6 @@ const ArrowAnnotate_Length = {
       toolName: metadata.toolName,
       displaySetInstanceUID: displaySet.displaySetInstanceUID,
       label: data.text,
-      text: data.text,
       displayText: displayText,
       data: data.cachedStats,
       type: getValueTypeFromToolType(toolName),
@@ -3540,8 +3545,8 @@ async function init(_ref) {
   }
   await (0,esm.init)({
     rendering: {
-      preferSizeOverAccuracy: Boolean(appConfig.use16BitDataType),
-      useNorm16Texture: Boolean(appConfig.use16BitDataType)
+      preferSizeOverAccuracy: Boolean(appConfig.preferSizeOverAccuracy),
+      useNorm16Texture: Boolean(appConfig.useNorm16Texture)
     }
   });
 
@@ -3710,6 +3715,18 @@ async function init(_ref) {
       });
     });
   };
+
+  /**
+   * Runs error handler for failed requests.
+   * @param event 
+   */
+  const imageLoadFailedHandler = _ref2 => {
+    let {
+      detail
+    } = _ref2;
+    const handler = src/* errorHandler */.Po.getHTTPErrorHandler();
+    handler(detail.error);
+  };
   const resetCrosshairs = evt => {
     const {
       element
@@ -3737,6 +3754,8 @@ async function init(_ref) {
     } = evt.detail;
     dist_esm.utilities.stackContextPrefetch.enable(element);
   });
+  esm.eventTarget.addEventListener(esm.EVENTS.IMAGE_LOAD_FAILED, imageLoadFailedHandler);
+  esm.eventTarget.addEventListener(esm.EVENTS.IMAGE_LOAD_ERROR, imageLoadFailedHandler);
   function elementEnabledHandler(evt) {
     const {
       element
@@ -4444,6 +4463,8 @@ function getCustomizationModule() {
   }];
 }
 /* harmony default export */ const src_getCustomizationModule = (getCustomizationModule);
+// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
+var gl_matrix_esm = __webpack_require__(45451);
 // EXTERNAL MODULE: ../../../node_modules/html2canvas/dist/html2canvas.esm.js
 var html2canvas_esm = __webpack_require__(76010);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/CornerstoneViewportDownloadForm.tsx
@@ -4767,6 +4788,7 @@ function getReconstructableStackViewports(viewportGridService, displaySetService
 
 
 
+
 function commandsModule(_ref) {
   let {
     servicesManager,
@@ -5157,10 +5179,18 @@ function commandsModule(_ref) {
       const {
         viewport
       } = enabledElement;
-      if (viewport instanceof esm.StackViewport) {
-        const {
-          rotation: currentRotation
-        } = viewport.getProperties();
+      if (viewport instanceof esm.BaseVolumeViewport) {
+        const camera = viewport.getCamera();
+        const rotAngle = rotation * Math.PI / 180;
+        const rotMat = gl_matrix_esm/* mat4.identity */._E.identity(new Float32Array(16));
+        gl_matrix_esm/* mat4.rotate */._E.rotate(rotMat, rotMat, rotAngle, camera.viewPlaneNormal);
+        const rotatedViewUp = gl_matrix_esm/* vec3.transformMat4 */.R3.transformMat4(gl_matrix_esm/* vec3.create */.R3.create(), camera.viewUp, rotMat);
+        viewport.setCamera({
+          viewUp: rotatedViewUp
+        });
+        viewport.render();
+      } else if (viewport.getRotation !== undefined) {
+        const currentRotation = viewport.getRotation();
         const newRotation = (currentRotation + rotation) % 360;
         viewport.setProperties({
           rotation: newRotation
@@ -5236,13 +5266,8 @@ function commandsModule(_ref) {
       const {
         viewport
       } = enabledElement;
-      if (viewport instanceof esm.StackViewport) {
-        viewport.resetProperties();
-        viewport.resetCamera();
-      } else {
-        viewport.resetProperties();
-        viewport.resetCamera();
-      }
+      viewport.resetProperties?.();
+      viewport.resetCamera();
       viewport.render();
     },
     scaleViewport: _ref12 => {
@@ -5398,6 +5423,27 @@ function commandsModule(_ref) {
       cornerstoneViewportService.storePresentation({
         viewportId
       });
+    },
+    attachProtocolViewportDataListener: _ref20 => {
+      let {
+        protocol,
+        stageIndex
+      } = _ref20;
+      const EVENT = cornerstoneViewportService.EVENTS.VIEWPORT_DATA_CHANGED;
+      const command = protocol.callbacks.onViewportDataInitialized;
+      const numPanes = protocol.stages?.[stageIndex]?.viewports.length ?? 1;
+      let numPanesWithData = 0;
+      const {
+        unsubscribe
+      } = cornerstoneViewportService.subscribe(EVENT, evt => {
+        numPanesWithData++;
+        if (numPanesWithData === numPanes) {
+          commandsManager.run(...command);
+
+          // Unsubscribe from the event
+          unsubscribe(EVENT);
+        }
+      });
     }
   };
   const definitions = {
@@ -5546,6 +5592,9 @@ function commandsModule(_ref) {
     },
     cleanUpCrosshairs: {
       commandFn: actions.cleanUpCrosshairs
+    },
+    attachProtocolViewportDataListener: {
+      commandFn: actions.attachProtocolViewportDataListener
     }
   };
   return {
@@ -8600,14 +8649,16 @@ class CornerstoneViewportService extends src/* PubSubService */.hC {
     viewportInfo.setViewportId(viewportId);
     this.viewportsById.set(viewportId, viewportInfo);
     const viewport = renderingEngine.getViewport(viewportId);
-    this._setDisplaySets(viewport, viewportData, viewportInfo, presentations);
+    const displaySetPromise = this._setDisplaySets(viewport, viewportData, viewportInfo, presentations);
 
     // The broadcast event here ensures that listeners have a valid, up to date
     // viewport to access.  Doing it too early can result in exceptions or
     // invalid data.
-    this._broadcastEvent(this.EVENTS.VIEWPORT_DATA_CHANGED, {
-      viewportData,
-      viewportId
+    displaySetPromise.then(() => {
+      this._broadcastEvent(this.EVENTS.VIEWPORT_DATA_CHANGED, {
+        viewportData,
+        viewportId
+      });
     });
   }
   getCornerstoneViewport(viewportId) {
@@ -8621,7 +8672,7 @@ class CornerstoneViewportService extends src/* PubSubService */.hC {
   getViewportInfo(viewportId) {
     return this.viewportsById.get(viewportId);
   }
-  _setStackViewport(viewport, viewportData, viewportInfo, presentations) {
+  async _setStackViewport(viewport, viewportData, viewportInfo, presentations) {
     const displaySetOptions = viewportInfo.getDisplaySetOptions();
     const {
       imageIds,
@@ -8655,7 +8706,7 @@ class CornerstoneViewportService extends src/* PubSubService */.hC {
         properties.invert = voiInverted;
       }
     }
-    viewport.setStack(imageIds, initialImageIndexToUse).then(() => {
+    return viewport.setStack(imageIds, initialImageIndexToUse).then(() => {
       viewport.setProperties({
         ...properties
       });
@@ -8928,26 +8979,31 @@ class CornerstoneViewportService extends src/* PubSubService */.hC {
     const viewportInfo = this.getViewportInfo(viewportId);
     const viewport = this.getCornerstoneViewport(viewportId);
     const viewportCamera = viewport.getCamera();
+    let displaySetPromise;
     if (viewport instanceof esm.VolumeViewport || viewport instanceof esm.VolumeViewport3D) {
-      this._setVolumeViewport(viewport, viewportData, viewportInfo).then(() => {
+      displaySetPromise = this._setVolumeViewport(viewport, viewportData, viewportInfo).then(() => {
         if (keepCamera) {
           viewport.setCamera(viewportCamera);
           viewport.render();
         }
       });
-      return;
     }
     if (viewport instanceof esm.StackViewport) {
-      this._setStackViewport(viewport, viewportData, viewportInfo);
-      return;
+      displaySetPromise = this._setStackViewport(viewport, viewportData, viewportInfo);
     }
+    displaySetPromise.then(() => {
+      this._broadcastEvent(this.EVENTS.VIEWPORT_DATA_CHANGED, {
+        viewportData,
+        viewportId
+      });
+    });
   }
   _setDisplaySets(viewport, viewportData, viewportInfo) {
     let presentations = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     if (viewport instanceof esm.StackViewport) {
-      this._setStackViewport(viewport, viewportData, viewportInfo, presentations);
+      return this._setStackViewport(viewport, viewportData, viewportInfo, presentations);
     } else if (viewport instanceof esm.VolumeViewport || viewport instanceof esm.VolumeViewport3D) {
-      this._setVolumeViewport(viewport, viewportData, viewportInfo, presentations);
+      return this._setVolumeViewport(viewport, viewportData, viewportInfo, presentations);
     } else {
       throw new Error('Unknown viewport type');
     }
@@ -9181,7 +9237,8 @@ class DicomLoaderService {
       SOPInstanceUID,
       authorizationHeaders,
       wadoRoot,
-      wadoUri
+      wadoUri,
+      instance
     } = dataset;
     // Retrieve wadors or just try to fetch wadouri
     if (!someInvalidStrings(wadoRoot)) {
@@ -9190,6 +9247,15 @@ class DicomLoaderService {
       return fetchIt(wadoUri, {
         headers: authorizationHeaders
       });
+    } else if (!someInvalidStrings(instance?.url)) {
+      // make sure the url is absolute, remove the scope
+      // from it if it is not absolute. For instance it might be dicomweb:http://....
+      // and we need to remove the dicomweb: part
+      const url = instance.url;
+      const absoluteUrl = url.startsWith('http') ? url : url.substring(url.indexOf(':') + 1);
+      return fetchIt(absoluteUrl, {
+        headers: authorizationHeaders
+      });
     }
   }
   *getLoaderIterator(dataset, studies, headers) {
@@ -9398,7 +9464,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__(3743);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(62231);
 
 
 /**

package/dist/{788.bundle.c3eec6c3ceea01af04b0.js → 788.bundle.d763978db2da812eaa61.js}

@@ -696,8 +696,8 @@ var react = __webpack_require__(43001);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
-var src = __webpack_require__(71783);
+// EXTERNAL MODULE: ../../ui/src/index.js + 486 modules
+var src = __webpack_require__(22582);
 // EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
 var core_src = __webpack_require__(71771);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
@@ -1542,10 +1542,10 @@ function getPanelModule(_ref) {
   }];
 }
 /* harmony default export */ const src_getPanelModule = (getPanelModule);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 348 modules
-var esm = __webpack_require__(14957);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
-var dist_esm = __webpack_require__(3743);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 391 modules
+var esm = __webpack_require__(28082);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 344 modules
+var dist_esm = __webpack_require__(62231);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/measurementServiceMappings/constants/supportedTools.js
 /* harmony default export */ const supportedTools = (['RectangleROIStartEndThreshold']);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/measurementServiceMappings/utils/getSOPInstanceAttributes.js