Updates to improve reactivity, session storage, logging

OHIFViewer/client/components/viewer/viewer.html

@@ -1,6 +1,9 @@
 <template name="viewer">
     <div id="viewer">
-        {{> studyBrowser studies=studies activeViewport=activeViewport}}
-        {{> viewerMain studies=studies activeViewport=activeViewport viewportRows=viewportRows viewportColumns=viewportColumns}}
+        {{> studyBrowser }}
+        <div class='viewerMain'>
+            {{ > toolbar }}
+            {{ > imageViewerViewports }}
+        </div>
     </div>
 </template>

OHIFViewer/client/components/viewer/viewer.js

@@ -1,4 +1,6 @@
 function resizeViewports() {
+    log.info("viewer resizeViewports");
+
     // Handle resizing of image viewer viewports
     // For some reason, this seems to need to be on
     // another delay, or the resizing won't work properly
@@ -15,7 +17,8 @@ function resizeViewports() {
 }
 
 Template.viewer.onCreated(function() {
-    console.log("Image Viewer onCreated");
+    log.info("viewer onCreated");
+
     OHIF = {
         viewer: {}
     };
@@ -55,35 +58,35 @@ Template.viewer.onCreated(function() {
         };
     }
 
-    if (this.data.activeViewport === undefined) {
-        this.data.activeViewport = new ReactiveVar(0);
-    }
-    if (this.data.viewportRows === undefined) {
-        this.data.viewportRows = new ReactiveVar(1);
-    }
-    if (this.data.viewportColumns === undefined) {
-        this.data.viewportColumns = new ReactiveVar(1);
-    }
-
     var contentId = this.data.contentId;
     
-    // Update the viewer data object
-    ViewerData[contentId].viewportColumns = this.data.viewportColumns;
-    ViewerData[contentId].viewportRows = this.data.viewportRows;
-    ViewerData[contentId].activeViewport = this.data.activeViewport;
-    Session.set('ViewerData', ViewerData);
+    if (ViewerData[contentId].loadedSeriesData) {
+        log.info('Reloading previous loadedSeriesData');
+
+        OHIF.viewer.loadedSeriesData = ViewerData[contentId].loadedSeriesData;
 
-    if (ViewerData[contentId].viewer) {
-        OHIF.viewer = ViewerData[contentId].viewer;
     } else {
-        OHIF.viewer.imageViewerLoadedSeriesDictionary = {};
-        ViewerData[contentId].viewer = OHIF.viewer;
+        log.info('Setting default ViewerData');
+        OHIF.viewer.loadedSeriesData = {};
+        
+        ViewerData[contentId].loadedSeriesData = OHIF.viewer.loadedSeriesData;
+
+        // Update the viewer data object
+        ViewerData[contentId].viewportColumns = 1;
+        ViewerData[contentId].viewportRows = 1;
+        ViewerData[contentId].activeViewport = 0;
+        Session.set('ViewerData', ViewerData);
     }
 
+    Session.set('activeViewport', ViewerData[contentId].activeViewport || 0);
+
+    Session.set("studies", this.data.studies);
+
     OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer("CornerstoneNewImage", cornerstoneTools.updateImageSynchronizer);
 });
 
 Template.viewer.onDestroyed(function() {
+    log.info("onDestroyed");
     OHIF.viewer.updateImageSynchronizer.destroy();
 });
 

OHIFViewer/client/components/viewer/viewer.styl

@@ -12,4 +12,10 @@
   user-select: none
   
 .studyBrowser
-  width: auto
+  width: auto
+  
+.viewerMain
+  float: left
+  background-color: gray
+  height: 100%
+  width: calc(100% - 120px)

OHIFViewer/client/components/viewer/viewerMain/viewerMain.html

@@ -1,6 +0,0 @@
-<template name="viewerMain">
-    <div class='viewerMain'>
-        {{ > toolbar activeViewport=activeViewport viewportRows=viewportRows viewportColumns=viewportColumns}}
-        {{ > imageViewerViewports studies=studies activeViewport=activeViewport viewportRows=viewportRows viewportColumns=viewportColumns}}
-    </div>
-</template>

OHIFViewer/client/components/viewer/viewerMain/viewerMain.js

@@ -1,5 +0,0 @@
-Template.viewerMain.helpers({
-    studies : function() {
-        return this.studies;
-    }
-});

OHIFViewer/client/components/viewer/viewerMain/viewerMain.styl

@@ -1,5 +0,0 @@
-.viewerMain
-  float: left
-  background-color: gray
-  height: 100%
-  width: calc(100% - 120px)