@ohif/app 3.9.0-beta.63 → 3.9.0-beta.65

package/dist/{281.bundle.7c7901a50253c44b7442.js → 281.bundle.b8b7d64372d238b1bed7.js}

@@ -2844,8 +2844,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.9.0-beta.63";
-  const commitHash = "0968b3abb1d38c6f0a66d2a75bbc52b7d8f6be17";
+  const versionNumber = "3.9.0-beta.65";
+  const commitHash = "246ebab6ebf5431a704a1861a5804045b9644ba4";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',

package/dist/{360.bundle.8a8f7bd0f6abe249c0bf.js → 360.bundle.e9046bdadd9127c4c283.js}

@@ -1,6 +1,34 @@
 "use strict";
 (globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[360],{
 
+/***/ 91851:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Z: () => (/* binding */ CodeNameCodeSequenceValues)
+/* harmony export */ });
+/* harmony import */ var _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(91202);
+
+const {
+  CodeScheme: Cornerstone3DCodeScheme
+} = _cornerstonejs_adapters__WEBPACK_IMPORTED_MODULE_0__.adaptersSR.Cornerstone3D;
+const CodeNameCodeSequenceValues = {
+  ImagingMeasurementReport: '126000',
+  ImageLibrary: '111028',
+  ImagingMeasurements: '126010',
+  MeasurementGroup: '125007',
+  ImageLibraryGroup: '126200',
+  TrackingUniqueIdentifier: '112040',
+  TrackingIdentifier: '112039',
+  Finding: '121071',
+  FindingSite: 'G-C0E3',
+  // SRT
+  CornerstoneFreeText: Cornerstone3DCodeScheme.codeValues.CORNERSTONEFREETEXT
+};
+
+
+/***/ }),
+
 /***/ 97360:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -530,12 +558,15 @@ function isRehydratable(displaySet, mappings) {
   console.log('No measurements found which were rehydratable');
   return false;
 }
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/constants/CodeNameCodeSequenceValues.ts
+var CodeNameCodeSequenceValues = __webpack_require__(91851);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/getSopClassHandlerModule.ts
 
 
 
 
 
+
 const {
   CodeScheme: Cornerstone3DCodeScheme
 } = adapters_es.adaptersSR.Cornerstone3D;
@@ -550,12 +581,13 @@ const {
 // Get stacks from referenced displayInstanceUID and load into wrapped CornerStone viewport.
 
 const sopClassUids = ['1.2.840.10008.5.1.4.1.1.88.11',
-//BASIC_TEXT_SR:
+// BASIC TEXT SR
 '1.2.840.10008.5.1.4.1.1.88.22',
-//ENHANCED_SR:
+// ENHANCED SR
 '1.2.840.10008.5.1.4.1.1.88.33',
-//COMPREHENSIVE_SR:
-'1.2.840.10008.5.1.4.1.1.88.34' //COMPREHENSIVE_3D_SR:
+// COMPREHENSIVE SR
+'1.2.840.10008.5.1.4.1.1.88.34' // Comprehensive 3D SR
+// '1.2.840.10008.5.1.4.1.1.88.50', // Mammography CAD SR
 ];
 const CORNERSTONE_3D_TOOLS_SOURCE_NAME = 'Cornerstone3DTools';
 const CORNERSTONE_3D_TOOLS_SOURCE_VERSION = '0.1';
@@ -567,19 +599,6 @@ const validateSameStudyUID = (uid, instances) => {
     }
   });
 };
-const CodeNameCodeSequenceValues = {
-  ImagingMeasurementReport: '126000',
-  ImageLibrary: '111028',
-  ImagingMeasurements: '126010',
-  MeasurementGroup: '125007',
-  ImageLibraryGroup: '126200',
-  TrackingUniqueIdentifier: '112040',
-  TrackingIdentifier: '112039',
-  Finding: '121071',
-  FindingSite: 'G-C0E3',
-  // SRT
-  CornerstoneFreeText: Cornerstone3DCodeScheme.codeValues.CORNERSTONEFREETEXT //
-};
 const CodingSchemeDesignators = {
   SRT: 'SRT',
   CornerstoneCodeSchemes: [Cornerstone3DCodeScheme.CodingSchemeDesignator, 'CST4']
@@ -637,17 +656,8 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     SOPClassUID
   } = instance;
   validateSameStudyUID(instance.StudyInstanceUID, instances);
-  if (!ConceptNameCodeSequence || ConceptNameCodeSequence.CodeValue !== CodeNameCodeSequenceValues.ImagingMeasurementReport) {
-    servicesManager.services.uiNotificationService.show({
-      title: 'DICOM SR',
-      message: 'OHIF only supports TID1500 Imaging Measurement Report Structured Reports. The SR you’re trying to view is not supported.',
-      type: 'warning',
-      duration: 6000
-    });
-    return [];
-  }
+  const isImagingMeasurementReport = ConceptNameCodeSequence?.CodeValue === CodeNameCodeSequenceValues/* default */.Z.ImagingMeasurementReport;
   const displaySet = {
-    //plugin: id,
     Modality: 'SR',
     displaySetInstanceUID: src.utils.guid(),
     SeriesDescription,
@@ -663,6 +673,7 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
     measurements: null,
     isDerivedDisplaySet: true,
     isLoaded: false,
+    isImagingMeasurementReport,
     sopClassUids,
     instance,
     addInstances
@@ -702,8 +713,13 @@ async function _load(displaySet, servicesManager, extensionManager) {
   if (displaySet.isLoaded !== true) {
     await retrieveBulkData(ContentSequence);
   }
-  displaySet.referencedImages = _getReferencedImagesList(ContentSequence);
-  displaySet.measurements = _getMeasurements(ContentSequence);
+  if (displaySet.isImagingMeasurementReport) {
+    displaySet.referencedImages = _getReferencedImagesList(ContentSequence);
+    displaySet.measurements = _getMeasurements(ContentSequence);
+  } else {
+    displaySet.referencedImages = [];
+    displaySet.measurements = [];
+  }
   const mappings = measurementService.getSourceMappings(CORNERSTONE_3D_TOOLS_SOURCE_NAME, CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
   displaySet.isHydrated = false;
   displaySet.isRehydratable = isRehydratable(displaySet, mappings);
@@ -839,8 +855,11 @@ function getSopClassHandlerModule({
   }];
 }
 function _getMeasurements(ImagingMeasurementReportContentSequence) {
-  const ImagingMeasurements = ImagingMeasurementReportContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.ImagingMeasurements);
-  const MeasurementGroups = _getSequenceAsArray(ImagingMeasurements.ContentSequence).filter(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.MeasurementGroup);
+  const ImagingMeasurements = ImagingMeasurementReportContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.ImagingMeasurements);
+  if (!ImagingMeasurements) {
+    return [];
+  }
+  const MeasurementGroups = _getSequenceAsArray(ImagingMeasurements.ContentSequence).filter(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.MeasurementGroup);
   const mergedContentSequencesByTrackingUniqueIdentifiers = _getMergedContentSequencesByTrackingUniqueIdentifiers(MeasurementGroups);
   const measurements = [];
   Object.keys(mergedContentSequencesByTrackingUniqueIdentifiers).forEach(trackingUniqueIdentifier => {
@@ -856,7 +875,7 @@ function _getMergedContentSequencesByTrackingUniqueIdentifiers(MeasurementGroups
   const mergedContentSequencesByTrackingUniqueIdentifiers = {};
   MeasurementGroups.forEach(MeasurementGroup => {
     const ContentSequence = _getSequenceAsArray(MeasurementGroup.ContentSequence);
-    const TrackingUniqueIdentifierItem = ContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.TrackingUniqueIdentifier);
+    const TrackingUniqueIdentifierItem = ContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.TrackingUniqueIdentifier);
     if (!TrackingUniqueIdentifierItem) {
       console.warn('No Tracking Unique Identifier, skipping ambiguous measurement.');
     }
@@ -868,7 +887,7 @@ function _getMergedContentSequencesByTrackingUniqueIdentifiers(MeasurementGroups
       // Add the ContentSequence minus the tracking identifier, as we have this
       // Information in the merged ContentSequence anyway.
       ContentSequence.forEach(item => {
-        if (item.ConceptNameCodeSequence.CodeValue !== CodeNameCodeSequenceValues.TrackingUniqueIdentifier) {
+        if (item.ConceptNameCodeSequence.CodeValue !== CodeNameCodeSequenceValues/* default */.Z.TrackingUniqueIdentifier) {
           mergedContentSequencesByTrackingUniqueIdentifiers[trackingUniqueIdentifier].push(item);
         }
       });
@@ -888,7 +907,7 @@ function _processTID1410Measurement(mergedContentSequence) {
 
   const graphicItem = mergedContentSequence.find(group => group.ValueType === 'SCOORD');
   const UIDREFContentItem = mergedContentSequence.find(group => group.ValueType === 'UIDREF');
-  const TrackingIdentifierContentItem = mergedContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.TrackingIdentifier);
+  const TrackingIdentifierContentItem = mergedContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.TrackingIdentifier);
   if (!graphicItem) {
     console.warn(`graphic ValueType ${graphicItem.ValueType} not currently supported, skipping annotation.`);
     return;
@@ -915,9 +934,9 @@ function _processTID1410Measurement(mergedContentSequence) {
 function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
   const NUMContentItems = mergedContentSequence.filter(group => group.ValueType === 'NUM');
   const UIDREFContentItem = mergedContentSequence.find(group => group.ValueType === 'UIDREF');
-  const TrackingIdentifierContentItem = mergedContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.TrackingIdentifier);
-  const finding = mergedContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.Finding);
-  const findingSites = mergedContentSequence.filter(item => item.ConceptNameCodeSequence.CodingSchemeDesignator === CodingSchemeDesignators.SRT && item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.FindingSite);
+  const TrackingIdentifierContentItem = mergedContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.TrackingIdentifier);
+  const finding = mergedContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.Finding);
+  const findingSites = mergedContentSequence.filter(item => item.ConceptNameCodeSequence.CodingSchemeDesignator === CodingSchemeDesignators.SRT && item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.FindingSite);
   const measurement = {
     loaded: false,
     labels: [],
@@ -925,7 +944,7 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
     TrackingUniqueIdentifier: UIDREFContentItem.UID,
     TrackingIdentifier: TrackingIdentifierContentItem.TextValue
   };
-  if (finding && CodingSchemeDesignators.CornerstoneCodeSchemes.includes(finding.ConceptCodeSequence.CodingSchemeDesignator) && finding.ConceptCodeSequence.CodeValue === CodeNameCodeSequenceValues.CornerstoneFreeText) {
+  if (finding && CodingSchemeDesignators.CornerstoneCodeSchemes.includes(finding.ConceptCodeSequence.CodingSchemeDesignator) && finding.ConceptCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.CornerstoneFreeText) {
     measurement.labels.push({
       label: CORNERSTONE_FREETEXT_CODE_VALUE,
       value: finding.ConceptCodeSequence.CodeMeaning
@@ -934,7 +953,7 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
 
   // TODO -> Eventually hopefully support SNOMED or some proper code library, just free text for now.
   if (findingSites.length) {
-    const cornerstoneFreeTextFindingSite = findingSites.find(FindingSite => CodingSchemeDesignators.CornerstoneCodeSchemes.includes(FindingSite.ConceptCodeSequence.CodingSchemeDesignator) && FindingSite.ConceptCodeSequence.CodeValue === CodeNameCodeSequenceValues.CornerstoneFreeText);
+    const cornerstoneFreeTextFindingSite = findingSites.find(FindingSite => CodingSchemeDesignators.CornerstoneCodeSchemes.includes(FindingSite.ConceptCodeSequence.CodingSchemeDesignator) && FindingSite.ConceptCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.CornerstoneFreeText);
     if (cornerstoneFreeTextFindingSite) {
       measurement.labels.push({
         label: CORNERSTONE_FREETEXT_CODE_VALUE,
@@ -1014,8 +1033,11 @@ function _getLabelFromMeasuredValueSequence(ConceptNameCodeSequence, MeasuredVal
   }; // E.g. Long Axis: 31.0 mm
 }
 function _getReferencedImagesList(ImagingMeasurementReportContentSequence) {
-  const ImageLibrary = ImagingMeasurementReportContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.ImageLibrary);
-  const ImageLibraryGroup = _getSequenceAsArray(ImageLibrary.ContentSequence).find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.ImageLibraryGroup);
+  const ImageLibrary = ImagingMeasurementReportContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.ImageLibrary);
+  if (!ImageLibrary) {
+    return [];
+  }
+  const ImageLibraryGroup = _getSequenceAsArray(ImageLibrary.ContentSequence).find(item => item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues/* default */.Z.ImageLibraryGroup);
   const referencedImages = [];
   _getSequenceAsArray(ImageLibraryGroup.ContentSequence).forEach(item => {
     const {
@@ -1417,7 +1439,7 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 571).then(__webpack_require__.bind(__webpack_require__, 85571));
+  return __webpack_require__.e(/* import() */ 714).then(__webpack_require__.bind(__webpack_require__, 78714));
 });
 const OHIFCornerstoneSRViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {

package/dist/{516.bundle.2ef0b13819eba82a074a.js → 516.bundle.693f55fcf3bb54b40468.js}

@@ -1143,8 +1143,8 @@ function onCompletedCalibrationLine(servicesManager, csToolsEvent) {
     });
   });
 }
-// EXTERNAL MODULE: ../../core/src/utils/index.ts + 27 modules
-var utils = __webpack_require__(21551);
+// EXTERNAL MODULE: ../../core/src/utils/index.ts + 28 modules
+var utils = __webpack_require__(42895);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/tools/OverlayPlaneModuleProvider.ts
 
 const _cachedOverlayMetadata = new Map();