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

Packages/lesiontracker/client/components/lesionTracker/lesionTracker.js

@@ -6,7 +6,7 @@ ViewerData = Session.get('ViewerData') || {};
 const worklistContentId = 'worklistTab';
 const viewerContentId = 'viewerTab';
 
-Template.lesionTracker.onRendered(function() {
+Template.lesionTracker.onRendered(() => {
     const templateData = Template.currentData();
     if (templateData && templateData.studyInstanceUid) {
         const studyInstanceUid = templateData.studyInstanceUid;
@@ -19,12 +19,10 @@ Template.lesionTracker.onRendered(function() {
         // TODO: Fix this it seems to be forcing two switches
         switchToTab(contentId);
     }
-
-    Meteor.subscribe('hangingprotocols');
 });
 
 Template.lesionTracker.events({
-    'click .js-toggle-studyList': function() {
+    'click .js-toggle-studyList'() {
         const contentId = Session.get('activeContentId');
 
         if (contentId !== worklistContentId) {
@@ -38,7 +36,7 @@ Template.lesionTracker.events({
 Session.set('defaultSignInMessage', 'Tumor tracking in your browser.');
 
 Template.lesionTracker.helpers({
-    studyListToggleText: function() {
+    studyListToggleText() {
         const contentId = Session.get('activeContentId');
         
         // If the Viewer has not been opened yet, 'Back to viewer' should
@@ -54,7 +52,7 @@ Template.lesionTracker.helpers({
             return 'Study list';
         }
     },
-    onStudyList: function() {
+    onStudyList() {
         return (Session.get('activeContentId') === 'worklistTab');
     }
 });

Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl

@@ -72,14 +72,3 @@ img.logoImage
         color: $textSecondaryColor
         font-size: 30px
         font-weight: 200
-
-// Override Viewerbase's borders
-#imageViewerViewports .viewportContainer
-  border: none !important
-  outline: 0 !important // Prevent blue outline in Chrome
-
-  &:hover
-  &.active
-  &:hover.active
-    border: none !important
-    outline: 0 !important // Prevent blue outline in Chrome

Packages/lesiontracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html

@@ -1,3 +0,0 @@
-<template name="lesionTrackerLayout">
-    {{>yield }}
-</template>

Packages/lesiontracker/client/components/viewer/viewer.js

@@ -26,6 +26,8 @@ Template.viewer.onCreated(() => {
     instance.data.state.set('leftSidebar', Session.get('leftSidebar'));
     instance.data.state.set('rightSidebar', Session.get('rightSidebar'));
 
+    instance.subscribe('hangingprotocols');
+    
     Session.set('currentTimepointId', instance.data.currentTimepointId);
 
     const contentId = instance.data.contentId;
@@ -49,18 +51,6 @@ Template.viewer.onCreated(() => {
     OHIF.viewer.defaultHotkeys.bidirectional = 'T'; // Target
     OHIF.viewer.defaultHotkeys.nonTarget = 'N'; // Non-target
 
-    if (isTouchDevice()) {
-        OHIF.viewer.tooltipConfig = {
-            trigger: 'manual'
-        };
-    } else {
-        OHIF.viewer.tooltipConfig = {
-            trigger: 'hover'
-        };
-    }
-
-    OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
-
     if (ViewerData[contentId].loadedSeriesData) {
         log.info('Reloading previous loadedSeriesData');
         OHIF.viewer.loadedSeriesData = ViewerData[contentId].loadedSeriesData;
@@ -68,20 +58,7 @@ Template.viewer.onCreated(() => {
     } else {
         log.info('Setting default ViewerData');
         OHIF.viewer.loadedSeriesData = {};
-
-        ViewerData[contentId].loadedSeriesData = OHIF.viewer.loadedSeriesData;
-
-        // Update the viewer data object
-        if (!instance.data.timepointIds || instance.data.timepointIds.length <= 1) {
-            // Update the viewer data object
-            ViewerData[contentId].viewportColumns = 1;
-            ViewerData[contentId].viewportRows = 1;
-        } else if (instance.data.timepointIds.length > 1) {
-            ViewerData[contentId].viewportColumns = 2;
-            ViewerData[contentId].viewportRows = 1;
-        }
-
-        ViewerData[contentId].activeViewport = 0;
+        ViewerData[contentId].loadedSeriesData = {};
         Session.set('ViewerData', ViewerData);
     }
 
@@ -108,11 +85,8 @@ Template.viewer.onCreated(() => {
         instance.subscribe('singlePatientMeasurements', dataContext.studies[0].patientId);
         instance.subscribe('singlePatientImageMeasurements', dataContext.studies[0].patientId);
         instance.subscribe('singlePatientAdditionalFindings', dataContext.studies[0].patientId);
-
-        const subscriptionsReady = instance.subscriptionsReady();
-        log.info('autorun viewer.js. Ready: ' + subscriptionsReady);
-
-        if (subscriptionsReady) {
+        
+        if (instance.subscriptionsReady()) {
             // Set buttons as enabled/disabled when Timepoints collection is ready
             timepointAutoCheck(dataContext);
 

Packages/lesiontracker/client/components/viewer/viewer.styl

@@ -6,6 +6,23 @@
   display: flex
   flex-flow: column wrap
   height: 100%
+  width: 100%
   margin: 0
   padding: 0
-  width: 100%
+
+
+#imageViewerViewports
+  .viewportContainer
+    border: none !important
+    outline: 0 !important // Prevent blue outline in Chrome
+
+    &:hover
+    &.active
+    &:hover.active
+      border: none !important
+      outline: 0 !important // Prevent blue outline in Chrome
+
+    &:not(:last-child)
+    .removable
+      .imageViewerViewport
+        border-right: $uiBorderThickness solid #436270