gras: move more public vars into registry

4 files changed, 25 insertions, 23 deletions

diff --git a/python/gras/stats/chart_factory.js b/python/gras/stats/chart_factory.js
index c998cb3..1c01b24 100644
--- a/python/gras/stats/chart_factory.js
+++ b/python/gras/stats/chart_factory.js
@@ -8,7 +8,8 @@ function gras_chart_factory_setup(point)
     $('block', point).each(function(index, block)
     {
         var id = $(block).attr('id');
-        var div = $('.chart_designer_blocks').get(index%2);
+        var container = $('#chart_designer_blocks');
+        var div = $('<div />');
         $(div).append('<label>' + id + '</label>');
         var input = $('<input />').attr({
             type: 'checkbox',
@@ -16,23 +17,18 @@ function gras_chart_factory_setup(point)
         });
         input.attr('checked', false);
         $(div).append(input);
+        $(container).append(div);
     });
 }
 
 /***********************************************************************
- * chart factory registry (filled in init)
- **********************************************************************/
-var gras_chart_factory_registry = new Array();
-var gras_chart_active_registry = new Array();
-
-/***********************************************************************
  * chart factory dispatcher
  **********************************************************************/
-function gras_chart_factory_dispatcher()
+function gras_chart_factory_dispatcher(registry)
 {
     //get a list of the selected blocks
     var selected_blocks = new Array();
-    $.each($('.chart_designer_blocks > :input'), function(index, input)
+    $.each($('#chart_designer_blocks input'), function(index, input)
     {
         var input = $(input);
         if (input.is(':checked'))
@@ -53,7 +49,7 @@ function gras_chart_factory_dispatcher()
     //call into the factory
     try
     {
-        var chart = new gras_chart_factory_registry[chart_type]({
+        var chart = new registry.chart_factories[chart_type]({
             block_ids:selected_blocks,
             panel:td.get(0),
         });
@@ -70,7 +66,7 @@ function gras_chart_factory_dispatcher()
     th_title.text(chart.title);
 
     //register the chart
-    gras_chart_active_registry.push(chart);
+    registry.active_charts.push(chart);
     $('#charts_panel').append(chart_box);
 
     //close button
@@ -82,8 +78,8 @@ function gras_chart_factory_dispatcher()
     th_title.append(close_div);
     $(close_href).click(function()
     {
-        var index = $.inArray(chart, gras_chart_active_registry);
-        gras_chart_active_registry.splice(index, 1);
+        var index = $.inArray(chart, registry.active_charts);
+        registry.active_charts.splice(index, 1);
         chart_box.remove();
     });
 
@@ -98,7 +94,10 @@ function gras_chart_factory_dispatcher()
 function gras_chart_factory_init(registry)
 {
     //install callback for chart factory
-    $('#chart_factory_button').click(gras_chart_factory_dispatcher);
+    $('#chart_factory_button').click(function()
+    {
+        gras_chart_factory_dispatcher(registry);
+    });
 
     //list of all known chart types
     var chart_options = [
@@ -108,9 +107,10 @@ function gras_chart_factory_init(registry)
     ];
 
     //init the chart selection input
+    registry.chart_factories = new Array();
     $.each(chart_options, function(index, options)
     {
-        gras_chart_factory_registry[options.key] = options.factory;
+        registry.chart_factories[options.key] = options.factory;
         var option = $('<option />').attr({value: options.key});
         option.text(options.name);
         $('#chart_type_selector').append(option);
diff --git a/python/gras/stats/main.css b/python/gras/stats/main.css
index f8a68c7..617a400 100644
--- a/python/gras/stats/main.css
+++ b/python/gras/stats/main.css
@@ -15,15 +15,18 @@ background-color:white;
 float:right;
 }
 
-.chart_designer_blocks label
+#chart_designer_blocks div
 {
 float:left;
+}
+
+#chart_designer_blocks label
+{
 text-decoration:underline;
 }
 
-.chart_designer_blocks input
+#chart_designer_blocks input
 {
-float:left;
 margin-right:7px;
 margin-left:3px;
 }
diff --git a/python/gras/stats/main.html b/python/gras/stats/main.html
index 21034d1..0dcd1af 100644
--- a/python/gras/stats/main.html
+++ b/python/gras/stats/main.html
@@ -30,12 +30,11 @@
                 <th>Global Options</th>
             </tr>
             <tr>
-                <td class="chart_designer_blocks"></td>
+                <td id="chart_designer_blocks" rowspan='2'></td>
                 <td><select id="chart_type_selector" /></td>
-                <td>Updates/sec: <input id="chart_update_rate" type="number" name="rate" min="1" max="10" size="4" /></td>
+                <td><label>Updates/sec:</label><input id="chart_update_rate" type="number" name="rate" min="1" max="10" size="4" /></td>
             </tr>
             <tr>
-                <td class="chart_designer_blocks"></td>
                 <td><input type="submit" value="Create New Chart" id="chart_factory_button" /></td>
                 <td><label>Active?</label><input id="chart_active_state" type="checkbox" name="active" /></td>
             </tr>
diff --git a/python/gras/stats/main.js b/python/gras/stats/main.js
index 967bbbd..6587dbf 100644
--- a/python/gras/stats/main.js
+++ b/python/gras/stats/main.js
@@ -9,7 +9,7 @@ var GrasStatsRegistry = function()
     this.block_enables = new Array();
     this.overall_rate = 2.0;
     this.overall_active = true;
-    this.block_charts = new Array();
+    this.active_charts = new Array();
 }
 
 /***********************************************************************
@@ -33,7 +33,7 @@ var gras_query_stats = function(registry)
                         gras_chart_factory_setup(xml);
                         registry.init = true;
                     }
-                    $.each(gras_chart_active_registry, function(index, chart)
+                    $.each(registry.active_charts, function(index, chart)
                     {
                         chart.update(xml);
                     });