@ohif/app 3.7.0-beta.4 → 3.7.0-beta.40

package/dist/{351.bundle.da314e071dcf5e888085.js → 468.bundle.84576e0c0e8a7bdcfb90.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[351],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[468],{
 
-/***/ 30351:
+/***/ 31468:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -21,12 +21,12 @@ var prop_types = __webpack_require__(60216);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 321 modules
 var esm = __webpack_require__(57270);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
-var dist_esm = __webpack_require__(77331);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 336 modules
+var dist_esm = __webpack_require__(58389);
+// EXTERNAL MODULE: ../../core/src/index.ts + 103 modules
+var src = __webpack_require__(87754);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/state.ts
 var state = __webpack_require__(21922);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.css
@@ -964,6 +964,99 @@ function CornerstoneOverlays(props) {
 /* harmony default export */ const Overlays_CornerstoneOverlays = (CornerstoneOverlays);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/utils/getSOPInstanceAttributes.js
 var getSOPInstanceAttributes = __webpack_require__(63130);
+;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/components/CinePlayer/CinePlayer.tsx
+
+
+
+function WrappedCinePlayer(_ref) {
+  let {
+    enabledVPElement,
+    viewportIndex,
+    servicesManager
+  } = _ref;
+  const {
+    toolbarService,
+    customizationService
+  } = servicesManager.services;
+  const [{
+    isCineEnabled,
+    cines
+  }, cineService] = (0,ui_src/* useCine */.vQ)();
+  const [{
+    activeViewportIndex
+  }] = (0,ui_src/* useViewportGrid */.O_)();
+  const {
+    component: CinePlayerComponent = ui_src/* CinePlayer */.H6
+  } = customizationService.get('cinePlayer') ?? {};
+  const handleCineClose = () => {
+    toolbarService.recordInteraction({
+      groupId: 'MoreTools',
+      itemId: 'cine',
+      interactionType: 'toggle',
+      commands: [{
+        commandName: 'toggleCine',
+        commandOptions: {},
+        context: 'CORNERSTONE'
+      }]
+    });
+  };
+  const cineHandler = () => {
+    if (!cines || !cines[viewportIndex] || !enabledVPElement) {
+      return;
+    }
+    const cine = cines[viewportIndex];
+    const isPlaying = cine.isPlaying || false;
+    const frameRate = cine.frameRate || 24;
+    const validFrameRate = Math.max(frameRate, 1);
+    if (isPlaying) {
+      cineService.playClip(enabledVPElement, {
+        framesPerSecond: validFrameRate
+      });
+    } else {
+      cineService.stopClip(enabledVPElement);
+    }
+  };
+  (0,react.useEffect)(() => {
+    dist_esm.eventTarget.addEventListener(dist_esm.Enums.Events.STACK_VIEWPORT_NEW_STACK, cineHandler);
+    return () => {
+      cineService.setCine({
+        id: viewportIndex,
+        isPlaying: false
+      });
+      dist_esm.eventTarget.removeEventListener(dist_esm.Enums.Events.STACK_VIEWPORT_NEW_STACK, cineHandler);
+    };
+  }, [enabledVPElement]);
+  (0,react.useEffect)(() => {
+    if (!cines || !cines[viewportIndex] || !enabledVPElement) {
+      return;
+    }
+    cineHandler();
+    return () => {
+      if (enabledVPElement && cines?.[viewportIndex]?.isPlaying) {
+        cineService.stopClip(enabledVPElement);
+      }
+    };
+  }, [cines, viewportIndex, cineService, enabledVPElement, cineHandler]);
+  const cine = cines[viewportIndex];
+  const isPlaying = cine && cine.isPlaying || false;
+  return isCineEnabled && /*#__PURE__*/react.createElement(CinePlayerComponent, {
+    className: "absolute left-1/2 -translate-x-1/2 bottom-3",
+    isPlaying: isPlaying,
+    onClose: handleCineClose,
+    onPlayPauseChange: isPlaying => cineService.setCine({
+      id: activeViewportIndex,
+      isPlaying
+    }),
+    onFrameRateChange: frameRate => cineService.setCine({
+      id: activeViewportIndex,
+      frameRate
+    })
+  });
+}
+/* harmony default export */ const CinePlayer = (WrappedCinePlayer);
+;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/components/CinePlayer/index.ts
+
+/* harmony default export */ const components_CinePlayer = (CinePlayer);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.tsx
 
 
@@ -976,6 +1069,7 @@ var getSOPInstanceAttributes = __webpack_require__(63130);
 
 
 
+
 const STACK = 'stack';
 
 /**
@@ -1040,19 +1134,13 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
     servicesManager,
     onElementEnabled,
     onElementDisabled,
+    isJumpToMeasurementDisabled,
     // Note: you SHOULD NOT use the initialImageIdOrIndex for manipulation
     // of the imageData in the OHIFCornerstoneViewport. This prop is used
     // to set the initial state of the viewport's first image to render
     initialImageIndex
   } = props;
   const [scrollbarHeight, setScrollbarHeight] = (0,react.useState)('100px');
-  const [{
-    isCineEnabled,
-    cines
-  }, cineService] = (0,ui_src/* useCine */.vQ)();
-  const [{
-    activeViewportIndex
-  }] = (0,ui_src/* useViewportGrid */.O_)();
   const [enabledVPElement, setEnabledVPElement] = (0,react.useState)(null);
   const elementRef = (0,react.useRef)();
   const {
@@ -1067,58 +1155,6 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
     stateSyncService
   } = servicesManager.services;
   const [viewportDialogState] = (0,ui_src/* useViewportDialog */.en)();
-  const cineHandler = () => {
-    if (!cines || !cines[viewportIndex] || !enabledVPElement) {
-      return;
-    }
-    const cine = cines[viewportIndex];
-    const isPlaying = cine.isPlaying || false;
-    const frameRate = cine.frameRate || 24;
-    const validFrameRate = Math.max(frameRate, 1);
-    if (isPlaying) {
-      cineService.playClip(enabledVPElement, {
-        framesPerSecond: validFrameRate
-      });
-    } else {
-      cineService.stopClip(enabledVPElement);
-    }
-  };
-  (0,react.useEffect)(() => {
-    dist_esm.eventTarget.addEventListener(dist_esm.Enums.Events.STACK_VIEWPORT_NEW_STACK, cineHandler);
-    return () => {
-      cineService.setCine({
-        id: viewportIndex,
-        isPlaying: false
-      });
-      dist_esm.eventTarget.removeEventListener(dist_esm.Enums.Events.STACK_VIEWPORT_NEW_STACK, cineHandler);
-    };
-  }, [enabledVPElement]);
-  (0,react.useEffect)(() => {
-    if (!cines || !cines[viewportIndex] || !enabledVPElement) {
-      return;
-    }
-    cineHandler();
-    return () => {
-      if (enabledVPElement && cines?.[viewportIndex]?.isPlaying) {
-        cineService.stopClip(enabledVPElement);
-      }
-    };
-  }, [cines, viewportIndex, cineService, enabledVPElement, cineHandler]);
-  const cine = cines[viewportIndex];
-  const isPlaying = cine && cine.isPlaying || false;
-  const handleCineClose = () => {
-    toolbarService.recordInteraction({
-      groupId: 'MoreTools',
-      itemId: 'cine',
-      interactionType: 'toggle',
-      commands: [{
-        commandName: 'toggleCine',
-        commandOptions: {},
-        context: 'CORNERSTONE'
-      }]
-    });
-  };
-
   // useCallback for scroll bar height calculation
   const setImageScrollBarHeight = (0,react.useCallback)(() => {
     const scrollbarHeight = `${elementRef.current.clientHeight - 20}px`;
@@ -1284,21 +1320,21 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
    * the cache for jumping to see if there is any jump queued, then we jump to the correct slice.
    */
   (0,react.useEffect)(() => {
+    if (isJumpToMeasurementDisabled) {
+      return;
+    }
     const unsubscribeFromJumpToMeasurementEvents = _subscribeToJumpToMeasurementEvents(measurementService, displaySetService, elementRef, viewportIndex, displaySets, viewportGridService, cornerstoneViewportService);
     _checkForCachedJumpToMeasurementEvents(measurementService, displaySetService, elementRef, viewportIndex, displaySets, viewportGridService, cornerstoneViewportService);
     return () => {
       unsubscribeFromJumpToMeasurementEvents();
     };
   }, [displaySets, elementRef, viewportIndex]);
+  console.debug('OHIFCornerstoneViewport rendering');
   return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("div", {
     className: "viewport-wrapper"
   }, /*#__PURE__*/react.createElement(index_esm/* default */.ZP, {
-    handleWidth: true,
-    handleHeight: true,
-    skipOnMount: true // Todo: make these configurable
-    ,
-    refreshMode: 'debounce',
-    refreshRate: 200 // transition amount in side panel
+    refreshMode: "debounce",
+    refreshRate: 50 // Wait 50 ms after last move to render
     ,
     onResize: onResize,
     targetRef: elementRef.current
@@ -1317,18 +1353,10 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
     element: elementRef.current,
     scrollbarHeight: scrollbarHeight,
     servicesManager: servicesManager
-  }), isCineEnabled && /*#__PURE__*/react.createElement(ui_src/* CinePlayer */.H6, {
-    className: "absolute left-1/2 -translate-x-1/2 bottom-3",
-    isPlaying: isPlaying,
-    onClose: handleCineClose,
-    onPlayPauseChange: isPlaying => cineService.setCine({
-      id: activeViewportIndex,
-      isPlaying
-    }),
-    onFrameRateChange: frameRate => cineService.setCine({
-      id: activeViewportIndex,
-      frameRate
-    })
+  }), /*#__PURE__*/react.createElement(components_CinePlayer, {
+    enabledVPElement: enabledVPElement,
+    viewportIndex: viewportIndex,
+    servicesManager: servicesManager
   })), /*#__PURE__*/react.createElement("div", {
     className: "absolute w-full"
   }, viewportDialogState.viewportIndex === viewportIndex && /*#__PURE__*/react.createElement(ui_src/* Notification */.P_, {
@@ -1451,6 +1479,9 @@ function _jumpToMeasurement(measurement, targetElementRef, viewportIndex, measur
 
 // Component displayName
 OHIFCornerstoneViewport.displayName = 'OHIFCornerstoneViewport';
+OHIFCornerstoneViewport.defaultProps = {
+  isJumpToMeasurementDisabled: false
+};
 OHIFCornerstoneViewport.propTypes = {
   viewportIndex: (prop_types_default()).number.isRequired,
   displaySets: (prop_types_default()).array.isRequired,
@@ -1459,6 +1490,7 @@ OHIFCornerstoneViewport.propTypes = {
   displaySetOptions: prop_types_default().arrayOf((prop_types_default()).any),
   servicesManager: (prop_types_default()).object.isRequired,
   onElementEnabled: (prop_types_default()).func,
+  isJumpToMeasurementDisabled: (prop_types_default()).bool,
   // Note: you SHOULD NOT use the initialImageIdOrIndex for manipulation
   // of the imageData in the OHIFCornerstoneViewport. This prop is used
   // to set the initial state of the viewport's first image to render

package/dist/{55.bundle.5f5e5ef9087b0beee35c.js → 55.bundle.fe53f3784bfe7db4a5a5.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__(40001);
 var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.css
 // extracted by mini-css-extract-plugin
 
@@ -53,8 +53,8 @@ const listComponentGenerator = props => {
 
 // EXTERNAL MODULE: ../../../node_modules/moment/moment.js
 var moment_moment = __webpack_require__(53806);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
-var esm = __webpack_require__(77331);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 336 modules
+var esm = __webpack_require__(58389);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/components/ViewportOverlay/utils.ts
 
 
@@ -251,8 +251,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__(75935);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var core_src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../core/src/index.ts + 103 modules
+var core_src = __webpack_require__(87754);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/dicomWebClient.ts
 
 

package/dist/{569.bundle.0ed8d8178ffd43fe1c34.js → 569.bundle.e77c17d37a65e5dedfed.js}

@@ -19,10 +19,10 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 var react = __webpack_require__(32735);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(21572);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../core/src/index.ts + 103 modules
+var src = __webpack_require__(87754);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
 function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
   const {
@@ -86,6 +86,7 @@ async function _hydrateSEGDisplaySet(_ref) {
 /* harmony default export */ const _hydrateSEG = (_hydrateSEGDisplaySet);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts
 
+
 const RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -116,11 +117,11 @@ function _askHydrate(uiViewportDialogService, viewportIndex) {
   return new Promise(function (resolve, reject) {
     const message = 'Do you want to open this Segmentation?';
     const actions = [{
-      type: 'secondary',
+      type: ui_src/* ButtonEnums.type */.LZ.U.secondary,
       text: 'No',
       value: RESPONSE.CANCEL
     }, {
-      type: 'primary',
+      type: ui_src/* ButtonEnums.type */.LZ.U.primary,
       text: 'Yes',
       value: RESPONSE.HYDRATE_SEG
     }];
@@ -255,7 +256,7 @@ function OHIFCornerstoneSEGViewport(props) {
     activeViewportIndex
   } = viewportGrid;
   const referencedDisplaySet = segDisplaySet.getReferenceDisplaySet();
-  const referencedDisplaySetMetadata = _getReferencedDisplaySetMetadata(referencedDisplaySet);
+  const referencedDisplaySetMetadata = _getReferencedDisplaySetMetadata(referencedDisplaySet, segDisplaySet);
   referencedDisplaySetRef.current = {
     displaySet: referencedDisplaySet,
     metadata: referencedDisplaySetMetadata
@@ -466,8 +467,8 @@ function OHIFCornerstoneSEGViewport(props) {
         patientSex: PatientSex || '',
         patientAge: PatientAge || '',
         MRN: PatientID || '',
-        thickness: SliceThickness ? `${SliceThickness.toFixed(2)}mm` : '',
-        spacing: SpacingBetweenSlices !== undefined ? `${SpacingBetweenSlices.toFixed(2)}mm` : '',
+        thickness: SliceThickness ? `${parseFloat(SliceThickness).toFixed(2)}mm` : '',
+        spacing: SpacingBetweenSlices !== undefined ? `${parseFloat(SpacingBetweenSlices).toFixed(2)}mm` : '',
         scanner: ManufacturerModelName || ''
       }
     }
@@ -490,20 +491,30 @@ OHIFCornerstoneSEGViewport.propTypes = {
 OHIFCornerstoneSEGViewport.defaultProps = {
   customProps: {}
 };
-function _getReferencedDisplaySetMetadata(referencedDisplaySet) {
+function _getReferencedDisplaySetMetadata(referencedDisplaySet, segDisplaySet) {
+  const {
+    SharedFunctionalGroupsSequence: [SharedFunctionalGroup]
+  } = segDisplaySet.instance;
+  const {
+    PixelMeasuresSequence: [PixelMeasures]
+  } = SharedFunctionalGroup;
+  const {
+    SpacingBetweenSlices,
+    SliceThickness
+  } = PixelMeasures;
   const image0 = referencedDisplaySet.images[0];
   const referencedDisplaySetMetadata = {
     PatientID: image0.PatientID,
     PatientName: image0.PatientName,
     PatientSex: image0.PatientSex,
     PatientAge: image0.PatientAge,
-    SliceThickness: image0.SliceThickness,
+    SliceThickness: image0.SliceThickness || SliceThickness,
     StudyDate: image0.StudyDate,
     SeriesDescription: image0.SeriesDescription,
     SeriesInstanceUID: image0.SeriesInstanceUID,
     SeriesNumber: image0.SeriesNumber,
     ManufacturerModelName: image0.ManufacturerModelName,
-    SpacingBetweenSlices: image0.SpacingBetweenSlices
+    SpacingBetweenSlices: image0.SpacingBetweenSlices || SpacingBetweenSlices
   };
   return referencedDisplaySetMetadata;
 }

package/dist/{581.bundle.360d26f97b37da8faec3.js → 581.bundle.15078e71fe52b53f48b3.js}

@@ -17,10 +17,10 @@ var react = __webpack_require__(32735);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(60216);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../core/src/index.ts + 103 modules
+var src = __webpack_require__(87754);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/_hydrateRT.ts
 async function _hydrateRTDisplaySet(_ref) {
   let {
@@ -77,6 +77,7 @@ async function _hydrateRTDisplaySet(_ref) {
 /* harmony default export */ const _hydrateRT = (_hydrateRTDisplaySet);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts
 
+
 const RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -109,11 +110,11 @@ function _askHydrate(uiViewportDialogService, viewportIndex) {
   return new Promise(function (resolve, reject) {
     const message = 'Do you want to open this Segmentation?';
     const actions = [{
-      type: 'secondary',
+      type: ui_src/* ButtonEnums.type */.LZ.U.secondary,
       text: 'No',
       value: RESPONSE.CANCEL
     }, {
-      type: 'primary',
+      type: ui_src/* ButtonEnums.type */.LZ.U.primary,
       text: 'Yes',
       value: RESPONSE.HYDRATE_SEG
     }];

package/dist/{616.bundle.3f5157b8b6911d95e8ec.js → 616.bundle.b159e7f111ada286d862.js}

@@ -24,8 +24,8 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 var react = __webpack_require__(32735);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/Math.js
 var Core_Math = __webpack_require__(92780);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../core/src/index.ts + 103 modules
+var src = __webpack_require__(87754);
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
 var dcmjs_es = __webpack_require__(22737);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/getSopClassHandlerModule.js
@@ -252,8 +252,8 @@ function getSopClassHandlerModule(_ref2) {
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(60216);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/panels/callInputDialog.tsx
 
 
@@ -295,11 +295,11 @@ function callInputDialog(uiDialogService, label, callback) {
         actions: [{
           id: 'cancel',
           text: 'Cancel',
-          type: 'primary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.secondary
         }, {
           id: 'save',
           text: 'Confirm',
-          type: 'secondary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.primary
         }],
         onSubmit: onSubmitHandler,
         body: _ref2 => {