Work towards tabbed panels. Still very broken

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}}
+                {{ >imageViewerViewport studies=studies activeViewport=activeViewport}}
             </div>
         </div>
         {{ /each }}

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

@@ -1,30 +1,50 @@
-function getNumViewports() {
-    var viewportRows = Session.get('viewportRows');
-    var viewportColumns = Session.get('viewportColumns');
-    return viewportRows * viewportColumns;
-}
-
 Template.imageViewerViewports.helpers({
   height: function() {
-    var viewportRows = Session.get('viewportRows');
+    var viewportRows;
+    if (!Template.parentData(1).viewportRows) {
+        viewportRows = 1;
+    } else {
+        viewportRows = Template.parentData(1).viewportRows.get();
+    }
     return 100 / viewportRows;
   },
   width: function() {
-    var viewportColumns = Session.get('viewportColumns');
+    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 numViewports = getNumViewports();
+    var viewportRows;
+    if (!this.viewportRows) {
+        viewportRows = 1;
+    } else {
+        viewportRows = this.viewportRows.get();
+    }
+
+    var viewportColumns;
+    if (!this.viewportColumns) {
+        viewportColumns = 1;
+    } else {
+        viewportColumns = this.viewportColumns.get();
+    }
+    
+    var numViewports = viewportRows * viewportColumns;
 
     var array = [];
     for (var i=0; i < numViewports; ++i) {
         var data = {
-            viewportIndex: i
+            viewportIndex: i,
+            studies: this.studies,
+            activeViewport: this.activeViewport
         };
         array.push(data);
     }
     return array;
-  }
+  },
 });