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

package/dist/{917.bundle.24fc5ca2280d2980bf0f.js → 12.bundle.d02c9736f7bdaabbf1df.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[917],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[12],{
 
-/***/ 95917:
+/***/ 85012:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -13,7 +13,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/dicom-video/package.json
 const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-dicom-video"}');
 ;// CONCATENATED MODULE: ../../../extensions/dicom-video/src/id.js
@@ -21,8 +21,8 @@ const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-dicom-video"}
 const id = package_namespaceObject.u2;
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-video`;
 
-// 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);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-video/src/getSopClassHandlerModule.js
 
 
@@ -127,7 +127,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 205).then(__webpack_require__.bind(__webpack_require__, 36205));
+  return __webpack_require__.e(/* import() */ 686).then(__webpack_require__.bind(__webpack_require__, 39686));
 });
 const OHIFCornerstoneVideoViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {

package/dist/{295.bundle.957b1159fec14b9199a1.js → 125.bundle.1ae4c6313c31cd0502cc.js}

@@ -1,15 +1,15 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[295],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[125],{
 
-/***/ 56295:
+/***/ 39125:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(32735);
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(60216);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(43001);
+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3827);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
 
 

package/dist/{208.bundle.e50761cf714ac772d9cc.js → 128.bundle.4b39b6452213ebee2101.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[208],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[128],{
 
-/***/ 9208:
+/***/ 59128:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -12,10 +12,10 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ basic_test_mode_src)
 });
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
-var ui_src = __webpack_require__(28619);
+// EXTERNAL MODULE: ../../core/src/index.ts + 104 modules
+var src = __webpack_require__(24966);
+// EXTERNAL MODULE: ../../ui/src/index.js + 456 modules
+var ui_src = __webpack_require__(60082);
 ;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/toolbarButtons.js
 // TODO: torn, can either bake this here; or have to create a whole new button type
 // Only ways that you can pass in a custom React component for render :l

package/dist/{616.bundle.cbb2e0a23b1343b6441f.js → 150.bundle.4ff43d080c1803b2ccf6.js}

@@ -1,6 +1,6 @@
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[616],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[150],{
 
-/***/ 72776:
+/***/ 48228:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -9,7 +9,8 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "default": () => (/* binding */ cornerstone_dicom_seg_src)
+  "default": () => (/* binding */ cornerstone_dicom_seg_src),
+  hydrateSEGDisplaySet: () => (/* reexport */ _hydrateSEG/* default */.Z)
 });
 
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/package.json
@@ -21,22 +22,34 @@ const SOPClassHandlerName = 'dicom-seg';
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(32735);
-// EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/Math.js
-var Core_Math = __webpack_require__(92780);
-// 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/@cornerstonejs/core/dist/esm/index.js + 337 modules
+var esm = __webpack_require__(45754);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
+var adapters_es = __webpack_require__(91202);
 // 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-seg/src/utils/dicomlabToRGB.ts
+
+
+/**
+ * Converts a CIELAB color to an RGB color using the dcmjs library.
+ * @param cielab - The CIELAB color to convert.
+ * @returns The RGB color as an array of three integers between 0 and 255.
+ */
+function dicomlabToRGB(cielab) {
+  const rgb = dcmjs_es["default"].data.Colors.dicomlab2RGB(cielab).map(x => Math.round(x * 255));
+  return rgb;
+}
+
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/getSopClassHandlerModule.js
 
 
 
 
-const {
-  DicomMessage,
-  DicomMetaDictionary
-} = dcmjs_es["default"].data;
+
 const sopClassUids = ['1.2.840.10008.5.1.4.1.1.66.4'];
 let loadPromises = {};
 function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager) {
@@ -130,8 +143,12 @@ function _load(segDisplaySet, servicesManager, extensionManager, headers) {
   // and also return the same promise to any other callers.
   loadPromises[SOPInstanceUID] = new Promise(async (resolve, reject) => {
     if (!segDisplaySet.segments || Object.keys(segDisplaySet.segments).length === 0) {
-      const segments = await _loadSegments(extensionManager, segDisplaySet, headers);
-      segDisplaySet.segments = segments;
+      await _loadSegments({
+        extensionManager,
+        servicesManager,
+        segDisplaySet,
+        headers
+      });
     }
     const suppressEvents = true;
     segmentationService.createSegmentationForSEGDisplaySet(segDisplaySet, null, suppressEvents).then(() => {
@@ -144,101 +161,62 @@ function _load(segDisplaySet, servicesManager, extensionManager, headers) {
   });
   return loadPromises[SOPInstanceUID];
 }
-async function _loadSegments(extensionManager, segDisplaySet, headers) {
+async function _loadSegments(_ref2) {
+  let {
+    extensionManager,
+    servicesManager,
+    segDisplaySet,
+    headers
+  } = _ref2;
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.common');
+  const {
+    segmentationService
+  } = servicesManager.services;
   const {
     dicomLoaderService
   } = utilityModule.exports;
-  const segArrayBuffer = await dicomLoaderService.findDicomDataPromise(segDisplaySet, null, headers);
-  const dicomData = DicomMessage.readFile(segArrayBuffer);
-  const dataset = DicomMetaDictionary.naturalizeDataset(dicomData.dict);
-  dataset._meta = DicomMetaDictionary.namifyDataset(dicomData.meta);
-  if (!Array.isArray(dataset.SegmentSequence)) {
-    dataset.SegmentSequence = [dataset.SegmentSequence];
+  const arrayBuffer = await dicomLoaderService.findDicomDataPromise(segDisplaySet, null, headers);
+  const cachedReferencedVolume = esm.cache.getVolume(segDisplaySet.referencedVolumeId);
+  if (!cachedReferencedVolume) {
+    throw new Error('Referenced Volume is missing for the SEG, and stack viewport SEG is not supported yet');
   }
-  const segments = _getSegments(dataset);
-  return segments;
+  const {
+    imageIds
+  } = cachedReferencedVolume;
+
+  // Todo: what should be defaults here
+  const tolerance = 0.001;
+  const skipOverlapping = true;
+  esm.eventTarget.addEventListener(adapters_es/* Enums */.Yb.Events.SEGMENTATION_LOAD_PROGRESS, evt => {
+    const {
+      percentComplete
+    } = evt.detail;
+    segmentationService._broadcastEvent(segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE, {
+      percentComplete
+    });
+  });
+  const results = await adapters_es/* adaptersSEG */.ok.Cornerstone3D.Segmentation.generateToolState(imageIds, arrayBuffer, esm.metaData, {
+    skipOverlapping,
+    tolerance,
+    eventTarget: esm.eventTarget,
+    triggerEvent: esm.triggerEvent
+  });
+  results.segMetadata.data.forEach((data, i) => {
+    if (i > 0) {
+      data.rgba = dicomlabToRGB(data.RecommendedDisplayCIELabValue);
+    }
+  });
+  Object.assign(segDisplaySet, results);
 }
 function _segmentationExists(segDisplaySet, segmentationService) {
   // This should be abstracted with the CornerstoneCacheService
   return segmentationService.getSegmentation(segDisplaySet.displaySetInstanceUID);
 }
-function _getPixelData(dataset, segments) {
-  let frameSize = Math.ceil(dataset.Rows * dataset.Columns / 8);
-  let nextOffset = 0;
-  Object.keys(segments).forEach(segmentKey => {
-    const segment = segments[segmentKey];
-    segment.numberOfFrames = segment.functionalGroups.length;
-    segment.size = segment.numberOfFrames * frameSize;
-    segment.offset = nextOffset;
-    nextOffset = segment.offset + segment.size;
-    const packedSegment = dataset.PixelData[0].slice(segment.offset, nextOffset);
-    segment.pixelData = dcmjs_es["default"].data.BitArray.unpack(packedSegment);
-    segment.geometry = geometryFromFunctionalGroups(dataset, segment.functionalGroups);
-  });
-  return segments;
-}
-function geometryFromFunctionalGroups(dataset, perFrame) {
-  let pixelMeasures = dataset.SharedFunctionalGroupsSequence.PixelMeasuresSequence;
-  let planeOrientation = dataset.SharedFunctionalGroupsSequence.PlaneOrientationSequence;
-  let planePosition = perFrame[0].PlanePositionSequence; // TODO: assume sorted frames!
-
-  const geometry = {};
-
-  // NB: DICOM PixelSpacing is defined as Row then Column,
-  // unlike ImageOrientationPatient
-  let spacingBetweenSlices = pixelMeasures.SpacingBetweenSlices;
-  if (!spacingBetweenSlices) {
-    if (pixelMeasures.SliceThickness) {
-      console.log('Using SliceThickness as SpacingBetweenSlices');
-      spacingBetweenSlices = pixelMeasures.SliceThickness;
-    }
-  }
-  geometry.spacing = [pixelMeasures.PixelSpacing[1], pixelMeasures.PixelSpacing[0], spacingBetweenSlices].map(Number);
-  geometry.dimensions = [dataset.Columns, dataset.Rows, perFrame.length].map(Number);
-  let orientation = planeOrientation.ImageOrientationPatient.map(Number);
-  const columnStepToPatient = orientation.slice(0, 3);
-  const rowStepToPatient = orientation.slice(3, 6);
-  geometry.planeNormal = [];
-  Core_Math/* default.cross */.ZP.cross(columnStepToPatient, rowStepToPatient, geometry.planeNormal);
-  let firstPosition = perFrame[0].PlanePositionSequence.ImagePositionPatient.map(Number);
-  let lastPosition = perFrame[perFrame.length - 1].PlanePositionSequence.ImagePositionPatient.map(Number);
-  geometry.sliceStep = [];
-  Core_Math/* default.subtract */.ZP.subtract(lastPosition, firstPosition, geometry.sliceStep);
-  Core_Math/* default.normalize */.ZP.normalize(geometry.sliceStep);
-  geometry.direction = columnStepToPatient.concat(rowStepToPatient).concat(geometry.sliceStep);
-  geometry.origin = planePosition.ImagePositionPatient.map(Number);
-  return geometry;
-}
-function _getSegments(dataset) {
-  const segments = {};
-  dataset.SegmentSequence.forEach(segment => {
-    const cielab = segment.RecommendedDisplayCIELabValue;
-    const rgba = dcmjs_es["default"].data.Colors.dicomlab2RGB(cielab).map(x => Math.round(x * 255));
-    rgba.push(255);
-    const segmentNumber = segment.SegmentNumber;
-    segments[segmentNumber] = {
-      color: rgba,
-      functionalGroups: [],
-      offset: null,
-      size: null,
-      pixelData: null,
-      label: segment.SegmentLabel
-    };
-  });
-
-  // make a list of functional groups per segment
-  dataset.PerFrameFunctionalGroupsSequence.forEach(functionalGroup => {
-    const segmentNumber = functionalGroup.SegmentIdentificationSequence.ReferencedSegmentNumber;
-    segments[segmentNumber].functionalGroups.push(functionalGroup);
-  });
-  return _getPixelData(dataset, segments);
-}
-function getSopClassHandlerModule(_ref2) {
+function getSopClassHandlerModule(_ref3) {
   let {
     servicesManager,
     extensionManager
-  } = _ref2;
+  } = _ref3;
   const getDisplaySetsFromSeries = instances => {
     return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
   };
@@ -250,10 +228,10 @@ function getSopClassHandlerModule(_ref2) {
 }
 /* harmony default export */ const src_getSopClassHandlerModule = (getSopClassHandlerModule);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
-var prop_types = __webpack_require__(60216);
+var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
-var ui_src = __webpack_require__(28619);
+// EXTERNAL MODULE: ../../ui/src/index.js + 456 modules
+var ui_src = __webpack_require__(60082);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/panels/callInputDialog.tsx
 
 
@@ -339,7 +317,7 @@ function callInputDialog(uiDialogService, label, callback) {
 }
 /* harmony default export */ const panels_callInputDialog = (callInputDialog);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
-var es = __webpack_require__(21572);
+var es = __webpack_require__(69190);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/panels/PanelSegmentation.tsx
 
 
@@ -535,7 +513,6 @@ const segProtocol = {
   // Don't store this hanging protocol as it applies to the currently active
   // display set by default
   // cacheId: null,
-  hasUpdatedPriorsInformation: false,
   name: 'Segmentations',
   // Just apply this one when specifically listed
   protocolMatchingRules: [],
@@ -594,6 +571,8 @@ function getHangingProtocolModule() {
 }
 /* harmony default export */ const src_getHangingProtocolModule = (getHangingProtocolModule);
 
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/_hydrateSEG.ts
+var _hydrateSEG = __webpack_require__(28417);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/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); }
 
@@ -601,8 +580,9 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
+
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 569).then(__webpack_require__.bind(__webpack_require__, 33569));
+  return __webpack_require__.e(/* import() */ 451).then(__webpack_require__.bind(__webpack_require__, 4451));
 });
 const OHIFCornerstoneSEGViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -654,7 +634,8 @@ const extension = {
     const ExtendedOHIFCornerstoneSEGViewport = props => {
       return /*#__PURE__*/react.createElement(OHIFCornerstoneSEGViewport, _extends({
         servicesManager: servicesManager,
-        extensionManager: extensionManager
+        extensionManager: extensionManager,
+        commandsManager: commandsManager
       }, props));
     };
     return [{
@@ -673,6 +654,69 @@ const extension = {
 };
 /* harmony default export */ const cornerstone_dicom_seg_src = (extension);
 
+
+/***/ }),
+
+/***/ 28417:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Z: () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+async function _hydrateSEGDisplaySet(_ref) {
+  let {
+    segDisplaySet,
+    viewportIndex,
+    servicesManager
+  } = _ref;
+  const {
+    segmentationService,
+    hangingProtocolService,
+    viewportGridService
+  } = servicesManager.services;
+  const displaySetInstanceUID = segDisplaySet.referencedDisplaySetInstanceUID;
+  let segmentationId = null;
+
+  // We need the hydration to notify panels about the new segmentation added
+  const suppressEvents = false;
+  segmentationId = await segmentationService.createSegmentationForSEGDisplaySet(segDisplaySet, segmentationId, suppressEvents);
+  segmentationService.hydrateSegmentation(segDisplaySet.displaySetInstanceUID);
+  const {
+    viewports
+  } = viewportGridService.getState();
+  const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportIndex, displaySetInstanceUID);
+
+  // 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, segDisplaySet.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__ = (_hydrateSEGDisplaySet);
+
 /***/ }),
 
 /***/ 78753: