moved over the git ignore file

[selectricity-live] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 413ebb0c10617d9e5ac38e2cc1a3ed0e74933008..f6dc5d5fc3f32fc2012f6435932503728b49f69f 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -1,8 +1,16 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+

 require 'date'
 class GraphController < ApplicationController  
   class GruffGraff
     
 require 'date'
 class GraphController < ApplicationController  
   class GruffGraff
     

-    COLORS = ['#74CE00', '#005CD9', '#DC0D13', '#131313', '#990033']
+    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)


@@ -45,6 +53,7 @@ class GraphController < ApplicationController
         end
       else #one dimensional array, just pass it in
       @graph.data( options.fetch(:data_name, "Data"), options[:data] )
         end
       else #one dimensional array, just pass it in
       @graph.data( options.fetch(:data_name, "Data"), options[:data] )

+      @graph.hide_legend = true

       end
       
       # set the labels or create an empty hash
       end
       
       # set the labels or create an empty hash


@@ -87,6 +96,8 @@ class GraphController < ApplicationController
     @election = Election.find(params[:id])
     data, labels, scale = get_votes_per_interval_data(@election)
     
     @election = Election.find(params[:id])
     data, labels, scale = get_votes_per_interval_data(@election)
     

+    hide_legend = true
+    

     graph = GruffGraff.new( :graph_type => Gruff::Line,
                             :data_name => @election.name,
                             :data => data,
     graph = GruffGraff.new( :graph_type => Gruff::Line,
                             :data_name => @election.name,
                             :data => data,


@@ -167,9 +178,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)