charma 0.1.1 → 0.1.2

data/examples/violin_charts.rb

@@ -9,7 +9,7 @@ SampleMaker = Struct.new(:size) do
   end
 
   def samples(*peaks)
-    srand(0)
+    srand(peaks.sum)
     Array.new(size){
       r + peaks.sample
     }
@@ -36,20 +36,23 @@ Charma::Document.new do |doc|
       ],
       x_ticks: %w(Q1 Q2 Q3 Q4),
     },
+    [10,50].map do |bins|
     {
-      title: "Small size sample",
+        title: "Small size sample (bins=#{bins})",
+        bins: bins,
       series:[
         {
           name: "foo",
-          y: Array.new(4){ |n| small.samples(n+2, (n+2)*2) }
+            y: Array.new(4){ |n| small.samples(n+4, (n+2)*2) }
         },
         {
           name: "bar",
-          y: Array.new(4){ |n| small.samples(n+2, (n+2)*2, 6) }
+            y: Array.new(4){ |n| small.samples(n+4, (n+2)*2, 6) }
         },
       ],
       x_ticks: %w(Q1 Q2 Q3 Q4),
-    },
+      }
+    end
   ].each do |opts|
     doc.new_page do |page|
       case opts

data/lib/charma/document.rb

@@ -2,21 +2,23 @@
 
 module Charma
   class Document
-    def initialize( &block )
+    def initialize(opts={}, &block )
       @pages = []
+      @opts = opts
       block[self]
     end
 
-    def new_page(&block)
-      page = Page.new(self)
+    def new_page(opts={},&block)
+      page = Page.new(opts)
       block[page]
       @pages.push page
     end
 
     def render( filename )
       raise "no page added" if @pages.empty?
-      opts = @pages.first.create_opts
+      opts = @pages.first.create_opts.merge(@opts)
       Prawn::Document.generate(filename, opts) do |pdf|
+        pdf.font( File.expand_path(@opts[:font]) ) if @opts[:font]
         @pages.each.with_index do |page,ix|
           pdf.start_new_page(page.create_opts) if ix != 0
           page.render(pdf)

data/lib/charma/page.rb

@@ -2,8 +2,8 @@
 
 module Charma
   class Page
-    def initialize( doc )
-      @doc = doc
+    def initialize( opts )
+      @opts = opts
       @graphs = []
     end
 
@@ -11,7 +11,7 @@ module Charma
       {
         page_size: "A4",
         page_layout: :landscape,
-      }
+      }.merge(@opts)
     end
 
     def split_rect( rc, pos, size )
@@ -37,6 +37,7 @@ module Charma
     end
 
     def render(pdf)
+      pdf.font File.expand_path(@opts[:font]) if @opts[:font]
       @graphs.each.with_index do |g,ix|
         g.render( pdf, area(pdf.margin_box, ix) )
       end

data/lib/charma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Charma
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/charma/violin_chart.rb

@@ -36,6 +36,7 @@ module Charma
         cx = rc.x + rc.w/2
         h = rc.h / hist.size.to_f
         hist.each.with_index do |f, ix|
+          next if f==0
           w = rc.w * f
           top = rc.bottom + h*(ix+1)
           edge = 1e-1 # バーの隙間を埋める
@@ -57,7 +58,7 @@ module Charma
     end
 
     def make_histograms( vals, range )
-      hist_size = [10,Math.sqrt( meansize(vals) ).round].max
+      hist_size = @opts[:bins] || [10,Math.sqrt( meansize(vals) ).round].max
       min = range.min
       step = (range.max - min).to_f / hist_size
       bottoms = Array.new(hist_size){ |ix| min + (ix+1)*step }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charma
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nabetani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -102,8 +102,12 @@ files:
 - charma.gemspec
 - examples/bar_charts.pdf
 - examples/bar_charts.rb
+- examples/japanese.pdf
+- examples/japanese.rb
 - examples/line_charts.pdf
 - examples/line_charts.rb
+- examples/pagefont.pdf
+- examples/pagefont.rb
 - examples/runall.rb
 - examples/shortest.pdf
 - examples/shortest.rb