projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed colors on graphs
[selectricity]
/
app
/
controllers
/
graph_controller.rb
diff --git
a/app/controllers/graph_controller.rb
b/app/controllers/graph_controller.rb
index b019aeb52b91e230eab971af3b4e47d8ccf5a1ac..8f1ccb893a2cd4338b5da98387c05cf3bf0aeaf3 100644
(file)
--- a/
app/controllers/graph_controller.rb
+++ b/
app/controllers/graph_controller.rb
@@
-2,7
+2,8
@@
require 'date'
class GraphController < ApplicationController
class GruffGraff
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
+46,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
+89,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
+112,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 => "Candidate
s
")
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
@@
-156,9
+171,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)
Benjamin Mako Hill
||
Want to submit a patch?