Bug fix for lesion table

LesionTracker/client/components/viewer.styl

@@ -8,7 +8,7 @@
 #viewportAndLesionTable
   height: 100%
   width: calc(100% - 120px)
-  float: right
+  float: left
 
 #imageViewerViewports
   .viewportContainer

LesionTracker/client/components/viewerMain/viewerMain.styl

@@ -1,4 +1,3 @@
 .viewerMain
   width: 100%
   height: 75%
-  float: left

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>

Packages/lesiontracker/components/lesionTable/lesionTable.styl

@@ -1,44 +1,72 @@
-#lesionTableContainer {
+#lesionTableContainer
     width: 100%
     height: 25%
-    overflow: auto;
-}
     
-table.lesionTable > thead > tr > th {
+    .lesionTable
-    font-style: italic;
+    
-    color:white;
+      td.lesionNumber, th#thNumber
-    height: 20px;
+        width: 70px
-    line-height: 20px;
+      
+      td.location, th#thLocation
+        width: 250px
+      
+      td.target, th#thTarget
+        width: 70px
+        
+      td.lesionTableTimepointCell
+        width: 70px
+
+
+      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;
+            margin: 0
-    padding: 5px;
+            padding: 5px
-    background-color: #424242;
+            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}
+            #thTarget 
-table.lesionTable tbody tr.lesionTableRow:nth-child(odd) {background: #BBB}
+                width: 1%
-table.lesionTable tbody tr.lesionTableRow:hover{ background-color: #009BD2; color: white;  }
 
-#thTarget {
+            #thLocation 
-    width: 1%;
+                text-align: left
-}
+                width: 15%
 
-#thLocation {
+            #thSpacer 
-    text-align: left;
+                width: 61%
-    width: 15%;
-}
           
+      tbody
+        display: block
+        height: 200px // Seems like this has to be fixed for overflow to work properly!
+        overflow: auto
+        width: 100%
         
-#thSpacer {
+        tr.lesionTableRow
-    width: 61%;
+          width: 100%
-}
           
-td.lesionNumber, .target,.lesionTableTimepointCell {
+          &:nth-child(even)
-    text-align: center;
+              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

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
     };

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);
+
+                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);
                 }
+
+                if (tools[tool].touch) {
                     tools[tool].touch.activate(element);
+                }
 
                 cornerstoneTools.zoomTouchPinch.activate(element);
                 cornerstoneTools.panMultiTouch.activate(element);

Packages/viewerbase/log.js

@@ -1,3 +1,3 @@
 // Create package logger using loglevel
 // https://atmospherejs.com/spacejamio/loglevel
-log = loglevel.createPackageLogger('viewerbase', defaultLevel = 'info');
+log = loglevel.createPackageLogger('viewerbase', defaultLevel = 'warn');

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');