commit e93a4c0fea42da5cd57506ab75eb6df3dff4762c
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Apr 11 21:45:41 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Apr 11 21:45:41 2014 +0000
tree 695d8e348ecc4c26e80463f7ef91c40caa9dc790
parent 7e41957aee7cc972b6379a38ada1f91e6a465c3e

rebaseline_server: fix sorting by perceptual diff column

(SkipBuildbotRuns)
BUG=skia:2410
NOTREECHECKS=True
NOTRY=True
R=rmistry@google.com
TBR=rmistry

Author: epoger@google.com

Review URL: https://codereview.chromium.org/235993002

git-svn-id: http://skia.googlecode.com/svn/trunk@14167 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/rebaseline_server/static/loader.js

diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/loader.js
index 562426d..dc33bd0 100644
--- a/gm/rebaseline_server/static/loader.js
+++ b/gm/rebaseline_server/static/loader.js
@@ -102,7 +102,7 @@
           $scope.imagePairs = data[constants.KEY__IMAGEPAIRS];
           $scope.imageSets = data[constants.KEY__IMAGESETS];
           $scope.sortColumnSubdict = constants.KEY__DIFFERENCE_DATA;
-          $scope.sortColumnKey = constants.KEY__DIFFERENCE_DATA__WEIGHTED_DIFF;
+          $scope.sortColumnKey = constants.KEY__DIFFERENCE_DATA__PERCEPTUAL_DIFF;
 
           $scope.showSubmitAdvancedSettings = false;
           $scope.submitAdvancedSettings = {};
@@ -411,7 +411,7 @@
             ($scope.sortColumnKey ==
              constants.KEY__DIFFERENCE_DATA__PERCENT_DIFF_PIXELS) ||
             ($scope.sortColumnKey ==
-             constants.KEY__DIFFERENCE_DATA__WEIGHTED_DIFF));
+             constants.KEY__DIFFERENCE_DATA__PERCEPTUAL_DIFF));
 
         $scope.filteredImagePairs =
             $filter("orderBy")(

gm/rebaseline_server/static/view.html

diff --git a/gm/rebaseline_server/static/view.html b/gm/rebaseline_server/static/view.html
index 2c11804..37ed4fa 100644
--- a/gm/rebaseline_server/static/view.html
+++ b/gm/rebaseline_server/static/view.html
@@ -260,8 +260,8 @@
             <input type="radio"
                    name="sortColumnRadio"
                    value="weightedDiffMeasure"
-                   ng-checked="(sortColumnKey == constants.KEY__DIFFERENCE_DATA__WEIGHTED_DIFF)"
-                   ng-click="sortResultsBy(constants.KEY__DIFFERENCE_DATA, constants.KEY__DIFFERENCE_DATA__WEIGHTED_DIFF)">
+                   ng-checked="(sortColumnKey == constants.KEY__DIFFERENCE_DATA__PERCEPTUAL_DIFF)"
+                   ng-click="sortResultsBy(constants.KEY__DIFFERENCE_DATA, constants.KEY__DIFFERENCE_DATA__PERCEPTUAL_DIFF)">
             perceptual difference
             <br>
             <input type="range" ng-model="pixelDiffBgColorBrightness"