othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update all cornerstone commands

Browse Source
This commit is contained in:
dannyrb 2020-06-26 14:22:45 -04:00
parent 8339154820
commit 33a2df6ad9
1 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
extensions/cornerstone/src/commandsModule.js
View File

@ -13,12 +13,17 @@ const { setViewportSpecificData } = OHIF.redux.actions;
const commandsModule = ({ servicesManager }) => { const commandsModule = ({ servicesManager }) => {
const { ViewportGridService } = servicesManager.services; const { ViewportGridService } = servicesManager.services;
function _getActiveViewportsEnabledElement() {
const { activeViewportIndex } = ViewportGridService.getState();
return getEnabledElement(activeViewportIndex);
}
const actions = { const actions = {
getCornerstoneLibraries: () => { getCornerstoneLibraries: () => {
return { cornerstone, cornerstoneTools }; return { cornerstone, cornerstoneTools };
}, },
rotateViewport: ({ viewports, rotation }) => { rotateViewport: ({ rotation }) => {
const enabledElement = getEnabledElement(viewports.activeViewportIndex); const enabledElement = _getActiveViewportsEnabledElement();
if (enabledElement) { if (enabledElement) {
let viewport = cornerstone.getViewport(enabledElement); let viewport = cornerstone.getViewport(enabledElement);
@ -27,8 +32,7 @@ const commandsModule = ({ servicesManager }) => {
} }
}, },
flipViewportHorizontal: () => { flipViewportHorizontal: () => {
const activeViewportIndex = 0; const enabledElement = _getActiveViewportsEnabledElement();
const enabledElement = getEnabledElement(activeViewportIndex);
if (enabledElement) { if (enabledElement) {
let viewport = cornerstone.getViewport(enabledElement); let viewport = cornerstone.getViewport(enabledElement);
@ -36,8 +40,8 @@ const commandsModule = ({ servicesManager }) => {
cornerstone.setViewport(enabledElement, viewport); cornerstone.setViewport(enabledElement, viewport);
} }
}, },
flipViewportVertical: ({ viewports }) => { flipViewportVertical: () => {
const enabledElement = getEnabledElement(viewports.activeViewportIndex); const enabledElement = _getActiveViewportsEnabledElement();
if (enabledElement) { if (enabledElement) {
let viewport = cornerstone.getViewport(enabledElement); let viewport = cornerstone.getViewport(enabledElement);
@ -45,8 +49,8 @@ const commandsModule = ({ servicesManager }) => {
cornerstone.setViewport(enabledElement, viewport); cornerstone.setViewport(enabledElement, viewport);
} }
}, },
scaleViewport: ({ direction, viewports }) => { scaleViewport: ({ direction }) => {
const enabledElement = getEnabledElement(viewports.activeViewportIndex); const enabledElement = _getActiveViewportsEnabledElement();
const step = direction * 0.15; const step = direction * 0.15;
if (enabledElement) { if (enabledElement) {
@ -60,16 +64,14 @@ const commandsModule = ({ servicesManager }) => {
} }
}, },
resetViewport: () => { resetViewport: () => {
const activeViewportIndex = 0; const enabledElement = _getActiveViewportsEnabledElement();
const enabledElement = getEnabledElement(activeViewportIndex);
if (enabledElement) { if (enabledElement) {
cornerstone.reset(enabledElement); cornerstone.reset(enabledElement);
} }
}, },
invertViewport: () => { invertViewport: () => {
const { activeViewportIndex } = ViewportGridService.getState(); const enabledElement = _getActiveViewportsEnabledElement();
const enabledElement = getEnabledElement(activeViewportIndex);
if (enabledElement) { if (enabledElement) {
let viewport = cornerstone.getViewport(enabledElement); let viewport = cornerstone.getViewport(enabledElement);
@ -85,8 +87,8 @@ const commandsModule = ({ servicesManager }) => {
} }
cornerstoneTools.setToolActive(toolName, { mouseButtonMask: 1 }); cornerstoneTools.setToolActive(toolName, { mouseButtonMask: 1 });
}, },
clearAnnotations: ({ viewports }) => { clearAnnotations: () => {
const element = getEnabledElement(viewports.activeViewportIndex); const element = _getActiveViewportsEnabledElement();
if (!element) { if (!element) {
return; return;
} }
@ -141,16 +143,16 @@ const commandsModule = ({ servicesManager }) => {
}); });
}); });
}, },
nextImage: ({ viewports }) => { nextImage: () => {
const enabledElement = getEnabledElement(viewports.activeViewportIndex); const enabledElement = _getActiveViewportsEnabledElement();
scroll(enabledElement, 1); scroll(enabledElement, 1);
}, },
previousImage: ({ viewports }) => { previousImage: () => {
const enabledElement = getEnabledElement(viewports.activeViewportIndex); const enabledElement = _getActiveViewportsEnabledElement();
scroll(enabledElement, -1); scroll(enabledElement, -1);
}, },
getActiveViewportEnabledElement: ({ viewports }) => { getActiveViewportEnabledElement: () => {
const enabledElement = getEnabledElement(viewports.activeViewportIndex); const enabledElement = _getActiveViewportsEnabledElement();
return enabledElement; return enabledElement;
}, },
showDownloadViewportModal: () => { showDownloadViewportModal: () => {
@ -253,8 +255,8 @@ const commandsModule = ({ servicesManager }) => {
setCornerstoneLayout: () => { setCornerstoneLayout: () => {
setCornerstoneLayout(); setCornerstoneLayout();
}, },
setWindowLevel: ({ viewports, window, level }) => { setWindowLevel: ({ window, level }) => {
const enabledElement = getEnabledElement(viewports.activeViewportIndex); const enabledElement = _getActiveViewportsEnabledElement();
if (enabledElement) { if (enabledElement) {
let viewport = cornerstone.getViewport(enabledElement); let viewport = cornerstone.getViewport(enabledElement);
@ -328,7 +330,7 @@ const commandsModule = ({ servicesManager }) => {
}, },
getActiveViewportEnabledElement: { getActiveViewportEnabledElement: {
commandFn: actions.getActiveViewportEnabledElement, commandFn: actions.getActiveViewportEnabledElement,
storeContexts: ['viewports'], storeContexts: [],
options: {}, options: {},
}, },
rotateViewportCW: { rotateViewportCW: {
@ -338,7 +340,7 @@ const commandsModule = ({ servicesManager }) => {
}, },
rotateViewportCCW: { rotateViewportCCW: {
commandFn: actions.rotateViewport, commandFn: actions.rotateViewport,
storeContexts: ['viewports'], storeContexts: [],
options: { rotation: -90 }, options: { rotation: -90 },
}, },
invertViewport: { invertViewport: {
@ -348,7 +350,7 @@ const commandsModule = ({ servicesManager }) => {
}, },
flipViewportVertical: { flipViewportVertical: {
commandFn: actions.flipViewportVertical, commandFn: actions.flipViewportVertical,
storeContexts: ['viewports'], storeContexts: [],
options: {}, options: {},
}, },
flipViewportHorizontal: { flipViewportHorizontal: {
@ -358,17 +360,17 @@ const commandsModule = ({ servicesManager }) => {
}, },
scaleUpViewport: { scaleUpViewport: {
commandFn: actions.scaleViewport, commandFn: actions.scaleViewport,
storeContexts: ['viewports'], storeContexts: [],
options: { direction: 1 }, options: { direction: 1 },
}, },
scaleDownViewport: { scaleDownViewport: {
commandFn: actions.scaleViewport, commandFn: actions.scaleViewport,
storeContexts: ['viewports'], storeContexts: [],
options: { direction: -1 }, options: { direction: -1 },
}, },
fitViewportToWindow: { fitViewportToWindow: {
commandFn: actions.scaleViewport, commandFn: actions.scaleViewport,
storeContexts: ['viewports'], storeContexts: [],
options: { direction: 0 }, options: { direction: 0 },
}, },
resetViewport: { resetViewport: {
@ -378,17 +380,17 @@ const commandsModule = ({ servicesManager }) => {
}, },
clearAnnotations: { clearAnnotations: {
commandFn: actions.clearAnnotations, commandFn: actions.clearAnnotations,
storeContexts: ['viewports'], storeContexts: [],
options: {}, options: {},
}, },
nextImage: { nextImage: {
commandFn: actions.nextImage, commandFn: actions.nextImage,
storeContexts: ['viewports'], storeContexts: [],
options: {}, options: {},
}, },
previousImage: { previousImage: {
commandFn: actions.previousImage, commandFn: actions.previousImage,
storeContexts: ['viewports'], storeContexts: [],
options: {}, options: {},
}, },
// TOOLS // TOOLS
@ -410,7 +412,7 @@ const commandsModule = ({ servicesManager }) => {
}, },
setWindowLevel: { setWindowLevel: {
commandFn: actions.setWindowLevel, commandFn: actions.setWindowLevel,
storeContexts: ['viewports'], storeContexts: [],
options: {}, options: {},
}, },
}; };