Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 var MAX_SWAP_IMG_SIZE = 400; | 1 var MAX_SWAP_IMG_SIZE = 200; |
|
epoger
2014/02/04 16:45:52
I assume the previous version of this file was cop
rmistry
2014/02/04 18:35:33
The previous version of this file is actually from
epoger
2014/02/04 18:50:14
Ah. So we currently have *3* diff_viewers:
1. her
| |
| 2 var MAGNIFIER_WIDTH = 200; | 2 var MAGNIFIER_WIDTH = 100; |
| 3 var MAGNIFIER_HEIGHT = 200; | 3 var MAGNIFIER_HEIGHT = 100; |
| 4 var MAGNIFIER_HALF_WIDTH = MAGNIFIER_WIDTH * 0.5; | 4 var MAGNIFIER_HALF_WIDTH = MAGNIFIER_WIDTH * 0.5; |
| 5 var MAGNIFIER_HALF_HEIGHT = MAGNIFIER_HEIGHT * 0.5; | 5 var MAGNIFIER_HALF_HEIGHT = MAGNIFIER_HEIGHT * 0.5; |
| 6 // TODO add support for a magnified scale factor | |
| 7 var MAGNIFIER_SCALE_FACTOR = 2.0; | 6 var MAGNIFIER_SCALE_FACTOR = 2.0; |
| 8 | 7 |
| 9 angular.module('diff_viewer', []). | 8 angular.module('diff_viewer', []).directive('imgCompare', function() { |
| 10 directive('imgCompare', function() { | |
| 11 // Custom directive for comparing (3-way) images | 9 // Custom directive for comparing (3-way) images |
| 12 return { | 10 return { |
| 13 restrict: 'E', // The directive can be used as an element name | 11 restrict: 'E', // The directive can be used as an element name |
| 14 replace: true, // The directive replaces itself with the template | 12 replace: true, // The directive replaces itself with the template |
| 15 template: '<canvas/>', | 13 template: '<canvas/>', |
| 16 scope: true, | 14 scope: true, |
| 17 link: function(scope, elm, attrs, ctrl) { | 15 link: function(scope, elm, attrs, ctrl) { |
| 18 var image = new Image(); | 16 var image = new Image(); |
| 19 var canvas = elm[0]; | 17 var canvas = elm[0]; |
| 20 var ctx = canvas.getContext('2d'); | 18 var ctx = canvas.getContext('2d'); |
| 21 | 19 |
| 22 var magnifyContent = false; | 20 var magnifyContent = false; |
| 23 var maskCanvas = false; | 21 var maskCanvas = false; |
| 24 | 22 |
| 25 // When the type attribute changes, load the image and then render | 23 // When the type attribute changes, load the image and then render |
| 26 attrs.$observe('type', function(value) { | 24 attrs.$observe('type', function(value) { |
| 27 switch(value) { | 25 switch(value) { |
| 28 case "alphaMask": | 26 case "differingPixelsInWhite": |
| 29 image.src = scope.record.differencePath; | 27 magnifyContent = true; |
| 28 break; | |
| 29 case "differencePerPixel": | |
| 30 maskCanvas = true; | 30 maskCanvas = true; |
| 31 break; | 31 break; |
| 32 case "baseline": | 32 case "baseline": |
| 33 image.src = scope.record.baselinePath; | |
| 34 magnifyContent = true; | 33 magnifyContent = true; |
| 35 break; | 34 break; |
| 36 case "test": | 35 case "test": |
| 37 image.src = scope.record.testPath; | |
| 38 magnifyContent = true; | 36 magnifyContent = true; |
| 39 break; | 37 break; |
| 40 default: | 38 default: |
| 41 console.log("Unknown type attribute on <img-compare>: " + va lue); | 39 console.log("Unknown type attribute on <img-compare>: " + va lue); |
| 42 return; | 40 return; |
| 43 } | 41 } |
| 44 | 42 |
| 43 image.src = attrs.src; | |
| 45 image.onload = function() { | 44 image.onload = function() { |
| 46 // compute the scaled image width/height for image and canvas | 45 // compute the scaled image width/height for image and canvas |
| 47 var divisor = 1; | 46 var divisor = 1; |
| 48 // Make it so the maximum size of an image is MAX_SWAP_IMG_SIZ E, | 47 // Make it so the maximum size of an image is MAX_SWAP_IMG_SIZ E, |
| 49 // and the images are scaled down in halves. | 48 // and the images are scaled down in halves. |
| 50 while ((image.width / divisor) > MAX_SWAP_IMG_SIZE) { | 49 while ((image.width / divisor) > MAX_SWAP_IMG_SIZE) { |
| 51 divisor *= 2; | 50 divisor *= 2; |
| 52 } | 51 } |
| 53 | 52 |
| 54 scope.setImgScaleFactor(1 / divisor); | 53 scope.setImgScaleFactor(1 / divisor); |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 139 var scaledHeight = MAGNIFIER_HEIGHT * scope.imgScaleFactor; | 138 var scaledHeight = MAGNIFIER_HEIGHT * scope.imgScaleFactor; |
| 140 return { | 139 return { |
| 141 x: event.offsetX - (scaledWidth * 0.5), | 140 x: event.offsetX - (scaledWidth * 0.5), |
| 142 y: event.offsetY - (scaledHeight * 0.5), | 141 y: event.offsetY - (scaledHeight * 0.5), |
| 143 width: scaledWidth, | 142 width: scaledWidth, |
| 144 height: scaledHeight | 143 height: scaledHeight |
| 145 }; | 144 }; |
| 146 }; | 145 }; |
| 147 | 146 |
| 148 // event handler for mouse events that triggers the magnification | 147 // event handler for mouse events that triggers the magnification |
| 149 // effect across the 3 images being compared. | 148 // effect across the 4 images being compared. |
| 150 scope.MagnifyDraw = function(event, startMagnify) { | 149 scope.MagnifyDraw = function(event, startMagnify) { |
| 151 if (startMagnify) { | 150 if (startMagnify) { |
| 152 scope.setMagnifierState(true); | 151 scope.setMagnifierState(true); |
| 153 } else if (!scope.magnifierOn) { | 152 } else if (!scope.magnifierOn) { |
| 154 return; | 153 return; |
| 155 } | 154 } |
| 156 | 155 |
| 157 scope.renderImage(); | 156 scope.renderImage(); |
| 158 | 157 |
| 159 // render the magnifier outline rect | 158 // render the magnifier outline rect |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 170 scope.setMagnifyCenter({x: event.offsetX, y: event.offsetY}); | 169 scope.setMagnifyCenter({x: event.offsetX, y: event.offsetY}); |
| 171 }; | 170 }; |
| 172 | 171 |
| 173 // event handler that triggers the end of the magnification effect and | 172 // event handler that triggers the end of the magnification effect and |
| 174 // resets all the canvases to their original state. | 173 // resets all the canvases to their original state. |
| 175 scope.MagnifyEnd = function(event) { | 174 scope.MagnifyEnd = function(event) { |
| 176 scope.renderImage(); | 175 scope.renderImage(); |
| 177 // update scope on baseline / test that will cause them to render | 176 // update scope on baseline / test that will cause them to render |
| 178 scope.setMagnifierState(false); | 177 scope.setMagnifierState(false); |
| 179 scope.setMagnifyCenter(undefined); | 178 scope.setMagnifyCenter(undefined); |
| 180 }; | 179 }; |
| 181 } | 180 } |
| 182 }; | 181 }; |
| 183 }); | 182 }); |
| 184 | 183 |
| 185 function ImageController($scope, $http, $location, $timeout, $parse) { | 184 function ImageController($scope, $http, $location, $timeout, $parse) { |
| 186 $scope.imgScaleFactor = 1.0; | 185 $scope.imgScaleFactor = 1.0; |
| 187 $scope.magnifierOn = false; | 186 $scope.magnifierOn = false; |
| 188 $scope.magnifyCenter = undefined; | 187 $scope.magnifyCenter = undefined; |
| 189 $scope.updatedMaskSize = undefined; | 188 $scope.updatedMaskSize = undefined; |
| 190 $scope.maskSizeUpdated = false; | 189 $scope.maskSizeUpdated = false; |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 203 | 202 |
| 204 $scope.updateMaskCanvasSize = function(updatedSize) { | 203 $scope.updateMaskCanvasSize = function(updatedSize) { |
| 205 $scope.updatedMaskSize = updatedSize; | 204 $scope.updatedMaskSize = updatedSize; |
| 206 } | 205 } |
| 207 | 206 |
| 208 $scope.maskCanvasSizeUpdated = function(flag) { | 207 $scope.maskCanvasSizeUpdated = function(flag) { |
| 209 $scope.maskSizeUpdated = flag; | 208 $scope.maskSizeUpdated = flag; |
| 210 } | 209 } |
| 211 } | 210 } |
| 212 | 211 |
| 213 function DiffListController($scope, $http, $location, $timeout, $parse) { | |
| 214 // Detect if we are running the web server version of the viewer. If so, we set a flag and | |
| 215 // enable some extra functionality of the website for rebaselining. | |
| 216 $scope.isDynamic = ($location.protocol() == "http" || $location.protocol() = = "https"); | |
| 217 | |
| 218 // Label each kind of differ for the sort buttons. | |
| 219 $scope.differs = [ | |
| 220 { | |
| 221 "title": "Different Pixels" | |
| 222 }, | |
| 223 { | |
| 224 "title": "Perceptual Difference" | |
| 225 } | |
| 226 ]; | |
| 227 | |
| 228 // Puts the records within AngularJS scope | |
| 229 $scope.records = SkPDiffRecords.records; | |
| 230 | |
| 231 // Keep track of the index of the last record to change so that shift clicki ng knows what range | |
| 232 // of records to apply the action to. | |
| 233 $scope.lastSelectedIndex = undefined; | |
| 234 | |
| 235 // Indicates which diff metric is used for sorting | |
| 236 $scope.sortIndex = 1; | |
| 237 | |
| 238 // Called by the sort buttons to adjust the metric used for sorting | |
| 239 $scope.setSortIndex = function(idx) { | |
| 240 $scope.sortIndex = idx; | |
| 241 | |
| 242 // Because the index of things has most likely changed, the ranges of sh ift clicking no | |
| 243 // longer make sense from the user's point of view. We reset it to avoid confusion. | |
| 244 $scope.lastSelectedIndex = undefined; | |
| 245 }; | |
| 246 | |
| 247 // A predicate for pulling out the number used for sorting | |
| 248 $scope.sortingDiffer = function(record) { | |
| 249 return record.diffs[$scope.sortIndex].result; | |
| 250 }; | |
| 251 | |
| 252 // Flash status indicator on the page, and then remove it so the style can p otentially be | |
| 253 // reapplied later. | |
| 254 $scope.flashStatus = function(success) { | |
| 255 var flashStyle = success ? "success-flash" : "failure-flash"; | |
| 256 var flashDurationMillis = success ? 500 : 800; | |
| 257 | |
| 258 // Store the style in the record. The row will pick up the style this wa y instead of through | |
| 259 // index because index can change with sort order. | |
| 260 $scope.statusClass = flashStyle; | |
| 261 | |
| 262 // The animation cannot be repeated unless the class is removed the elem ent. | |
| 263 $timeout(function() { | |
| 264 $scope.statusClass = ""; | |
| 265 }, flashDurationMillis); | |
| 266 }; | |
| 267 | |
| 268 $scope.selectedRebaseline = function(index, event) { | |
| 269 // Retrieve the records in the same order they are displayed. | |
| 270 var recordsInOrder = $parse("records | orderBy:sortingDiffer")($scope); | |
| 271 | |
| 272 // If the user is shift clicking, apply the last tick/untick to all elem ents in between this | |
| 273 // record, and the last one they ticked/unticked. | |
| 274 if (event.shiftKey && $scope.lastSelectedIndex !== undefined) { | |
| 275 var currentAction = recordsInOrder[index].isRebaselined; | |
| 276 var smallerIndex = Math.min($scope.lastSelectedIndex, index); | |
| 277 var largerIndex = Math.max($scope.lastSelectedIndex, index); | |
| 278 for (var recordIndex = smallerIndex; recordIndex <= largerIndex; rec ordIndex++) { | |
| 279 recordsInOrder[recordIndex].isRebaselined = currentAction; | |
| 280 } | |
| 281 $scope.lastSelectedIndex = index; | |
| 282 } | |
| 283 else | |
| 284 { | |
| 285 $scope.lastSelectedIndex = index; | |
| 286 } | |
| 287 | |
| 288 }; | |
| 289 | |
| 290 $scope.commitRebaselines = function() { | |
| 291 // Gather up all records that have the rebaseline set. | |
| 292 var rebaselines = []; | |
| 293 for (var recordIndex = 0; recordIndex < $scope.records.length; recordInd ex++) { | |
| 294 if ($scope.records[recordIndex].isRebaselined) { | |
| 295 rebaselines.push($scope.records[recordIndex].testPath); | |
| 296 } | |
| 297 } | |
| 298 $http.post("/commit_rebaselines", { | |
| 299 "rebaselines": rebaselines | |
| 300 }).success(function(data) { | |
| 301 $scope.flashStatus(data.success); | |
| 302 }).error(function() { | |
| 303 $scope.flashStatus(false); | |
| 304 }); | |
| 305 }; | |
| 306 } | |
| OLD | NEW |