Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(measurement): fix for measurement jump is not switching series in 2DMPR #4779

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
20 changes: 16 additions & 4 deletions extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ const OHIFCornerstoneViewport = React.memo(
measurement = cacheJumpToMeasurementEvent.measurement;
// Delete the position presentation so that viewport navigates direct
presentations.positionPresentation = null;
cacheJumpToMeasurementEvent = null;
}

// Note: This is a hack to get the grid to re-render the OHIFCornerstoneViewport component
Expand All @@ -286,7 +285,13 @@ const OHIFCornerstoneViewport = React.memo(
);

if (measurement) {
cs3DTools.annotation.selection.setAnnotationSelected(measurement.uid);
_checkForCachedJumpToMeasurementEvents(
elementRef,
viewportId,
displaySets,
servicesManager
);
cacheJumpToMeasurementEvent = null;
}
};

Expand Down Expand Up @@ -314,8 +319,6 @@ const OHIFCornerstoneViewport = React.memo(
servicesManager
);

_checkForCachedJumpToMeasurementEvents(elementRef, viewportId, displaySets, servicesManager);

return () => {
unsubscribeFromJumpToMeasurementEvents();
};
Expand Down Expand Up @@ -452,6 +455,15 @@ function _subscribeToJumpToMeasurementEvents(elementRef, viewportId, servicesMan
if (cacheJumpToMeasurementEvent.cornerstoneViewport !== viewportId) {
return;
}
const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
if (
!viewportInfo?.contains(
measurement.displaySetInstanceUID,
measurement.referencedImageId || measurement.metadata?.referencedImageId
)
) {
return;
}
_jumpToMeasurement(measurement, elementRef, viewportId, servicesManager);
}
);
Expand Down