TODO has been modified to relfect bug changes already delt with. Also, autogenerated...

[selectricity] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index b019aeb52b91e230eab971af3b4e47d8ccf5a1ac..92e1a1efcf3f5048ae3dacf18405213632e19aff 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -1,8 +1,27 @@
+# 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: 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/>.
+

 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 +64,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 +107,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,


@@ -108,14 +130,25 @@ class GraphController < ApplicationController
     @election.results unless @election.borda_result
     data, labels = get_borda_points(@election.borda_result)
     
     @election.results unless @election.borda_result
     data, labels = get_borda_points(@election.borda_result)
     

+    size = "400x300"
+    size = "580x300" if @election.candidates.size >= 5
+    
+   if @election.candidates.size >= 5
+     marker_font_size = 17
+   else
+     marker_font_size = 20
+   end
+    

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

+                            :size => size,

                             :title => "Points Per Candidate",
                             :marker_color => '#999999',
                             :title => "Points Per Candidate",
                             :marker_color => '#999999',

+                            :marker_font_size => marker_font_size,

                             :y_axis_label => "Points",
                             :y_axis_label => "Points",

-                            :x_axis_label => "Candidate")
+                            :x_axis_label => "Candidates")

     send_data(*graph.output)
   end
   #Acording to Tufte, small, concomparitive, highly labeled data sets usually
     send_data(*graph.output)
   end
   #Acording to Tufte, small, concomparitive, highly labeled data sets usually