Updates to save viewport data across sessions / while switching tabs

Packages/viewerbase/components/viewer/imageViewerViewports/imageViewerViewports.html

@@ -3,7 +3,7 @@
         {{ #each viewportArray }}
         <div class="viewportContainer" style="height:{{height}}%;width:{{width}}%;">
             <div class="removable">
-                {{ >imageViewerViewport viewportIndex=viewportIndex studies=studies activeViewport=activeViewport}}
+                {{ >imageViewerViewport viewportIndex=viewportIndex studies=studies activeViewport=activeViewport seriesInstanceUid=seriesInstanceUid studyInstanceUid=studyInstanceUid currentImageIdIndex=currentImageIdIndex viewport=viewport}}
             </div>
         </div>
         {{ /each }}

Packages/viewerbase/components/viewer/imageViewerViewports/imageViewerViewports.js

@@ -1,50 +1,73 @@
 Template.imageViewerViewports.helpers({
-  height: function() {
-    var viewportRows;
-    if (!Template.parentData(1).viewportRows) {
-        viewportRows = 1;
-    } else {
-        viewportRows = Template.parentData(1).viewportRows.get();
-    }
-    return 100 / viewportRows;
-  },
-  width: function() {
-    var viewportColumns;
-    if (!Template.parentData(1).viewportColumns) {
-        viewportColumns = 1;
-    } else {
-        viewportColumns = Template.parentData(1).viewportColumns.get();
-    }
-    return 100 / viewportColumns;
-  },
-  viewportArray: function() {
-    // This is a really annoying thing to have to do, but Meteor
-    // doesn't want to let me use another type of helper.
-    var viewportRows;
-    if (!this.viewportRows) {
-        viewportRows = 1;
-    } else {
-        viewportRows = this.viewportRows.get();
-    }
+    height: function() {
+        var viewportRows;
+        if (!Template.parentData(1).viewportRows) {
+            viewportRows = 1;
+        } else {
+            viewportRows = Template.parentData(1).viewportRows.curValue; //Having issues with .get(), not sure why?
+        }
+        return 100 / viewportRows;
+    },
+    width: function() {
+        var viewportColumns;
+        if (!Template.parentData(1).viewportColumns) {
+            viewportColumns = 1;
+        } else {
+            viewportColumns = Template.parentData(1).viewportColumns.curValue;  //Having issues with .get(), not sure why?
+        }
+        return 100 / viewportColumns;
+    },
+    viewportArray: function() {
+        // This is a really annoying thing to have to do, but Meteor
+        // doesn't want to let me use another type of helper.
+        var viewportRows;
+        if (!this.viewportRows) {
+            viewportRows = 1;
+        } else {
+            viewportRows = this.viewportRows.curValue; //Having issues with .get(), not sure why?
+        }
 
-    var viewportColumns;
-    if (!this.viewportColumns) {
-        viewportColumns = 1;
-    } else {
-        viewportColumns = this.viewportColumns.get();
-    }
-    
-    var numViewports = viewportRows * viewportColumns;
+        var viewportColumns;
+        if (!this.viewportColumns) {
+            viewportColumns = 1;
+        } else {
+            viewportColumns = this.viewportColumns.curValue; //Having issues with .get(), not sure why?
+        }
+        
+        var viewportData;
+        if (OHIF && OHIF.viewer && !$.isEmptyObject(OHIF.viewer.imageViewerLoadedSeriesDictionary)) {
+            viewportData = OHIF.viewer.imageViewerLoadedSeriesDictionary;
+        }
 
-    var array = [];
-    for (var i=0; i < numViewports; ++i) {
-        var data = {
-            viewportIndex: i,
-            studies: this.studies,
-            activeViewport: this.activeViewport
+        var hangingProtocol = getHangingProtocol();
+        var inputData = {
+            viewportColumns: viewportColumns,
+            viewportRows: viewportRows,
+            studies: this.studies
         };
-        array.push(data);
-    }
-    return array;
-  },
+        var hangingProtocolViewportData = hangingProtocol(inputData);
+        
+        var array = [];
+        var numViewports = viewportRows * viewportColumns;
+        for (var i=0; i < numViewports; ++i) {
+            var data = {
+                viewportIndex: i,
+                studies: this.studies,
+                activeViewport: this.activeViewport
+            };
+            if (viewportData && viewportData[i]) {
+                data.seriesInstanceUid = viewportData[i].seriesInstanceUid;
+                data.studyInstanceUid = viewportData[i].studyInstanceUid;
+                data.currentImageIdIndex = viewportData[i].currentImageIdIndex;
+                data.viewport = viewportData[i].viewport;
+            } else if (hangingProtocolViewportData && hangingProtocolViewportData[i]) {
+                data.seriesInstanceUid = hangingProtocolViewportData[i].seriesInstanceUid;
+                data.studyInstanceUid = hangingProtocolViewportData[i].studyInstanceUid;
+                data.currentImageIdIndex = hangingProtocolViewportData[i].currentImageIdIndex;
+                data.viewport = hangingProtocolViewportData[i].viewport;
+            }
+            array.push(data);
+        }
+        return array;
+    },
 });