fix(segmentation overlay): update viewport ds list upon seg delete - OHIF-2425 (#5729)
- add segmentationExists check to getSopClassHandlerModule - now firing SEGMENTATION_REMOVED and SEGMENTATION_REPRESENTATION_REMOVED events - centralized segmentation removal in a listener - when a segmentation is deleted (completely), remove it from all viewports it overlays - when a segmentation is removed from a viewport, remove it as overlay from the viewport --------- Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com> Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
This commit is contained in:
11 files changed
+174
-48
No files matched your search
@@ -15,6 +15,7 @@ describe('setUpSegmentationEventHandlers', () => {
|
||||
const mockSegmentationService = {
|
||||
EVENTS: {
|
||||
SEGMENTATION_ADDED: 'SEGMENTATION_ADDED',
|
||||
SEGMENTATION_REMOVED: 'SEGMENTATION_REMOVED',
|
||||
},
|
||||
subscribe: jest.fn(),
|
||||
getSegmentation: jest.fn(),
|
||||
@@ -40,6 +41,7 @@ describe('setUpSegmentationEventHandlers', () => {
|
||||
const mockUnsubscribeDataModified = jest.fn();
|
||||
const mockUnsubscribeModified = jest.fn();
|
||||
const mockUnsubscribeCreated = jest.fn();
|
||||
const mockUnsubscribeRemoved = jest.fn();
|
||||
const mockUnsubscribeSelectedSegmentationsForViewportEvents = [jest.fn(), jest.fn()];
|
||||
|
||||
const defaultParameters = {
|
||||
@@ -59,8 +61,14 @@ describe('setUpSegmentationEventHandlers', () => {
|
||||
unsubscribeSelectedSegmentationsForViewportEvents:
|
||||
mockUnsubscribeSelectedSegmentationsForViewportEvents,
|
||||
});
|
||||
mockSegmentationService.subscribe.mockReturnValue({
|
||||
unsubscribe: mockUnsubscribeCreated,
|
||||
mockSegmentationService.subscribe.mockImplementation((eventName: string) => {
|
||||
if (eventName === mockSegmentationService.EVENTS.SEGMENTATION_ADDED) {
|
||||
return { unsubscribe: mockUnsubscribeCreated };
|
||||
}
|
||||
if (eventName === mockSegmentationService.EVENTS.SEGMENTATION_REMOVED) {
|
||||
return { unsubscribe: mockUnsubscribeRemoved };
|
||||
}
|
||||
return { unsubscribe: jest.fn() };
|
||||
});
|
||||
});
|
||||
|
||||
@@ -99,6 +107,7 @@ describe('setUpSegmentationEventHandlers', () => {
|
||||
mockUnsubscribeDataModified,
|
||||
mockUnsubscribeModified,
|
||||
mockUnsubscribeCreated,
|
||||
mockUnsubscribeRemoved,
|
||||
...mockUnsubscribeSelectedSegmentationsForViewportEvents,
|
||||
],
|
||||
});
|
||||
@@ -358,5 +367,6 @@ describe('setUpSegmentationEventHandlers', () => {
|
||||
expect(mockUnsubscribeDataModified).toHaveBeenCalled();
|
||||
expect(mockUnsubscribeModified).toHaveBeenCalled();
|
||||
expect(mockUnsubscribeCreated).toHaveBeenCalled();
|
||||
expect(mockUnsubscribeRemoved).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -7,7 +7,8 @@ import {
|
||||
} from './segmentationHandlers';
|
||||
|
||||
export const setUpSegmentationEventHandlers = ({ servicesManager, commandsManager }) => {
|
||||
const { segmentationService, customizationService, displaySetService } = servicesManager.services;
|
||||
const { segmentationService, customizationService, displaySetService, viewportGridService } =
|
||||
servicesManager.services;
|
||||
|
||||
const { unsubscribe: unsubscribeSegmentationDataModifiedHandler } =
|
||||
setupSegmentationDataModifiedHandler({
|
||||
@@ -57,6 +58,36 @@ export const setUpSegmentationEventHandlers = ({ servicesManager, commandsManage
|
||||
}
|
||||
);
|
||||
|
||||
const { unsubscribe: unsubscribeSegmentationRemoved } = segmentationService.subscribe(
|
||||
segmentationService.EVENTS.SEGMENTATION_REMOVED,
|
||||
({ segmentationId }) => {
|
||||
const displaySet = displaySetService.getDisplaySetByUID(segmentationId);
|
||||
|
||||
// Remove the display set layer from all viewports that have it
|
||||
if (displaySet) {
|
||||
const state = viewportGridService.getState();
|
||||
const viewports = state.viewports;
|
||||
|
||||
// Find all viewports that contain this segmentation's display set as a layer
|
||||
for (const [viewportId, viewport] of viewports.entries()) {
|
||||
const displaySetInstanceUIDs = viewport.displaySetInstanceUIDs || [];
|
||||
if (displaySetInstanceUIDs.includes(segmentationId)) {
|
||||
// Remove the display set layer from this viewport
|
||||
commandsManager.runCommand('removeDisplaySetLayer', {
|
||||
viewportId,
|
||||
displaySetInstanceUID: segmentationId,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Delete the display set from the service if it was made in client
|
||||
if (displaySet.madeInClient) {
|
||||
displaySetService.deleteDisplaySet(segmentationId);
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
const { unsubscribeSelectedSegmentationsForViewportEvents } =
|
||||
setUpSelectedSegmentationsForViewportHandler({
|
||||
segmentationService,
|
||||
@@ -66,6 +97,7 @@ export const setUpSegmentationEventHandlers = ({ servicesManager, commandsManage
|
||||
unsubscribeSegmentationDataModifiedHandler,
|
||||
unsubscribeSegmentationModifiedHandler,
|
||||
unsubscribeSegmentationCreated,
|
||||
unsubscribeSegmentationRemoved,
|
||||
...unsubscribeSelectedSegmentationsForViewportEvents,
|
||||
];
|
||||
|
||||
|
||||
Reference in new issue
Block a user