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

fix: left right hotkeys and remove non working ones (#2922)

Browse Source 
* fix: constant should be enums in cs3d

* remove non working hotkeys for now
This commit is contained in:
Alireza 2022-09-08 22:02:20 -04:00 committed by GitHub
parent aec48b065c
commit 71f5fa8e2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 168 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/cornerstone-dicom-sr/package.json
View File

@ -45,7 +45,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": "7.16.3", "@babel/runtime": "7.16.3",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"@cornerstonejs/core": "^0.15.3", "@cornerstonejs/core": "^0.16.1",
"@cornerstonejs/tools": "^0.23.3" "@cornerstonejs/tools": "^0.24.1"
} }
} }

4
extensions/cornerstone/package.json
View File

@ -43,9 +43,9 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "7.17.9", "@babel/runtime": "7.17.9",
"@cornerstonejs/core": "^0.15.3", "@cornerstonejs/core": "^0.16.1",
"@cornerstonejs/streaming-image-volume-loader": "^0.4.23", "@cornerstonejs/streaming-image-volume-loader": "^0.4.23",
"@cornerstonejs/tools": "^0.23.3", "@cornerstonejs/tools": "^0.24.1",
"@kitware/vtk.js": "^24.18.7", "@kitware/vtk.js": "^24.18.7",
"dom-to-image": "^2.6.0", "dom-to-image": "^2.6.0",
"lodash.debounce": "4.0.8", "lodash.debounce": "4.0.8",

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

@ -404,6 +404,17 @@ const commandsModule = ({ servicesManager }) => {
viewport.render(); viewport.render();
} }
}, },
incrementActiveViewport: () => {
const { activeViewportIndex, viewports } = ViewportGridService.getState();
const nextViewportIndex = (activeViewportIndex + 1) % viewports.length;
ViewportGridService.setActiveViewportIndex(nextViewportIndex);
},
decrementActiveViewport: () => {
const { activeViewportIndex, viewports } = ViewportGridService.getState();
const nextViewportIndex =
(activeViewportIndex - 1 + viewports.length) % viewports.length;
ViewportGridService.setActiveViewportIndex(nextViewportIndex);
},
}; };
const definitions = { const definitions = {
@ -432,6 +443,14 @@ const commandsModule = ({ servicesManager }) => {
storeContexts: [], storeContexts: [],
options: { rotation: -90 }, options: { rotation: -90 },
}, },
incrementActiveViewport: {
commandFn: actions.incrementActiveViewport,
storeContexts: [],
},
decrementActiveViewport: {
commandFn: actions.decrementActiveViewport,
storeContexts: [],
},
flipViewportHorizontal: { flipViewportHorizontal: {
commandFn: actions.flipViewportHorizontal, commandFn: actions.flipViewportHorizontal,
storeContexts: [], storeContexts: [],

2
extensions/cornerstone/src/index.tsx
View File

@ -3,7 +3,6 @@ import * as cornerstone from '@cornerstonejs/core';
import * as cornerstoneTools from '@cornerstonejs/tools'; import * as cornerstoneTools from '@cornerstonejs/tools';
import { import {
Enums as cs3DEnums, Enums as cs3DEnums,
CONSTANTS,
imageLoadPoolManager, imageLoadPoolManager,
imageRetrievalPoolManager, imageRetrievalPoolManager,
} from '@cornerstonejs/core'; } from '@cornerstonejs/core';
@ -119,7 +118,6 @@ const cornerstoneExtension = {
name: 'core', name: 'core',
exports: { exports: {
Enums: cs3DEnums, Enums: cs3DEnums,
CONSTANTS,
}, },
}, },
{ {

4
extensions/cornerstone/src/services/ViewportService/Viewport.ts
View File

@ -1,4 +1,4 @@
import { Types, Enums, CONSTANTS } from '@cornerstonejs/core'; import { Types, Enums } from '@cornerstonejs/core';
import getCornerstoneBlendMode from '../../utils/getCornerstoneBlendMode'; import getCornerstoneBlendMode from '../../utils/getCornerstoneBlendMode';
import getCornerstoneOrientation from '../../utils/getCornerstoneOrientation'; import getCornerstoneOrientation from '../../utils/getCornerstoneOrientation';
import getCornerstoneViewportType from '../../utils/getCornerstoneViewportType'; import getCornerstoneViewportType from '../../utils/getCornerstoneViewportType';
@ -137,7 +137,7 @@ class ViewportInfo {
if (viewportOptionsEntry.viewportType?.toLowerCase() === VOLUME) { if (viewportOptionsEntry.viewportType?.toLowerCase() === VOLUME) {
orientation = getCornerstoneOrientation(viewportOptionsEntry.orientation); orientation = getCornerstoneOrientation(viewportOptionsEntry.orientation);
} else { } else {
orientation = CONSTANTS.ORIENTATION.AXIAL; orientation = Enums.OrientationAxis.AXIAL;
} }
if (!toolGroupId) { if (!toolGroupId) {

14
extensions/cornerstone/src/utils/getCornerstoneOrientation.ts
View File

@ -1,4 +1,4 @@
import { CONSTANTS } from '@cornerstonejs/core'; import { Enums } from '@cornerstonejs/core';
import { log } from '@ohif/core'; import { log } from '@ohif/core';
const AXIAL = 'axial'; const AXIAL = 'axial';
@ -7,16 +7,16 @@ const CORONAL = 'coronal';
export default function getCornerstoneOrientation( export default function getCornerstoneOrientation(
orientation: string orientation: string
): CONSTANTS.ORIENTATION { ): Enums.OrientationAxis {
switch (orientation.toLowerCase()) { switch (orientation.toLowerCase()) {
case AXIAL: case AXIAL:
return CONSTANTS.ORIENTATION.AXIAL; return Enums.OrientationAxis.AXIAL;
case SAGITTAL: case SAGITTAL:
return CONSTANTS.ORIENTATION.SAGITTAL; return Enums.OrientationAxis.SAGITTAL;
case CORONAL: case CORONAL:
return CONSTANTS.ORIENTATION.CORONAL; return Enums.OrientationAxis.CORONAL;
default: default:
log.wanr('Choosing default orientation: axial'); log.wanr('Choosing acquisition plane orientation');
return CONSTANTS.ORIENTATION.AXIAL; return Enums.OrientationAxis.ACQUISITION;
} }
} }

24
extensions/dicom-pdf/src/index.tsx
View File

@ -45,18 +45,18 @@ const dicomPDFExtension = {
{ name: 'dicom-pdf', component: ExtendedOHIFCornerstonePdfViewport }, { name: 'dicom-pdf', component: ExtendedOHIFCornerstonePdfViewport },
]; ];
}, },
getCommandsModule({ servicesManager }) { // getCommandsModule({ servicesManager }) {
return { // return {
definitions: { // definitions: {
setToolActive: { // setToolActive: {
commandFn: () => null, // commandFn: () => null,
storeContexts: [], // storeContexts: [],
options: {}, // options: {},
}, // },
}, // },
defaultContext: 'ACTIVE_VIEWPORT::PDF', // defaultContext: 'ACTIVE_VIEWPORT::PDF',
}; // };
}, // },
getSopClassHandlerModule, getSopClassHandlerModule,
}; };

36
extensions/dicom-video/src/index.tsx
View File

@ -46,29 +46,19 @@ const dicomVideoExtension = {
{ name: 'dicom-video', component: ExtendedOHIFCornerstoneVideoViewport }, { name: 'dicom-video', component: ExtendedOHIFCornerstoneVideoViewport },
]; ];
}, },
getCommandsModule({ servicesManager }) { // getCommandsModule({ servicesManager }) {
return { // return {
definitions: { // definitions: {
setToolActive: { // setToolActive: {
commandFn: ({ toolName, element }) => { // commandFn: ({ toolName, element }) => {
if (!toolName) { // },
console.warn('No toolname provided to setToolActive command'); // storeContexts: [],
} // options: {},
// },
// Set same tool or alt tool // },
const toolAlias = _getToolAlias(toolName); // defaultContext: 'ACTIVE_VIEWPORT::VIDEO',
// };
cornerstoneTools.setToolActiveForElement(element, toolAlias, { // },
mouseButtonMask: 1,
});
},
storeContexts: [],
options: {},
},
},
defaultContext: 'ACTIVE_VIEWPORT::VIDEO',
};
},
getSopClassHandlerModule, getSopClassHandlerModule,
}; };

4
extensions/measurement-tracking/package.json
View File

@ -32,8 +32,8 @@
"peerDependencies": { "peerDependencies": {
"@ohif/core": "^3.0.0", "@ohif/core": "^3.0.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"@cornerstonejs/core": "^0.15.3", "@cornerstonejs/core": "^0.16.1",
"@cornerstonejs/tools": "^0.23.3", "@cornerstonejs/tools": "^0.24.1",
"@ohif/extension-cornerstone-dicom-sr": "^3.0.0", "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
"dcmjs": "^0.24.5", "dcmjs": "^0.24.5",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",

21
extensions/measurement-tracking/src/index.tsx
View File

@ -12,27 +12,6 @@ const measurementTrackingExtension = {
getContextModule, getContextModule,
getPanelModule, getPanelModule,
getViewportModule, getViewportModule,
getCommandsModule({ servicesManager }) {
return {
definitions: {
setToolActive: {
commandFn: ({ toolName, element }) => {
if (!toolName) {
console.warn('No toolname provided to setToolActive command');
}
// Set same tool or alt tool
cornerstoneTools.setToolActiveForElement(element, toolName, {
mouseButtonMask: 1,
});
},
storeContexts: [],
options: {},
},
},
defaultContext: 'ACTIVE_VIEWPORT::TRACKED',
};
},
}; };
export default measurementTrackingExtension; export default measurementTrackingExtension;

24
platform/core/src/defaults/hotkeyBindings.js
View File

@ -76,18 +76,18 @@ const bindings = [
keys: ['left'], keys: ['left'],
isEditable: true, isEditable: true,
}, },
{ // {
commandName: 'nextViewportDisplaySet', // commandName: 'nextViewportDisplaySet',
label: 'Next Series', // label: 'Next Series',
keys: ['pageup'], // keys: ['pageup'],
isEditable: true, // isEditable: true,
}, // },
{ // {
commandName: 'previousViewportDisplaySet', // commandName: 'previousViewportDisplaySet',
label: 'Previous Series', // label: 'Previous Series',
keys: ['pagedown'], // keys: ['pagedown'],
isEditable: true, // isEditable: true,
}, // },
{ {
commandName: 'nextImage', commandName: 'nextImage',
label: 'Next Image', label: 'Next Image',

1
platform/docs/docs/platform/extensions/modules/utility.md
View File

@ -29,7 +29,6 @@ getUtilityModule({ servicesManager }) {
name: 'core', name: 'core',
exports: { exports: {
Enums: cs3DEnums, Enums: cs3DEnums,
CONSTANTS,
}, },
}, },
{ {

20
platform/viewer/public/config/aws.js
View File

@ -98,16 +98,16 @@ window.config = {
{ commandName: 'resetViewport', label: 'Reset', keys: ['space'] }, { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
{ commandName: 'nextImage', label: 'Next Image', keys: ['down'] }, { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
{ commandName: 'previousImage', label: 'Previous Image', keys: ['up'] }, { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
{ // {
commandName: 'previousViewportDisplaySet', // commandName: 'previousViewportDisplaySet',
label: 'Previous Series', // label: 'Previous Series',
keys: ['pagedown'], // keys: ['pagedown'],
}, // },
{ // {
commandName: 'nextViewportDisplaySet', // commandName: 'nextViewportDisplaySet',
label: 'Next Series', // label: 'Next Series',
keys: ['pageup'], // keys: ['pageup'],
}, // },
{ commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] }, { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
// ~ Window level presets // ~ Window level presets
{ {

23
platform/viewer/public/config/default.js
View File

@ -102,17 +102,22 @@ window.config = {
{ commandName: 'resetViewport', label: 'Reset', keys: ['space'] }, { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
{ commandName: 'nextImage', label: 'Next Image', keys: ['down'] }, { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
{ commandName: 'previousImage', label: 'Previous Image', keys: ['up'] }, { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
// {
// commandName: 'previousViewportDisplaySet',
// label: 'Previous Series',
// keys: ['pagedown'],
// },
// {
// commandName: 'nextViewportDisplaySet',
// label: 'Next Series',
// keys: ['pageup'],
// },
{ {
commandName: 'previousViewportDisplaySet', commandName: 'setToolActive',
label: 'Previous Series', commandOptions: { toolName: 'Zoom' },
keys: ['pagedown'], label: 'Zoom',
keys: ['z'],
}, },
{
commandName: 'nextViewportDisplaySet',
label: 'Next Series',
keys: ['pageup'],
},
{ commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
// ~ Window level presets // ~ Window level presets
{ {
commandName: 'windowLevelPreset1', commandName: 'windowLevelPreset1',

20
platform/viewer/public/config/demo.js
View File

@ -46,16 +46,16 @@ window.config = {
{ commandName: 'resetViewport', label: 'Reset', keys: ['space'] }, { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
{ commandName: 'nextImage', label: 'Next Image', keys: ['down'] }, { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
{ commandName: 'previousImage', label: 'Previous Image', keys: ['up'] }, { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
{ // {
commandName: 'previousViewportDisplaySet', // commandName: 'previousViewportDisplaySet',
label: 'Previous Series', // label: 'Previous Series',
keys: ['pagedown'], // keys: ['pagedown'],
}, // },
{ // {
commandName: 'nextViewportDisplaySet', // commandName: 'nextViewportDisplaySet',
label: 'Next Series', // label: 'Next Series',
keys: ['pageup'], // keys: ['pageup'],
}, // },
{ commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] }, { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
// ~ Window level presets // ~ Window level presets
{ {

20
platform/viewer/public/config/dicomweb_relative.js
View File

@ -99,16 +99,16 @@ window.config = {
{ commandName: 'resetViewport', label: 'Reset', keys: ['space'] }, { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
{ commandName: 'nextImage', label: 'Next Image', keys: ['down'] }, { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
{ commandName: 'previousImage', label: 'Previous Image', keys: ['up'] }, { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
{ // {
commandName: 'previousViewportDisplaySet', // commandName: 'previousViewportDisplaySet',
label: 'Previous Series', // label: 'Previous Series',
keys: ['pagedown'], // keys: ['pagedown'],
}, // },
{ // {
commandName: 'nextViewportDisplaySet', // commandName: 'nextViewportDisplaySet',
label: 'Next Series', // label: 'Next Series',
keys: ['pageup'], // keys: ['pageup'],
}, // },
{ commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] }, { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
// ~ Window level presets // ~ Window level presets
{ {

20
platform/viewer/public/config/e2e.js
View File

@ -117,16 +117,16 @@ window.config = {
{ commandName: 'resetViewport', label: 'Reset', keys: ['space'] }, { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
{ commandName: 'nextImage', label: 'Next Image', keys: ['down'] }, { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
{ commandName: 'previousImage', label: 'Previous Image', keys: ['up'] }, { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
{ // {
commandName: 'previousViewportDisplaySet', // commandName: 'previousViewportDisplaySet',
label: 'Previous Series', // label: 'Previous Series',
keys: ['pagedown'], // keys: ['pagedown'],
}, // },
{ // {
commandName: 'nextViewportDisplaySet', // commandName: 'nextViewportDisplaySet',
label: 'Next Series', // label: 'Next Series',
keys: ['pageup'], // keys: ['pageup'],
}, // },
{ commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] }, { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
// ~ Window level presets // ~ Window level presets
{ {

20
platform/viewer/public/config/local_static.js
View File

@ -99,16 +99,16 @@ window.config = {
{ commandName: 'resetViewport', label: 'Reset', keys: ['space'] }, { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
{ commandName: 'nextImage', label: 'Next Image', keys: ['down'] }, { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
{ commandName: 'previousImage', label: 'Previous Image', keys: ['up'] }, { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
{ // {
commandName: 'previousViewportDisplaySet', // commandName: 'previousViewportDisplaySet',
label: 'Previous Series', // label: 'Previous Series',
keys: ['pagedown'], // keys: ['pagedown'],
}, // },
{ // {
commandName: 'nextViewportDisplaySet', // commandName: 'nextViewportDisplaySet',
label: 'Next Series', // label: 'Next Series',
keys: ['pageup'], // keys: ['pageup'],
}, // },
{ commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] }, { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
// ~ Window level presets // ~ Window level presets
{ {

20
platform/viewer/public/config/netlify.js
View File

@ -96,16 +96,16 @@ window.config = {
{ commandName: 'resetViewport', label: 'Reset', keys: ['space'] }, { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
{ commandName: 'nextImage', label: 'Next Image', keys: ['down'] }, { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
{ commandName: 'previousImage', label: 'Previous Image', keys: ['up'] }, { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
{ // {
commandName: 'previousViewportDisplaySet', // commandName: 'previousViewportDisplaySet',
label: 'Previous Series', // label: 'Previous Series',
keys: ['pagedown'], // keys: ['pagedown'],
}, // },
{ // {
commandName: 'nextViewportDisplaySet', // commandName: 'nextViewportDisplaySet',
label: 'Next Series', // label: 'Next Series',
keys: ['pageup'], // keys: ['pageup'],
}, // },
{ commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] }, { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
// ~ Window level presets // ~ Window level presets
{ {

20
platform/viewer/public/config/public_dicomweb.js
View File

@ -50,16 +50,16 @@ window.config = {
{ commandName: 'resetViewport', label: 'Reset', keys: ['space'] }, { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
{ commandName: 'nextImage', label: 'Next Image', keys: ['down'] }, { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
{ commandName: 'previousImage', label: 'Previous Image', keys: ['up'] }, { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
{ // {
commandName: 'previousViewportDisplaySet', // commandName: 'previousViewportDisplaySet',
label: 'Previous Series', // label: 'Previous Series',
keys: ['pagedown'], // keys: ['pagedown'],
}, // },
{ // {
commandName: 'nextViewportDisplaySet', // commandName: 'nextViewportDisplaySet',
label: 'Next Series', // label: 'Next Series',
keys: ['pageup'], // keys: ['pageup'],
}, // },
{ commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] }, { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
// ~ Window level presets // ~ Window level presets
{ {

18
yarn.lock
View File

@ -2306,6 +2306,14 @@
detect-gpu "^4.0.7" detect-gpu "^4.0.7"
lodash.clonedeep "4.5.0" lodash.clonedeep "4.5.0"
"@cornerstonejs/core@^0.16.1":
version "0.16.1"
resolved "https://registry.npmjs.org/@cornerstonejs/core/-/core-0.16.1.tgz#796016bae79950bd76cfb8aaf57bc7c3d131059c"
integrity sha512-cWu/NswDKcbdnheiJ8w0BhUL9960z9uL9MVV378f1/k3oh2lW3IIwSlUPk2oQfh9qDVH6MY89KjbKDvooDwvag==
dependencies:
detect-gpu "^4.0.7"
lodash.clonedeep "4.5.0"
"@cornerstonejs/streaming-image-volume-loader@^0.4.23": "@cornerstonejs/streaming-image-volume-loader@^0.4.23":
version "0.4.23" version "0.4.23"
resolved "https://registry.npmjs.org/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-0.4.23.tgz#77d8d0de03ea7343ff73af7b98ec2035212c1215" resolved "https://registry.npmjs.org/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-0.4.23.tgz#77d8d0de03ea7343ff73af7b98ec2035212c1215"
@ -2314,12 +2322,12 @@
"@cornerstonejs/core" "^0.15.3" "@cornerstonejs/core" "^0.15.3"
cornerstone-wado-image-loader "^4.2.1" cornerstone-wado-image-loader "^4.2.1"
"@cornerstonejs/tools@^0.23.3": "@cornerstonejs/tools@^0.24.1":
version "0.23.3" version "0.24.1"
resolved "https://registry.npmjs.org/@cornerstonejs/tools/-/tools-0.23.3.tgz#4fde6b4218605eec4ba21ffe4ec25a75f48f1da1" resolved "https://registry.npmjs.org/@cornerstonejs/tools/-/tools-0.24.1.tgz#d6c38af6167b515b3545b7dc2db43b34f6e43d30"
integrity sha512-j2nbwVQDihSBsbDhSa0tSmqFoqhNbx9w4TX2szXW6toqT2jgshwZQ4c3/UCWr5wBRBhKDe/gVRlU9IfjJSt89A== integrity sha512-X98m1MZahte1m+hd/J8oSUH5zxj+hv/7Stav3AHOUfyMPTm9tcl32bH87WpLK7cm9bLRzMNp23/6U1biEH2+Gg==
dependencies: dependencies:
"@cornerstonejs/core" "^0.15.3" "@cornerstonejs/core" "^0.16.1"
lodash.clonedeep "4.5.0" lodash.clonedeep "4.5.0"
lodash.get "^4.4.2" lodash.get "^4.4.2"