@@ -2,8 +2,6 @@ ## Constants ## -PLOTR_VERSION = "0.3.0" - ## ## Load the library ## @@ -13,4 +11,4 @@ require 'helpers/chartr_helpers' ## ## Inject includes for Chartr libraries ## -ActionView::Base.send(:include, ActionView::Helpers::ChartrHelpers) \ No newline at end of file +ActionView::Base.send(:include, ActionView::Helpers::ChartrHelpers) environment.rb @@ -25,6 +25,7 @@ end class Chartr::Chart attr_accessor :data + def initialize(params = {}) @options ||= {} @options = @options.deep_merge(params) lib/chart.rb @@ -1,8 +1,7 @@ module Chartr include ActiveSupport - require "chartdata" require "chart" Dir["#{File.dirname(__FILE__)}/charts/**"].map do |chart| require chart if chart =~ /.*?_chart.rb$/ end -end \ No newline at end of file +end lib/chartr.rb @@ -6,4 +6,37 @@ class Chartr::BarChart < Chartr::Chart super end + + # Takes data in the form [["foo", 1], ["bar", 2], ["bee", 3], + # ["bop", 4]] for the xaxis, or [1, "foo"], etc... for 'horizontal' + # graphs (labels along the y axis). + def labeled_data(newdata) + ticks = [] + @data = [] + i = 1 + + @options[:bars] ||= {} + if newdata[0][0].is_a? Numeric + axis = :yaxis + @options[:bars][:horizontal] = true + else + axis = :xaxis + @options[:bars][:horizontal] = false + end + + newdata.each do |a| + if axis == :xaxis + @data << [i,a[1]] + ticks << [i + 0.5, a[0]] + else + @data << [a[0],i] + ticks << [i + 0.5, a[1]] + end + i += 1 + end + @data = [@data] + @options[axis] ||= {} + @options[axis][:ticks] = ticks + end + end lib/charts/bar_chart.rb 9e20ec5eb9575edd8cdb2a439b407f076a2748d1 David N. Welton davidw@dedasys.com http://github.com/davidw/chartr/commit/535bfcaf68df4fb2d23460c2b2e45bbac7e90422 535bfcaf68df4fb2d23460c2b2e45bbac7e90422 2009-02-18T14:28:42-08:00 2009-02-18T14:28:42-08:00 Removed chartdata require, moved labeled_data to barchart. 6806f3e431a081d100d50c5eebfe9794fdfb1a45 David N. Welton davidw@dedasys.com