@ohif/app 3.7.0-beta.6 → 3.7.0-beta.61

package/dist/{642.bundle.0a98bca321a959b489f2.js → 814.bundle.9218ffc353490526c320.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[642],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[814],{
 
-/***/ 73642:
+/***/ 92814:
 /***/ ((__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-pdf/package.json
 const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-dicom-pdf"}');
 ;// CONCATENATED MODULE: ../../../extensions/dicom-pdf/src/id.js
@@ -21,8 +21,8 @@ const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-dicom-pdf"}')
 const id = package_namespaceObject.u2;
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-pdf`;
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../core/src/index.ts + 106 modules
+var src = __webpack_require__(38930);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-pdf/src/getSopClassHandlerModule.js
 
 
@@ -110,7 +110,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 295).then(__webpack_require__.bind(__webpack_require__, 56295));
+  return __webpack_require__.e(/* import() */ 125).then(__webpack_require__.bind(__webpack_require__, 39125));
 });
 const OHIFCornerstonePdfViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {

package/dist/{799.bundle.758558e64147e5aad612.js → 822.bundle.99bf759483aa32086346.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__(38930);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(33570);
+/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(69190);
+/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26925);
+/* harmony import */ var _getContextModule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(1053);
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(45754);
 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); }
 
 
@@ -40,15 +40,16 @@ function TrackedCornerstoneViewport(props) {
   } = 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);
@@ -69,6 +70,7 @@ function TrackedCornerstoneViewport(props) {
     PatientAge,
     SliceThickness,
     SpacingBetweenSlices,
+    StudyDate,
     ManufacturerModelName
   } = displaySet.images[0];
   const updateIsTracked = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(() => {
@@ -132,6 +134,53 @@ 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 {
+          activeViewportIndex
+        } = 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 (viewportIndex === activeViewportIndex) {
+          const {
+            referenceStudyUID: StudyInstanceUID,
+            referenceSeriesUID: SeriesInstanceUID
+          } = measurement;
+          sendTrackedMeasurementsEvent('SET_DIRTY', {
+            SeriesInstanceUID
+          });
+          sendTrackedMeasurementsEvent('TRACK_SERIES', {
+            viewportIndex,
+            StudyInstanceUID,
+            SeriesInstanceUID
+          });
+        }
+      }).unsubscribe);
+    });
+    return () => {
+      subscriptions.forEach(unsub => {
+        unsub();
+      });
+    };
+  }, [measurementService, sendTrackedMeasurementsEvent, viewportIndex, viewportGridService]);
   function switchMeasurement(direction) {
     const newTrackedMeasurementUID = _getNextMeasurementUID(direction, servicesManager, trackedMeasurementUID, trackedMeasurements);
     if (!newTrackedMeasurementUID) {
@@ -159,8 +208,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,7 +217,8 @@ 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 || ''
       }
@@ -261,7 +310,7 @@ function _getStatusComponent(isTracked) {
     }, " 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);

package/dist/{953.bundle.3b0189ebc11cf0946f18.js → 886.bundle.c5a6b96760ea43352375.js}

@@ -1,21 +1,22 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[953],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[886],{
 
-/***/ 27953:
+/***/ 48886:
 /***/ ((__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 prop_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(60216);
+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3827);
 /* 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__(32735);
-/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21572);
-/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(48501);
-/* harmony import */ var _tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(94709);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(28619);
-/* harmony import */ var _utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(68525);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(43001);
+/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(69190);
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(38930);
+/* harmony import */ var _tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(64035);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(33570);
+/* harmony import */ var _utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38965);
+/* harmony import */ var _state__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(62657);
 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); }
 
 
@@ -24,6 +25,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
+
 const {
   formatDate
 } = _ohif_core__WEBPACK_IMPORTED_MODULE_3__.utils;
@@ -40,6 +42,7 @@ function OHIFCornerstoneSRViewport(props) {
     servicesManager,
     extensionManager
   } = props;
+  const [appConfig] = (0,_state__WEBPACK_IMPORTED_MODULE_7__/* .useAppConfig */ .M)();
   const {
     displaySetService,
     cornerstoneViewportService,
@@ -84,7 +87,8 @@ function OHIFCornerstoneSRViewport(props) {
         SeriesInstanceUIDs
       } = (0,_utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)({
         servicesManager,
-        extensionManager
+        extensionManager,
+        appConfig
       }, displaySetInstanceUID);
       const displaySets = displaySetService.getDisplaySetsForSeries(SeriesInstanceUIDs[0]);
       if (displaySets.length) {
@@ -193,7 +197,8 @@ function OHIFCornerstoneSRViewport(props) {
         positionIds: null
       },
       onElementEnabled: onElementEnabled,
-      initialImageIndex: initialImageIndex
+      initialImageIndex: initialImageIndex,
+      isJumpToMeasurementDisabled: true
     }));
   }, [activeImageDisplaySetData, viewportIndex, measurementSelected]);
   const onMeasurementChange = (0,react__WEBPACK_IMPORTED_MODULE_1__.useCallback)(direction => {
@@ -421,6 +426,7 @@ function _getStatusComponent(_ref4) {
       break;
     case 3:
       StatusIcon = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .Icon */ .JO, {
+        className: "text-aqua-pale",
         name: "status-untracked"
       });
       ToolTipMessage = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("div", null, `Click ${loadStr} to restore measurements.`);