Turn Borda Bar graph on its side.

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

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 92e1a1efcf3f5048ae3dacf18405213632e19aff..bd11174757fe141495bea3eb1510dea37d458626 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -2,26 +2,15 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# This program is free software. Please see the COPYING file for
+# details.
 
 require 'date'
 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)
@@ -131,7 +120,9 @@ class GraphController < ApplicationController
     data, labels = get_borda_points(@election.borda_result)
     
     size = "400x300"
-    size = "580x300" if @election.candidates.size >= 5
+    #size = "580x300" if @election.candidates.size >= 5
+    size = sprintf "580x%d", @election.candidates.size*22 \
+      if @election.candidates.size >= 5
     
    if @election.candidates.size >= 5
      marker_font_size = 17
@@ -139,7 +130,7 @@ class GraphController < ApplicationController
      marker_font_size = 20
    end
     
-    graph = GruffGraff.new( :graph_type => Gruff::Bar,
+    graph = GruffGraff.new( :graph_type => Gruff::SideBar,
                             :data_name => @election.name,
                             :data => data,
                             :interval_labels => labels,
@@ -147,8 +138,8 @@ class GraphController < ApplicationController
                             :title => "Points Per Candidate",
                             :marker_color => '#999999',
                             :marker_font_size => marker_font_size,
-                            :y_axis_label => "Points",
-                            :x_axis_label => "Candidates")
+                            :x_axis_label => "Points",
+                            :y_axis_label => "Candidates")
     send_data(*graph.output)
   end
   #Acording to Tufte, small, concomparitive, highly labeled data sets usually
@@ -189,9 +180,22 @@ class GraphController < ApplicationController
     @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",
+                           :size => size,
+                           :marker_font_size => marker_font_size,
+                          :legend_font_size => legend_font_size,
                            :data => data)
     send_data(*pie.output)