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

[OHIF-295] - Esc button should stop the creation of a measurement or annotation (#1883)

Browse Source 
* WIP, need to fix arrow making measurement

* Update cornerstoneTools to fix cst arrow annotate event bug.
This commit is contained in:
James Petts 2020-07-10 20:00:10 +01:00 committed by GitHub
parent 89cbe5bf2e
commit ce40f04f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/cornerstone/package.json
View File

@ -33,7 +33,7 @@
"@ohif/ui": "^0.50.0",
"cornerstone-core": "^2.3.0",
"cornerstone-math": "^0.1.8",
"cornerstone-tools": "4.18.0",
"cornerstone-tools": "4.18.1",
"cornerstone-wado-image-loader": "^3.1.2",
"dcmjs": "0.14.2",
"dicom-parser": "^1.8.3",

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

@ -79,6 +79,21 @@ const commandsModule = ({ servicesManager }) => {
cornerstone.setViewport(enabledElement, viewport);
}
},
cancelMeasurement: () => {
const enabledElement = _getActiveViewportsEnabledElement();
if (enabledElement) {
debugger;
const cancelActiveManipulatorsForElement = cornerstoneTools.getModule(
'manipulatorState'
).setters.cancelActiveManipulatorsForElement;
cancelActiveManipulatorsForElement(enabledElement);
cornerstone.updateImage(enabledElement);
}
},
// TODO: this is receiving `evt` from `ToolbarRow`. We could use it to have
// better mouseButtonMask sets.
setToolActive: ({ toolName }) => {
@ -349,6 +364,11 @@ const commandsModule = ({ servicesManager }) => {
storeContexts: [],
options: {},
},
cancelMeasurement: {
commandFn: actions.cancelMeasurement,
storeContexts: [],
options: {},
},
flipViewportVertical: {
commandFn: actions.flipViewportVertical,
storeContexts: [],

2
extensions/dicom-rt/package.json
View File

@ -30,7 +30,7 @@
"peerDependencies": {
"@ohif/core": "^0.50.0",
"cornerstone-core": "^2.2.8",
"cornerstone-tools": "4.18.0",
"cornerstone-tools": "4.18.1",
"dcmjs": "0.14.2",
"prop-types": "^15.6.2",
"react": "^16.8.6",

2
extensions/dicom-segmentation/package.json
View File

@ -30,7 +30,7 @@
"peerDependencies": {
"@ohif/core": "^0.50.0",
"cornerstone-core": "^2.2.8",
"cornerstone-tools": "4.18.0",
"cornerstone-tools": "4.18.1",
"dcmjs": "0.14.2",
"prop-types": "^15.6.2",
"react": "^16.8.6",

2
extensions/dicom-sr/package.json
View File

@ -33,7 +33,7 @@
"@ohif/ui": "^0.50.0",
"cornerstone-core": "^2.3.0",
"cornerstone-math": "^0.1.8",
"cornerstone-tools": "4.18.0",
"cornerstone-tools": "4.18.1",
"cornerstone-wado-image-loader": "^3.1.2",
"dcmjs": "0.14.2",
"dicom-parser": "^1.8.3",

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

@ -28,7 +28,7 @@
},
"peerDependencies": {
"@ohif/core": "^0.50.0",
"cornerstone-tools": "4.18.0",
"cornerstone-tools": "4.18.1",
"dcmjs": "0.14.2",
"prop-types": "^15.6.2",
"react": "^16.13.1",

2
extensions/vtk/package.json
View File

@ -57,7 +57,7 @@
"@ohif/core": "^2.9.6",
"@ohif/ui": "^2.0.0",
"cornerstone-core": "^2.3.0",
"cornerstone-tools": "4.18.0",
"cornerstone-tools": "4.18.1",
"cornerstone-wado-image-loader": "^3.1.2",
"dicom-parser": "^1.8.3",
"gh-pages": "^2.0.1",

2
platform/core/package.json
View File

@ -31,7 +31,7 @@
},
"peerDependencies": {
"cornerstone-core": "^2.3.0",
"cornerstone-tools": "4.18.0",
"cornerstone-tools": "4.18.1",
"cornerstone-wado-image-loader": "^3.1.2",
"dicom-parser": "^1.8.3"
},

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

@ -1,4 +1,4 @@
import windowLevelPresets from "./windowLevelPresets";
import windowLevelPresets from './windowLevelPresets';
/*
* Supported Keys: https://craig.is/killing/mice
@ -19,6 +19,11 @@ export default [
{ commandName: 'rotateViewportCW', label: 'Rotate Right', keys: ['r'] },
{ commandName: 'rotateViewportCCW', label: 'Rotate Left', keys: ['l'] },
{ commandName: 'invertViewport', label: 'Invert', keys: ['i'] },
{
commandName: 'cancelMeasurement',
label: 'Cancel Cornerstone Measurement',
keys: ['esc'],
},
{
commandName: 'flipViewportVertical',
label: 'Flip Horizontally',

2
platform/viewer/package.json
View File

@ -67,7 +67,7 @@
"classnames": "^2.2.6",
"core-js": "^3.2.1",
"cornerstone-math": "^0.1.8",
"cornerstone-tools": "4.18.0",
"cornerstone-tools": "4.18.1",
"cornerstone-wado-image-loader": "^3.1.2",
"dcmjs": "0.14.2",
"dicom-parser": "^1.8.3",

8
yarn.lock
View File

@ -6766,10 +6766,10 @@ cornerstone-math@^0.1.8:
resolved "https://registry.yarnpkg.com/cornerstone-math/-/cornerstone-math-0.1.8.tgz#68ab1f9e4fdcd7c5cb23a0d2eb4263f9f894f1c5"
integrity sha512-x7NEQHBtVG7j1yeyj/aRoKTpXv1Vh2/H9zNLMyqYJDtJkNng8C4Q8M3CgZ1qer0Yr7eVq2x+Ynmj6kfOm5jXKw==
cornerstone-tools@4.18.0:
version "4.18.0"
resolved "https://registry.yarnpkg.com/cornerstone-tools/-/cornerstone-tools-4.18.0.tgz#3b9497390fe7a7479db6f480d3219cc20c97e128"
integrity sha512-r1IslS/SaybyZq95jhaHltuYuA/c8h6C6iUMYGsuMh1laENYV9Nm0XsI0Ud+w1v5ZgvbHu52bw0rUQmWkOHszA==
cornerstone-tools@4.18.1:
version "4.18.1"
resolved "https://registry.yarnpkg.com/cornerstone-tools/-/cornerstone-tools-4.18.1.tgz#8e37770656a1dbd80e043f365baf697b9414e39f"
integrity sha512-PHuThDgJAc0I+hI/uu1CJ8rqcyUamE8fXP04NpuDd4gdsQlzy9V7oZxG3Wf7AsupzZoINGUNCCDGQnrCE10r4w==
dependencies:
"@babel/runtime" "7.1.2"
cornerstone-math "0.1.7"