From a41e50d79f109c3874892ab7a26647bbc4c4fc3a Mon Sep 17 00:00:00 2001
From: Aysel Afsar <aysel.afsar@gmail.com>
Date: Wed, 2 Mar 2016 23:38:03 -0500
Subject: [PATCH] LT-115: Activate CR/UN/EX tools data when lesion table is
 clicked

---
 Packages/lesiontracker/client/compatibility/crunexTool.js | 1 +
 Packages/lesiontracker/lib/LesionManager.js               | 3 +++
 Packages/lesiontracker/lib/activateMeasurements.js        | 7 ++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Packages/lesiontracker/client/compatibility/crunexTool.js b/Packages/lesiontracker/client/compatibility/crunexTool.js
index b14adf26a..487734bc9 100644
--- a/Packages/lesiontracker/client/compatibility/crunexTool.js
+++ b/Packages/lesiontracker/client/compatibility/crunexTool.js
@@ -161,6 +161,7 @@
                 response: toolName,
                 isTarget: true,
                 measurementType: 'nonTarget',
+                toolType: toolType,
                 toolName: 'Target'
             };
 
diff --git a/Packages/lesiontracker/lib/LesionManager.js b/Packages/lesiontracker/lib/LesionManager.js
index 767caf70c..d7745e59f 100644
--- a/Packages/lesiontracker/lib/LesionManager.js
+++ b/Packages/lesiontracker/lib/LesionManager.js
@@ -83,6 +83,9 @@ function updateLesionData(lesionData) {
             id: lesionData.id,
             measurementType: lesionData.measurementType
         };
+        if (lesionData.toolType) {
+            measurement.toolType = lesionData.toolType;
+        }
 
         // Retrieve the location name given the locationUID
         if (lesionData.locationUID !== undefined) {
diff --git a/Packages/lesiontracker/lib/activateMeasurements.js b/Packages/lesiontracker/lib/activateMeasurements.js
index 72d917a87..7061478ad 100644
--- a/Packages/lesiontracker/lib/activateMeasurements.js
+++ b/Packages/lesiontracker/lib/activateMeasurements.js
@@ -60,7 +60,12 @@ function activateTool(element, measurementData, timepointId) {
     deactivateAllToolData(element, 'lesion');
     deactivateAllToolData(element, 'nonTarget');
 
-    var toolType = measurementData.isTarget ? 'lesion' : 'nonTarget';
+    // Deactivate CRUNEX Tools
+    deactivateAllToolData(element, 'crTool');
+    deactivateAllToolData(element, 'unTool');
+    deactivateAllToolData(element, 'exTool');
+
+    var toolType = measurementData.toolType ? measurementData.toolType:(measurementData.isTarget ? 'lesion' : 'nonTarget');
     var toolData = cornerstoneTools.getToolState(element, toolType);
     if (!toolData) {
         return;