Remove tabbed layout in favour of current Lesion Tracker design (OHIF-49)

Packages/viewerbase/client/components/viewer/gridLayout/gridLayout.js

@@ -29,12 +29,4 @@ Template.gridLayout.helpers({
 
         return viewportData;
     }
-});
-
-Template.gridLayout.onRendered(function() {
-    OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
-});
-
-Template.gridLayout.onDestroyed(function() {
-    OHIF.viewer.updateImageSynchronizer.destroy();
-});
+});

Packages/viewerbase/client/components/viewer/gridLayout/gridLayout.styl

@@ -2,19 +2,4 @@
 
 #imageViewerViewports
   height: 100%
-  width: 100%
-
-  .viewportContainer
-    float: left
-    border: $viewportBorderThickness solid $viewportBorderColor
-    
-    &.active, &:hover.active
-      border: $viewportBorderThickness solid $viewportBorderColorActive
-      
-    &:hover
-      border: $viewportBorderThickness solid $viewportBorderColorHover
-    
-    .removable
-      width: 100%
-      height: 100%
-      position: relative // Necessary so that the viewportOverlay is on top of the viewports
+  width: 100%

Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js

@@ -25,6 +25,11 @@ function loadSeriesIntoViewport(data, templateData) {
     var viewportIndex = $('.imageViewerViewport').index(element);
 
     layoutManager = layoutManager || window.layoutManager;
+    layoutManager.viewportData = layoutManager.viewportData || {};
+    if (layoutManager.viewportData[viewportIndex] === undefined) {
+    	layoutManager.viewportData[viewportIndex] = {};	
+    }
+
     layoutManager.viewportData[viewportIndex].viewportIndex = viewportIndex;
 
     // Get the contentID of the current worklist tab, if the viewport is running

Packages/viewerbase/client/components/viewer/viewerMain/viewerMain.js

@@ -1,6 +1,9 @@
 Template.viewerMain.onCreated(() => {
     // Attach the Window resize listener
     $(window).on('resize', handleResize);
+
+    // Create the synchronizer used to update reference lines
+    OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
 });
 
 Template.viewerMain.onRendered(() => {
@@ -21,6 +24,6 @@ Template.viewerMain.onDestroyed(() => {
     // Remove the Window resize listener
     $(window).off('resize', handleResize);
 
-    // Destory the synchronizer used to update reference lines
+    // Destroy the synchronizer used to update reference lines
     OHIF.viewer.updateImageSynchronizer.destroy();
 });

Packages/viewerbase/client/components/viewer/viewerMain/viewerMain.styl

@@ -7,11 +7,22 @@
   #layoutManagerTarget
     width: 100%
     height: 100%
-
     transition(all 0.3s ease)
 
     #imageViewerViewports
-      .viewportContainer:not(:last-child)
+      .viewportContainer
+        float: left
+        border: $viewportBorderThickness solid $viewportBorderColor
+
+        &:hover
+          border: $viewportBorderThickness solid $viewportBorderColorHover
+          
+        &.active, &:hover.active
+          border: $viewportBorderThickness solid $viewportBorderColorActive
+
         .removable
-          .imageViewerViewport
-            border-right: $uiBorderThickness solid #436270
+          width: 100%
+          height: 100%
+          position: relative // Necessary so that the viewportOverlay is on top of the viewports
+
+

Packages/viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.html

@@ -11,13 +11,13 @@
             <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
         </div>
         <div class="bottomright dicomTag">
-            <div>Zoom: {{formatNumberPrecision zoom 2}}%</div>
+            <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 2}}%{{/if}}</div>
             <div>{{compression}}</div>
             <div>{{wwwc}}</div>
         </div>
         <div class="bottomleft dicomTag">
-            <div>Ser: {{seriesNumber}}</div>
-            <div>Img: {{imageNumber}} ({{imageIndex}}/{{numImages}})</div>
+            <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
+            <div>{{#if numImages}}Img: {{imageNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
             <div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
             <div>{{imageDimensions}}</div>
             <div>{{seriesDescription}}</div>
@@ -33,12 +33,12 @@
             <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
         </div>
         <div class="bottomright dicomTag">
-            <div>Ser: {{seriesNumber}}</div>
-            <div>Img: {{imageNumber}} ({{imageIndex}}/{{numImages}})</div>
+            <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
+            <div>{{#if numImages}}Img: {{imageNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
             <div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
             <div>{{imageDimensions}}</div>
             <div>{{seriesDescription}}</div>
-            <div>Zoom: {{formatNumberPrecision zoom 2}}%</div>
+            <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 2}}%{{/if}}</div>
             <div>{{compression}}</div>
             <div>{{wwwc}}</div>
         </div>
@@ -53,12 +53,12 @@
             <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
         </div>
         <div class="bottomleft dicomTag">
-            <div>Ser: {{seriesNumber}}</div>
-            <div>Img: {{imageNumber}} ({{imageIndex}}/{{numImages}})</div>
+            <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
+            <div>{{#if numImages}}Img: {{imageNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
             <div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
             <div>{{imageDimensions}}</div>
             <div>{{seriesDescription}}</div>
-            <div>Zoom: {{formatNumberPrecision zoom 2}}%</div>
+            <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 2}}%{{/if}}</div>
             <div>{{compression}}</div>
             <div>{{wwwc}}</div>
         </div>

Packages/viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.js

@@ -133,12 +133,12 @@ Template.viewportOverlay.helpers({
         Session.get('CornerstoneImageRendered' + this.viewportIndex);
         var element = getElementIfNotEmpty(this.viewportIndex);
         if (!element) {
-            return '';
+            return;
         }
 
         var viewport = cornerstone.getViewport(element);
         if (!viewport) {
-            return '';
+            return;
         }
 
         return (viewport.scale * 100.0);