@ohif/app 3.7.0-beta.5 → 3.7.0-beta.51

package/dist/{199.bundle.dff92336f7bc36f2e484.js → 506.bundle.e7e138496747d049843e.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[199],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[506],{
 
-/***/ 31199:
+/***/ 53506:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -9,7 +9,8 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "default": () => (/* binding */ cornerstone_dicom_rt_src)
+  "default": () => (/* binding */ cornerstone_dicom_rt_src),
+  hydrateRTDisplaySet: () => (/* reexport */ _hydrateRT/* default */.Z)
 });
 
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/package.json
@@ -21,11 +22,11 @@ const SOPClassHandlerName = 'dicom-rt';
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(32735);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+var react = __webpack_require__(43001);
+// EXTERNAL MODULE: ../../core/src/index.ts + 104 modules
+var src = __webpack_require__(24966);
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
-var dcmjs_es = __webpack_require__(22737);
+var dcmjs_es = __webpack_require__(67540);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/loadRTStruct.js
 
 const {
@@ -159,11 +160,6 @@ async function loadRTStruct(extensionManager, rtStructDisplaySet, referencedDisp
         NumberOfContourPoints,
         ContourGeometricType
       } = ContourSequenceArray[c];
-      const sopInstanceUID = ContourImageSequence.ReferencedSOPInstanceUID;
-      const imageId = _getImageId(imageIdSopInstanceUidPairs, sopInstanceUID);
-      if (!imageId) {
-        continue;
-      }
       let isSupported = false;
       const points = [];
       for (let p = 0; p < NumberOfContourPoints * 3; p += 3) {
@@ -420,13 +416,16 @@ function getSopClassHandlerModule(_ref2) {
   }];
 }
 /* harmony default export */ const src_getSopClassHandlerModule = (getSopClassHandlerModule);
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/_hydrateRT.ts
+var _hydrateRT = __webpack_require__(50995);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/index.tsx
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 
 
+
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 581).then(__webpack_require__.bind(__webpack_require__, 72581));
+  return __webpack_require__.e(/* import() */ 471).then(__webpack_require__.bind(__webpack_require__, 56471));
 });
 const OHIFCornerstoneRTViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -452,12 +451,14 @@ const extension = {
   getViewportModule(_ref) {
     let {
       servicesManager,
-      extensionManager
+      extensionManager,
+      commandsManager
     } = _ref;
     const ExtendedOHIFCornerstoneRTViewport = props => {
       return /*#__PURE__*/react.createElement(OHIFCornerstoneRTViewport, _extends({
         servicesManager: servicesManager,
-        extensionManager: extensionManager
+        extensionManager: extensionManager,
+        commandsManager: commandsManager
       }, props));
     };
     return [{
@@ -475,6 +476,69 @@ const extension = {
 };
 /* harmony default export */ const cornerstone_dicom_rt_src = (extension);
 
+
+/***/ }),
+
+/***/ 50995:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Z: () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+async function _hydrateRTDisplaySet(_ref) {
+  let {
+    rtDisplaySet,
+    viewportIndex,
+    servicesManager
+  } = _ref;
+  const {
+    segmentationService,
+    hangingProtocolService,
+    viewportGridService
+  } = servicesManager.services;
+  const displaySetInstanceUID = rtDisplaySet.referencedDisplaySetInstanceUID;
+  let segmentationId = null;
+
+  // We need the hydration to notify panels about the new segmentation added
+  const suppressEvents = false;
+  segmentationId = await segmentationService.createSegmentationForRTDisplaySet(rtDisplaySet, segmentationId, suppressEvents);
+  segmentationService.hydrateSegmentation(rtDisplaySet.displaySetInstanceUID);
+  const {
+    viewports
+  } = viewportGridService.getState();
+  const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportIndex, displaySetInstanceUID);
+  viewportGridService.setDisplaySetsForViewports(updatedViewports);
+
+  // Todo: fix this after we have a better way for stack viewport segmentations
+
+  // check every viewport in the viewports to see if the displaySetInstanceUID
+  // is being displayed, if so we need to update the viewport to use volume viewport
+  // (if already is not using it) since Cornerstone3D currently only supports
+  // volume viewport for segmentation
+  viewports.forEach((viewport, index) => {
+    if (index === viewportIndex) {
+      return;
+    }
+    const shouldDisplaySeg = segmentationService.shouldRenderSegmentation(viewport.displaySetInstanceUIDs, rtDisplaySet.displaySetInstanceUID);
+    if (shouldDisplaySeg) {
+      updatedViewports.push({
+        viewportIndex: index,
+        displaySetInstanceUIDs: viewport.displaySetInstanceUIDs,
+        viewportOptions: {
+          initialImageOptions: {
+            preset: 'middle'
+          }
+        }
+      });
+    }
+  });
+
+  // Do the entire update at once
+  viewportGridService.setDisplaySetsForViewports(updatedViewports);
+  return true;
+}
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (_hydrateRTDisplaySet);
+
 /***/ })
 
 }]);

package/dist/{935.bundle.deeffff0e4f7b528e3c3.js → 604.bundle.a51f83e64004bca5f497.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[935],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[604],{
 
-/***/ 75935:
+/***/ 97604:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -1841,7 +1841,6 @@ var utils = {
 };
 
 
-//# sourceMappingURL=dicomweb-client.es.js.map
 
 
 /***/ })

package/dist/{984.bundle.0301a876361809048be0.js → 663.bundle.8f1eb54994e740164a70.js}

@@ -1,6 +1,6 @@
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[984],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[663],{
 
-/***/ 65948:
+/***/ 42170:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -16,7 +16,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(32735);
+var react = __webpack_require__(43001);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/package.json
 const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-cornerstone-dicom-sr"}');
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/id.js
@@ -25,16 +25,16 @@ const id = package_namespaceObject.u2;
 const SOPClassHandlerName = 'dicom-sr';
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../core/src/index.ts + 104 modules
+var src = __webpack_require__(24966);
 // EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
-var esm = __webpack_require__(88256);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 321 modules
-var dist_esm = __webpack_require__(57270);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
-var core_dist_esm = __webpack_require__(77331);
+var esm = __webpack_require__(45451);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 323 modules
+var dist_esm = __webpack_require__(26925);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 337 modules
+var core_dist_esm = __webpack_require__(45754);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/tools/modules/dicomSRModule.js
-var dicomSRModule = __webpack_require__(94709);
+var dicomSRModule = __webpack_require__(64035);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/constants/scoordTypes.js
 /* harmony default export */ const scoordTypes = ({
   POINT: 'POINT',
@@ -486,8 +486,8 @@ function _getRenderableData(GraphicType, GraphicData, imageId, TrackingIdentifie
   }
   return renderableData;
 }
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/@cornerstonejs/adapters.es.js
-var adapters_es = __webpack_require__(4606);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
+var adapters_es = __webpack_require__(91202);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/isRehydratable.js
 
 const cornerstoneAdapters = adapters_es.adaptersSR.Cornerstone3D.MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
@@ -776,7 +776,9 @@ function _measurementReferencesSOPInstanceUID(measurement, SOPInstanceUID, frame
   // NOTE: The ReferencedFrameNumber can be multiple values according to the DICOM
   //  Standard. But for now, we will support only one ReferenceFrameNumber.
   const ReferencedFrameNumber = measurement.coords[0].ReferencedSOPSequence && measurement.coords[0].ReferencedSOPSequence[0]?.ReferencedFrameNumber || 1;
-  if (frameNumber && Number(frameNumber) !== Number(ReferencedFrameNumber)) return false;
+  if (frameNumber && Number(frameNumber) !== Number(ReferencedFrameNumber)) {
+    return false;
+  }
   for (let j = 0; j < coords.length; j++) {
     const coord = coords[j];
     const {
@@ -985,7 +987,9 @@ function _getReferencedImagesList(ImagingMeasurementReportContentSequence) {
     const {
       ReferencedSOPSequence
     } = item;
-    if (!ReferencedSOPSequence) return;
+    if (!ReferencedSOPSequence) {
+      return;
+    }
     for (const ref of _getSequenceAsArray(ReferencedSOPSequence)) {
       if (ref.ReferencedSOPClassUID) {
         const {
@@ -1002,7 +1006,9 @@ function _getReferencedImagesList(ImagingMeasurementReportContentSequence) {
   return referencedImages;
 }
 function _getSequenceAsArray(sequence) {
-  if (!sequence) return [];
+  if (!sequence) {
+    return [];
+  }
   return Array.isArray(sequence) ? sequence : [sequence];
 }
 /* harmony default export */ const src_getSopClassHandlerModule = (getSopClassHandlerModule);
@@ -1012,7 +1018,6 @@ const srProtocol = {
   // Don't store this hanging protocol as it applies to the currently active
   // display set by default
   // cacheId: null,
-  hasUpdatedPriorsInformation: false,
   name: 'SR Key Images',
   // Just apply this one when specifically listed
   protocolMatchingRules: [],
@@ -1088,7 +1093,7 @@ function onModeEnter(_ref) {
   });
 }
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
-var dcmjs_es = __webpack_require__(22737);
+var dcmjs_es = __webpack_require__(67540);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getFilteredCornerstoneToolState.ts
 
 
@@ -1356,7 +1361,7 @@ function init(_ref) {
   });
 }
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js + 1 modules
-var hydrateStructuredReport = __webpack_require__(68525);
+var hydrateStructuredReport = __webpack_require__(38965);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/createReferencedImageDisplaySet.ts
 
 const createReferencedImageDisplaySet_ImageSet = src.classes.ImageSet;
@@ -1366,7 +1371,9 @@ const findInstance = (measurement, displaySetService) => {
     ReferencedSOPInstanceUID: sopUid
   } = measurement;
   const referencedDisplaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
-  if (!referencedDisplaySet.images) return;
+  if (!referencedDisplaySet.images) {
+    return;
+  }
   return referencedDisplaySet.images.find(it => it.SOPInstanceUID === sopUid);
 };
 
@@ -1381,8 +1388,12 @@ const findReferencedInstances = (displaySetService, displaySet) => {
     const {
       imageId
     } = measurement;
-    if (!imageId) continue;
-    if (instanceById[imageId]) continue;
+    if (!imageId) {
+      continue;
+    }
+    if (instanceById[imageId]) {
+      continue;
+    }
     const instance = findInstance(measurement, displaySetService);
     if (!instance) {
       console.log('Measurement', measurement, 'had no instances found');
@@ -1449,7 +1460,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 953).then(__webpack_require__.bind(__webpack_require__, 27953));
+  return __webpack_require__.e(/* import() */ 886).then(__webpack_require__.bind(__webpack_require__, 48886));
 });
 const OHIFCornerstoneSRViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -1511,7 +1522,7 @@ const dicomSRExtension = {
 
 /***/ }),
 
-/***/ 94709:
+/***/ 64035:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -1520,7 +1531,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__(77331);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(45754);
 
 const state = {
   TrackingUniqueIdentifier: null,
@@ -1573,7 +1584,7 @@ function getTrackingUniqueIdentifiersForElement(element) {
 
 /***/ }),
 
-/***/ 68525:
+/***/ 38965:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -1583,10 +1594,10 @@ __webpack_require__.d(__webpack_exports__, {
   Z: () => (/* binding */ hydrateStructuredReport)
 });
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
-var esm = __webpack_require__(77331);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 337 modules
+var esm = __webpack_require__(45754);
+// EXTERNAL MODULE: ../../core/src/index.ts + 104 modules
+var src = __webpack_require__(24966);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getLabelFromDCMJSImportedToolData.js
 /**
  * Extracts the label from the toolData imported from dcmjs. We need to do this
@@ -1609,8 +1620,8 @@ function getLabelFromDCMJSImportedToolData(toolData) {
     return finding.CodeMeaning;
   }
 }
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/@cornerstonejs/adapters.es.js
-var adapters_es = __webpack_require__(4606);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
+var adapters_es = __webpack_require__(91202);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js
 
 
@@ -1627,7 +1638,9 @@ const CORNERSTONE_3D_TOOLS_SOURCE_NAME = 'Cornerstone3DTools';
 const CORNERSTONE_3D_TOOLS_SOURCE_VERSION = '0.1';
 const supportedLegacyCornerstoneTags = ['cornerstoneTools@^4.0.0'];
 const convertCode = (codingValues, code) => {
-  if (!code || code.CodingSchemeDesignator === 'CORNERSTONEJS') return;
+  if (!code || code.CodingSchemeDesignator === 'CORNERSTONEJS') {
+    return;
+  }
   const ref = `${code.CodingSchemeDesignator}:${code.CodeValue}`;
   const ret = {
     ...codingValues[ref],
@@ -1638,13 +1651,17 @@ const convertCode = (codingValues, code) => {
   return ret;
 };
 const convertSites = (codingValues, sites) => {
-  if (!sites || !sites.length) return;
+  if (!sites || !sites.length) {
+    return;
+  }
   const ret = [];
   // Do as a loop to convert away from Proxy instances
   for (let i = 0; i < sites.length; i++) {
     // Deal with irregular conversion from dcmjs
     const site = convertCode(codingValues, sites[i][0] || sites[i]);
-    if (site) ret.push(site);
+    if (site) {
+      ret.push(site);
+    }
   }
   return ret.length && ret || undefined;
 };