@@ -6,7 +6,7 @@ class Page < ActiveRecord::Base @pageviews = JSON.parse(self.daily_timeline.pageviews) @dates = JSON.parse(self.daily_timeline.dates) maxval = @pageviews.max - normed_values = @pageviews.collect { |x| x * (120.0 / maxval)} + normed_values = @pageviews.collect { |x| x * (110.0 / maxval)} date_view_hash = {} @dates.each_with_index do |date, index| date_view_hash[date] = normed_values[index] @@ -16,8 +16,13 @@ class Page < ActiveRecord::Base return sorted_pageviews end - def sparkline - dataset = GC4R::API::GoogleChartDataset.new :data => self.normed_daily_pageviews, :color => '0000FF' + def sparkline( fillcolor='76A4FB' ) + dataset = GC4R::API::GoogleChartDataset.new :data => self.normed_daily_pageviews, + :color => '000000', :fill => ['B', fillcolor ,'0','0','0'] + # red => FF0000 + # lightblue => 76A4FB + # green => 33FF00 + # darkblue => 0000FF data = GC4R::API::GoogleChartData.new :datasets => dataset , :min => 0, :max => 120 # @chart = GoogleBarChart.new :width => 120, :height => 12 @chart = GC4R::API::GoogleSparklinesChart.new :width => 120, :height => 12 app/models/page.rb @@ -21,7 +21,7 @@ <tr> <td><%= index + 1 + APP_CONFIG['articles_per_page']*(params[:page].to_i - 1) %></td> <td><%= number_with_delimiter(page.total_pageviews, ',') %></td> - <td><%= link_to page.title, page %><BR><%= image_tag page.sparkline.to_url %> </td> + <td><%= link_to page.title, page %><BR><%= image_tag page.sparkline('76A4FB').to_url %> </td> <td><%= link_to 'http://en.wikipedia.org/wiki/' + page.url, 'http://en.wikipedia.org/wiki/' + page.url %></td> </tr> <% end %> app/views/pages/index.html.erb @@ -124,6 +124,18 @@ module GC4R !min.nil? && !max.nil? end end + class ChartFillArea < Struct.new :fill + include GoogleChartsObject + def get_param + "chm" + end + def get_value + expand_multiple fill, "," + end + def valid? + !fill.nil? && !fill.empty? + end + end class ChartDataColor < Struct.new :colors include GoogleChartsObject def get_param @@ -288,11 +300,12 @@ module GC4R # data and dataset class GoogleChartDataset - attr_accessor :data, :color, :title + attr_accessor :data, :color, :title, :fill def initialize options={} @data = options[:data] @color = options[:color] @title = options[:title] + @fill = options[:fill] end end class GoogleChartData < ChartContainer @@ -300,19 +313,23 @@ module GC4R datasets = [] colors = [] legend = [] + fill = [] if options[:datasets].is_a?(Array) options[:datasets].each do |dataset| datasets << dataset.data colors << dataset.color + fill << dataset.fill legend << dataset.title end else datasets << options[:datasets].data colors << options[:datasets].color + fill << options[:datasets].fill legend << options[:datasets].title end add ChartData.new(datasets.compact) add ChartDataColor.new(colors.compact) + add ChartFillArea.new(fill.compact) add ChartDataLegend.new(legend.compact) add ChartDataPieLabels.new(legend.compact) add ChartDataScale.new(options[:min], options[:max]) vendor/plugins/svn/lib/gc4r.rb lib/gc4r.rb daceb7483e53a8ec1ab967c191afa1045a5085d4 Pete Skomoroch pete@datawrangling.com http://github.com/datawrangling/trendingtopics/commit/061a94fbb6a0690a51748524bb60cf652fa83cc4 061a94fbb6a0690a51748524bb60cf652fa83cc4 2009-06-03T16:16:13-07:00 2009-06-03T16:16:13-07:00 extended gc4r to take sparkline fill areas e396b5c34625434e4db42848180c92365235cd51 Pete Skomoroch pete@datawrangling.com