--- trunk/lib/Frey/jQuery/flot.pm	2008/12/16 22:37:18	868
+++ trunk/lib/Frey/jQuery/flot.pm	2008/12/16 23:03:21	869
@@ -5,6 +5,7 @@
 with 'Frey::Web';
 #with 'Frey::Storage';
 with 'Frey::jQuery';
+with 'Frey::File'; # FIXME inline on demand?
 
 use DateTimeX::Easy;
 
@@ -31,7 +32,7 @@
 
 	$self->add_css("$path/layout.css");
 
-	my $sponge = Frey::Shell::sar->new()->as_sponge;
+	my $sponge = Frey::Shell::sar->new( sar_command => 'sar -n 1' )->as_sponge;
 	warn $self->dump( $sponge );
 
 	my $by_col;
@@ -43,29 +44,37 @@
 		}
 	}
 
-	my $data_js;
+	my $dataset;
 	my @names;
 	foreach my $nr ( keys %$by_col ) {
-		my $name = 'd' . $nr;
-		push @names, $name;
-		$data_js .= qq|var $name = |  . to_json( $by_col->{$nr} ) . qq|;\n|;
+		my $name = $sponge->{NAME}->[$nr];
+		$dataset->{ $name }->{label} ||= $name;
+		$dataset->{ $name }->{data} = $by_col->{$nr};
 	}
 
+	my $data_js = 'var datasets = ' . to_json( $dataset ) . ';';
+
 	warn "# $data_js";
 
 	q|
     	<div id="placeholder" style="width:600px;height:300px;"></div>
 
+		<div id="choices">Show:</div>
+
 		<script id="source" language="javascript" type="text/javascript">
 		$(function () {
 			var options = {
-				xaxis: { mode: "time" },
-				selection: { mode: "x" }
+				//selection: { mode: "x" },
+				//yaxis: { min: 0, max: 100 },
+				xaxis: { mode: "time" }
 			};
-	| . $data_js . q|
-			$.plot($("#placeholder"), [
-	| . join(',',@names) . q|		
-			], options);
+
+			|
+			. $data_js
+			. $self->read_file('static/Frey/jQuery/flot/dataset_checkboxes.js')
+			. 
+			q|
+
 		});
 		</script>
 	|;