@ohif/app 3.11.0-beta.98 → 3.11.0

package/dist/{147.bundle.a28710f442d91d98ee60.js → 147.bundle.e22bae08eb10c0a51314.js}

@@ -14,10 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(86326);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js
-var esm = __webpack_require__(4667);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
-var dist_esm = __webpack_require__(15327);
+var esm = __webpack_require__(15327);
 // EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
 var src = __webpack_require__(15871);
 // EXTERNAL MODULE: ../../ui-next/src/index.ts + 3072 modules
@@ -63,7 +61,7 @@ function CornerstoneImageScrollbar({
         isPlaying: false
       });
     }
-    dist_esm.utilities.jumpToSlice(viewport.element, {
+    esm.utilities.jumpToSlice(viewport.element, {
       imageIndex,
       debounceLoading: true
     });
@@ -73,7 +71,7 @@ function CornerstoneImageScrollbar({
       return;
     }
     const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-    if (!viewport || viewport instanceof dist_esm.VolumeViewport3D) {
+    if (!viewport || viewport instanceof esm.VolumeViewport3D) {
       return;
     }
     try {
@@ -94,10 +92,10 @@ function CornerstoneImageScrollbar({
     const {
       viewportType
     } = viewportData;
-    const eventId = viewportType === dist_esm.Enums.ViewportType.STACK && dist_esm.Enums.Events.STACK_NEW_IMAGE || viewportType === dist_esm.Enums.ViewportType.ORTHOGRAPHIC && dist_esm.Enums.Events.VOLUME_NEW_IMAGE || dist_esm.Enums.Events.IMAGE_RENDERED;
+    const eventId = viewportType === esm.Enums.ViewportType.STACK && esm.Enums.Events.STACK_NEW_IMAGE || viewportType === esm.Enums.ViewportType.ORTHOGRAPHIC && esm.Enums.Events.VOLUME_NEW_IMAGE || esm.Enums.Events.IMAGE_RENDERED;
     const updateIndex = event => {
       const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-      if (!viewport || viewport instanceof dist_esm.VolumeViewport3D) {
+      if (!viewport || viewport instanceof esm.VolumeViewport3D) {
         return;
       }
       const {
@@ -136,6 +134,8 @@ CornerstoneImageScrollbar.propTypes = {
 /* harmony default export */ const ViewportImageScrollbar = (CornerstoneImageScrollbar);
 // EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 1 modules
 var gl_matrix_esm = __webpack_require__(3823);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js
+var dist_esm = __webpack_require__(4667);
 // EXTERNAL MODULE: ../../../node_modules/moment/moment.js
 var moment = __webpack_require__(14867);
 var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
@@ -316,27 +316,27 @@ function CustomizableViewportOverlay({
       const {
         windowWidth,
         windowCenter
-      } = dist_esm.utilities.windowLevel.toWindowLevel(lower, upper);
+      } = esm.utilities.windowLevel.toWindowLevel(lower, upper);
       setVOI({
         windowCenter,
         windowWidth
       });
     };
-    element.addEventListener(dist_esm.Enums.Events.VOI_MODIFIED, updateVOI);
+    element.addEventListener(esm.Enums.Events.VOI_MODIFIED, updateVOI);
     return () => {
-      element.removeEventListener(dist_esm.Enums.Events.VOI_MODIFIED, updateVOI);
+      element.removeEventListener(esm.Enums.Events.VOI_MODIFIED, updateVOI);
     };
   }, [viewportId, viewportData, voi, element]);
   const annotationModified = (0,react.useCallback)(evt => {
-    if (evt.detail.annotation.metadata.toolName === esm.UltrasoundPleuraBLineTool.toolName) {
+    if (evt.detail.annotation.metadata.toolName === dist_esm.UltrasoundPleuraBLineTool.toolName) {
       // Update the annotation state to trigger a re-render
       setAnnotationState(prevState => prevState + 1);
     }
   }, []);
   (0,react.useEffect)(() => {
-    dist_esm.eventTarget.addEventListener(esm.Enums.Events.ANNOTATION_MODIFIED, annotationModified);
+    esm.eventTarget.addEventListener(dist_esm.Enums.Events.ANNOTATION_MODIFIED, annotationModified);
     return () => {
-      dist_esm.eventTarget.removeEventListener(esm.Enums.Events.ANNOTATION_MODIFIED, annotationModified);
+      esm.eventTarget.removeEventListener(dist_esm.Enums.Events.ANNOTATION_MODIFIED, annotationModified);
     };
   }, [annotationModified]);
   /**
@@ -357,9 +357,9 @@ function CustomizableViewportOverlay({
         setScale(scale);
       }
     };
-    element.addEventListener(dist_esm.Enums.Events.CAMERA_MODIFIED, updateScale);
+    element.addEventListener(esm.Enums.Events.CAMERA_MODIFIED, updateScale);
     return () => {
-      element.removeEventListener(dist_esm.Enums.Events.CAMERA_MODIFIED, updateScale);
+      element.removeEventListener(esm.Enums.Events.CAMERA_MODIFIED, updateScale);
     };
   }, [viewportId, viewportData, cornerstoneViewportService, element]);
   const _renderOverlayItem = (0,react.useCallback)((item, props) => {
@@ -439,10 +439,10 @@ function getDisplaySets(viewportData, displaySetService) {
 const getInstanceNumber = (viewportData, viewportId, imageIndex, cornerstoneViewportService) => {
   let instanceNumber;
   switch (viewportData.viewportType) {
-    case dist_esm.Enums.ViewportType.STACK:
+    case esm.Enums.ViewportType.STACK:
       instanceNumber = _getInstanceNumberFromStack(viewportData, imageIndex);
       break;
-    case dist_esm.Enums.ViewportType.ORTHOGRAPHIC:
+    case esm.Enums.ViewportType.ORTHOGRAPHIC:
       instanceNumber = _getInstanceNumberFromVolume(viewportData, viewportId, cornerstoneViewportService, imageIndex);
       break;
   }
@@ -454,7 +454,7 @@ function _getInstanceNumberFromStack(viewportData, imageIndex) {
   if (!imageId) {
     return;
   }
-  const generalImageModule = dist_esm.metaData.get('generalImageModule', imageId) || {};
+  const generalImageModule = esm.metaData.get('generalImageModule', imageId) || {};
   const {
     instanceNumber
   } = generalImageModule;
@@ -507,7 +507,7 @@ function _getInstanceNumberFromVolume(viewportData, viewportId, cornerstoneViewp
     }
     const {
       instanceNumber
-    } = dist_esm.metaData.get('generalImageModule', imageId) || {};
+    } = esm.metaData.get('generalImageModule', imageId) || {};
     return parseInt(instanceNumber);
   }
 }
@@ -634,7 +634,7 @@ var classnames_default = /*#__PURE__*/__webpack_require__.n(classnames);
 const {
   getOrientationStringLPS,
   invertOrientationStringLPS
-} = esm.utilities.orientation;
+} = dist_esm.utilities.orientation;
 function ViewportOrientationMarkers({
   element,
   viewportData,
@@ -662,10 +662,10 @@ function ViewportOrientationMarkers({
   (0,react.useEffect)(() => {
     initialVolumeOrientationRef.current.initialViewUp = null;
     initialVolumeOrientationRef.current.initialViewRight = null;
-    if (viewportData?.viewportType !== 'stack' && element && (0,dist_esm.getEnabledElement)(element)) {
+    if (viewportData?.viewportType !== 'stack' && element && (0,esm.getEnabledElement)(element)) {
       const {
         viewport
-      } = (0,dist_esm.getEnabledElement)(element);
+      } = (0,esm.getEnabledElement)(element);
       const {
         viewUp,
         viewPlaneNormal
@@ -695,9 +695,9 @@ function ViewportOrientationMarkers({
         setFlipVertical(camera.flipVertical);
       }
     };
-    element.addEventListener(dist_esm.Enums.Events.CAMERA_MODIFIED, cameraModifiedListener);
+    element.addEventListener(esm.Enums.Events.CAMERA_MODIFIED, cameraModifiedListener);
     return () => {
-      element.removeEventListener(dist_esm.Enums.Events.CAMERA_MODIFIED, cameraModifiedListener);
+      element.removeEventListener(esm.Enums.Events.CAMERA_MODIFIED, cameraModifiedListener);
     };
   }, []);
   const markers = (0,react.useMemo)(() => {
@@ -718,9 +718,9 @@ function ViewportOrientationMarkers({
         columnCosines,
         isDefaultValueSetForColumnCosine,
         isDefaultValueSetForColumnCosine
-      } = dist_esm.metaData.get('imagePlaneModule', imageId) || {});
+      } = esm.metaData.get('imagePlaneModule', imageId) || {});
     } else {
-      if (!element || !(0,dist_esm.getEnabledElement)(element)) {
+      if (!element || !(0,esm.getEnabledElement)(element)) {
         return '';
       }
       if (initialVolumeOrientationRef.current.initialViewUp && initialVolumeOrientationRef.current.initialViewRight) {
@@ -768,6 +768,9 @@ function _getOrientationMarkers(rowCosines, columnCosines, rotation, flipVertica
   const columnString = getOrientationStringLPS(columnCosines);
   const oppositeRowString = invertOrientationStringLPS(rowString);
   const oppositeColumnString = invertOrientationStringLPS(columnString);
+
+  // Round to 4 decimal places (after rotate right 3 times and flip horizontally -> rotation is 90.00000000000001)
+  rotation = Math.round(rotation * 10000) / 10000;
   const markers = {
     top: oppositeColumnString,
     left: oppositeRowString,
@@ -843,13 +846,13 @@ function ViewportImageSliceLoadingIndicator({
     }
   };
   (0,react.useEffect)(() => {
-    element.addEventListener(dist_esm.Enums.Events.STACK_VIEWPORT_SCROLL, setLoadingState);
-    element.addEventListener(dist_esm.Enums.Events.IMAGE_LOAD_ERROR, setErrorState);
-    element.addEventListener(dist_esm.Enums.Events.STACK_NEW_IMAGE, setFinishLoadingState);
+    element.addEventListener(esm.Enums.Events.STACK_VIEWPORT_SCROLL, setLoadingState);
+    element.addEventListener(esm.Enums.Events.IMAGE_LOAD_ERROR, setErrorState);
+    element.addEventListener(esm.Enums.Events.STACK_NEW_IMAGE, setFinishLoadingState);
     return () => {
-      element.removeEventListener(dist_esm.Enums.Events.STACK_VIEWPORT_SCROLL, setLoadingState);
-      element.removeEventListener(dist_esm.Enums.Events.STACK_NEW_IMAGE, setFinishLoadingState);
-      element.removeEventListener(dist_esm.Enums.Events.IMAGE_LOAD_ERROR, setErrorState);
+      element.removeEventListener(esm.Enums.Events.STACK_VIEWPORT_SCROLL, setLoadingState);
+      element.removeEventListener(esm.Enums.Events.STACK_NEW_IMAGE, setFinishLoadingState);
+      element.removeEventListener(esm.Enums.Events.IMAGE_LOAD_ERROR, setErrorState);
     };
   }, [element, viewportData]);
   if (error) {
@@ -1062,16 +1065,16 @@ function WrappedCinePlayer({
     if (!enabledVPElement) {
       return;
     }
-    enabledVPElement.addEventListener(dist_esm.Enums.Events.VIEWPORT_NEW_IMAGE_SET, newDisplaySetHandler);
+    enabledVPElement.addEventListener(esm.Enums.Events.VIEWPORT_NEW_IMAGE_SET, newDisplaySetHandler);
     // this doesn't makes sense that we are listening to this event on viewport element
-    enabledVPElement.addEventListener(dist_esm.Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, newDisplaySetHandler);
+    enabledVPElement.addEventListener(esm.Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, newDisplaySetHandler);
     return () => {
       cineService.setCine({
         id: viewportId,
         isPlaying: false
       });
-      enabledVPElement.removeEventListener(dist_esm.Enums.Events.VIEWPORT_NEW_IMAGE_SET, newDisplaySetHandler);
-      enabledVPElement.removeEventListener(dist_esm.Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, newDisplaySetHandler);
+      enabledVPElement.removeEventListener(esm.Enums.Events.VIEWPORT_NEW_IMAGE_SET, newDisplaySetHandler);
+      enabledVPElement.removeEventListener(esm.Enums.Events.VOLUME_VIEWPORT_NEW_VOLUME, newDisplaySetHandler);
     };
   }, [enabledVPElement, newDisplaySetHandler, viewportId]);
   (0,react.useEffect)(() => {
@@ -1134,9 +1137,9 @@ function RenderCinePlayer({
         label: splittingTag
       });
     };
-    dist_esm.eventTarget.addEventListener(dist_esm.Enums.Events.DYNAMIC_VOLUME_DIMENSION_GROUP_CHANGED, handleDimensionGroupChange);
+    esm.eventTarget.addEventListener(esm.Enums.Events.DYNAMIC_VOLUME_DIMENSION_GROUP_CHANGED, handleDimensionGroupChange);
     return () => {
-      dist_esm.eventTarget.removeEventListener(dist_esm.Enums.Events.DYNAMIC_VOLUME_DIMENSION_GROUP_CHANGED, handleDimensionGroupChange);
+      esm.eventTarget.removeEventListener(esm.Enums.Events.DYNAMIC_VOLUME_DIMENSION_GROUP_CHANGED, handleDimensionGroupChange);
     };
   }, [dynamicInfo]);
   (0,react.useEffect)(() => {
@@ -1149,7 +1152,7 @@ function RenderCinePlayer({
       numDimensionGroups,
       splittingTag
     } = dynamicInfo || {};
-    const volume = dist_esm.cache.getVolume(volumeId, true);
+    const volume = esm.cache.getVolume(volumeId, true);
     volume.dimensionGroupNumber = dimensionGroupNumber;
     setDynamicInfo({
       volumeId,
@@ -1163,7 +1166,7 @@ function RenderCinePlayer({
       volumeId,
       dimensionGroupNumber
     } = props;
-    const volume = dist_esm.cache.getVolume(volumeId, true);
+    const volume = esm.cache.getVolume(volumeId, true);
     volume.dimensionGroupNumber = dimensionGroupNumber;
   }, []);
   return /*#__PURE__*/react.createElement(CinePlayerComponent, {
@@ -1369,8 +1372,6 @@ function arePropsEqual(prevProps, nextProps) {
   return prevProps.viewportId === nextProps.viewportId && prevProps.servicesManager === nextProps.servicesManager;
 }
 /* harmony default export */ const utils_ActiveViewportBehavior = (ActiveViewportBehavior);
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/services/ViewportService/CornerstoneViewportService.ts + 4 modules
-var CornerstoneViewportService = __webpack_require__(11794);
 ;// ../../../extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.tsx
 
 
@@ -1384,8 +1385,6 @@ var CornerstoneViewportService = __webpack_require__(11794);
 
 
 
-
-
 const STACK = 'stack';
 
 // Cache for viewport dimensions, persists across component remounts
@@ -1538,7 +1537,7 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
   // disable the element upon unmounting
   (0,react.useEffect)(() => {
     cornerstoneViewportService.enableViewport(viewportId, elementRef.current);
-    dist_esm.eventTarget.addEventListener(dist_esm.Enums.Events.ELEMENT_ENABLED, elementEnabledHandler);
+    esm.eventTarget.addEventListener(esm.Enums.Events.ELEMENT_ENABLED, elementEnabledHandler);
     setImageScrollBarHeight();
     return () => {
       const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
@@ -1557,7 +1556,7 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
       }
       cornerstoneViewportService.disableElement(viewportId);
       viewportRef.unregister();
-      dist_esm.eventTarget.removeEventListener(dist_esm.Enums.Events.ELEMENT_ENABLED, elementEnabledHandler);
+      esm.eventTarget.removeEventListener(esm.Enums.Events.ELEMENT_ENABLED, elementEnabledHandler);
     };
   }, []);
 
@@ -1613,28 +1612,6 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
     };
     loadViewportData();
   }, [viewportOptions, displaySets, dataSource]);
-
-  /**
-   * There are two scenarios for jump to click
-   * 1. Current viewports contain the displaySet that the annotation was drawn on
-   * 2. Current viewports don't contain the displaySet that the annotation was drawn on
-   * and we need to change the viewports displaySet for jumping.
-   * Since measurement_jump happens via events and listeners, the former case is handled
-   * by the measurement_jump direct callback, but the latter case is handled first by
-   * the viewportGrid to set the correct displaySet on the viewport, AND THEN we check
-   * 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 {
-      unsubscribe
-    } = measurementService.subscribe(src/* MeasurementService */.C5.EVENTS.JUMP_TO_MEASUREMENT_VIEWPORT, event => handleJumpToMeasurement(event, elementRef, viewportId, cornerstoneViewportService));
-    return () => {
-      unsubscribe();
-    };
-  }, [displaySets, elementRef, viewportId, isJumpToMeasurementDisabled, servicesManager]);
   const Notification = customizationService.getCustomization('ui.notificationComponent');
   return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("div", {
     className: "viewport-wrapper"
@@ -1680,49 +1657,6 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
     viewportId: viewportId
   }));
 }, areEqual);
-
-// Helper function to handle jumping to measurements
-function handleJumpToMeasurement(event, elementRef, viewportId, cornerstoneViewportService) {
-  const {
-    measurement,
-    isConsumed
-  } = event;
-  if (!measurement || isConsumed) {
-    return;
-  }
-  const enabledElement = (0,dist_esm.getEnabledElement)(elementRef.current);
-  if (!enabledElement) {
-    return;
-  }
-  const viewport = enabledElement.viewport;
-  const {
-    metadata,
-    displaySetInstanceUID
-  } = measurement;
-  const viewportDisplaySets = cornerstoneViewportService.getViewportDisplaySets(viewportId);
-  const showingDisplaySet = viewportDisplaySets.find(ds => ds.displaySetInstanceUID === displaySetInstanceUID);
-  let metadataToUse = metadata;
-  // if it is not showing the displaySet we need to remove the FOR from the metadata
-  if (!showingDisplaySet) {
-    metadataToUse = {
-      ...metadata,
-      FrameOfReferenceUID: undefined
-    };
-  }
-
-  // Todo: make it work with cases where we want to define FOR based measurements too
-  if (!viewport.isReferenceViewable(metadataToUse, CornerstoneViewportService/* WITH_NAVIGATION */.g)) {
-    return;
-  }
-  try {
-    viewport.setViewReference(metadata);
-    viewport.render();
-  } catch (e) {
-    console.warn('Unable to apply', metadata, e);
-  }
-  esm.annotation.selection.setAnnotationSelected(measurement.uid);
-  event?.consume?.();
-}
 function _rehydrateSynchronizers(viewportId, syncGroupService) {
   const {
     synchronizersStore
@@ -1816,17 +1750,6 @@ function areEqual(prevProps, nextProps) {
   }
   return true;
 }
-
-// Helper function to check if display sets have changed
-function haveDisplaySetsChanged(prevDisplaySets, currentDisplaySets) {
-  if (prevDisplaySets.length !== currentDisplaySets.length) {
-    return true;
-  }
-  return currentDisplaySets.some((currentDS, index) => {
-    const prevDS = prevDisplaySets[index];
-    return currentDS.displaySetInstanceUID !== prevDS.displaySetInstanceUID;
-  });
-}
 /* harmony default export */ const Viewport_OHIFCornerstoneViewport = (OHIFCornerstoneViewport);
 
 /***/ })

package/dist/{1919.bundle.a80e1fa53f199f8862dd.js → 1919.bundle.ca1ffebd2ee775dc2d82.js}

@@ -1145,10 +1145,10 @@ function WorkflowPanel({
 
 
 
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 140 modules
-var default_src = __webpack_require__(49625);
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 177 modules
-var cornerstone_src = __webpack_require__(56972);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 139 modules
+var default_src = __webpack_require__(11447);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 184 modules
+var cornerstone_src = __webpack_require__(20557);
 ;// ../../../extensions/cornerstone-dynamic-volume/src/panels/DynamicExport.tsx
 
 
@@ -2048,6 +2048,8 @@ var Events;
     Events["TOOLGROUP_VIEWPORT_REMOVED"] = "CORNERSTONE_TOOLS_TOOLGROUP_VIEWPORT_REMOVED";
     Events["TOOL_MODE_CHANGED"] = "CORNERSTONE_TOOLS_TOOL_MODE_CHANGED";
     Events["CROSSHAIR_TOOL_CENTER_CHANGED"] = "CORNERSTONE_TOOLS_CROSSHAIR_TOOL_CENTER_CHANGED";
+    Events["VOLUMECROPPINGCONTROL_TOOL_CHANGED"] = "CORNERSTONE_TOOLS_VOLUMECROPPINGCONTROL_TOOL_CHANGED";
+    Events["VOLUMECROPPING_TOOL_CHANGED"] = "CORNERSTONE_TOOLS_VOLUMECROPPING_TOOL_CHANGED";
     Events["ANNOTATION_ADDED"] = "CORNERSTONE_TOOLS_ANNOTATION_ADDED";
     Events["ANNOTATION_COMPLETED"] = "CORNERSTONE_TOOLS_ANNOTATION_COMPLETED";
     Events["ANNOTATION_MODIFIED"] = "CORNERSTONE_TOOLS_ANNOTATION_MODIFIED";