From 37fa29cce4dc44261b1d232704a6253242853374 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Mon, 14 Dec 2015 08:31:25 -0500
Subject: [PATCH] Updated hotkey presets to the specified defaults. Closes
 LT-21

---
 LesionTracker/client/components/viewer.js | 12 ++++++++++--
 Packages/viewerbase/lib/enableHotkeys.js  | 12 ++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/LesionTracker/client/components/viewer.js b/LesionTracker/client/components/viewer.js
index ed8cb7c7e..b3372edb5 100644
--- a/LesionTracker/client/components/viewer.js
+++ b/LesionTracker/client/components/viewer.js
@@ -51,11 +51,19 @@ Template.viewer.onCreated(function() {
             Session.set('UpdateCINE', Random.id());
         },
         toggleLesionTrackerTools: toggleLesionTrackerTools,
-        clearTools: clearTools
+        clearTools: clearTools,
+        lesion: function() {
+            toolManager.setActiveTool("lesion");
+        },
+        nonTarget: function() {
+            toolManager.setActiveTool("nonTarget");
+        },
     };
 
     // The hotkey can also be an array (e.g. ["NUMPAD0", "0"])
-    OHIF.viewer.defaultHotkeys.toggleLesionTrackerTools = "Y";
+    OHIF.viewer.defaultHotkeys.toggleLesionTrackerTools = "O";
+    OHIF.viewer.defaultHotkeys.lesion = "T"; // Target
+    OHIF.viewer.defaultHotkeys.nonTarget = "N"; // Non-target
 
     // Enable hotkeys
     enableHotkeys();
diff --git a/Packages/viewerbase/lib/enableHotkeys.js b/Packages/viewerbase/lib/enableHotkeys.js
index a5fffeca6..14d4ad134 100644
--- a/Packages/viewerbase/lib/enableHotkeys.js
+++ b/Packages/viewerbase/lib/enableHotkeys.js
@@ -10,10 +10,8 @@ Meteor.startup(function() {
         defaultTool: "ESC",
         angle: "A",
         stackScroll: "S",
-        wwwcRegion: "R",
         pan: "P",
         magnify: "M",
-        length: "L",
         scrollDown: "DOWN",
         scrollUp: "UP",
         nextPanel: "RIGHT",
@@ -22,11 +20,10 @@ Meteor.startup(function() {
         flipV: "V",
         flipH: "H",
         wwwc: "W",
-        annotate: "T",
+        zoom: "Z",
         cinePlay: "SPACE",
-        rotateR: "F",
-        rotateL: "G",
-        toggleTools: 'TAB',
+        rotateR: "R",
+        rotateL: "L",
         toggleOverlayTags: 'SHIFT',
         WLPresetSoftTissue: ["NUMPAD1", "1"],
         WLPresetLung: ["NUMPAD2", "2"],
@@ -53,6 +50,9 @@ Meteor.startup(function() {
         wwwc: function() {
             toolManager.setActiveTool("wwwc");
         },
+        zoom: function() {
+            toolManager.setActiveTool("zoom");
+        },
         angle: function() {
             toolManager.setActiveTool("angle");
         },