From a18b6a6dbfdd409a9182091b3409287ea483e123 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Wed, 11 Nov 2015 00:05:01 +0100
Subject: [PATCH] Bug fix for lesion table

---
 LesionTracker/client/components/viewer.styl   |   2 +-
 .../components/viewerMain/viewerMain.styl     |   3 +-
 .../components/lesionTable/lesionTable.html   |   5 +-
 .../components/lesionTable/lesionTable.styl   | 106 +++++++++++-------
 Packages/viewerbase/lib/metaDataProvider.js   |   7 +-
 Packages/viewerbase/lib/toolManager.js        |  12 +-
 Packages/viewerbase/log.js                    |   2 +-
 Packages/viewerbase/package.js                |   1 +
 8 files changed, 89 insertions(+), 49 deletions(-)

diff --git a/LesionTracker/client/components/viewer.styl b/LesionTracker/client/components/viewer.styl
index ee00237b3..a2beb0524 100644
--- a/LesionTracker/client/components/viewer.styl
+++ b/LesionTracker/client/components/viewer.styl
@@ -8,7 +8,7 @@
 #viewportAndLesionTable
   height: 100%
   width: calc(100% - 120px)
-  float: right
+  float: left
 
 #imageViewerViewports
   .viewportContainer
diff --git a/LesionTracker/client/components/viewerMain/viewerMain.styl b/LesionTracker/client/components/viewerMain/viewerMain.styl
index 8fd983b59..c18d60a83 100644
--- a/LesionTracker/client/components/viewerMain/viewerMain.styl
+++ b/LesionTracker/client/components/viewerMain/viewerMain.styl
@@ -1,4 +1,3 @@
 .viewerMain
   width: 100%
-  height: 75%
-  float: left
\ No newline at end of file
+  height: 75%
\ No newline at end of file
diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.html b/Packages/lesiontracker/components/lesionTable/lesionTable.html
index b5d48b2cb..1942d8881 100644
--- a/Packages/lesiontracker/components/lesionTable/lesionTable.html
+++ b/Packages/lesiontracker/components/lesionTable/lesionTable.html
@@ -1,6 +1,6 @@
 <template name="lesionTable">
     <div id="lesionTableContainer">
-        <table class="table table-bordered lesionTable" id="tblLesion">
+        <table class="table table-striped noselect lesionTable" id="tblLesion">
             <thead>
                 <tr>
                     <th id="thNumber">Lesion #</th>
@@ -10,7 +10,8 @@
                     {{ #each timepoints }}
                          {{ >lesionTableTimepointHeader }}
                     {{ /each }}
-                    <th id="thSpacer"> </th>
+                    <!--What is this for?-->
+                    <!--<th id="thSpacer"> </th>-->
                 </tr>
             </thead>
             <tbody>
diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.styl b/Packages/lesiontracker/components/lesionTable/lesionTable.styl
index a1a55fa84..7fe8624e9 100644
--- a/Packages/lesiontracker/components/lesionTable/lesionTable.styl
+++ b/Packages/lesiontracker/components/lesionTable/lesionTable.styl
@@ -1,44 +1,72 @@
-#lesionTableContainer {
+#lesionTableContainer
     width: 100%
     height: 25%
-    overflow: auto;
-}
-
-table.lesionTable > thead > tr > th {
-    font-style: italic;
-    color:white;
-    height: 20px;
-    line-height: 20px;
-    text-align: center
-    margin: 0;
-    padding: 5px;
-    background-color: #424242;
-}
-table.lesionTable > tbody > tr > td {
-    height: 15px;
-    line-height: 15px;
-    margin: 0;
-    padding: 5px;
-}
-
-table.lesionTable tbody tr.lesionTableRow:nth-child(even) {background: #888}
-table.lesionTable tbody tr.lesionTableRow:nth-child(odd) {background: #BBB}
-table.lesionTable tbody tr.lesionTableRow:hover{ background-color: #009BD2; color: white;  }
-
-#thTarget {
-    width: 1%;
-}
-
-#thLocation {
-    text-align: left;
-    width: 15%;
-}
+    
+    .lesionTable
+    
+      td.lesionNumber, th#thNumber
+        width: 70px
+      
+      td.location, th#thLocation
+        width: 250px
+      
+      td.target, th#thTarget
+        width: 70px
+        
+      td.lesionTableTimepointCell
+        width: 70px
 
 
-#thSpacer {
-    width: 61%;
-}
+      thead
+        width: 100%
+        display: block
+        
+        tr
+          width: 100%
+            
+          th
+            border-bottom-width: 0
+            float:left
+            font-weight: normal
+            color:white
+            line-height: 20px
+            text-align: center
+            margin: 0
+            padding: 5px
+            background-color: #424242
+            
+            #thTarget 
+                width: 1%
 
-td.lesionNumber, .target,.lesionTableTimepointCell {
-    text-align: center;
-}
\ No newline at end of file
+            #thLocation 
+                text-align: left
+                width: 15%
+
+            #thSpacer 
+                width: 61%
+          
+      tbody
+        display: block
+        height: 200px // Seems like this has to be fixed for overflow to work properly!
+        overflow: auto
+        width: 100%
+        
+        tr.lesionTableRow
+          width: 100%
+          
+          &:nth-child(even)
+              background: #888    
+          &:nth-child(odd)
+              background: #BBB
+          &:hover(odd)
+              background-color: #009BD2
+              color: white
+
+            td
+                border-bottom-width: 0
+                float:left
+                margin: 0
+                padding: 5px
+
+                &.lesionNumber,  &.target, &.lesionTableTimepointCell 
+                    text-align: center
diff --git a/Packages/viewerbase/lib/metaDataProvider.js b/Packages/viewerbase/lib/metaDataProvider.js
index 90e59473c..5b3f5292a 100644
--- a/Packages/viewerbase/lib/metaDataProvider.js
+++ b/Packages/viewerbase/lib/metaDataProvider.js
@@ -20,11 +20,16 @@ addMetaData = function(imageId, data) {
         description: seriesMetaData.seriesDescription,
         number: seriesMetaData.seriesNumber,
         modality: seriesMetaData.modality,
-        instanceUid: seriesMetaData.instanceUid,
+        instanceUid: seriesMetaData.seriesInstanceUid,
         numImages: numImages
     };
 
     metaData.instance = {
+        wadouri: instanceMetaData.wadouri,
+        imageType: instanceMetaData.imageType,
+        photometricInterpretation: instanceMetaData.photometricInterpretation,
+        sopInstanceUid: instanceMetaData.sopInstanceUid,
+        sopClassUid: instanceMetaData.sopClassUid,
         number: instanceMetaData.instanceNumber,
         index: imageIndex
     };
diff --git a/Packages/viewerbase/lib/toolManager.js b/Packages/viewerbase/lib/toolManager.js
index e10ae4cea..4efa642e9 100644
--- a/Packages/viewerbase/lib/toolManager.js
+++ b/Packages/viewerbase/lib/toolManager.js
@@ -86,11 +86,14 @@ toolManager = {
             if (!element.classList.contains('empty') && canvases.length > 0) {
                 // First, deactivate the current active tool
                 tools[activeTool].mouse.deactivate(element, 1);
-                tools[activeTool].touch.deactivate(element);
+
+                if (tools[activeTool].touch) {
+                    tools[activeTool].touch.deactivate(element);
+                }
 
                 // First, get the stack toolData
                 var toolData = cornerstoneTools.getToolState(element, 'stack');
-                if (toolData === undefined || toolData.data === undefined || toolData.data.length === 0) {
+                if (!toolData || !toolData.data || !toolData.data.length) {
                     return;
                 }
 
@@ -127,7 +130,10 @@ toolManager = {
                     // Activate the chosen tool
                     tools[tool].mouse.activate(element, 1);
                 }
-                tools[tool].touch.activate(element);
+
+                if (tools[tool].touch) {
+                    tools[tool].touch.activate(element);
+                }
 
                 cornerstoneTools.zoomTouchPinch.activate(element);
                 cornerstoneTools.panMultiTouch.activate(element);
diff --git a/Packages/viewerbase/log.js b/Packages/viewerbase/log.js
index bb7ba9220..e188235f2 100644
--- a/Packages/viewerbase/log.js
+++ b/Packages/viewerbase/log.js
@@ -1,3 +1,3 @@
 // Create package logger using loglevel
 // https://atmospherejs.com/spacejamio/loglevel
-log = loglevel.createPackageLogger('viewerbase', defaultLevel = 'info');
\ No newline at end of file
+log = loglevel.createPackageLogger('viewerbase', defaultLevel = 'warn');
\ No newline at end of file
diff --git a/Packages/viewerbase/package.js b/Packages/viewerbase/package.js
index 40de44935..f2fa2376d 100644
--- a/Packages/viewerbase/package.js
+++ b/Packages/viewerbase/package.js
@@ -14,6 +14,7 @@ Package.onUse(function (api) {
     api.use('ian:accounts-ui-bootstrap-3');
     api.use('http');
     api.use('practicalmeteor:loglevel');
+    api.use('momentjs:moment');
 
     // Our custom package
     api.use('cornerstone');