@ohif/app 3.7.0-beta.9 → 3.7.0-beta.90

package/dist/{799.bundle.758558e64147e5aad612.js → 822.bundle.00de6455c18be0307b41.js}

@@ -1,22 +1,22 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[799],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[822],{
 
-/***/ 91799:
+/***/ 86822:
 /***/ ((__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__);
-/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(48501);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28619);
-/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(21572);
-/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(57270);
-/* harmony import */ var _getContextModule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(43418);
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(77331);
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(67869);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(71783);
+/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(69190);
+/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(14957);
+/* harmony import */ var _getContextModule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(41832);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(3743);
 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); }
 
 
@@ -32,30 +32,29 @@ const {
 function TrackedCornerstoneViewport(props) {
   const {
     displaySets,
-    viewportIndex,
+    viewportId,
     viewportLabel,
     servicesManager,
-    extensionManager,
-    viewportOptions
+    extensionManager
   } = props;
   const {
     t
-  } = (0,react_i18next__WEBPACK_IMPORTED_MODULE_4__/* .useTranslation */ .$G)('TrackedViewport');
+  } = (0,react_i18next__WEBPACK_IMPORTED_MODULE_4__/* .useTranslation */ .$G)('Common');
   const {
     measurementService,
-    cornerstoneViewportService
+    cornerstoneViewportService,
+    viewportGridService
   } = servicesManager.services;
 
   // Todo: handling more than one displaySet on the same viewport
   const displaySet = displaySets[0];
-  const [trackedMeasurements] = (0,_getContextModule__WEBPACK_IMPORTED_MODULE_6__/* .useTrackedMeasurements */ .I)();
+  const [trackedMeasurements, sendTrackedMeasurementsEvent] = (0,_getContextModule__WEBPACK_IMPORTED_MODULE_6__/* .useTrackedMeasurements */ .I)();
   const [isTracked, setIsTracked] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false);
   const [trackedMeasurementUID, setTrackedMeasurementUID] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null);
   const [viewportElem, setViewportElem] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null);
   const {
     trackedSeries
   } = trackedMeasurements.context;
-  const viewportId = viewportOptions.viewportId;
   const {
     SeriesDate,
     SeriesDescription,
@@ -69,10 +68,11 @@ function TrackedCornerstoneViewport(props) {
     PatientAge,
     SliceThickness,
     SpacingBetweenSlices,
+    StudyDate,
     ManufacturerModelName
   } = displaySet.images[0];
   const updateIsTracked = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(() => {
-    const viewport = cornerstoneViewportService.getCornerstoneViewportByIndex(viewportIndex);
+    const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
     if (viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_7__.BaseVolumeViewport) {
       // A current image id will only exist for volume viewports that can have measurements tracked.
       // Typically these are those volume viewports for the series of acquisition.
@@ -87,7 +87,7 @@ function TrackedCornerstoneViewport(props) {
     if (trackedSeries.includes(SeriesInstanceUID) !== isTracked) {
       setIsTracked(!isTracked);
     }
-  }, [isTracked, trackedMeasurements, viewportIndex, SeriesInstanceUID]);
+  }, [isTracked, trackedMeasurements, viewportId, SeriesInstanceUID]);
   const onElementEnabled = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(evt => {
     if (evt.detail.element !== viewportElem) {
       // The VOLUME_VIEWPORT_NEW_VOLUME event allows updateIsTracked to reliably fetch the image id for a volume viewport.
@@ -103,7 +103,7 @@ function TrackedCornerstoneViewport(props) {
     const {
       unsubscribe
     } = cornerstoneViewportService.subscribe(cornerstoneViewportService.EVENTS.VIEWPORT_DATA_CHANGED, props => {
-      if (props.viewportIndex !== viewportIndex) {
+      if (props.viewportId !== viewportId) {
         return;
       }
       updateIsTracked();
@@ -111,7 +111,7 @@ function TrackedCornerstoneViewport(props) {
     return () => {
       unsubscribe();
     };
-  }, [updateIsTracked, viewportIndex]);
+  }, [updateIsTracked, viewportId]);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
     if (isTracked) {
       _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__.annotation.config.style.setViewportToolStyles(viewportId, {
@@ -132,13 +132,60 @@ function TrackedCornerstoneViewport(props) {
       _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__.annotation.config.style.setViewportToolStyles(viewportId, {});
     };
   }, [isTracked]);
+
+  /**
+   * The effect for listening to measurement service measurement added events
+   * and in turn firing an event to update the measurement tracking state machine.
+   * The TrackedCornerstoneViewport is the best place for this because when
+   * a measurement is added, at least one TrackedCornerstoneViewport will be in
+   * the DOM and thus can react to the events fired.
+   */
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
+    const added = measurementService.EVENTS.MEASUREMENT_ADDED;
+    const addedRaw = measurementService.EVENTS.RAW_MEASUREMENT_ADDED;
+    const subscriptions = [];
+    [added, addedRaw].forEach(evt => {
+      subscriptions.push(measurementService.subscribe(evt, _ref => {
+        let {
+          source,
+          measurement
+        } = _ref;
+        const {
+          activeViewportId
+        } = viewportGridService.getState();
+
+        // Each TrackedCornerstoneViewport receives the MeasurementService's events.
+        // Only send the tracked measurements event for the active viewport to avoid
+        // sending it more than once.
+        if (viewportId === activeViewportId) {
+          const {
+            referenceStudyUID: StudyInstanceUID,
+            referenceSeriesUID: SeriesInstanceUID
+          } = measurement;
+          sendTrackedMeasurementsEvent('SET_DIRTY', {
+            SeriesInstanceUID
+          });
+          sendTrackedMeasurementsEvent('TRACK_SERIES', {
+            viewportId,
+            StudyInstanceUID,
+            SeriesInstanceUID
+          });
+        }
+      }).unsubscribe);
+    });
+    return () => {
+      subscriptions.forEach(unsub => {
+        unsub();
+      });
+    };
+  }, [measurementService, sendTrackedMeasurementsEvent, viewportId, viewportGridService]);
   function switchMeasurement(direction) {
     const newTrackedMeasurementUID = _getNextMeasurementUID(direction, servicesManager, trackedMeasurementUID, trackedMeasurements);
     if (!newTrackedMeasurementUID) {
       return;
     }
     setTrackedMeasurementUID(newTrackedMeasurementUID);
-    measurementService.jumpToMeasurement(viewportIndex, newTrackedMeasurementUID);
+    measurementService.jumpToMeasurement(viewportId, newTrackedMeasurementUID);
   }
   const getCornerstoneViewport = () => {
     const {
@@ -159,8 +206,7 @@ function TrackedCornerstoneViewport(props) {
     getStatusComponent: () => _getStatusComponent(isTracked),
     studyData: {
       label: viewportLabel,
-      studyDate: formatDate(SeriesDate),
-      // TODO: This is series date. Is that ok?
+      studyDate: formatDate(SeriesDate) || formatDate(StudyDate) || t('NoStudyDate'),
       currentSeries: SeriesNumber,
       // TODO - switch entire currentSeries to be UID based or actual position based
       seriesDescription: SeriesDescription,
@@ -169,18 +215,19 @@ function TrackedCornerstoneViewport(props) {
         patientSex: PatientSex || '',
         patientAge: PatientAge || '',
         MRN: PatientID || '',
-        thickness: SliceThickness ? `${parseFloat(SliceThickness).toFixed(2)}mm` : '',
+        thickness: SliceThickness ? `${parseFloat(SliceThickness).toFixed(2)}` : '',
+        thicknessUnits: 'mm',
         spacing: SpacingBetweenSlices !== undefined ? `${parseFloat(SpacingBetweenSlices).toFixed(2)}mm` : '',
         scanner: ManufacturerModelName || ''
       }
     }
   }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("div", {
-    className: "relative flex flex-row w-full h-full overflow-hidden"
+    className: "relative flex h-full w-full flex-row overflow-hidden"
   }, getCornerstoneViewport()));
 }
 TrackedCornerstoneViewport.propTypes = {
   displaySets: prop_types__WEBPACK_IMPORTED_MODULE_1___default().arrayOf((prop_types__WEBPACK_IMPORTED_MODULE_1___default().object).isRequired).isRequired,
-  viewportIndex: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().number).isRequired,
+  viewportId: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().string).isRequired,
   dataSource: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().object),
   children: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().node),
   customProps: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().object)
@@ -195,12 +242,12 @@ function _getNextMeasurementUID(direction, servicesManager, trackedMeasurementId
   } = servicesManager.services;
   const measurements = measurementService.getMeasurements();
   const {
-    activeViewportIndex,
+    activeViewportId,
     viewports
   } = viewportGridService.getState();
   const {
     displaySetInstanceUIDs: activeViewportDisplaySetInstanceUIDs
-  } = viewports[activeViewportIndex];
+  } = viewports.get(activeViewportId);
   const {
     trackedSeries
   } = trackedMeasurements.context;
@@ -249,19 +296,19 @@ function _getStatusComponent(isTracked) {
       className: "flex pt-1"
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_3__/* .Icon */ .JO, {
       name: "info-link",
-      className: "w-4 text-primary-main"
+      className: "text-primary-main w-4"
     })), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("div", {
-      className: "flex ml-4"
+      className: "ml-4 flex"
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("span", {
-      className: "text-base text-common-light"
+      className: "text-common-light text-base"
     }, isTracked ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, "Series is", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("span", {
       className: "font-bold text-white"
-    }, " tracked"), " and can be viewed ", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("br", null), " in the measurement panel") : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, "Measurements for", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("span", {
+    }, " tracked"), " and can be viewed ", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("br", null), ' ', "in the measurement panel") : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, "Measurements for", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("span", {
       className: "font-bold text-white"
     }, " untracked "), "series ", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("br", null), " will not be shown in the ", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("br", null), " measurements panel"))))
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_3__/* .Icon */ .JO, {
     name: trackedIcon,
-    className: "text-primary-light"
+    className: "text-aqua-pale"
   })));
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (TrackedCornerstoneViewport);