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

Improving Keyboard Shortcuts form

Browse Source
This commit is contained in:
Bruno Alves de Faria 2017-10-26 16:04:54 -02:00
parent efa7d48da1
commit eca52c64e6
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Packages/ohif-hotkeys/client/components/form.js
View File

@ -33,7 +33,16 @@ Template.hotkeysForm.onCreated(() => {
}; };
const rg = (start, end) => _.range(start, end + 1); const rg = (start, end) => _.range(start, end + 1);
instance.allowedKeys = _.union(rg(32, 40), rg(48, 57), rg(65, 90), rg(112, 121), [123]); instance.allowedKeys = _.union(
[8, 13, 27, 32, 46], // BACKSPACE, ENTER, ESCAPE, SPACE, DELETE
[12, 106, 107, 109, 110, 111], // Numpad keys
rg(219, 221), // [\]
rg(186, 191), // ;=,-./
rg(112, 130), // F1-F19
rg(33, 40), // arrow keys, home/end, pg dn/up
rg(48, 57), // 0-9
rg(65, 90) // A-Z
);
instance.updateInputText = (event, displayPressedKey=false) => { instance.updateInputText = (event, displayPressedKey=false) => {
const $target = $(event.currentTarget); const $target = $(event.currentTarget);
@ -41,7 +50,7 @@ Template.hotkeysForm.onCreated(() => {
if (displayPressedKey) { if (displayPressedKey) {
const specialKeyName = jQuery.hotkeys.specialKeys[event.which]; const specialKeyName = jQuery.hotkeys.specialKeys[event.which];
const keyName = specialKeyName || event.key; const keyName = specialKeyName || String.fromCharCode(event.keyCode) || event.key;
keysPressedArray.push(keyName.toUpperCase()); keysPressedArray.push(keyName.toUpperCase());
} }
@ -91,6 +100,11 @@ Template.hotkeysForm.onCreated(() => {
Template.hotkeysForm.events({ Template.hotkeysForm.events({
'keydown .hotkey'(event, instance) { 'keydown .hotkey'(event, instance) {
// Prevent ESC key from propagating and closing the modal
if (event.keyCode === 27) {
event.stopPropagation();
}
if (instance.allowedKeys.indexOf(event.keyCode) > -1) { if (instance.allowedKeys.indexOf(event.keyCode) > -1) {
instance.updateInputText(event, true); instance.updateInputText(event, true);
$(event.currentTarget).trigger('hotkeyChange'); $(event.currentTarget).trigger('hotkeyChange');

6
Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
View File

@ -35,7 +35,6 @@ Meteor.startup(function() {
dragProbe: '', dragProbe: '',
ellipticalRoi: '', ellipticalRoi: '',
rectangleRoi: '', rectangleRoi: '',
spine: '',
// Viewport hotkeys // Viewport hotkeys
flipH: 'H', flipH: 'H',
@ -111,14 +110,13 @@ Meteor.startup(function() {
zoom: 'Zoom', zoom: 'Zoom',
angle: 'Angle Measurement', angle: 'Angle Measurement',
dragProbe: 'Pixel Probe', dragProbe: 'Pixel Probe',
ellipticalRoi: 'Elliptical Probe', ellipticalRoi: 'Elliptical ROI',
rectangleRoi: 'Rectangle', rectangleRoi: 'Rectangle ROI',
magnify: 'Magnify', magnify: 'Magnify',
annotate: 'Annotate', annotate: 'Annotate',
stackScroll: 'Scroll Stack', stackScroll: 'Scroll Stack',
pan: 'Pan', pan: 'Pan',
length: 'Length Measurement', length: 'Length Measurement',
spine: 'Spine Labels',
wwwcRegion: 'W/L by Region' wwwcRegion: 'W/L by Region'
}); });