X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/823d530ba46c1fb3518c4deef0081738503837eb..64b49c1b5806419a887dbe1a59c72073b943ead4:/app/controllers/graph_controller.rb?ds=sidebyside

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 814eb36..b019aeb 100644
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -1,18 +1,36 @@
 require 'date'
 class GraphController < ApplicationController  
   class GruffGraff
-  
+    
+    COLORS = ['#74CE00', '#005CD9', '#DC0D13', '#131313', '#990033']
+    BACKGROUND_COLORS = ['#74CE00', '#FFFFFF'] #for green and white background
+    
     def initialize(options)
       size = options[:size] ? options[:size] : "400x300" #allow custom sizing
       @graph = options[:graph_type].new(size)
       
       @graph.no_data_message = "No Voters"
       
-      @graph.theme = { :colors => ['#005CD9', '#DC0D13', '#131313', '#990033'],
-                       :background_colors => ['#74CE00', '#FFFFFF'] }
+      @graph.theme = { :colors => COLORS,
+                       :background_colors => ['#e5e5e5', '#FFFFFF']  }
       @graph.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
                                    RAILS_ROOT)
       
+      if options[:legend_font_size]
+        @graph.legend_font_size = options[:legend_font_size] 
+      end
+      
+      if options[:title_font_size]  
+        @graph.title_font_size = options[:title_font_size]
+      end
+      
+      #marker count doesn't include minimum value line, default is 4
+      @graph.marker_count = options[:marker_count] if options[:marker_count]
+      
+      @graph.marker_font_size = options[:marker_font_size] if options[:marker_font_size]
+      
+      @graph.marker_color = options[:marker_color] if options[:marker_color]
+      
       # fill in the data with the optional data name
       #Check to see if multiple datasets, if so, fill them all!
       #Sort by biggest first piece of data.
@@ -74,7 +92,12 @@ class GraphController < ApplicationController
                             :data => data,
                             :interval_labels => labels,
                             :title => "Voters Over Time",
-                            :size => "700x400",
+                            :size => "330x232", 
+                            :legend_font_size => 40,
+                            :title_font_size => 50,
+                            :marker_count => 2,
+                            :marker_font_size => 30,
+                            :marker_color => '#999999',
                             :x_axis_label => scale,
                             :y_axis_label => "Number of Votes")
     send_data(*graph.output)
@@ -90,6 +113,7 @@ class GraphController < ApplicationController
                             :data => data,
                             :interval_labels => labels,
                             :title => "Points Per Candidate",
+                            :marker_color => '#999999',
                             :y_axis_label => "Points",
                             :x_axis_label => "Candidate")
     send_data(*graph.output)
@@ -133,7 +157,7 @@ class GraphController < ApplicationController
       data[names[candidate]] = votes
     end
      
-    pie = GruffGraff.new ( :graph_type => Gruff::Pie,
+    pie = GruffGraff.new( :graph_type => Gruff::Pie,
                            :title => "Percentage of First Place Votes",
                            :data => data)
     send_data(*pie.output)
@@ -258,15 +282,15 @@ class GraphController < ApplicationController
     # Create the hash for the labels. Each graph has ten columns, and three
     # will be labeled
     if timedelta < 2.hours #under two hours use minutes for labels
-      labels_hash[0] = starttime.min.to_s
-      labels_hash[(numcols/2)-1] = (starttime + (timedelta/2)).min.to_s
-      labels_hash[numcols-1] = Time.now.min.to_s
-      interval_type = "Minute of the Hour"
+      labels_hash[0] = "Start"
+      labels_hash[(numcols/2)-1] = fmt_decimal((timedelta/120)) #halfway
+      labels_hash[numcols-1] = fmt_decimal((timedelta/60))
+      interval_type = "Minutes After Start"
     elsif timedelta < 2.days #more than 2 hours means use hours for labels
-      labels_hash[0] = starttime.hour.to_s
-      labels_hash[(numcols/2)-1] = (starttime + (timedelta/2)).hour.to_s
-      labels_hash[numcols-1] = Time.now.hour.to_s
-      interval_type = "Hour of the Day on 24 hour scale"
+      labels_hash[0] = "Start"
+      labels_hash[(numcols/2)-1] = fmt_decimal((timedelta/7200))
+      labels_hash[numcols-1] = fmt_decimal((timedelta/3600))
+      interval_type = "Hours After Start (Up to 48)"
     else #more than 2 days means use dates for labels
       labels_hash[0] = (Date.parse(starttime.to_s)).to_s
       labels_hash[(numcols/2)-1] = (Date.parse((starttime + (timedelta/2)).to_s)).to_s
@@ -278,6 +302,10 @@ class GraphController < ApplicationController
     return total_per_interval, labels_hash, interval_type   
   end
   
+  def fmt_decimal(number)
+    sprintf( "%0.1f", number)
+  end
+  
   def get_borda_points(result)
     points = Array.new
     labels = Hash.new
@@ -306,5 +334,4 @@ class GraphController < ApplicationController
     end
   return preference_tally
   end
-
 end