From 1887df2dc56621c43fee8f85cfed2af2d6db24a9 Mon Sep 17 00:00:00 2001
From: James Petts <jpetts@12136phydt.icr.ac.uk>
Date: Tue, 23 Oct 2018 12:21:21 +0100
Subject: [PATCH] Kind of working, updated cornerstone-core lib.

---
 Packages/ohif-cornerstone/package.js                      | 2 +-
 .../viewer/imageViewerViewport/imageViewerViewport.js     | 3 ++-
 Packages/ohif-viewerbase/client/lib/toolManager.js        | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Packages/ohif-cornerstone/package.js b/Packages/ohif-cornerstone/package.js
index 9662d5a80..d7eac0958 100644
--- a/Packages/ohif-cornerstone/package.js
+++ b/Packages/ohif-cornerstone/package.js
@@ -6,7 +6,7 @@ Package.describe({
 
 Npm.depends({
     hammerjs: '2.0.8',
-    'cornerstone-core': '2.2.4',
+    'cornerstone-core': '2.2.6',
     'cornerstone-tools': '3.0.0-b.959',
     'cornerstone-math': '0.1.6',
     'dicom-parser': '1.8.0',
diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index d4a33c251..4d0552358 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -268,7 +268,8 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
         }
 
         // Enabling new eventDispatches form cornerstoneTools v3
-        //cornerstoneTools.addEnabledElement(element);
+        //cornerstoneTools.addEnabledElement(element); NOTE: This should be done by cTools internally now, no?
+        console.log('====imageViewerViewport, instantiateTools');
         toolManager.instantiateTools(element);
 
         // Use the tool manager to enable the currently active tool for this
diff --git a/Packages/ohif-viewerbase/client/lib/toolManager.js b/Packages/ohif-viewerbase/client/lib/toolManager.js
index 980abaa9b..cbdeac745 100644
--- a/Packages/ohif-viewerbase/client/lib/toolManager.js
+++ b/Packages/ohif-viewerbase/client/lib/toolManager.js
@@ -27,8 +27,12 @@ export const toolManager = {
             toolManager.setDefaultTool(OHIF.viewer.defaultTool);
         }
 
+        console.log('======INITIALIZING CORNERSTONETOOLS======');
+
         cornerstoneTools.init();
 
+        console.log('======CORNERSTONETOOLS INITIALIZED======');
+
         tools = [
           'Length',
           'Angle',
@@ -135,6 +139,8 @@ export const toolManager = {
             toolManager.init();
         }
 
+        console.log("toolManager.getActiveTool");
+
         // If activeTool is not defined, we should set as defaultTool
         if (!activeTool) {
             activeTool = defaultTool;
@@ -159,3 +165,5 @@ export const toolManager = {
         //
     }
 };
+
+toolManager.init();