@ohif/app 3.8.0-beta.65 → 3.8.0-beta.67

package/dist/{530.bundle.72d9812f117036615a38.js → 530.bundle.aaf1c61342805ff32648.js}

@@ -12,9 +12,9 @@ __webpack_require__.r(__webpack_exports__);
 /* 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__(41766);
 /* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80619);
-/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(78198);
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(85073);
 /* harmony import */ var _tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(74334);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(58046);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(3962);
 /* harmony import */ var _utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(77089);
 /* harmony import */ var _state__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(15575);
 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); }
@@ -26,9 +26,6 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
-const {
-  formatDate
-} = _ohif_core__WEBPACK_IMPORTED_MODULE_3__.utils;
 const MEASUREMENT_TRACKING_EXTENSION_ID = '@ohif/extension-measurement-tracking';
 const SR_TOOLGROUP_BASE_NAME = 'SRToolGroup';
 function OHIFCornerstoneSRViewport(props) {
@@ -36,7 +33,6 @@ function OHIFCornerstoneSRViewport(props) {
     children,
     dataSource,
     displaySets,
-    viewportLabel,
     viewportOptions,
     servicesManager,
     extensionManager
@@ -45,7 +41,8 @@ function OHIFCornerstoneSRViewport(props) {
   const {
     displaySetService,
     cornerstoneViewportService,
-    measurementService
+    measurementService,
+    viewportActionCornersService
   } = servicesManager.services;
   const viewportId = viewportOptions.viewportId;
 
@@ -64,6 +61,9 @@ function OHIFCornerstoneSRViewport(props) {
     viewports,
     activeViewportId
   } = viewportGrid;
+  const {
+    t
+  } = (0,react_i18next__WEBPACK_IMPORTED_MODULE_2__/* .useTranslation */ .Bd)('Common');
 
   // Optional hook into tracking extension, if present.
   let trackedMeasurements;
@@ -200,16 +200,11 @@ function OHIFCornerstoneSRViewport(props) {
   }, [activeImageDisplaySetData, viewportId, measurementSelected]);
   const onMeasurementChange = (0,react__WEBPACK_IMPORTED_MODULE_1__.useCallback)(direction => {
     let newMeasurementSelected = measurementSelected;
-    if (direction === 'right') {
-      newMeasurementSelected++;
-      if (newMeasurementSelected >= measurementCount) {
-        newMeasurementSelected = 0;
-      }
-    } else {
-      newMeasurementSelected--;
-      if (newMeasurementSelected < 0) {
-        newMeasurementSelected = measurementCount - 1;
-      }
+    newMeasurementSelected += direction;
+    if (newMeasurementSelected >= measurementCount) {
+      newMeasurementSelected = 0;
+    } else if (newMeasurementSelected < 0) {
+      newMeasurementSelected = measurementCount - 1;
     }
     setTrackingIdentifiers(newMeasurementSelected);
     updateViewport(newMeasurementSelected);
@@ -277,6 +272,32 @@ function OHIFCornerstoneSRViewport(props) {
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
     updateViewport(measurementSelected);
   }, [dataSource, srDisplaySet]);
+  (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
+    viewportActionCornersService.setComponents([{
+      viewportId,
+      id: 'viewportStatusComponent',
+      component: _getStatusComponent({
+        srDisplaySet,
+        viewportId,
+        isRehydratable: srDisplaySet.isRehydratable,
+        isLocked,
+        sendTrackedMeasurementsEvent,
+        t
+      }),
+      indexPriority: -100,
+      location: viewportActionCornersService.LOCATIONS.topLeft
+    }, {
+      viewportId,
+      id: 'viewportActionArrowsComponent',
+      index: 0,
+      component: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .ViewportActionArrows */ .$I, {
+        key: "actionArrows",
+        onArrowsClick: onMeasurementChange
+      }),
+      indexPriority: 0,
+      location: viewportActionCornersService.LOCATIONS.topRight
+    }]);
+  }, [isLocked, onMeasurementChange, sendTrackedMeasurementsEvent, srDisplaySet, t, viewportActionCornersService, viewportId]);
 
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   let childrenWithProps = null;
@@ -291,51 +312,7 @@ function OHIFCornerstoneSRViewport(props) {
       });
     });
   }
-  const {
-    PatientID,
-    PatientName,
-    PatientSex,
-    PatientAge,
-    SliceThickness,
-    ManufacturerModelName,
-    StudyDate,
-    SeriesDescription,
-    SpacingBetweenSlices,
-    SeriesNumber
-  } = referencedDisplaySetMetadata;
-
-  // TODO -> disabled double click for now: onDoubleClick={_onDoubleClick}
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(react__WEBPACK_IMPORTED_MODULE_1__.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .ViewportActionBar */ .cS, {
-    onDoubleClick: evt => {
-      evt.stopPropagation();
-      evt.preventDefault();
-    },
-    onArrowsClick: onMeasurementChange,
-    getStatusComponent: () => _getStatusComponent({
-      srDisplaySet,
-      viewportId,
-      isTracked: false,
-      isRehydratable: srDisplaySet.isRehydratable,
-      isLocked,
-      sendTrackedMeasurementsEvent
-    }),
-    studyData: {
-      label: viewportLabel,
-      useAltStyling: true,
-      studyDate: formatDate(StudyDate),
-      currentSeries: SeriesNumber,
-      seriesDescription: SeriesDescription || '',
-      patientInformation: {
-        patientName: PatientName ? _ohif_core__WEBPACK_IMPORTED_MODULE_3__/* ["default"].utils */ .Ay.utils.formatPN(PatientName.Alphabetic) : '',
-        patientSex: PatientSex || '',
-        patientAge: PatientAge || '',
-        MRN: PatientID || '',
-        thickness: SliceThickness ? `${parseFloat(SliceThickness).toFixed(2)}mm` : '',
-        spacing: SpacingBetweenSlices !== undefined ? `${SpacingBetweenSlices.toFixed(2)}mm` : '',
-        scanner: ManufacturerModelName || ''
-      }
-    }
-  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("div", {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(react__WEBPACK_IMPORTED_MODULE_1__.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("div", {
     className: "relative flex h-full w-full flex-row overflow-hidden"
   }, getCornerstoneViewport(), childrenWithProps));
 }
@@ -347,7 +324,6 @@ OHIFCornerstoneSRViewport.propTypes = {
   viewportLabel: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().string),
   customProps: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().object),
   viewportOptions: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().object),
-  viewportLabel: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().string),
   servicesManager: prop_types__WEBPACK_IMPORTED_MODULE_0___default().instanceOf(_ohif_core__WEBPACK_IMPORTED_MODULE_3__/* .ServicesManager */ .CS).isRequired,
   extensionManager: prop_types__WEBPACK_IMPORTED_MODULE_0___default().instanceOf(_ohif_core__WEBPACK_IMPORTED_MODULE_3__/* .ExtensionManager */ .nH).isRequired
 };
@@ -387,7 +363,8 @@ function _getStatusComponent({
   viewportId,
   isRehydratable,
   isLocked,
-  sendTrackedMeasurementsEvent
+  sendTrackedMeasurementsEvent,
+  t
 }) {
   const handleMouseUp = () => {
     sendTrackedMeasurementsEvent('HYDRATE_SR', {
@@ -395,9 +372,6 @@ function _getStatusComponent({
       viewportId
     });
   };
-  const {
-    t
-  } = (0,react_i18next__WEBPACK_IMPORTED_MODULE_2__/* .useTranslation */ .Bd)('Common');
   const loadStr = t('LOAD');
 
   // 1 - Incompatible

package/dist/{544.bundle.c3009e245ceb1554c70a.js → 544.bundle.33ed8e4a3eaf16b55af7.js}

@@ -22,8 +22,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../../node_modules/lodash.debounce/index.js
 var lodash_debounce = __webpack_require__(14771);
 var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
-// EXTERNAL MODULE: ../../ui/src/index.js + 497 modules
-var src = __webpack_require__(58046);
+// EXTERNAL MODULE: ../../ui/src/index.js + 519 modules
+var src = __webpack_require__(3962);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.css
 // extracted by mini-css-extract-plugin
 
@@ -258,8 +258,8 @@ const itemGenerator = props => {
 /* harmony default export */ const ViewportOverlay = (generateFromConfig({}));
 // EXTERNAL MODULE: ../../../node_modules/dicomweb-client/build/dicomweb-client.es.js
 var dicomweb_client_es = __webpack_require__(36922);
-// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
-var core_src = __webpack_require__(78198);
+// EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
+var core_src = __webpack_require__(85073);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/dicomWebClient.ts
 
 

package/dist/{559.bundle.05bd51e94422a2cab116.js → 559.bundle.601f9e285f6b3b4d1ac5.js}

@@ -25,8 +25,8 @@ const id = package_namespaceObject.UU;
 const SOPClassHandlerName = 'dicom-sr';
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
-var src = __webpack_require__(78198);
+// EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
+var src = __webpack_require__(85073);
 // EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
 var esm = __webpack_require__(83636);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 16 modules
@@ -1601,8 +1601,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 383 modules
 var esm = __webpack_require__(50719);
-// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
-var src = __webpack_require__(78198);
+// EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
+var src = __webpack_require__(85073);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getLabelFromDCMJSImportedToolData.js
 /**
  * Extracts the label from the toolData imported from dcmjs. We need to do this