From: Date: Thu, 27 Nov 2008 20:06:31 +0000 (-0500) Subject: fixed colors on graphs X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/0283f11b7fec9fcfb81093f9458e759ee7f91707?hp=f1e56bb13af6a40c2a81d224cff940f73aae6875 fixed colors on graphs --- diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb index 0ef4e71..8f1ccb8 100644 --- a/app/controllers/graph_controller.rb +++ b/app/controllers/graph_controller.rb @@ -2,8 +2,8 @@ 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) @@ -171,9 +171,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)