numo-gnuplot 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8bcac7c2ba2e8b6312acd20b52748afd86ddeb2
-  data.tar.gz: c246dfd861b0a58a83a0b3a41f5868de6b4b4c29
+  metadata.gz: c624c33da64f76b0b4f072f55918c6e1b5ae7a2d
+  data.tar.gz: 8209e3093a40fcf2219cc71be057022fc329eac1
 SHA512:
-  metadata.gz: 16c972884c66c7ea7e85714ea53eb2482f4907eeed485d6287c1f251c06dd4031adf7bfc76d10ff059d8242ef15d63ad961e9d66c140d996b3cdb85c8e4e8080
-  data.tar.gz: a9408c167e56b22303cc77bb9b363be2b672f09031ea5465077918c8a40f3607f7153c02db739b390aad61ad62cf76888b20a98a0a98b9e831d06c886a0ab673
+  metadata.gz: eb122b78463ec953a1a9fea7a3957c4724c7ba7fed987b2c68bfa5368c85468e20ee244f75ad60ad587f13625e823ad835aa202c3916113a1832dc4340399132
+  data.tar.gz: c0061a69f0d39943c8e2eb2d83bc2ee71429d702f87d67edecc63174d32de7ef6b7ce8c13aa6704fc58b0ad6a875858bb19361c86e7edf75847bb0689b54679b

data/README.md

@@ -1,11 +1,13 @@
 # Numo::Gnuplot : Gnuplot interface for Ruby
 
-* Alpha version under development.
+Alpha version under development.
+
 * [GitHub site](https://github.com/ruby-numo/gnuplot)
 * [RubyGems site](https://rubygems.org/gems/numo-gnuplot)
-* [API doc](http://www.rubydoc.info/gems/numo-gnuplot/Numo/Gnuplot)
+* [Demo repository](https://github.com/ruby-numo/numo-gnuplot-demo)
 
-* Visit [Demo page](https://github.com/ruby-numo/numo-gnuplot-demo).
+* [API doc](http://www.rubydoc.info/gems/numo-gnuplot/Numo/Gnuplot)
+* [Introduction.ja](https://github.com/ruby-numo/gnuplot/wiki/Introduction.ja) (in Japanese)
 
 Although there are many [other Gnuplot interface libraries for Ruby](https://github.com/ruby-numo/gnuplot#related-work),
 none of them have so simple interface as to show an XY data plot by just typing:
@@ -32,7 +34,7 @@ Or install it yourself as:
 
     $ gem install numo-gnuplot
 
-## Demo page
+## Demo
 
 * [Ruby/Numo::Gnuplot Demo](https://github.com/ruby-numo/numo-gnuplot-demo)
 

data/ToDo

@@ -0,0 +1,5 @@
+* allow rgbimage, rgbalpha -- done
+* allow timefmt data
+
+* more examples
+* all style catalog

data/examples/Rakefile

@@ -1,3 +1,7 @@
 require "rake/clean"
 
 CLEAN.include %w[*.png tmp.dat]
+
+task :default do
+  sh "ruby all.rb"
+end

data/lib/numo/gnuplot.rb

@@ -18,7 +18,7 @@ module Numo
 
 class Gnuplot
 
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
   POOL = []
   DATA_FORMAT = "%.7g"
 
@@ -89,7 +89,7 @@ class Gnuplot
 
   def _plot_splot(cmd,contents)
     r = contents.shift.map{|x| "#{x} "}.join
-    c = contents.map{|x| x.cmd_str}.join(",")
+    c = contents.map{|x| x.cmd_str}.join(", ")
     d = contents.map{|x| x.data_str}.join
     run "#{cmd} #{r}#{c}", d
     nil
@@ -230,7 +230,8 @@ class Gnuplot
 
   # output current plot to file with terminal setting from extension
   # (not Gnuplot command)
-  def output(filename,term=nil,*opts)
+  def output(filename,**opts)
+    term = opts.delete(:term) || opts.delete(:terminal)
     if term.nil? && /\.(\w+)$/ =~ filename
       term = $1
     end
@@ -238,7 +239,7 @@ class Gnuplot
     if term.nil?
       kernel_raise GnuplotError,"file extension is not given"
     end
-    set terminal:[term,*opts]
+    set :terminal, term, *opts
     set output:filename
     refresh
     unset :terminal
@@ -305,7 +306,53 @@ class Gnuplot
   end
 
   def send_cmd(s,data=nil)
-    puts "<"+s if @debug
+    if @debug
+      puts "<"+s
+      if data && !data.empty?
+        if data.size > 144
+          s1 = data[0..71]
+          s2 = data[-72..-1]
+          if s1.force_encoding("UTF-8").ascii_only? &&
+              s2.force_encoding("UTF-8").ascii_only?
+            a = [nil]*6
+            if /\A(.+?)$(.+)?/m =~ s1
+              a[0..1] = $1,$2
+              if a[1] && /\A(.+?)?$(.+)?/m =~ a[1].strip
+                a[1..2] = $1,$2
+                a[1] = a[1]+"..." if !a[2]
+              else
+                a[0] = a[0]+"..."
+              end
+            end
+            if /(.+)?^(.+?)\z/m =~ s2
+              a[4..5] = $1,$2
+              if a[4] && /(.+)?^(.+?)?\z/m =~ a[4].strip
+                a[3..4] = $1,$2
+                a[4] = "..."+a[4] if !a[3]
+              else
+                a[5] = "..."+a[5]
+              end
+            end
+            if a[2] || a[3]
+              a[2..3] = ["...",nil]
+            end
+            a.each{|l| puts "<"+l if l}
+          else
+            c = data[0..31].inspect
+            c += "..." if data.size > 32
+            puts "<"+c
+          end
+        else
+          if data.force_encoding("UTF-8").ascii_only?
+            data.split(/\n/).each{|l| puts "<"+l}
+          else
+            c = data[0..31].inspect
+            c += "..." if data.size > 32
+            puts "<"+c
+          end
+        end
+      end
+    end
     @iow.puts s
     @iow.puts data
     @iow.flush
@@ -670,6 +717,13 @@ class Gnuplot
               data << x
             else
               @options << x
+              if x.kind_of? Hash
+                x.each do |k,v|
+                  if /^#{k}/ =~ "with"
+                    @style = v; break;
+                  end
+                end
+              end
             end
           end
           if data.empty?
@@ -681,8 +735,21 @@ class Gnuplot
       end
     end
 
+    def parse_data_style(data)
+      if @style
+        re = /^#{@style}/
+        if re =~ "image"
+          return ImageData.new(*data)
+        elsif re =~ "rgbimage"
+          return RgbImageData.new(*data)
+        elsif re =~ "rgbalpha"
+          return RgbAlphaData.new(*data)
+        end
+      end
+    end
+
     def parse_data(data)
-      PlotData.new(*data)
+      parse_data_style(data) || PlotData.new(*data)
     end
 
     def cmd_str
@@ -730,21 +797,17 @@ class Gnuplot
   # @private
   class SPlotItem < PlotItem  # :nodoc: all
     def parse_data(data)
-      if data.size == 1
-        if data[0].respond_to?(:shape)
-          SPlotArray.new(*data)
-        else
-          PlotData.new(*data)
-        end
-      else
+      parse_data_style(data) ||
+        (data.size == 1) ?
+        ImageData.new(data.first) :
         SPlotRecord.new(*data)
-      end
     end
   end
 
 
   # @private
   class PlotData  # :nodoc: all
+
     def data_format
       @data_format || DATA_FORMAT
     end
@@ -866,17 +929,60 @@ class Gnuplot
   end
 
   # @private
-  class SPlotArray < PlotData  # :nodoc: all
+  class ImageData < PlotData  # :nodoc: all
+
+    def check_shape
+      if @data.shape.size != 2
+        raise IndexError,"array should be 2-dimensional"
+      end
+      @shape = @data.shape
+    end
+
     def initialize(data)
-      @data = data
+      @text = false
+      if data.respond_to?(:shape)
+        @data = data
+        check_shape
+        if defined? Numo::NArray
+          @format =
+            case @data
+            when Numo::DFloat; "%float64"
+            when Numo::SFloat; "%float32"
+            when Numo::Int8;   "%int8"
+            when Numo::UInt8;  "%uint8"
+            when Numo::Int16;  "%int16"
+            when Numo::UInt16; "%uint16"
+            when Numo::Int32;  "%int32"
+            when Numo::UInt32; "%uint32"
+            when Numo::Int64;  "%int64"
+            when Numo::UInt64; "%uint64"
+            else
+              raise ArgumentError,"not supported NArray type"
+            end
+        end
+      elsif data.kind_of? Array
+        n = nil
+        @data = []
+        data.each do |a|
+          @data.concat(a)
+          m = a.size
+          if n && n != m
+            raise IndexError,"element size differs (%d should be %d)"%[m, n]
+          end
+          n = m
+        end
+        @shape = [data.size,n]
+        @format = "%float64"
+      else
+        raise ArgumentError,"argument should be data array"
+      end
     end
 
     def cmd_str
       if @text
         "'-' matrix"
       else
-        s = @data.shape
-        "'-' binary array=(#{s[1]},#{s[0]}) format='%float64'"
+        "'-' binary array=(#{@shape[1]},#{@shape[0]}) format='#{@format}'"
       end
     end
 
@@ -884,15 +990,63 @@ class Gnuplot
       if @text
         f = data_format
         s = ""
-        a.each do |b|
+        @data.to_a.each do |b|
           s << b.map{|e| f%e}.join(" ")+"\n"
         end
         s+"\ne"
       elsif defined? Numo::NArray
-        Numo::DFloat.cast(@data).to_string
+        if @data.kind_of?(Numo::NArray)
+          @data.to_string
+        else
+          Numo::DFloat.cast(@data).to_string
+        end
       else
-        @data.to_a.flatten.pack("d*")
+        @data.pack("d*")
+      end
+    end
+  end
+
+  # @private
+  class RgbImageData < ImageData  # :nodoc: all
+
+    def initialize(data)
+      if data.kind_of?(Numo::NArray)
+        super(data)
+      else
+        super(Numo::NArray[*data])
+      end
+    end
+
+    def check_shape
+      if @data.shape.size != 3
+        raise IndexError,"array should be 2-dimensional"
+      end
+      if @data.shape[2] != 3
+        raise IndexError,"shape[2] (last dimension size) must be 3"
+      end
+      @shape = @data.shape
+    end
+  end
+
+  # @private
+  class RgbAlphaData < ImageData  # :nodoc: all
+
+    def initialize(data)
+      if data.kind_of?(Numo::NArray)
+        super(data)
+      else
+        super(Numo::NArray[*data])
+      end
+    end
+
+    def check_shape
+      if @data.shape.size != 3
+        raise IndexError,"array should be 2-dimensional"
+      end
+      if @data.shape[2] != 4
+        raise IndexError,"shape[2] (last dimension size) must be 4"
       end
+      @shape = @data.shape
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-gnuplot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,6 +50,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ToDo
 - examples/Rakefile
 - examples/all.rb
 - examples/ex001.rb