gras: remove old default charts

5 files changed, 21 insertions, 251 deletions

diff --git a/python/gras/stats/CMakeLists.txt b/python/gras/stats/CMakeLists.txt
index c1e50d6..fe07f55 100644
--- a/python/gras/stats/CMakeLists.txt
+++ b/python/gras/stats/CMakeLists.txt
@@ -16,7 +16,6 @@ INSTALL(
     main.js
     registry.js
     utils.js
-    charts.js
     chart_factory.js
     chart_overhead_compare.js
     chart_overall_throughput.js
diff --git a/python/gras/stats/chart_factory.js b/python/gras/stats/chart_factory.js
index 1c49717..cd096a5 100644
--- a/python/gras/stats/chart_factory.js
+++ b/python/gras/stats/chart_factory.js
@@ -76,7 +76,7 @@ function gras_chart_factory_dispatcher()
 /***********************************************************************
  * chart factory init
  **********************************************************************/
-function gras_chart_factory_init()
+function gras_chart_factory_init(registry)
 {
     //install callback for chart factory
     $('#chart_factory_button').click(gras_chart_factory_dispatcher);
@@ -96,4 +96,23 @@ function gras_chart_factory_init()
         option.text(options.name);
         $('#chart_type_selector').append(option);
     });
+
+    //init overall config gui element for rate
+    var overall_rate = $('#chart_update_rate');
+    overall_rate.val(registry.overall_rate);
+    overall_rate.change(function()
+    {
+        registry.overall_rate = overall_rate.val();
+    });
+
+    //init overall config gui element for activity
+    registry.overall_active = true;
+    var overall_active = $('#chart_active_state');
+    overall_active.attr('checked', registry.overall_active);
+    overall_active.change(function()
+    {
+        registry.overall_active = overall_active.is(':checked');
+        if (registry.overall_active) gras_query_stats(registry);
+        else window.clearInterval(registry.timeout_handle);
+    });
 }
diff --git a/python/gras/stats/charts.js b/python/gras/stats/charts.js
deleted file mode 100644
index ed264ad..0000000
--- a/python/gras/stats/charts.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/***********************************************************************
- * Throughput chart
- **********************************************************************/
-var gras_setup_overall_chart = function(registry)
-{
-    var div = $('#overall_chart:first');
-    var td = $('td:last', div);
-    var chart = new google.visualization.LineChart(td.get(0));
-    registry.overall_chart = chart;
-}
-
-var gras_update_throughput_chart = function(registry)
-{
-    if (registry.history.length == 1)
-    {
-        gras_setup_individual_charts(registry);
-        return;
-    }
-    if (registry.history.length < 2) return;
-
-    var ids = new Array();
-    $.each(registry.getBlockIds(), function(index, id)
-    {
-        if (registry.block_enables[id]) ids.push(id);
-    });
-
-    var data_set = [['Throughput'].concat(ids)];
-    for (var i = Math.max(registry.history.length-10, 1); i < registry.history.length; i++)
-    {
-        var row = new Array();
-        row.push(i.toString());
-        for (var j = 0; j < ids.length; j++)
-        {
-            row.push(gras_extract_throughput_delta(registry.history[i-1], registry.history[i], ids[j])/1e6);
-        }
-        data_set.push(row);
-    }
-
-    var chart_data = google.visualization.arrayToDataTable(data_set);
-    var options = {
-        width:$('#page').width()*0.9,
-        height:'250',
-        chartArea:{left:0,top:0,right:0,bottom:0,width:"100%",height:"85%"},
-        legend: {'position': 'bottom'},
-    };
-    registry.overall_chart.draw(chart_data, options);
-}
-
-/***********************************************************************
- * Overhead comparison chart
- **********************************************************************/
-var gras_setup_overall_chart_pie = function(registry)
-{
-    var div = $('#overall_chart_pie:first');
-    var td = $('td:last', div);
-    var chart = new google.visualization.PieChart(td.get(0));
-    registry.overall_chart_pie = chart;
-}
-
-var gras_update_time_compare_chart = function(registry)
-{
-    var point = registry.history[registry.history.length-1];
-    var data_set = new Array();
-    data_set.push(['Task', 'Percent']);
-    $.each(registry.getBlockIds(), function(index, id)
-    {
-        if (registry.block_enables[id])
-        {
-            var percents = gras_extract_percent_times(point, id);
-            data_set.push([id, percents['total']]);
-        }
-    });
-
-    var data = google.visualization.arrayToDataTable(data_set)
-
-    var options = {
-        width:$('#page').width()/5,
-        chartArea:{left:5,top:0,right:5,bottom:0,width:"100%",height:"100%"},
-    };
-
-    var chart = registry.overall_chart_pie;
-    chart.draw(data, options);
-}
-
-/***********************************************************************
- * Block handler breakdown chart
- **********************************************************************/
-var gras_setup_per_block_enable_checkbox = function(elem, id, registry)
-{
-    $(elem).append('<label>' + id + '</label>');
-    var input = $('<input />').attr({
-        type: 'checkbox',
-        name: id
-    });
-    registry.block_enables[id] = false;
-    input.attr('checked', registry.block_enables[id]);
-    input.change(function()
-    {
-        registry.block_enables[id] = input.is(':checked');
-        //gras_update_throughput_chart(registry);
-        var div = $('#per_block_charts');
-        gras_animate_show_hide($('table[name="' + id + '"]', div), registry.block_enables[id]);
-    });
-    $(elem).append(input);
-    $(elem).append('&nbsp;');
-    input.change();
-}
-
-var gras_setup_per_block_charts = function(id, registry)
-{
-    var div = $('#per_block_charts');
-    var table = $('<table />');
-    table.attr('name', id);
-    div.append(table);
-    table.append('<tr><th></th></tr>');
-    $('th:last', table).text(id);
-    table.append('<tr><td></td></tr>');
-    var td = $('td:last', table);
-    var chart = new google.visualization.PieChart(td.get(0));
-    registry.block_charts[id] = chart;
-}
-
-var gras_setup_individual_charts = function(registry)
-{
-    var point = registry.history[0];
-    var div = $('#block_enables:first');
-    var config = $('td:last', div);
-    var count = 0;
-    $.each(registry.getBlockIds(), function(index, id)
-    {
-        gras_setup_per_block_charts(id, registry);
-        gras_setup_per_block_enable_checkbox(config, id, registry);
-        count++;
-        if (count == Math.round(registry.getBlockIds().length/2))
-        {
-            var table = $('table:last', div);
-            $(table).append('<tr><td></td></tr>');
-            config = $('td:last', div);
-        }
-    });
-}
-
-var gras_update_per_block_chart = function(id, registry)
-{
-    var point = registry.history[registry.history.length-1];
-    var percents = gras_extract_percent_times(point, id);
-    var data = google.visualization.arrayToDataTable([
-          ['Task', 'Percent'],
-          ['Work prep', percents['prep']],
-          ['Work task', percents['work']],
-          ['Work post', percents['post']],
-          ['Input tasks', percents['input']],
-          ['Output tasks', percents['output']],
-    ]);
-
-    var options = {
-        width:$('#page').width()/5,
-        chartArea:{left:5,top:0,right:5,bottom:0,width:"100%",height:"100%"},
-    };
-
-    var chart = registry.block_charts[id];
-    chart.draw(data, options);
-}
-
-var gras_update_per_block_charts = function(registry)
-{
-    if (registry.history.length == 0) return;
-    $.each(registry.getBlockIds(), function(index, id)
-    {
-        gras_update_per_block_chart(id, registry);
-    });
-}
diff --git a/python/gras/stats/main.html b/python/gras/stats/main.html
index 2782d28..1f91f90 100644
--- a/python/gras/stats/main.html
+++ b/python/gras/stats/main.html
@@ -11,7 +11,6 @@
     <script type="text/javascript" src="http://www.google.com/jsapi"></script>
     <script type="text/javascript" src="/registry.js"></script>
     <script type="text/javascript" src="/utils.js"></script>
-    <script type="text/javascript" src="/charts.js"></script>
     <script type="text/javascript" src="/chart_factory.js"></script>
     <script type="text/javascript" src="/chart_overhead_compare.js"></script>
     <script type="text/javascript" src="/chart_overall_throughput.js"></script>
@@ -44,43 +43,6 @@
         </table>
     </div>
     <div id="charts_panel"></div>
-    <div id="overall_config">
-        <table>
-        <tr><th colspan="2">Throughput options</th></tr>
-        <tr>
-            <td colspan="2">Updates/sec: <input type="number" name="rate" min="1" max="10" size="4" /></td>
-        </tr>
-        <tr>
-            <td><label>Active?</label><input type="checkbox" name="active" /></td>
-            <td><label>Show?</label><input type="checkbox" name="show" /></td>
-        </tr>
-        </table>
-    </div>
-    <div id="block_enables">
-        <table>
-        <tr><th>Block enables</th></tr>
-        <tr><td></td></tr>
-        </table>
-    </div>
-    <div style="clear:both;"></div>
-    <div id="overall_chart">
-        <table>
-        <tr><th>Thoughput (MIps) per block vs time (seconds)</th></tr>
-        <tr>
-            <td></td>
-        </tr>
-        </table>
-    </div>
-    <div id="overall_chart_pie">
-        <table>
-        <tr><th>Overhead compare</th></tr>
-        <tr>
-            <td></td>
-        </tr>
-        </table>
-    </div>
-    <div id="per_block_charts">
-    </div>
     <div style="display:none" id="div-dialog-warning">
     </div>
 </body>
diff --git a/python/gras/stats/main.js b/python/gras/stats/main.js
index 956405b..99ed152 100644
--- a/python/gras/stats/main.js
+++ b/python/gras/stats/main.js
@@ -16,9 +16,6 @@ var gras_query_stats = function(registry)
                 {
                     registry.appendPoint(xml);
                     gras_chart_factory_setup(registry);
-                    gras_update_throughput_chart(registry);
-                    gras_update_time_compare_chart(registry);
-                    gras_update_per_block_charts(registry);
                     $.each(gras_chart_active_registry, function(index, chart)
                     {
                         chart.update(registry.history);
@@ -40,41 +37,6 @@ var gras_query_stats = function(registry)
 var gras_stats_main = function()
 {
     var registry = new GrasStatsRegistry();
-    var overall_config = $('#overall_config').get(0);
-
-    gras_setup_overall_chart(registry);
-    gras_setup_overall_chart_pie(registry);
-
-    gras_chart_factory_init();
-
-    //init overall config gui element for rate
-    var overall_rate = $('#chart_update_rate');
-    overall_rate.val(registry.overall_rate);
-    overall_rate.change(function()
-    {
-        registry.overall_rate = overall_rate.val();
-    });
-
-    //init overall config gui element for activity
-    registry.overall_active = true;
-    var overall_active = $('#chart_active_state');
-    overall_active.attr('checked', registry.overall_active);
-    overall_active.change(function()
-    {
-        registry.overall_active = overall_active.is(':checked');
-        if (registry.overall_active) gras_query_stats(registry);
-        else window.clearInterval(registry.timeout_handle);
-    });
-
-    //init overall config gui element for showing
-    var overall_show = $('input[name="show"]', overall_config);
-    overall_show.attr('checked', false);
-    overall_show.change(function()
-    {
-        var chart = $('#overall_chart');
-        gras_animate_show_hide(chart, overall_show.is(':checked'));
-    });
-    overall_show.change();
-
+    gras_chart_factory_init(registry);
     gras_query_stats(registry);
 }