fnando-chart 0.0.2 → 0.0.3

data/README.markdown

@@ -44,7 +44,8 @@ Just require the Chart library.
 	  :margins   => [50, 25],
 	  :plot_area => [320, 180],
 	  :labels => %w(Ruby Python Erlang),
-	  :multicolor => false
+	  :multicolor => false,
+	  :angle => 45
 	})
 
 	chart.write("bar.png")
@@ -53,6 +54,28 @@ Result:
 
 ![Bars chart](http://f.simplesideias.com.br/chart/bar.png)
 
+To display custom fields, use `:extra_labels` with `:label_format`:
+	
+	# set some data
+	data  = [3600.99, 1479.00, 900.10]
+	
+	chart = Chart::Bar.new({
+	  :width => 400,
+	  :height => 240,
+	  :data => data,
+	  :margins   => [50, 25],
+	  :plot_area => [320, 180],
+	  :legend => %w(Ruby Python Erlang),
+	  :multicolor => true,
+	  :label_format => "{={field0} * 1.6/1000|0}K ({field1})",
+	  :inside => true,
+	  :extra_fields => [[3000, 2000, 1600], ["FOO", "BAR", "LOL"]]
+	})
+
+Result:
+
+![Bars chart with custom fields and label format](http://f.simplesideias.com.br/chart/bar_with_extra_fields.png)
+
 ### Multicolor Bars
 
 	# set some data
@@ -66,7 +89,8 @@ Result:
 	  :margins   => [50, 25],
 	  :plot_area => [320, 180],
 	  :labels => %w(Jan Feb Mar),
-	  :multicolor => true
+	  :multicolor => true,
+	  :label_format => nil
 	})
 
 	chart.write("multicolorbar.png")
@@ -244,6 +268,8 @@ Result:
 
 ![Line chart with custom symbol](http://f.simplesideias.com.br/chart/line_with_custom_symbol.png)
 
+Check it out the `examples` directory for additional samples.
+
 MAINTAINER
 ----------
 

data/Rakefile

@@ -5,7 +5,7 @@ PKG_FILES = %w(init.rb Rakefile chart.gemspec License.txt README.markdown) +
 
 spec = Gem::Specification.new do |s|
   s.name = "chart"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.summary = "A simple ChartDirector wrapper"
   s.authors = ["Nando Vieira"]
   s.email = ["fnando.vieira@gmail.com"]

data/chart.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
  "lib/chart/pie.rb",
  "lib/chart.rb"]
   s.email = ["fnando.vieira@gmail.com"]
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.homepage = "http://github.com/fnando/chart"
   s.name = "chart"
   s.summary = "A simple ChartDirector wrapper"

data/lib/chart/bar.rb

@@ -18,11 +18,25 @@ module Chart
       # set the labels
       @object.xAxis.setLabels(@labels)
       
+      # set extra fields
+      add_extra_fields
+      
       # add data to layer
       if @multicolor
-        @object.addBarLayer3(@data, @colors, @legend, 0)
+        layer = @object.addBarLayer3(@data, @colors, @legend, 0)
       else
-        @object.addBarLayer(@data, @colors.first)
+        layer = @object.addBarLayer(@data, @colors.first)
+      end
+
+      # set label over bars
+      unless @label_format.nil?
+        if @inside
+          layer.setDataLabelFormat(@label_format)
+          layer.setDataLabelStyle("normal", 8, 0x000000, @angle)
+        else
+          layer.setAggregateLabelFormat(@label_format)
+          layer.setAggregateLabelStyle("normal", 8, 0x00000, @angle)
+        end
       end
     end
     
@@ -30,6 +44,8 @@ module Chart
       def defaults!
         super
         @colors = Chart::COLORS
+        @label_format = "{value}"
+        @angle = 0
       end
   end
 end

data/lib/chart/base.rb

@@ -73,6 +73,15 @@ module Chart
     # Set line symbols
     attr_accessor :symbols
     
+    # Set the angle
+    attr_accessor :angle
+    
+    # Set extra fields for labels
+    attr_accessor :extra_fields
+    
+    # Display label value inside bars (true|false)
+    attr_accessor :inside
+    
     # The ChartDirector object
     attr_accessor :object
     
@@ -109,6 +118,17 @@ module Chart
       # Set the chart defaults; should be overwritten.
       def defaults!
         @plot_top_margin = 50
+        @extra_fields = []
+      end
+      
+      def add_extra_fields
+        @extra_fields.each do |fields|
+          if fields.any? {|i| i.class != String }
+            @object.addExtraField2(fields)
+          else
+            @object.addExtraField(fields)
+          end
+        end
       end
   end
 end

data/lib/chart/grouped_bar.rb

@@ -18,6 +18,9 @@ module Chart
       # set the labels
       @object.xAxis.setLabels(@labels)
       
+      # set extra fields
+      add_extra_fields
+      
       # create the layer
       layer = @object.addBarLayer2(ChartDirector::Side, 0)
       
@@ -25,6 +28,24 @@ module Chart
       @data.each_with_index do |data, index|
         layer.addDataSet(data, @colors[index], legend[index])
       end
+      
+      # set label over bars
+      unless @label_format.nil?
+        if @inside
+          layer.setDataLabelFormat(@label_format)
+          layer.setDataLabelStyle("normal", 8, 0x000000, @angle)
+        else
+          layer.setAggregateLabelFormat(@label_format)
+          layer.setAggregateLabelStyle("normal", 8, 0x00000, @angle)
+        end
+      end
     end
+    
+    private
+      def defaults!
+        super
+        @label_format = "{value}"
+        @angle = 0
+      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fnando-chart
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nando Vieira