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 6 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,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 @@ -287,7 +286,13 @@ const OHIFCornerstoneViewport = React.memo(
);

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

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

_checkForCachedJumpToMeasurementEvents(elementRef, viewportId, displaySets, servicesManager);

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