Merge lp:~joetalbott/qa-dashboard/add_stddev_line into lp:qa-dashboard

[Joe Talbott]

Add standard deviation line to graphs

Add standard deviation line to graphs

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'bootspeed/api.py'
--- bootspeed/api.py	2012-12-13 02:32:26 +0000
+++ bootspeed/api.py	2012-12-14 00:00:27 +0000
@@ -131,6 +131,7 @@
              min=r.kernel_min,
              max=r.kernel_max,
              avg=r.kernel_avg,
+             std=r.kernel_std,
              build_number=r.image.build_number,
         )        
         image_data.append(image_info)
@@ -164,6 +165,7 @@
              min=r.kernel_init_min,
              max=r.kernel_init_max,
              avg=r.kernel_init_avg,
+             std=r.kernel_init_std,
              build_number=r.image.build_number,
         )        
         image_data.append(image_info)
@@ -197,6 +199,7 @@
              min=r.plumbing_min,
              max=r.plumbing_max,
              avg=r.plumbing_avg,
+             std=r.plumbing_std,
              build_number=r.image.build_number,
         )        
         image_data.append(image_info)
@@ -230,6 +233,7 @@
              min=r.xorg_min,
              max=r.xorg_max,
              avg=r.xorg_avg,
+             std=r.xorg_std,
              build_number=r.image.build_number,
         )        
         image_data.append(image_info)
@@ -263,6 +267,7 @@
              min=r.desktop_min,
              max=r.desktop_max,
              avg=r.desktop_avg,
+             std=r.desktop_std,
              build_number=r.image.build_number,
         )        
         image_data.append(image_info)

=== modified file 'common/static/js/graph.js'
--- common/static/js/graph.js	2012-12-13 00:56:26 +0000
+++ common/static/js/graph.js	2012-12-14 00:00:27 +0000
@@ -26,8 +26,8 @@
 
     var setCount = e.seriesCount;
     console.log("setCount: ", setCount);
-    if (setCount != 4) {
-      throw "Exactly 4 values must be provided for error bar chart";
+    if (setCount != 5) {
+      throw "Exactly 5 values must be provided for error bar chart";
     }
 
     var speeds = [];
@@ -46,11 +46,13 @@
         min: sets[0][p].yval,
         avg: sets[1][p].yval,
         max: sets[2][p].yval,
-        release: sets[3][p].yval,
+		std: sets[3][p].yval,
+        release: sets[4][p].yval,
         minY: sets[0][p].y,
         avgY: sets[1][p].y,
         maxY: sets[2][p].y,
-        releaseY: sets[3][p].y
+		stdY: sets[3][p].y,
+        releaseY: sets[4][p].y
       };
       speeds.push(speed);
     }
@@ -61,12 +63,16 @@
 
     var HASH_WIDTH = 4;
     var y_bottom = e.dygraph.toDomYCoord(0); // see http://dygraphs.com/jsdoc/symbols/Dygraph.html#toDomYCoord
+
+	var std_prev_x = 0;
+	var std_prev_y = 0;
     for (p = 0; p < speeds.length; p++) {
 
       speed = speeds[p];
       var topY = area.h * speed.maxY + area.y;
       var bottomY = area.h * speed.minY + area.y;
       var centerX = area.x + sets[0][p].x * area.w;
+	  var stdY = area.h * speed.stdY + area.y;
 
       // Draw the bar first
       var bodyY = area.h * speed.avgY + area.y;
@@ -89,6 +95,17 @@
       ctx.closePath();
 
       ctx.stroke();
+
+      // Draw stddev line
+	  ctx.beginPath();
+	  ctx.moveTo(std_prev_x, std_prev_y);
+	  ctx.lineTo(centerX, stdY);
+	  ctx.closePath();
+	  // Store old values
+	  std_prev_x = centerX;
+	  std_prev_y = stdY;
+	  ctx.stroke();
+
     }
     ctx.strokeStyle = 'rgba(0, 0, 0, 1.00)';
     ctx.lineWidth = 1.0;
@@ -148,7 +165,7 @@
             for (x in bootspeedData.image_data) {
               var record = bootspeedData.image_data[x];
               var last_release_avg = bootspeedData.last_release_avg
-              values.push([x, record.min, record.avg, record.max, last_release_avg]);
+              values.push([x, record.min, record.avg, record.max, record.std, last_release_avg]);
               values_labels.push(record.build_number)
               var last_release_name = bootspeedData.last_release_name
               console.log("last_release_avg: " + last_release_avg);
@@ -161,7 +178,7 @@
                   width: 700,
                   height: 500,
                   plotter: errorBarChartPlotter,
-                  labels: ["x", "min", "avg", "max", last_release_name],
+                  labels: ["x", "min", "avg", "max", "std", last_release_name],
                   axisLabelFontSize: 12,
                   xAxisHeight: 80,
                   rightGap: 10,