Fixed cell background color generation in table view.

Signed-off-by: Mark Nelson <[email protected]>

Author: markhpc

include/css/table.css

@@ -1,14 +1,14 @@
 #view > tbody div {
-  height:50;
+/*  height:50; */
 }
 
 th {
- background-color:black;
+ background-color:blue;
   color:white  
 }
 
 td {
-  border: 1px solid black;
+  border: 1px solid lightgrey;
   background-color:#ccc;
   width:200px;
 }

include/js/table.js

@@ -1,5 +1,18 @@
 var keys = d3.keys(dataSet[0]);
 
+var mins = {}
+var maxes = {}
+dataSet.forEach(function(item) {
+  var mean = d3.mean(d3.values(item).slice(3));
+  var deviation = d3.deviation(d3.values(item).slice(3));
+  var minmax_key = d3.values(item).slice(0,3).join("");
+//  console.log(minmax_key);
+  mins[minmax_key] = mean-deviation;
+  maxes[minmax_key] = mean+deviation;
+});
+//console.log(mins);
+//console.log(maxes);
+
 var thead = d3.select("#view > thead")
 var th = thead.selectAll("th")
         .data(keys)
@@ -15,15 +28,27 @@ var tr = tbody.selectAll("tr")
     .append('tr')
         .selectAll('td')
         .data(function (row) {
-            return d3.entries(row);
-        })
+            key = d3.values(row).slice(0,3).join("")
+            dataArray = d3.entries(row);
+            dataArray.forEach(function(data) {
+              data["min"] = mins[key];
+              data["max"] = maxes[key];
+            });
+//            console.log(dataArray);
+            return dataArray;
+
+       })
         .enter()
         .append('td')
         .append('div')
         .style({
             "background-color": function(d, i){
                 if(i < 3) return "lightblue";
-                return makecolor(d.value, 20, 181);
+                console.log(d);
+                if (d.min === 0 && d.max === 0) {
+                   return "lightgrey";
+                }
+                return makecolor(d.value, d.min, d.max);
             },
         })
         .text(function(d){

parsing/test.py

@@ -79,9 +79,10 @@ def getbw(s):
     html.add_html(html.read_file('/home/nhm/src/ceph-tools/cbt/include/html/table.html'))
     html.add_style(html.read_file('/home/nhm/src/ceph-tools/cbt/include/css/table.css'))
     html.add_script(html.read_file('/home/nhm/src/ceph-tools/cbt/include/js/jsxcompressor.min.js'))
-    html.add_encoded_script(html.read_file('/home/nhm/src/ceph-tools/cbt/include/js/d3.ugly.js'))
-    html.add_encoded_script(html.format_data(database.fetch_table(['opsize', 'testtype'])))
-    html.add_encoded_script(html.read_file('/home/nhm/src/ceph-tools/cbt/include/js/table.js'))
+    html.add_script(html.read_file('/home/nhm/src/ceph-tools/cbt/include/js/d3.js'))
+    html.add_script(html.read_file('/home/nhm/src/ceph-tools/cbt/include/js/d3var.js'))
+    html.add_script(html.format_data(database.fetch_table(['opsize', 'testtype'])))
+    html.add_script(html.read_file('/home/nhm/src/ceph-tools/cbt/include/js/table.js'))
 
     print '<meta charset="utf-8">'
     print '<title>D3 Table Test </title>'