From aa5e23cf8ebb60dac61bb6fd8d6d5aac9eef4df2 Mon Sep 17 00:00:00 2001
From: Evren Ozkan <evren217@gmail.com>
Date: Mon, 9 Nov 2015 15:35:06 -0500
Subject: [PATCH] Bug fixing: nonTarget tool measurements will be active when
 row is selected

---
 Packages/cornerstone/client/cornerstoneTools.js    |  2 +-
 Packages/lesiontracker/compatibility/lesionTool.js | 10 +++++-----
 .../lesiontracker/compatibility/nonTargetTool.js   |  7 ++++---
 .../components/lesionTable/lesionTable.js          | 14 +++++++++++---
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Packages/cornerstone/client/cornerstoneTools.js b/Packages/cornerstone/client/cornerstoneTools.js
index 0bd804b74..40fc0b2fd 100644
--- a/Packages/cornerstone/client/cornerstoneTools.js
+++ b/Packages/cornerstone/client/cornerstoneTools.js
@@ -1104,7 +1104,7 @@ if (typeof cornerstoneTools === 'undefined') {
                     imageNeedsUpdate = true;
                 }
 
-                if ((mouseToolInterface.pointInsideRect(eventData.element, data, coords) && !data.active) || (!mouseToolInterface.pointInsideRect(eventData.element, data, coords) && data.active)) {
+                if (mouseToolInterface.pointInsideRect(eventData.element, data, coords) && !data.active || !mouseToolInterface.pointInsideRect(eventData.element, data, coords) && data.active) {
                     data.active = !data.active;
                     imageNeedsUpdate = true;
                 }
diff --git a/Packages/lesiontracker/compatibility/lesionTool.js b/Packages/lesiontracker/compatibility/lesionTool.js
index e0ca51471..63fabfeb3 100644
--- a/Packages/lesiontracker/compatibility/lesionTool.js
+++ b/Packages/lesiontracker/compatibility/lesionTool.js
@@ -105,19 +105,19 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
 
     }
 
-    function suscribeLesionToolModifiedEvent(element) {
+    function suscribeLesionToolSelectedEvent(element) {
         var elementEvents = $._data(element, "events");
-        var index = Object.keys(elementEvents).indexOf("LesionToolModified");
+        var index = Object.keys(elementEvents).indexOf("LesionToolSelected");
         if (index < 0) {
-            // Subscribe LesionToolModified and calls measurementModified function when lesion measurement is changed or updated.
-            $(element).on("LesionToolModified", measurementModified);
+            // Subscribe LesionToolSelected and calls measurementModified function when lesion measurement is changed or updated.
+            $(element).on("LesionToolSelected", measurementModified);
         }
 
     }
     ///////// BEGIN IMAGE RENDERING ///////
     function onImageRendered(e, eventData) {
 
-        suscribeLesionToolModifiedEvent(e.currentTarget);
+        suscribeLesionToolSelectedEvent(e.currentTarget);
 
         // if we have no toolData for this element, return immediately as there is nothing to do
         var toolData = cornerstoneTools.getToolState(e.currentTarget, toolType);
diff --git a/Packages/lesiontracker/compatibility/nonTargetTool.js b/Packages/lesiontracker/compatibility/nonTargetTool.js
index dfc3dcb84..71a01e965 100644
--- a/Packages/lesiontracker/compatibility/nonTargetTool.js
+++ b/Packages/lesiontracker/compatibility/nonTargetTool.js
@@ -187,10 +187,10 @@
 
     function suscribeNonTargetToolModifiedEvent(element) {
         var elementEvents = $._data(element, "events");
-        var index = Object.keys(elementEvents).indexOf("nonTargetToolModified");
+        var index = Object.keys(elementEvents).indexOf("NonTargetToolSelected");
         if (index < 0) {
             // Subscribe LesionToolModified and calls measurementModified function when lesion measurement is changed or updated.
-            $(element).on("nonTargetToolModified", measurementModified);
+            $(element).on("NonTargetToolSelected", measurementModified);
         }
 
     }
@@ -303,7 +303,7 @@
         context.restore();
 
     }
-        // ---- Touch tool ----
+    // ---- Touch tool ----
 
     ///////// BEGIN ACTIVE TOOL ///////
     function addNewMeasurementTouch(touchEventData) {
@@ -346,6 +346,7 @@
         });
     }
 
+
     function doubleClickCallback(e, eventData) {
         var element = eventData.element;
         var data;
diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.js b/Packages/lesiontracker/components/lesionTable/lesionTable.js
index 615de2e8e..565dbf75e 100644
--- a/Packages/lesiontracker/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/components/lesionTable/lesionTable.js
@@ -78,11 +78,19 @@ function updateLesions(e) {
             eventData.type = "inactive";
         }
 
-        if(!isTarget) {
-            $(element).trigger("nonTargetToolModified", eventData);
+        if (!isTarget) {
+            $(element).trigger("NonTargetToolSelected", eventData);
+
+            // Deactivate lesion tool measurements
+            eventData.type = "inactive";
+            $(element).trigger("LesionToolSelected", eventData);
             return;
         }
-        $(element).trigger("LesionToolModified", eventData);
+        $(element).trigger("LesionToolSelected", eventData);
+
+        // Deactivate nonTarget tool measurements
+        eventData.type = "inactive";
+        $(element).trigger("NonTargetToolSelected", eventData);
 
     });
 }