rebaseline_server: improve pixel diff reporting

gm/rebaseline_server/results.py

 #!/usr/bin/python
 
 """
 Copyright 2013 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Repackage expected/actual GM results as needed by our HTML rebaseline viewer.
 """
@@ skipping 43 matching lines @@
 
   Once this object has been constructed, the results (in self._results[])
   are immutable.  If you want to update the results based on updated JSON
   file contents, you will need to create a new Results object."""
 
   def __init__(self, actuals_root, expected_root, generated_images_root):
     """
     Args:
       actuals_root: root directory containing all actual-results.json files
       expected_root: root directory containing all expected-results.json files
-      generated_images_root: directory within which to create all pixels diffs;
+      generated_images_root: directory within which to create all pixel diffs;
           if this directory does not yet exist, it will be created
     """
     self._image_diff_db = imagediffdb.ImageDiffDB(generated_images_root)
     self._actuals_root = actuals_root
     self._expected_root = expected_root
     self._load_actual_and_expected()
     self._timestamp = int(time.time())
 
   def get_timestamp(self):
     """Return the time at which this object was created, in seconds past epoch
@@ skipping 318 matching lines @@
               # FIELDS_PASSED_THRU_VERBATIM that may be overwritten below...
               gm_json.JSONKEY_EXPECTEDRESULTS_IGNOREFAILURE: False,
           }
           if expectations_per_test:
             for field in FIELDS_PASSED_THRU_VERBATIM:
               results_for_this_test[field] = expectations_per_test.get(field)
 
           if updated_result_type == gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON:
             pass # no diff record to calculate at all
           elif updated_result_type == gm_json.JSONKEY_ACTUALRESULTS_SUCCEEDED:
+            results_for_this_test['numDifferingPixels'] = 0
             results_for_this_test['percentDifferingPixels'] = 0
             results_for_this_test['weightedDiffMeasure'] = 0
+            results_for_this_test['maxDiffPerChannel'] = 0
           else:
             try:
               diff_record = self._image_diff_db.get_diff_record(
                   expected_image_locator=expected_image[1],
                   actual_image_locator=actual_image[1])
+              results_for_this_test['numDifferingPixels'] = (
+                  diff_record.get_num_pixels_differing())
               results_for_this_test['percentDifferingPixels'] = (
                   diff_record.get_percent_pixels_differing())
               results_for_this_test['weightedDiffMeasure'] = (
                   diff_record.get_weighted_diff_measure())
+              results_for_this_test['maxDiffPerChannel'] = (
+                  diff_record.get_max_diff_per_channel())
             except KeyError:
               logging.warning('unable to find diff_record for ("%s", "%s")' %
                               (expected_image[1], actual_image[1]))
               pass
 
           Results._add_to_category_dict(categories_all, results_for_this_test)
           data_all.append(results_for_this_test)
 
           # TODO(epoger): In effect, we have a list of resultTypes that we
           # include in the different result lists (data_all and data_failures).
@@ skipping 46 matching lines @@
       category_dict: category dict-of-dicts to modify
       category_name: category name, as a string
       category_values: list of values we want to make sure are represented
                        for this category
     """
     if not category_dict.get(category_name):
       category_dict[category_name] = {}
     for category_value in category_values:
       if not category_dict[category_name].get(category_value):
         category_dict[category_name][category_value] = 0