@ohif/app 3.10.0-beta.113 → 3.10.0-beta.115

package/dist/{5770.bundle.700382010763de7c58fd.js → 4113.bundle.8fccd7af6118fde173aa.js}

@@ -1,5 +1,5 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[5770],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[4113],{
 
 /***/ 74137:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -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__(4904);
+/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(72931);
 
 const {
   CodeScheme: Cornerstone3DCodeScheme
@@ -55,7 +55,7 @@ const enums = {
 
 /***/ }),
 
-/***/ 25770:
+/***/ 34113:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -75,16 +75,16 @@ __webpack_require__.d(__webpack_exports__, {
 var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
 var src = __webpack_require__(5058);
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 113 modules
-var cornerstone_src = __webpack_require__(19072);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 62 modules
-var esm = __webpack_require__(4904);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 95 modules
-var dist_esm = __webpack_require__(31856);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 114 modules
+var cornerstone_src = __webpack_require__(39855);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 66 modules
+var esm = __webpack_require__(72931);
+// 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
 var core_dist_esm = __webpack_require__(81985);
-// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 1 modules
-var gl_matrix_esm = __webpack_require__(3823);
+// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js
+var gl_matrix_esm = __webpack_require__(40230);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/enums.ts
 var enums = __webpack_require__(74137);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getRenderableData.ts
@@ -302,11 +302,11 @@ function addSRAnnotation(measurement, imageId, frameNumber) {
   dist_esm.annotation.state.addAnnotation(SRAnnotation);
   console.debug('Adding SR annotation:', SRAnnotation);
 }
-;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/isRehydratable.js
+;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/isRehydratable.ts
 
-const cornerstoneAdapters = esm/* adaptersSR */.QX.Cornerstone3D.MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
-const supportedLegacyCornerstoneTags = ['cornerstoneTools@^4.0.0'];
-const CORNERSTONE_3D_TAG = esm/* adaptersSR */.QX.Cornerstone3D.CORNERSTONE_3D_TAG;
+const {
+  MeasurementReport
+} = esm/* adaptersSR */.QX.Cornerstone3D;
 
 /**
  * Checks if the given `displaySet`can be rehydrated into the `measurementService`.
@@ -319,31 +319,23 @@ function isRehydratable(displaySet, mappings) {
   if (!mappings || !mappings.length) {
     return false;
   }
-  const mappingDefinitions = mappings.map(m => m.annotationType);
+  const mappingDefinitions = new Set();
+  for (const m of mappings) {
+    mappingDefinitions.add(m.annotationType);
+  }
   const {
     measurements
   } = displaySet;
-  const adapterKeys = Object.keys(cornerstoneAdapters).filter(adapterKey => typeof cornerstoneAdapters[adapterKey].isValidCornerstoneTrackingIdentifier === 'function');
-  const adapters = [];
-  adapterKeys.forEach(key => {
-    if (mappingDefinitions.includes(key)) {
-      // Must have both a dcmjs adapter and a measurementService
-      // Definition in order to be a candidate for import.
-      adapters.push(cornerstoneAdapters[key]);
-    }
-  });
   for (let i = 0; i < measurements.length; i++) {
     const {
       TrackingIdentifier
     } = measurements[i] || {};
-    const hydratable = adapters.some(adapter => {
-      let [cornerstoneTag, toolName] = TrackingIdentifier.split(':');
-      if (supportedLegacyCornerstoneTags.includes(cornerstoneTag)) {
-        cornerstoneTag = CORNERSTONE_3D_TAG;
-      }
-      const mappedTrackingIdentifier = `${cornerstoneTag}:${toolName}`;
-      return adapter.isValidCornerstoneTrackingIdentifier(mappedTrackingIdentifier);
-    });
+    if (!TrackingIdentifier) {
+      console.warn('No tracking identifier for measurement ', measurements[i]);
+      continue;
+    }
+    const adapter = MeasurementReport.getAdapterForTrackingIdentifier(TrackingIdentifier);
+    const hydratable = adapter && mappingDefinitions.has(adapter.toolType);
     if (hydratable) {
       return true;
     }
@@ -1024,8 +1016,8 @@ function getHangingProtocolModule() {
 }
 /* harmony default export */ const src_getHangingProtocolModule = ((/* unused pure expression or super */ null && (getHangingProtocolModule)));
 
-// EXTERNAL MODULE: ../../ui/src/index.js + 694 modules
-var ui_src = __webpack_require__(12318);
+// EXTERNAL MODULE: ../../ui/src/index.js + 693 modules
+var ui_src = __webpack_require__(61533);
 // EXTERNAL MODULE: ../../i18n/src/index.js + 150 modules
 var i18n_src = __webpack_require__(16076);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/onModeEnter.tsx
@@ -1190,14 +1182,14 @@ const {
   guid
 } = src/* default.utils */.Ay.utils;
 const {
-  MeasurementReport,
-  CORNERSTONE_3D_TAG: hydrateStructuredReport_CORNERSTONE_3D_TAG
+  MeasurementReport: hydrateStructuredReport_MeasurementReport,
+  CORNERSTONE_3D_TAG
 } = esm/* adaptersSR */.QX.Cornerstone3D;
 const {
   CORNERSTONE_3D_TOOLS_SOURCE_NAME: hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_NAME,
   CORNERSTONE_3D_TOOLS_SOURCE_VERSION: hydrateStructuredReport_CORNERSTONE_3D_TOOLS_SOURCE_VERSION
 } = cornerstone_src.Enums;
-const hydrateStructuredReport_supportedLegacyCornerstoneTags = ['cornerstoneTools@^4.0.0'];
+const supportedLegacyCornerstoneTags = (/* unused pure expression or super */ null && (['cornerstoneTools@^4.0.0']));
 const convertCode = (codingValues, code) => {
   if (!code || code.CodingSchemeDesignator === 'CORNERSTONEJS') {
     return;
@@ -1268,10 +1260,12 @@ function hydrateStructuredReport({
       imageIdsForToolState[ReferencedSOPInstanceUID][frameNumber] = imageId;
     }
   });
-  const datasetToUse = _mapLegacyDataSet(instance);
+
+  // Mapping of legacy datasets is now directly handled by adapters module
+  const datasetToUse = instance;
 
   // Use dcmjs to generate toolState.
-  let storedMeasurementByAnnotationType = MeasurementReport.generateToolState(datasetToUse,
+  let storedMeasurementByAnnotationType = hydrateStructuredReport_MeasurementReport.generateToolState(datasetToUse,
   // NOTE: we need to pass in the imageIds to dcmjs since the we use them
   // for the imageToWorld transformation. The following assumes that the order
   // that measurements were added to the display set are the same order as
@@ -1386,46 +1380,6 @@ function hydrateStructuredReport({
     SeriesInstanceUIDs
   };
 }
-function _mapLegacyDataSet(dataset) {
-  const REPORT = 'Imaging Measurements';
-  const GROUP = 'Measurement Group';
-  const TRACKING_IDENTIFIER = 'Tracking Identifier';
-
-  // Identify the Imaging Measurements
-  const imagingMeasurementContent = toArray(dataset.ContentSequence).find(codeMeaningEquals(REPORT));
-
-  // Retrieve the Measurements themselves
-  const measurementGroups = toArray(imagingMeasurementContent.ContentSequence).filter(codeMeaningEquals(GROUP));
-
-  // For each of the supported measurement types, compute the measurement data
-  const measurementData = {};
-  const cornerstoneToolClasses = MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
-  const registeredToolClasses = [];
-  Object.keys(cornerstoneToolClasses).forEach(key => {
-    registeredToolClasses.push(cornerstoneToolClasses[key]);
-    measurementData[key] = [];
-  });
-  measurementGroups.forEach((measurementGroup, index) => {
-    const measurementGroupContentSequence = toArray(measurementGroup.ContentSequence);
-    const TrackingIdentifierGroup = measurementGroupContentSequence.find(contentItem => contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_IDENTIFIER);
-    const TrackingIdentifier = TrackingIdentifierGroup.TextValue;
-    let [cornerstoneTag, toolName] = TrackingIdentifier.split(':');
-    if (hydrateStructuredReport_supportedLegacyCornerstoneTags.includes(cornerstoneTag)) {
-      cornerstoneTag = hydrateStructuredReport_CORNERSTONE_3D_TAG;
-    }
-    const mappedTrackingIdentifier = `${cornerstoneTag}:${toolName}`;
-    TrackingIdentifierGroup.TextValue = mappedTrackingIdentifier;
-  });
-  return dataset;
-}
-const toArray = function (x) {
-  return Array.isArray(x) ? x : [x];
-};
-const codeMeaningEquals = codeMeaningName => {
-  return contentItem => {
-    return contentItem.ConceptNameCodeSequence.CodeMeaning === codeMeaningName;
-  };
-};
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/commandsModule.ts
 
 

package/dist/{4202.bundle.add83801fbc8227d551b.js → 4202.bundle.c86958c59da67316127c.js}

@@ -11,7 +11,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(97598);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(86326);
-/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(52441);
+/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(95371);
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 
 

package/dist/{4526.bundle.bf1047785c90ef0a9fec.js → 4526.bundle.7b394677fd5dc4fad06f.js}

@@ -16,10 +16,10 @@ __webpack_require__.d(__webpack_exports__, {
 var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(99993);
-// EXTERNAL MODULE: ../../ui/src/index.js + 694 modules
-var src = __webpack_require__(12318);
-// EXTERNAL MODULE: ../../ui-next/src/index.ts + 2637 modules
-var ui_next_src = __webpack_require__(52441);
+// EXTERNAL MODULE: ../../ui/src/index.js + 693 modules
+var src = __webpack_require__(61533);
+// EXTERNAL MODULE: ../../ui-next/src/index.ts + 2653 modules
+var ui_next_src = __webpack_require__(95371);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
 function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
   const tools = customizationService.getCustomization('cornerstone.overlayViewportTools');
@@ -144,8 +144,8 @@ function _getStatusComponent({
     side: "bottom"
   }, /*#__PURE__*/react.createElement(ToolTipMessage, null))), !ToolTipMessage && /*#__PURE__*/react.createElement(StatusArea, null));
 }
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 113 modules
-var cornerstone_src = __webpack_require__(19072);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 114 modules
+var cornerstone_src = __webpack_require__(39855);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/enums/index.js + 2 modules
 var enums = __webpack_require__(99737);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/viewports/OHIFCornerstoneSEGViewport.tsx