From: Forrest Voight <forrest@forre.st>
Date: Sun, 6 May 2012 13:56:17 +0000 (-0400)
Subject: added sort_key to data_to_lines and sort versions numerically
X-Git-Tag: 0.11.2~27
X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=1c439b70513a1a2e36e87874758e4bdeb24c2510

added sort_key to data_to_lines and sort versions numerically
---

diff --git a/web-static/graphs.html b/web-static/graphs.html
index 64f7c8e..72d330c 100644
--- a/web-static/graphs.html
+++ b/web-static/graphs.html
@@ -198,7 +198,7 @@
                 });
             }
             
-            function data_to_lines(data) {
+            function data_to_lines(data, sort_key) {
                 var vers = {}; for(var i = 0; i < data.length; ++i) for(var v in data[i][1]) vers[v] = null;
                 var verlist = []; for(var v in vers) verlist.push(v);
                 verlist.sort();
@@ -211,8 +211,9 @@
                         label: verlist[i]
                     });
                 }
-                function m(x) { return d3.max(x.data, function(d){ return d[1] }) }
-                lines.sort(function(a, b){ return m(a) - m(b) });
+                if(sort_key == undefined)
+                    var sort_key = function(x) { return d3.max(x.data, function(d){ return d[1] }) }
+                lines.sort(function(a, b){ return sort_key(a) - sort_key(b) });
                 return lines;
             }
             
@@ -264,7 +265,7 @@
                 });
                 
                 d3.json("/web/graph_data/desired_versions/last_" + lowerperiod, function(data) {
-                    plot(d3.select('#desired_versions'), '', null, data_to_lines(data));
+                    plot(d3.select('#desired_versions'), '', null, data_to_lines(data, function(line){ return parseInt(line.label) }), true);
                 });
             }