fix: remaining bugs for MPR and toolbar icon colors (#3026)
* feat: warn for overlapping segments * fix: typo * refactor mpr toggle and stack sync * fix: wip for more general mpr * fix: tool groups for mpr * fix: changing of viewport id * fix: viewport Id for the seg viewports * fix * update cornerstone version
This commit is contained in:
1 parent
6db4d7a917
commit
87eab39768
27 files changed
+726
-384
No files matched your search
@@ -0,0 +1,74 @@
|
||||
/**
|
||||
* Given the ViewportGridService state it will re create the protocol viewport structure
|
||||
* that was used at the hanging protocol creation time. This is used to re create the
|
||||
* viewport structure when the user decides to go back to a previous cached
|
||||
* layout in the viewport grid.
|
||||
*
|
||||
*
|
||||
* viewportGrid's viewports look like
|
||||
*
|
||||
* viewports = [
|
||||
* {
|
||||
* displaySetInstanceUIDs: string[],
|
||||
* displaySetOptions: [],
|
||||
* viewportOptions: {}
|
||||
* height: number,
|
||||
* width: number,
|
||||
* x: number,
|
||||
* y: number
|
||||
* },
|
||||
* ]
|
||||
*
|
||||
* and hanging protocols viewport structure looks like
|
||||
*
|
||||
* viewportStructure: {
|
||||
* layoutType: 'grid',
|
||||
* properties: {
|
||||
* rows: 3,
|
||||
* columns: 4,
|
||||
* layoutOptions: [
|
||||
* {
|
||||
* x: 0,
|
||||
* y: 0,
|
||||
* width: 1 / 4,
|
||||
* height: 1 / 3,
|
||||
* },
|
||||
* {
|
||||
* x: 1 / 4,
|
||||
* y: 0,
|
||||
* width: 1 / 4,
|
||||
* height: 1 / 3,
|
||||
* },
|
||||
* ],
|
||||
* },
|
||||
* },
|
||||
*/
|
||||
export default function getProtocolViewportStructureFromGridViewports({
|
||||
numRows,
|
||||
numCols,
|
||||
viewports,
|
||||
}: {
|
||||
numRows: number;
|
||||
numCols: number;
|
||||
viewports: any[];
|
||||
}) {
|
||||
const viewportStructure = {
|
||||
layoutType: 'grid',
|
||||
properties: {
|
||||
rows: numRows,
|
||||
columns: numCols,
|
||||
layoutOptions: [],
|
||||
},
|
||||
};
|
||||
|
||||
viewports.forEach(viewport => {
|
||||
viewportStructure.properties.layoutOptions.push({
|
||||
x: viewport.x,
|
||||
y: viewport.y,
|
||||
width: viewport.width,
|
||||
height: viewport.height,
|
||||
});
|
||||
});
|
||||
|
||||
return viewportStructure;
|
||||
}
|
||||
@@ -0,0 +1,285 @@
|
||||
import { Enums } from '@cornerstonejs/tools';
|
||||
import removeToolGroupSegmentationRepresentations from '../removeToolGroupSegmentationRepresentations';
|
||||
|
||||
const MPR_TOOLGROUP_ID = 'mpr';
|
||||
|
||||
const cachedState = {
|
||||
protocol: null,
|
||||
stage: null,
|
||||
viewportMatchDetails: null,
|
||||
viewportStructure: null,
|
||||
toolOptions: null,
|
||||
};
|
||||
|
||||
const setCachedState = (
|
||||
protocol,
|
||||
stage,
|
||||
viewportMatchDetails,
|
||||
viewportStructure,
|
||||
toolOptions
|
||||
) => {
|
||||
cachedState.protocol = protocol;
|
||||
cachedState.stage = stage;
|
||||
cachedState.viewportMatchDetails = viewportMatchDetails;
|
||||
cachedState.viewportStructure = viewportStructure;
|
||||
cachedState.toolOptions = JSON.parse(JSON.stringify(toolOptions));
|
||||
};
|
||||
|
||||
const resetCachedState = () => {
|
||||
cachedState.protocol = null;
|
||||
cachedState.stage = null;
|
||||
cachedState.viewportMatchDetails = null;
|
||||
cachedState.viewportStructure = null;
|
||||
cachedState.toolOptions = null;
|
||||
};
|
||||
|
||||
export default function toggleMPRHangingProtocol({
|
||||
toggledState,
|
||||
servicesManager,
|
||||
getToolGroup,
|
||||
}) {
|
||||
const {
|
||||
UINotificationService,
|
||||
HangingProtocolService,
|
||||
ViewportGridService,
|
||||
ToolBarService,
|
||||
} = servicesManager.services;
|
||||
|
||||
const {
|
||||
activeViewportIndex,
|
||||
viewports,
|
||||
numRows,
|
||||
numCols,
|
||||
} = ViewportGridService.getState();
|
||||
const viewportDisplaySetInstanceUIDs =
|
||||
viewports[activeViewportIndex].displaySetInstanceUIDs;
|
||||
|
||||
const errorCallback = error => {
|
||||
UINotificationService.show({
|
||||
title: 'Multiplanar reconstruction (MPR) ',
|
||||
message:
|
||||
'Cannot create MPR for this DisplaySet since it is not reconstructable.',
|
||||
type: 'info',
|
||||
duration: 3000,
|
||||
});
|
||||
};
|
||||
|
||||
// What is the current active protocol and stage number to restore later
|
||||
const { protocol, stage } = HangingProtocolService.getActiveProtocol();
|
||||
|
||||
if (toggledState) {
|
||||
resetCachedState();
|
||||
|
||||
const {
|
||||
viewportMatchDetails,
|
||||
viewportStructure,
|
||||
toolOptions,
|
||||
} = _getViewportsInfo({
|
||||
protocol,
|
||||
stage,
|
||||
viewports,
|
||||
servicesManager,
|
||||
});
|
||||
|
||||
setCachedState(
|
||||
protocol,
|
||||
stage,
|
||||
viewportMatchDetails,
|
||||
viewportStructure,
|
||||
toolOptions
|
||||
);
|
||||
|
||||
const matchDetails = {
|
||||
displaySetInstanceUIDs: viewportDisplaySetInstanceUIDs,
|
||||
};
|
||||
|
||||
_disableCrosshairs(
|
||||
toolOptions.map(({ toolGroupId }) => toolGroupId),
|
||||
getToolGroup
|
||||
);
|
||||
|
||||
HangingProtocolService.setProtocol(
|
||||
MPR_TOOLGROUP_ID,
|
||||
matchDetails,
|
||||
errorCallback
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const restoreErrorCallback = error => {
|
||||
UINotificationService.show({
|
||||
title: 'Multiplanar reconstruction (MPR) ',
|
||||
message:
|
||||
'Something went wrong while trying to restore the previous layout.',
|
||||
type: 'info',
|
||||
duration: 3000,
|
||||
});
|
||||
};
|
||||
|
||||
_disableCrosshairs([MPR_TOOLGROUP_ID], getToolGroup);
|
||||
|
||||
const { layoutType, properties } = cachedState.viewportStructure;
|
||||
const { viewportMatchDetails } = cachedState;
|
||||
|
||||
// The reason we split the flow here is that we don't allow viewport grid
|
||||
// change in the non default hanging protocol, so we can just apply the
|
||||
// cached protocol and stage. However, for the default protocol, we need
|
||||
// to also apply the layout type and properties.
|
||||
if (cachedState.protocol.id !== 'default') {
|
||||
HangingProtocolService.setProtocol(
|
||||
cachedState.protocol.id,
|
||||
viewportMatchDetails,
|
||||
restoreErrorCallback
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
HangingProtocolService.setProtocol(
|
||||
'default',
|
||||
viewportMatchDetails,
|
||||
restoreErrorCallback
|
||||
);
|
||||
|
||||
if (numRows !== properties.rows || numCols !== properties.columns) {
|
||||
ViewportGridService.setLayout({
|
||||
numRows: properties.rows,
|
||||
numCols: properties.columns,
|
||||
layoutType,
|
||||
layoutOptions: properties.layoutOptions,
|
||||
});
|
||||
}
|
||||
|
||||
const numViewports =
|
||||
properties.layoutOptions.length || properties.rows * properties.columns;
|
||||
|
||||
// loop inside viewportMatchDetails map
|
||||
// and set the viewportOptions for each viewport
|
||||
[...Array(numViewports).keys()].forEach(viewportIndex => {
|
||||
const viewportMatchDetailsForViewport = viewportMatchDetails.get(
|
||||
viewportIndex
|
||||
);
|
||||
|
||||
if (viewportMatchDetailsForViewport) {
|
||||
const {
|
||||
viewportOptions,
|
||||
displaySetsInfo,
|
||||
} = viewportMatchDetailsForViewport;
|
||||
ViewportGridService.setDisplaySetsForViewport({
|
||||
viewportIndex,
|
||||
displaySetInstanceUIDs: displaySetsInfo.map(
|
||||
displaySetInfo => displaySetInfo.displaySetInstanceUID
|
||||
),
|
||||
viewportOptions,
|
||||
});
|
||||
} else {
|
||||
ViewportGridService.setDisplaySetsForViewport({
|
||||
viewportIndex,
|
||||
displaySetInstanceUIDs: [],
|
||||
viewportOptions: {},
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
ToolBarService.recordInteraction({
|
||||
groupId: 'WindowLevel',
|
||||
itemId: 'WindowLevel',
|
||||
interactionType: 'tool',
|
||||
commands: [
|
||||
{
|
||||
commandName: 'setToolActive',
|
||||
commandOptions: {
|
||||
toolName: 'WindowLevel',
|
||||
},
|
||||
context: 'CORNERSTONE',
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
//clear segmentations if they exist
|
||||
removeToolGroupSegmentationRepresentations(MPR_TOOLGROUP_ID);
|
||||
}
|
||||
|
||||
function _disableCrosshairs(toolGroupIds, getToolGroup) {
|
||||
toolGroupIds.forEach(toolGroupId => {
|
||||
const toolGroup = getToolGroup(toolGroupId);
|
||||
if (
|
||||
toolGroup.getToolInstance('Crosshairs')?.mode === Enums.ToolModes.Active
|
||||
) {
|
||||
toolGroup.setToolDisabled('Crosshairs');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function _getViewportsInfo({ protocol, stage, viewports, servicesManager }) {
|
||||
// here we need to use the viewports and try to map it into the
|
||||
// viewportMatchDetails and displaySetMatch that HangingProtocolService
|
||||
// expects
|
||||
const {
|
||||
ViewportGridService,
|
||||
HangingProtocolService,
|
||||
ToolGroupService,
|
||||
} = servicesManager.services;
|
||||
|
||||
const { numRows, numCols } = ViewportGridService.getState();
|
||||
|
||||
let viewportMatchDetails = new Map();
|
||||
|
||||
const viewportStructure = {
|
||||
layoutType: 'grid',
|
||||
properties: {
|
||||
rows: numRows,
|
||||
columns: numCols,
|
||||
layoutOptions: [],
|
||||
},
|
||||
};
|
||||
|
||||
viewports.forEach((viewport, viewportIndex) => {
|
||||
viewportStructure.properties.layoutOptions.push({
|
||||
x: viewport.x,
|
||||
y: viewport.y,
|
||||
width: viewport.width,
|
||||
height: viewport.height,
|
||||
});
|
||||
});
|
||||
|
||||
if (protocol.id === 'default') {
|
||||
viewports.forEach((viewport, viewportIndex) => {
|
||||
if (viewport.displaySetInstanceUIDs) {
|
||||
viewportMatchDetails.set(viewportIndex, {
|
||||
displaySetsInfo: viewport.displaySetInstanceUIDs.map(
|
||||
displaySetInstanceUID => {
|
||||
return { displaySetInstanceUID };
|
||||
}
|
||||
),
|
||||
viewportOptions: viewport.viewportOptions,
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
({ viewportMatchDetails } = HangingProtocolService.getMatchDetails());
|
||||
}
|
||||
|
||||
// get the toolGroup state for viewports
|
||||
let toolOptions = [];
|
||||
const viewportIds = viewports
|
||||
.map(
|
||||
viewport =>
|
||||
viewport.displaySetInstanceUIDs &&
|
||||
viewport.displaySetInstanceUIDs.length > 0 &&
|
||||
viewport.viewportOptions?.viewportId
|
||||
)
|
||||
.filter(Boolean);
|
||||
|
||||
if (viewportIds.length) {
|
||||
toolOptions = viewportIds.map(viewportId => {
|
||||
const toolGroup = ToolGroupService.getToolGroupForViewport(viewportId);
|
||||
return {
|
||||
toolGroupId: toolGroup.id,
|
||||
toolOptions: toolGroup.toolOptions,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
return { viewportMatchDetails, viewportStructure, toolOptions };
|
||||
}
|
||||
Reference in new issue
Block a user