From b2bfa2b09b156adfd4006ee97f08e5986d7b2c25 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Thu, 15 Jan 2015 18:48:11 -0800
Subject: [PATCH] [Fixed Position] Populate background grid

Add a background grid to fixed position view, WTD-615.
---
 .../features/layout/res/templates/fixed.html  | 14 +++++++-
 .../features/layout/src/FixedController.js    | 35 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/platform/features/layout/res/templates/fixed.html b/platform/features/layout/res/templates/fixed.html
index 3f480c72e8..1675cd2cde 100644
--- a/platform/features/layout/res/templates/fixed.html
+++ b/platform/features/layout/res/templates/fixed.html
@@ -1,7 +1,19 @@
-<div style="width: 100%; height: 100%;"
+
+
+<div style="width: 100%; height: 100%; position: absolute; left: 0px; top: 0px;"
      ng-controller="FixedController as controller">
 
+    <!-- Background grid -->
+    <div ng-repeat="cell in controller.getCellStyles()"
+         style="position: absolute; border: 1px gray solid; background: black;"
+         ng-style="cell">
+    </div>
+
+
+
+
     <div ng-repeat="childObject in composition"
+         style="position: absolute;"
          ng-style="controller.getStyle(childObject.getId())">
 
         <div ng-style="controller.getCellStyle()">
diff --git a/platform/features/layout/src/FixedController.js b/platform/features/layout/src/FixedController.js
index ff43e6c4b0..a959775120 100644
--- a/platform/features/layout/src/FixedController.js
+++ b/platform/features/layout/src/FixedController.js
@@ -6,7 +6,8 @@ define(
         "use strict";
 
         var DEFAULT_DIMENSIONS = [ 2, 1 ],
-            DEFAULT_GRID_SIZE = [64, 16];
+            DEFAULT_GRID_SIZE = [64, 16],
+            DEFAULT_GRID_EXTENT = [4, 4];
 
         /**
          * The FixedController is responsible for supporting the
@@ -18,8 +19,10 @@ define(
          */
         function FixedController($scope) {
             var gridSize = DEFAULT_GRID_SIZE,
+                gridExtent = DEFAULT_GRID_EXTENT,
                 activeDrag,
                 activeDragId,
+                cellStyles = [],
                 rawPositions = {},
                 positions = {};
 
@@ -34,6 +37,25 @@ define(
                 return copy;
             }
 
+            // Refresh cell styles (e.g. because grid extent changed)
+            function refreshCellStyles() {
+                var x, y;
+
+                cellStyles = [];
+
+                for (x = 0; x < gridExtent[0]; x += 1) {
+                    for (y = 0; y < gridExtent[1]; y += 1) {
+                        // Position blocks; subtract out border size from w/h
+                        cellStyles.push({
+                            left: x * gridSize[0] + 'px',
+                            top: y * gridSize[1] + 'px',
+                            width: gridSize[0] - 2 + 'px',
+                            height: gridSize[1] - 2 + 'px'
+                        });
+                    }
+                }
+            }
+
             // Convert from { positions: ..., dimensions: ... } to an
             // apropriate ng-style argument, to position frames.
             function convertPosition(raw) {
@@ -86,7 +108,18 @@ define(
             // Position panes when the model field changes
             $scope.$watch("model", lookupPanels);
 
+            refreshCellStyles();
+
             return {
+                /**
+                 * Get styles for all background cells, as will populate the
+                 * ng-style tag.
+                 * @memberof FixedController#
+                 * @returns {Array} cell styles
+                 */
+                getCellStyles: function () {
+                    return cellStyles;
+                },
                 /**
                  * Get a style object for a frame with the specified domain
                  * object identifier, suitable for use in an `ng-style`