Add magnifier to rebaseline server

gm/rebaseline_server/static/diff_viewer.js

Index: gm/rebaseline_server/static/diff_viewer.js
diff --git a/tools/skpdiff/diff_viewer.js b/gm/rebaseline_server/static/diff_viewer.js
similarity index 54%
copy from tools/skpdiff/diff_viewer.js
copy to gm/rebaseline_server/static/diff_viewer.js
index 6be434b4db17be05f0e85866b5cbd6d17e16e02c..cad83321fbd192e6a39914d561b8337044dad76b 100644
--- a/tools/skpdiff/diff_viewer.js
+++ b/gm/rebaseline_server/static/diff_viewer.js
@@ -1,13 +1,11 @@
-var MAX_SWAP_IMG_SIZE = 400;
-var MAGNIFIER_WIDTH = 200;
-var MAGNIFIER_HEIGHT = 200;
+var MAX_SWAP_IMG_SIZE = 200;
+var MAGNIFIER_WIDTH = 100;
+var MAGNIFIER_HEIGHT = 100;
 var MAGNIFIER_HALF_WIDTH = MAGNIFIER_WIDTH * 0.5;
 var MAGNIFIER_HALF_HEIGHT = MAGNIFIER_HEIGHT * 0.5;
-// TODO add support for a magnified scale factor
 var MAGNIFIER_SCALE_FACTOR = 2.0;
 
-angular.module('diff_viewer', []).
-directive('imgCompare', function() {
+angular.module('diff_viewer', []).directive('imgCompare', function() {
   // Custom directive for comparing (3-way) images
   return {
       restrict: 'E', // The directive can be used as an element name
@@ -18,23 +16,20 @@ directive('imgCompare', function() {
           var image = new Image();
           var canvas = elm[0];
           var ctx = canvas.getContext('2d');
-
           var magnifyContent = false;
-          var maskCanvas = false;
 
           // When the type attribute changes, load the image and then render
           attrs.$observe('type', function(value) {
               switch(value) {
-                case "alphaMask":
-                    image.src = scope.record.differencePath;
-                    maskCanvas = true;
+                case "differingPixelsInWhite":
+                    magnifyContent = true;
+                    break;
+                case "differencePerPixel":
                     break;
                 case "baseline":
-                    image.src = scope.record.baselinePath;
                     magnifyContent = true;
                     break;
                 case "test":
-                    image.src = scope.record.testPath;
                     magnifyContent = true;
                     break;
                 default:
@@ -42,6 +37,7 @@ directive('imgCompare', function() {
                     return;
               }
 
+              image.src = attrs.src;
               image.onload = function() {
                   // compute the scaled image width/height for image and canvas
                   var divisor = 1;
@@ -57,29 +53,10 @@ directive('imgCompare', function() {
                   canvas.width = image.width * scope.imgScaleFactor;
                   canvas.height = image.height * scope.imgScaleFactor;
 
-                  // update the size for non-alphaMask canvas when loading baseline image
-                  if (!scope.maskSizeUpdated) {
-                      if (!maskCanvas) {
-                          scope.updateMaskCanvasSize({width: canvas.width, height: canvas.height});
-                      }
-                      scope.maskCanvasSizeUpdated(true);
-                  }
-
-                  // render the image onto the canvas
                   scope.renderImage();
               }
           });
 
-          // when updatedMaskSize changes, update mask canvas size.
-          scope.$watch('updatedMaskSize', function(updatedSize) {
-              if (!maskCanvas) {
-                  return;
-              }
-
-              canvas.width = updatedSize.width;
-              canvas.height = updatedSize.height;
-          });
-
           // When the magnify attribute changes, render the magnified rect at
           // the default zoom level.
           scope.$watch('magnifyCenter', function(magCenter) {
@@ -146,7 +123,7 @@ directive('imgCompare', function() {
           };
 
           // event handler for mouse events that triggers the magnification
-          // effect across the 3 images being compared.
+          // effect across the 4 images being compared.
           scope.MagnifyDraw = function(event, startMagnify) {
               if (startMagnify) {
                   scope.setMagnifierState(true);
@@ -177,7 +154,7 @@ directive('imgCompare', function() {
               // update scope on baseline / test that will cause them to render
               scope.setMagnifierState(false);
               scope.setMagnifyCenter(undefined);
-        };
+          };
       }
   };
 });
@@ -186,8 +163,6 @@ function ImageController($scope, $http, $location, $timeout, $parse) {
   $scope.imgScaleFactor = 1.0;
   $scope.magnifierOn = false;
   $scope.magnifyCenter = undefined;
-  $scope.updatedMaskSize = undefined;
-  $scope.maskSizeUpdated = false;
 
   $scope.setImgScaleFactor = function(scaleFactor) {
     $scope.imgScaleFactor = scaleFactor;
@@ -200,107 +175,5 @@ function ImageController($scope, $http, $location, $timeout, $parse) {
   $scope.setMagnifyCenter = function(magnifyCenter) {
       $scope.magnifyCenter = magnifyCenter;
   }
-
-  $scope.updateMaskCanvasSize = function(updatedSize) {
-      $scope.updatedMaskSize = updatedSize;
-  }
-
-  $scope.maskCanvasSizeUpdated = function(flag) {
-      $scope.maskSizeUpdated = flag;
-  }
 }
 
-function DiffListController($scope, $http, $location, $timeout, $parse) {
-    // Detect if we are running the web server version of the viewer. If so, we set a flag and
-    // enable some extra functionality of the website for rebaselining.
-    $scope.isDynamic = ($location.protocol() == "http" || $location.protocol() == "https");
-
-    // Label each kind of differ for the sort buttons.
-    $scope.differs = [
-        {
-            "title": "Different Pixels"
-        },
-        {
-            "title": "Perceptual Difference"
-        }
-    ];
-
-    // Puts the records within AngularJS scope
-    $scope.records = SkPDiffRecords.records;
-
-    // Keep track of the index of the last record to change so that shift clicking knows what range
-    // of records to apply the action to.
-    $scope.lastSelectedIndex = undefined;
-
-    // Indicates which diff metric is used for sorting
-    $scope.sortIndex = 1;
-
-    // Called by the sort buttons to adjust the metric used for sorting
-    $scope.setSortIndex = function(idx) {
-        $scope.sortIndex = idx;
-
-        // Because the index of things has most likely changed, the ranges of shift clicking no
-        // longer make sense from the user's point of view. We reset it to avoid confusion.
-        $scope.lastSelectedIndex = undefined;
-    };
-
-    // A predicate for pulling out the number used for sorting
-    $scope.sortingDiffer = function(record) {
-        return record.diffs[$scope.sortIndex].result;
-    };
-
-    // Flash status indicator on the page, and then remove it so the style can potentially be
-    // reapplied later.
-    $scope.flashStatus = function(success) {
-        var flashStyle = success ? "success-flash" : "failure-flash";
-        var flashDurationMillis = success ? 500 : 800;
-
-        // Store the style in the record. The row will pick up the style this way instead of through
-        // index because index can change with sort order.
-        $scope.statusClass = flashStyle;
-
-        // The animation cannot be repeated unless the class is removed the element.
-        $timeout(function() {
-            $scope.statusClass = "";
-        }, flashDurationMillis);
-    };
-
-    $scope.selectedRebaseline = function(index, event) {
-        // Retrieve the records in the same order they are displayed.
-        var recordsInOrder = $parse("records | orderBy:sortingDiffer")($scope);
-
-        // If the user is shift clicking, apply the last tick/untick to all elements in between this
-        // record, and the last one they ticked/unticked.
-        if (event.shiftKey && $scope.lastSelectedIndex !== undefined) {
-            var currentAction = recordsInOrder[index].isRebaselined;
-            var smallerIndex = Math.min($scope.lastSelectedIndex, index);
-            var largerIndex = Math.max($scope.lastSelectedIndex, index);
-            for (var recordIndex = smallerIndex; recordIndex <= largerIndex; recordIndex++) {
-                recordsInOrder[recordIndex].isRebaselined = currentAction;
-            }
-            $scope.lastSelectedIndex = index;
-        }
-        else
-        {
-            $scope.lastSelectedIndex = index;
-        }
-
-    };
-
-    $scope.commitRebaselines = function() {
-        // Gather up all records that have the rebaseline set.
-        var rebaselines = [];
-        for (var recordIndex = 0; recordIndex < $scope.records.length; recordIndex++) {
-            if ($scope.records[recordIndex].isRebaselined) {
-                rebaselines.push($scope.records[recordIndex].testPath);
-            }
-        }
-        $http.post("/commit_rebaselines", {
-            "rebaselines": rebaselines
-        }).success(function(data) {
-            $scope.flashStatus(data.success);
-        }).error(function() {
-            $scope.flashStatus(false);
-        });
-    };
-}