merged in changes from live version

[selectricity] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 92e1a1efcf3f5048ae3dacf18405213632e19aff..0599b70d02de8c996a7035f7f35c0a42990d2284 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -20,8 +20,8 @@ require 'date'
 class GraphController < ApplicationController  
   class GruffGraff
     
 class GraphController < ApplicationController  
   class GruffGraff
     

-    COLORS = ['#74CE00', '#005CD9', '#DC0D13', '#131313', '#A214A4', 'EFF80E',
-              '90E5E6', 'F58313', '437D3D', '0E026C']
+    COLORS = ['#74CE00', '#005CD9', '#DC0D13', '#131313', '#A214A4', '#EFF80E',
+              '#90E5E6', '#F58313', '#437D3D', '#0E026C']

     BACKGROUND_COLORS = ['#74CE00', '#FFFFFF'] #for green and white background
     
     def initialize(options)
     BACKGROUND_COLORS = ['#74CE00', '#FFFFFF'] #for green and white background
     
     def initialize(options)


@@ -189,9 +189,22 @@ class GraphController < ApplicationController
     @election.plurality_result.points.each do |candidate, votes|
       data[names[candidate]] = votes
     end
     @election.plurality_result.points.each do |candidate, votes|
       data[names[candidate]] = votes
     end

-     
+    size = "400x300"
+    size = "520x300" if @election.candidates.size >= 8
+
+   if @election.candidates.size >= 8
+     marker_font_size = 20
+     legend_font_size = 17
+   else
+     marker_font_size = 17
+     legend_font_size = 17
+   end
+ 

     pie = GruffGraff.new( :graph_type => Gruff::Pie,
                            :title => "Percentage of First Place Votes",
     pie = GruffGraff.new( :graph_type => Gruff::Pie,
                            :title => "Percentage of First Place Votes",

+                           :size => size,
+                           :marker_font_size => marker_font_size,
+                          :legend_font_size => legend_font_size,

                            :data => data)
     send_data(*pie.output)
                            
                            :data => data)
     send_data(*pie.output)