prawn-graph 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33dd1aa4f0429ff97c4b3884a7015e9953fab007
-  data.tar.gz: 6dc03f1716e431ff2f5a77c3ad537812d78ca1da
+  metadata.gz: d3612a0dc1901afe56dcc1c6f2c1679330bdf758
+  data.tar.gz: 716552d134c3cc1eb5bd10af28758bb62dbcaac8
 SHA512:
-  metadata.gz: 729c459c07fa3c2be69f5b0b914e53834432b23d5255ca73efe983d4ff8728e3dc444d76b71e40005dfe9b8587d574988fc3172a4ca40be48e3076c56ed6fd73
-  data.tar.gz: e1b4d17c28db4d882471cae5fe286624055fe863eb6b4eebaac4148a8900de89e6c435988925cb0ad6cc939965d34bd3f719c6b9563baf5baee7a70f566874ad
+  metadata.gz: 20fad935934c6be4e53733c510dd407cc53eb94981464afee7aa7152fc657709340b773e7bb50e3f4dbd1b2cde3f8888ec59f4433a9389d6da5daa0006cf73ae
+  data.tar.gz: a2dde074ccb358c88f342d9f59885e6f45c6e97e9434bb63eabaf133c1af0a8da272860aaa282d373a4d7d1f48a8d67b330b6c3790c619e8abb8a3eb8f45e7d7

data/README.md

@@ -121,13 +121,15 @@ Option        | Data type | Description
   require 'prawn-graph'
 
   series = []
-  series << Prawn::Graph::Series.new([4,9,3,2,1,6,2,8,2,3,4,9,2], title: "A label for a series", type: :bar)
-  series << Prawn::Graph::Series.new([5,4,3,2,7,9,2,8,7,5,4,9,2].reverse, title: "Another label", type: :line, mark_average: true, mark_minimum: true)
+  series << Prawn::Graph::Series.new([4,9,3,2,1,6,2,8,2,3,4,9,2],  title: "A label for a series", type: :bar)
+  series << Prawn::Graph::Series.new([5,4,3,2,7,9,2,8,7,5,4,9,2],  title: "Another label", type: :line, mark_average: true, mark_minimum: true)
   series << Prawn::Graph::Series.new([1,2,3,4,5,9,6,4,5,6,3,2,11], title: "Yet another label", type: :bar)
   series << Prawn::Graph::Series.new([1,2,3,4,5,12,6,4,5,6,3,2,9].shuffle, title: "One final label", type: :line, mark_average: true, mark_maximum: true)
 
+  xaxis_labels = ['0900', '1000', '1100', '1200', '1300', '1400', '1500', '1600', '1700', '1800', '1900', '2000', '2100']
+
   Prawn::Document.generate('test.pdf') do
-    graph series, width: 500, height: 200, title: "A Title for the chart", at: [10,700]
+    graph series, width: 500, height: 200, title: "A Title for the chart", at: [10,700], xaxis_labels: xaxis_labels
   end
 ``` 
 

data/lib/prawn/graph/chart_components/canvas.rb

@@ -5,7 +5,7 @@ module Prawn
       # as the container in which your chart / graph will be sized to fit within. 
       #
       class Canvas
-        attr_reader :layout, :series, :prawn, :theme
+        attr_reader :layout, :series, :prawn, :theme, :options
 
         # @param series [Array[Prawn::Graph::Series]]
         # @param prawn [Prawn::Document]
@@ -15,7 +15,7 @@ module Prawn
         def initialize(series, prawn, options = {}, &block)
           @series   = series
           verify_series_are_ok!
-          @options  = options.merge({ series_count: series.size })
+          @options  =  {xaxis_labels: []}.merge(options.merge({ series_count: series.size }))
           @prawn    = prawn
           @theme    = Prawn::Graph::Theme::Default
           @layout   = Prawn::Graph::Calculations::LayoutCalculator.new([prawn.bounds.width, prawn.bounds.height], @options, @theme).calculate

data/lib/prawn/graph/chart_components/series_renderer.rb

@@ -145,6 +145,17 @@ module Prawn
             prawn.stroke_horizontal_line(0, @plot_area_width, at: 0) 
             prawn.stroke_vertical_line(0, @plot_area_height, at: 0) 
             prawn.fill_and_stroke_ellipse [ 0,0], 1
+
+            return if @canvas.options[:xaxis_labels].size.zero?
+
+            width_of_each_label = (@plot_area_width / @canvas.options[:xaxis_labels].size) - 1
+            @canvas.options[:xaxis_labels].each_with_index do |label, i|
+              offset    = i + 1
+              position  = ((offset * width_of_each_label) - width_of_each_label) + 1
+              
+              prawn.text_box  label, at: [ position, -2 ], width: width_of_each_label, height: 6, valign: :center, align: :right,
+                              overflow: :shrink_to_fit
+            end
           end
 
           # Calculates the relative height of a given point based on the maximum value present in
@@ -266,6 +277,17 @@ module Prawn
             prawn.stroke_horizontal_line(0, @plot_area_width, at: 0) 
             prawn.stroke_vertical_line(0, @plot_area_height, at: 0) 
             prawn.fill_and_stroke_ellipse [ 0,0], 1
+
+            return if @canvas.options[:xaxis_labels].size.zero?
+
+            width_of_each_label = (@plot_area_width / @canvas.options[:xaxis_labels].size) - 1
+            @canvas.options[:xaxis_labels].each_with_index do |label, i|
+              offset    = i + 1
+              position  = ((offset * width_of_each_label) - width_of_each_label) + 1
+              
+              prawn.text_box  label, at: [ position, -2 ], width: width_of_each_label, height: 6, valign: :center, align: :right,
+                              overflow: :shrink_to_fit
+            end
           end
 
           # Calculates the relative height of a given point based on the maximum value present in

data/lib/prawn/graph/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Graph
-    VERSION = "0.9.4"
+    VERSION = "0.9.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn-graph
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Ryan Stenhouse