gras: added close button to charts

4 files changed, 30 insertions, 26 deletions

diff --git a/python/gras/stats/chart_factory.js b/python/gras/stats/chart_factory.js
index 4f9a789..c998cb3 100644
--- a/python/gras/stats/chart_factory.js
+++ b/python/gras/stats/chart_factory.js
@@ -30,7 +30,7 @@ var gras_chart_active_registry = new Array();
  **********************************************************************/
 function gras_chart_factory_dispatcher()
 {
-    //step 1) get a list of the selected blocks
+    //get a list of the selected blocks
     var selected_blocks = new Array();
     $.each($('.chart_designer_blocks > :input'), function(index, input)
     {
@@ -41,11 +41,9 @@ function gras_chart_factory_dispatcher()
         }
     });
 
-    //step 2) get the type of chart to create
+    //get the type of chart to create
     var chart_type = $('#chart_type_selector').val();
 
-    //step 3) create the chart given options
-
     //create containers
     var chart_box = $('<table />').attr({class:'chart_container'});
     var tr = $('<tr />');
@@ -75,6 +73,20 @@ function gras_chart_factory_dispatcher()
     gras_chart_active_registry.push(chart);
     $('#charts_panel').append(chart_box);
 
+    //close button
+    var close_div = $('<div/>').attr({class:'chart_designer_block_close'});
+    var close_href = $('<a />').attr({href:'#', class:"ui-dialog-titlebar-close ui-corner-all", role:"button"});
+    var close_span = $('<span />').attr({class:"ui-icon ui-icon-closethick"}).text('close');
+    close_div.append(close_href);
+    close_href.append(close_span);
+    th_title.append(close_div);
+    $(close_href).click(function()
+    {
+        var index = $.inArray(chart, gras_chart_active_registry);
+        gras_chart_active_registry.splice(index, 1);
+        chart_box.remove();
+    });
+
     //finish gui building
     chart_box.append(tr_title);
     chart_box.append(tr);
diff --git a/python/gras/stats/chart_overall_throughput.js b/python/gras/stats/chart_overall_throughput.js
index 55a8241..7e049d2 100644
--- a/python/gras/stats/chart_overall_throughput.js
+++ b/python/gras/stats/chart_overall_throughput.js
@@ -38,7 +38,7 @@ GrasChartOverallThroughput.prototype.update = function(point)
 
     var chart_data = google.visualization.arrayToDataTable(data_set);
     var options = {
-        width:$('#page').width()*0.33,
+        width:$('#page').width()*0.4,
         chartArea:{left:0,top:0,right:0,bottom:0,width:"100%",height:"85%"},
         legend: {'position': 'bottom'},
     };
diff --git a/python/gras/stats/main.css b/python/gras/stats/main.css
index 17344c2..f8a68c7 100644
--- a/python/gras/stats/main.css
+++ b/python/gras/stats/main.css
@@ -10,6 +10,11 @@ color:black;
 background-color:white;
 }
 
+.chart_designer_block_close
+{
+float:right;
+}
+
 .chart_designer_blocks label
 {
 float:left;
@@ -28,26 +33,6 @@ margin-left:3px;
 float:left;
 }
 
-#overall_chart_pie table
-{
-float:left;
-}
-
-#per_block_charts table
-{
-float:left;
-}
-
-#overall_config
-{
-float:left;
-}
-
-#block_enables
-{
-float:left;
-}
-
 #page{
 padding:10px;
 color:inherit;
diff --git a/python/gras/stats/main.js b/python/gras/stats/main.js
index e0f32e6..967bbbd 100644
--- a/python/gras/stats/main.js
+++ b/python/gras/stats/main.js
@@ -44,7 +44,14 @@ var gras_query_stats = function(registry)
                     gras_query_stats(registry);
                 }, Math.round(1000/registry.overall_rate));
             }
-        }
+        },
+        error: function()
+        {
+            registry.timeout_handle = window.setTimeout(function()
+            {
+                gras_query_stats(registry);
+            }, 1000);
+        },
     });
 }