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

Replace keypress with keydown to fix Measurement deletion from Lesion Table

Browse Source
This commit is contained in:
Erik Ziegler 2015-12-20 18:52:17 -05:00
parent 220ff065dc
commit 5eb8a717cb
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/lesiontracker/client/compatibility/deleteLesionKeyboardTool.js
View File

@ -70,7 +70,7 @@
} }
function keyDownCallback(e, eventData) { function keyDownCallback(e, eventData) {
var keyCode = eventData.keyCode; var keyCode = eventData.which;
if (keyCode === keys.DELETE || if (keyCode === keys.DELETE ||
(keyCode === keys.D && eventData.event.ctrlKey === true)) { (keyCode === keys.D && eventData.event.ctrlKey === true)) {

18
Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.js
View File

@ -15,6 +15,12 @@ function doneCallback(measurementData, deleteTool) {
} }
} }
// Delete a lesion if Ctrl+D or DELETE is pressed while a lesion is selected
var keys = {
D: 68,
DELETE: 46
};
Template.lesionTableRow.events({ Template.lesionTableRow.events({
'dblclick .location': function() { 'dblclick .location': function() {
log.info('Double clicked on Lesion Location cell'); log.info('Double clicked on Lesion Location cell');
@ -26,16 +32,16 @@ Template.lesionTableRow.events({
changeLesionLocationCallback(measurementData, null, doneCallback); changeLesionLocationCallback(measurementData, null, doneCallback);
}, },
'keypress .location': function(e) { 'keydown .location': function(e) {
var keyCode = e.keyCode; var keyCode = e.which;
if (keyCode === keys.DELETE || if (keyCode === keys.DELETE ||
(keyCode === keys.D && e.ctrlKey === true)) { (keyCode === keys.D && e.ctrlKey === true)) {
var currentMeasurement = Template.parentData(1); var currentMeasurement = this;
var currentTimepointID = this.timepointID;
showConfirmDialog(function() { showConfirmDialog(function() {
log.info('Removing Lesion: ' + currentMeasurement._id); Meteor.call("removeMeasurement", currentMeasurement._id, function(error, response) {
clearMeasurementTimepointData(currentMeasurement._id, currentTimepointID); console.log('Removed!');
});
}); });
} }
} }

13
Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.js
View File

@ -70,21 +70,22 @@ Template.lesionTableTimepointCell.events({
if (currentMeasurement.isTarget) { if (currentMeasurement.isTarget) {
showConfirmDialog(function() { showConfirmDialog(function() {
log.info('Confirm clicked!');
clearMeasurementTimepointData(currentMeasurement._id, currentTimepointID); clearMeasurementTimepointData(currentMeasurement._id, currentTimepointID);
}); });
} else { } else {
changeNonTargetResponse(measurementData, null, doneCallback); changeNonTargetResponse(measurementData, null, doneCallback);
} }
}, },
'keypress .lesionTableTimepointCell': function(e) { 'keydown .lesionTableTimepointCell': function(e) {
var keyCode = e.keyCode; var keyCode = e.which;
if (keyCode === keys.DELETE || if (keyCode === keys.DELETE ||
(keyCode === keys.D && e.ctrlKey === true)) { (keyCode === keys.D && e.ctrlKey === true)) {
var currentMeasurement = Template.parentData(1); var currentMeasurement = Template.parentData(1);
log.info('Removing Lesion: ' + currentMeasurement._id); var currentTimepointID = this.timepointID;
// TODO = Add confirm dialog first!
clearMeasurementTimepointData(currentMeasurement._id, this.timepointID); showConfirmDialog(function() {
clearMeasurementTimepointData(currentMeasurement._id, currentTimepointID);
});
} }
} }
}); });