added support for block canvas and staircase plot, switch to relative requires

Author: nanobowers

example/ex_line_plot.rb

@@ -0,0 +1,7 @@
+#!/bin/env ruby
+require_relative "../lib/unicode_plot"
+
+UnicodePlot.lineplot([1, 2, 7], [9, -6, 8], title: "Default Lineplot").render
+UnicodePlot.lineplot([1, 2, 7], [9, -6, 8], title: "Ascii Lineplot", canvas: :ascii).render
+UnicodePlot.lineplot([1, 2, 7], [9, -6, 8], title: "Dot Lineplot", canvas: :dot).render
+UnicodePlot.lineplot([1, 2, 7], [9, -6, 8], title: "Block Lineplot", canvas: :block).render

example/ex_staircase_plot.rb

@@ -12,7 +12,11 @@
 
 # Two plots at a time.
 # Using an explicit limit because data for the 2nd plot is outside the bounds from the 1st plot
-plot = UnicodePlot.stairs([1, 2, 4, 7, 8], [1, 3, 4, 2, 7], title: "Two Staircases", xlim: [0,10] )
+plot = UnicodePlot.stairs([1, 2, 4, 7, 8], [1, 3, 4, 2, 7], title: "Two Staircases", xlim: [1,10] )
+UnicodePlot.stairs!(plot, [0, 3, 5, 6, 9], [2, 5, 3, 4, 0])
+plot.render
+
+plot = UnicodePlot.stairs([1, 2, 4, 7, 8], [1, 3, 4, 2, 7], title: "Two Staircases", xlim: [1,10] , canvas: :block)
 UnicodePlot.stairs!(plot, [0, 3, 5, 6, 9], [2, 5, 3, 4, 0])
 plot.render
 

example/staircase_plot.rb

@@ -0,0 +1,19 @@
+#!/bin/env ruby
+require_relative "../lib/unicode_plot"
+
+# single plot at a time
+UnicodePlot.stairs([1, 2, 4, 7, 8], [1, 3, 4, 2, 7], style: :post).render
+
+# pre: style
+UnicodePlot.stairs([1, 2, 4, 7, 8], [1, 3, 4, 2, 7], style: :pre).render
+
+# Another single plot with title
+UnicodePlot.stairs([2, 3, 5, 6, 9], [2, 5, 3, 4, 2], title: "My Staircase Plot").render
+
+# Two plots at a time.
+# Using an explicit limit because data for the 2nd plot is outside the bounds from the 1st plot
+plot = UnicodePlot.stairs([1, 2, 4, 7, 8], [1, 3, 4, 2, 7], title: "Two Staircases", xlim: [0,10] )
+UnicodePlot.stairs!(plot, [0, 3, 5, 6, 9], [2, 5, 3, 4, 0])
+plot.render
+
+

lib/unicode_plot.rb

@@ -1,25 +1,30 @@
 require 'stringio'
 
-require 'unicode_plot/version'
+require_relative './unicode_plot/version'
 
-require 'unicode_plot/utils'
-require 'unicode_plot/styled_printer'
-require 'unicode_plot/value_transformer'
-require 'unicode_plot/renderer'
+require_relative './unicode_plot/utils'
+require_relative './unicode_plot/styled_printer'
+require_relative './unicode_plot/value_transformer'
+require_relative './unicode_plot/renderer'
 
-require 'unicode_plot/canvas'
-require 'unicode_plot/braille_canvas'
-require 'unicode_plot/density_canvas'
-require 'unicode_plot/lookup_canvas'
-require 'unicode_plot/ascii_canvas'
-require 'unicode_plot/dot_canvas'
+require_relative './unicode_plot/canvas'
+require_relative './unicode_plot/braille_canvas'
+require_relative './unicode_plot/density_canvas'
+require_relative './unicode_plot/lookup_canvas'
+require_relative './unicode_plot/ascii_canvas'
+require_relative './unicode_plot/dot_canvas'
+require_relative './unicode_plot/block_canvas'
 
-require 'unicode_plot/plot'
-require 'unicode_plot/grid_plot'
+require_relative './unicode_plot/plot'
+require_relative './unicode_plot/grid_plot'
+
+require_relative './unicode_plot/barplot'
+require_relative './unicode_plot/boxplot'
+require_relative './unicode_plot/densityplot'
+require_relative './unicode_plot/lineplot'
+require_relative './unicode_plot/histogram'
+require_relative './unicode_plot/scatterplot'
+
+# new!
+require_relative './unicode_plot/stairs'
 
-require 'unicode_plot/barplot'
-require 'unicode_plot/boxplot'
-require 'unicode_plot/densityplot'
-require 'unicode_plot/lineplot'
-require 'unicode_plot/histogram'
-require 'unicode_plot/scatterplot'

lib/unicode_plot/block_canvas.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 =begin
 The `BlockCanvas` is also Unicode-based.
 It has half the resolution of the `BrailleCanvas`.
@@ -9,18 +10,29 @@
 using binary operations.
 =end
 
-class BlockCanvas < LookupCanvas
-  
-  BLOCK_SIGNS = [0b1000, 0b0010,
-                 0b0100, 0b0001]
+module UnicodePlot
+  class BlockCanvas < LookupCanvas
+    X_PIXEL_PER_CHAR = 2
+    Y_PIXEL_PER_CHAR = 2
+
+    def initialize(width, height, fill_char=0, **kw)
+      super(width, height,
+            X_PIXEL_PER_CHAR,
+            Y_PIXEL_PER_CHAR,
+            fill_char,
+            **kw)
+    end
+    
+    BLOCK_SIGNS = [ [0b1000, 0b0010].freeze,
+                    [0b0100, 0b0001].freeze
+                  ].freeze
 
-  BLOCK_DECODE = [' ', '▗', '▖', '▄',
-                  '▝', '▐', '▞', '▟',
-                  '▘', '▚', '▌', '▙',
-                  '▀', '▜', '▛', '█' ]
+    BLOCK_DECODE = [' ', '▗', '▖', '▄',
+                    '▝', '▐', '▞', '▟',
+                    '▘', '▚', '▌', '▙',
+                    '▀', '▜', '▛', '█' ].freeze
 
-  def x_pixel_per_char ; 2 ; end
-  def y_pixel_per_char ; 2 ; end
-  def lookup_encode ; BLOCK_SIGNS ; end
-  def lookup_decode ; BLOCK_DECODE ; end
+    def lookup_encode(x,y) ; BLOCK_SIGNS[x][y] ; end
+    def lookup_decode(x) ; BLOCK_DECODE[x] ; end
+  end
 end

lib/unicode_plot/canvas.rb

@@ -10,6 +10,8 @@ def self.create(canvas_type, width, height, **kw)
         BrailleCanvas.new(width, height, **kw)
       when :density
         DensityCanvas.new(width, height, **kw)
+      when :block
+        BlockCanvas.new(width, height, **kw)
       when :dot
         DotCanvas.new(width, height, **kw)
       else