From edd2b7bbd13898d00d236f606ce7c82b4a4b0b22 Mon Sep 17 00:00:00 2001
From: Adam Wiggins <adam@heroku.com>
Date: Sat, 1 Nov 2008 19:32:54 -0700
Subject: [PATCH] view multiple data sets in the same graph

---
 main.rb                    | 10 ++++++---
 views/amstock_settings.erb | 42 ++++++++++++++++++++++----------------
 views/graph.erb            |  2 +-
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/main.rb b/main.rb
index ffc3953..91bb2e7 100644
--- a/main.rb
+++ b/main.rb
@@ -30,12 +30,16 @@ def self.make_table(db)
 end
 
 get '/graphs/:id' do
-	throw :halt, [ 404, "No such graph" ] unless Points.data.filter(:graph => params[:id]).count > 0
-	erb :graph, :locals => { :id => params[:id] }
+	graphs = [ params[:id] ] + (params[:and] || '').split(',')
+	graphs.each do |graph|
+		throw :halt, [ 404, "No such graph \"#{graph}\"" ] unless Points.data.filter(:graph => graph).count > 0
+	end
+	erb :graph, :locals => { :id => params[:id], :others => params[:and] }
 end
 
 get '/graphs/:id/amstock_settings.xml' do
-	erb :amstock_settings, :locals => { :id => params[:id] }
+	graphs = [ params[:id] ] + (params[:and] || '').split(',')
+	erb :amstock_settings, :locals => { :graphs => graphs }
 end
 
 get '/graphs/:id/data.csv' do
diff --git a/views/amstock_settings.erb b/views/amstock_settings.erb
index 8bc80bd..8bfed28 100644
--- a/views/amstock_settings.erb
+++ b/views/amstock_settings.erb
@@ -10,23 +10,27 @@
 		</letters>
 	</number_format>
 	<data_sets> 
-		<data_set>
-			<title><%= id %></title>
-			<short><%= id %></short>
-			<color>004090</color>
-			<file_name>/graphs/<%= id %>/data.csv</file_name>
-			<csv>
-				<reverse>true</reverse>
-				<separator>,</separator>
-				<date_format>YYYY-MM-DD hh:mm:ss</date_format>
-				<decimal_separator>.</decimal_separator>
-				<columns>
-					<column>date</column>
-					<column>volume</column>
-					<column>close</column>
-				</columns>
-			</csv>
-		</data_set>
+		<% graphs.each do |id| %>
+			<data_set>
+			<compare_list_box selected="true">true</compare_list_box>
+
+				<title><%= id %></title>
+				<short><%= id %></short>
+				<color><%= sprintf("%02x02x02x", rand(200), rand(200), rand(200)) %></color>
+				<file_name>/graphs/<%= id %>/data.csv</file_name>
+				<csv>
+					<reverse>true</reverse>
+					<separator>,</separator>
+					<date_format>YYYY-MM-DD hh:mm:ss</date_format>
+					<decimal_separator>.</decimal_separator>
+					<columns>
+						<column>date</column>
+						<column>volume</column>
+						<column>close</column>
+					</columns>
+				</csv>
+			</data_set>
+		<% end %>
 	</data_sets>
 
 	<charts>
@@ -53,6 +57,8 @@
 						<close>close</close>
 					</data_sources>
 
+					<compare_source>close</compare_source>
+
 					<bullet>round_outline</bullet>
 
 					<legend>
@@ -66,7 +72,7 @@
 	</charts>
 
 	<data_set_selector>
-		<enabled>false</enabled>
+		<enabled><%= graphs.size > 1 ? 'true' : 'false' %></enabled>
 	</data_set_selector>
 
 	<period_selector>
diff --git a/views/graph.erb b/views/graph.erb
index 43d44a6..b0a297a 100644
--- a/views/graph.erb
+++ b/views/graph.erb
@@ -12,7 +12,7 @@
 	<script type="text/javascript">
 		// <![CDATA[
 		var so = new SWFObject("/amstock.swf", "amline", "100%", "100%", "8", "#FFFFFF");
-		so.addVariable("settings_file", escape("/graphs/<%= id %>/amstock_settings.xml"));
+		so.addVariable("settings_file", escape("/graphs/<%= id %>/amstock_settings.xml?and=<%= others %>"));
 		so.addVariable("preloader_color", "#999999");
 		so.write("flashcontent");
 		// ]]>