@ohif/app 3.9.0-beta.76 → 3.9.0-beta.78

package/dist/{1169.bundle.a3d3d310f1d8d7e335bf.js → 1169.bundle.d32f38ab5aa329346850.js}

@@ -79,73 +79,44 @@ function CornerstoneImageScrollbar({
     if (!viewport) {
       return;
     }
-    if (viewportData.viewportType === dist_esm.Enums.ViewportType.STACK) {
-      const imageIndex = viewport.getCurrentImageIdIndex();
-      setImageSliceData({
-        imageIndex: imageIndex,
-        numberOfSlices: viewportData.data[0].imageIds.length
-      });
-      return;
-    }
-    if (viewportData.viewportType === dist_esm.Enums.ViewportType.ORTHOGRAPHIC) {
-      const sliceData = dist_esm.utilities.getImageSliceDataForVolumeViewport(viewport);
-      if (!sliceData) {
-        return;
-      }
-      const {
-        imageIndex,
-        numberOfSlices
-      } = sliceData;
-      setImageSliceData({
-        imageIndex,
-        numberOfSlices
-      });
-    }
+    const imageIndex = viewport.getCurrentImageIdIndex();
+    const numberOfSlices = viewport.getNumberOfSlices();
+    setImageSliceData({
+      imageIndex: imageIndex,
+      numberOfSlices
+    });
   }, [viewportId, viewportData]);
   (0,react.useEffect)(() => {
-    if (viewportData?.viewportType !== dist_esm.Enums.ViewportType.STACK) {
-      return;
-    }
-    const updateStackIndex = event => {
-      const {
-        newImageIdIndex
-      } = event.detail;
-      // find the index of imageId in the imageIds
-      setImageSliceData({
-        imageIndex: newImageIdIndex,
-        numberOfSlices: viewportData.data[0].imageIds.length
-      });
-    };
-    element.addEventListener(dist_esm.Enums.Events.STACK_VIEWPORT_SCROLL, updateStackIndex);
-    return () => {
-      element.removeEventListener(dist_esm.Enums.Events.STACK_VIEWPORT_SCROLL, updateStackIndex);
-    };
-  }, [viewportData, element]);
-  (0,react.useEffect)(() => {
-    if (viewportData?.viewportType !== dist_esm.Enums.ViewportType.ORTHOGRAPHIC) {
+    if (!viewportData) {
       return;
     }
-    const updateVolumeIndex = event => {
+    const {
+      viewportType
+    } = viewportData;
+    const eventId = viewportType === dist_esm.Enums.ViewportType.STACK && dist_esm.Enums.Events.STACK_VIEWPORT_SCROLL || viewportType === dist_esm.Enums.ViewportType.ORTHOGRAPHIC && dist_esm.Enums.Events.VOLUME_NEW_IMAGE || dist_esm.Enums.Events.IMAGE_RENDERED;
+    const updateIndex = event => {
+      const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
       const {
         imageIndex,
-        numberOfSlices
+        newImageIdIndex = imageIndex
       } = event.detail;
+      const numberOfSlices = viewport.getNumberOfSlices();
       // find the index of imageId in the imageIds
       setImageSliceData({
-        imageIndex,
+        imageIndex: newImageIdIndex,
         numberOfSlices
       });
     };
-    element.addEventListener(dist_esm.Enums.Events.VOLUME_NEW_IMAGE, updateVolumeIndex);
+    element.addEventListener(eventId, updateIndex);
     return () => {
-      element.removeEventListener(dist_esm.Enums.Events.VOLUME_NEW_IMAGE, updateVolumeIndex);
+      element.removeEventListener(eventId, updateIndex);
     };
   }, [viewportData, element]);
   return /*#__PURE__*/react.createElement(ui_src/* ImageScrollbar */.Ln, {
     onChange: evt => onImageScrollbarChange(evt, viewportId),
     max: imageSliceData.numberOfSlices ? imageSliceData.numberOfSlices - 1 : 0,
     height: scrollbarHeight,
-    value: imageSliceData.imageIndex
+    value: imageSliceData.imageIndex || 0
   });
 }
 CornerstoneImageScrollbar.propTypes = {
@@ -472,8 +443,6 @@ function CornerstoneOverlays(props) {
   }));
 }
 /* harmony default export */ const Overlays_CornerstoneOverlays = (CornerstoneOverlays);
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/utils/getSOPInstanceAttributes.js
-var getSOPInstanceAttributes = __webpack_require__(90927);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 13 modules
 var streaming_image_volume_loader_dist_esm = __webpack_require__(15793);
 // EXTERNAL MODULE: ./state/index.js + 1 modules
@@ -1653,7 +1622,6 @@ function getWindowLevelActionMenu({
 
 
 
-
 const STACK = 'stack';
 
 /**
@@ -1718,6 +1686,7 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
     viewportOptions,
     displaySetOptions,
     servicesManager,
+    commandsManager,
     onElementEnabled,
     // eslint-disable-next-line react/prop-types
     onElementDisabled,
@@ -1755,14 +1724,12 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
   const elementRef = (0,react.useRef)();
   const [appConfig] = (0,state_0/* useAppConfig */.M)();
   const {
-    measurementService,
     displaySetService,
     toolbarService,
     toolGroupService,
     syncGroupService,
     cornerstoneViewportService,
     cornerstoneCacheService,
-    viewportGridService,
     stateSyncService,
     viewportActionCornersService
   } = servicesManager.services;
@@ -1929,8 +1896,8 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
     if (isJumpToMeasurementDisabled) {
       return;
     }
-    const unsubscribeFromJumpToMeasurementEvents = _subscribeToJumpToMeasurementEvents(measurementService, displaySetService, elementRef, viewportId, displaySets, viewportGridService, cornerstoneViewportService);
-    _checkForCachedJumpToMeasurementEvents(measurementService, displaySetService, elementRef, viewportId, displaySets, viewportGridService, cornerstoneViewportService);
+    const unsubscribeFromJumpToMeasurementEvents = _subscribeToJumpToMeasurementEvents(elementRef, viewportId, servicesManager);
+    _checkForCachedJumpToMeasurementEvents(elementRef, viewportId, displaySets, servicesManager);
     return () => {
       unsubscribeFromJumpToMeasurementEvents();
     };
@@ -2005,7 +1972,11 @@ const OHIFCornerstoneViewport = /*#__PURE__*/react.memo(props => {
     viewportId: viewportId
   }));
 }, areEqual);
-function _subscribeToJumpToMeasurementEvents(measurementService, displaySetService, elementRef, viewportId, displaySets, viewportGridService, cornerstoneViewportService) {
+function _subscribeToJumpToMeasurementEvents(elementRef, viewportId, servicesManager) {
+  const {
+    measurementService,
+    cornerstoneViewportService
+  } = servicesManager.services;
   const {
     unsubscribe
   } = measurementService.subscribe(src.MeasurementService.EVENTS.JUMP_TO_MEASUREMENT_VIEWPORT, props => {
@@ -2020,20 +1991,22 @@ function _subscribeToJumpToMeasurementEvents(measurementService, displaySetServi
     }
     if (cacheJumpToMeasurementEvent.cornerstoneViewport === undefined) {
       // Decide on which viewport should handle this
-      cacheJumpToMeasurementEvent.cornerstoneViewport = cornerstoneViewportService.getViewportIdToJump(jumpId, measurement.displaySetInstanceUID, {
+      cacheJumpToMeasurementEvent.cornerstoneViewport = cornerstoneViewportService.getViewportIdToJump(jumpId, {
+        displaySetInstanceUID: measurement.displaySetInstanceUID,
+        ...measurement.metadata,
         referencedImageId: measurement.referencedImageId || measurement.metadata?.referencedImageId
       });
     }
     if (cacheJumpToMeasurementEvent.cornerstoneViewport !== viewportId) {
       return;
     }
-    _jumpToMeasurement(measurement, elementRef, viewportId, measurementService, displaySetService, viewportGridService, cornerstoneViewportService);
+    _jumpToMeasurement(measurement, elementRef, viewportId, servicesManager);
   });
   return unsubscribe;
 }
 
 // Check if there is a queued jumpToMeasurement event
-function _checkForCachedJumpToMeasurementEvents(measurementService, displaySetService, elementRef, viewportId, displaySets, viewportGridService, cornerstoneViewportService) {
+function _checkForCachedJumpToMeasurementEvents(elementRef, viewportId, displaySets, servicesManager) {
   if (!cacheJumpToMeasurementEvent) {
     return;
   }
@@ -2052,22 +2025,15 @@ function _checkForCachedJumpToMeasurementEvents(measurementService, displaySetSe
   } = cacheJumpToMeasurementEvent;
   if (measurement && elementRef) {
     if (displaysUIDs.includes(measurement?.displaySetInstanceUID)) {
-      _jumpToMeasurement(measurement, elementRef, viewportId, measurementService, displaySetService, viewportGridService, cornerstoneViewportService);
+      _jumpToMeasurement(measurement, elementRef, viewportId, servicesManager);
     }
   }
 }
-function _jumpToMeasurement(measurement, targetElementRef, viewportId, measurementService, displaySetService, viewportGridService, cornerstoneViewportService) {
-  const targetElement = targetElementRef.current;
+function _jumpToMeasurement(measurement, targetElementRef, viewportId, servicesManager) {
   const {
-    displaySetInstanceUID,
-    SOPInstanceUID,
-    frameNumber
-  } = measurement;
-  if (!SOPInstanceUID) {
-    console.warn('cannot jump in a non-acquisition plane measurements yet');
-    return;
-  }
-  const referencedDisplaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
+    viewportGridService
+  } = servicesManager.services;
+  const targetElement = targetElementRef.current;
 
   // Todo: setCornerstoneMeasurementActive should be handled by the toolGroupManager
   //  to set it properly
@@ -2078,43 +2044,17 @@ function _jumpToMeasurement(measurement, targetElementRef, viewportId, measureme
   if (enabledElement) {
     // See how the jumpToSlice() of Cornerstone3D deals with imageIdx param.
     const viewport = enabledElement.viewport;
-    let imageIdIndex = 0;
-    let viewportCameraDirectionMatch = true;
-    if (viewport instanceof dist_esm.StackViewport) {
-      const imageIds = viewport.getImageIds();
-      imageIdIndex = imageIds.findIndex(imageId => {
-        const {
-          SOPInstanceUID: aSOPInstanceUID,
-          frameNumber: aFrameNumber
-        } = (0,getSOPInstanceAttributes/* default */.Z)(imageId);
-        return aSOPInstanceUID === SOPInstanceUID && (!frameNumber || frameNumber === aFrameNumber);
-      });
-    } else {
-      // for volume viewport we can't rely on the imageIdIndex since it can be
-      // a reconstructed view that doesn't match the original slice numbers etc.
-      const {
-        viewPlaneNormal: measurementViewPlane
-      } = measurement.metadata;
-      imageIdIndex = referencedDisplaySet.images.findIndex(i => i.SOPInstanceUID === SOPInstanceUID);
-
-      // the index is reversed in the volume viewport
-      // imageIdIndex = referencedDisplaySet.images.length - 1 - imageIdIndex;
-
-      const {
-        viewPlaneNormal: viewportViewPlane
-      } = viewport.getCamera();
-
-      // should compare abs for both planes since the direction can be flipped
-      if (measurementViewPlane && !dist_esm.utilities.isEqual(measurementViewPlane.map(Math.abs), viewportViewPlane.map(Math.abs))) {
-        viewportCameraDirectionMatch = false;
-      }
-    }
-    if (!viewportCameraDirectionMatch || imageIdIndex === -1) {
+    const {
+      metadata
+    } = measurement;
+    if (!viewport.isReferenceViewable(metadata, {
+      withNavigation: true,
+      withOrientation: true
+    })) {
+      console.log("Reference isn't viewable, postponing until updated");
       return;
     }
-    esm.utilities.jumpToSlice(targetElement, {
-      imageIndex: imageIdIndex
-    });
+    viewport.setViewReference(metadata);
     esm.annotation.selection.setAnnotationSelected(measurement.uid);
     // Jump to measurement consumed, remove.
     cacheJumpToMeasurementEvent?.consume?.();