ruby-gr 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55e5471b8532f7e180f80572158336cecc130575626a2b3361bd7ce6b0454bef
-  data.tar.gz: d7387d744d28cb389a44769df8b9d477adc2a1320f73f8d02c55ffc17d1b1a02
+  metadata.gz: 898535fe254b0d6a4a457f6583e6d969cf10598f040bc64464f4e5458a151e57
+  data.tar.gz: a8d0a53dee6d84f52f73c9e014a38ce9def381492abf55b88867a6fe1e6c639f
 SHA512:
-  metadata.gz: 1d13f13cb5e85843ab006b0ea1ce8a6d400edceb0b5f69ac8bf86eb5a756ce8c2dfed5ebbf7c0ecddc07ef48fba948528c53df77bf6899664098f76c8fbdb282
-  data.tar.gz: 7f1d0091163902cb52acd7f3e0fab91cc15e178a0c39be8476e05397a8f9b6de9aad25211f4e9cb2e04ee199ebf51a6a78d8d3afbc89781743c616c74fa6a8fb
+  metadata.gz: f66234f7d19386f36d3106ec6f7e6e529ca5b0f85f6ea1e0bbd13686b3d5d41d2073f3530436dde1a89d1d0c11cfb6fa5f30839d0022e6e67670f33ea91a8aa4
+  data.tar.gz: 36ca2dca1f723a51d066d063b12601574cf2fb643d4a2221a481642d20f8097982e0fc9500488a2e79b09a01aa8169de7b32237dee75ece63aef39000be5f7a3

data/README.md

@@ -1,4 +1,4 @@
-# GR module for Ruby
+# GR.rb
 
 [![The MIT License](https://img.shields.io/badge/license-MIT-orange.svg)](LICENSE.txt)
 [![Build Status](https://travis-ci.org/red-data-tools/GR.rb.svg?branch=master)](https://travis-ci.org/red-data-tools/GR.rb)
@@ -6,9 +6,7 @@
 [![Gitter Chat](https://badges.gitter.im/red-data-tools/en.svg)](https://gitter.im/red-data-tools/en)
 [![Docs Latest](https://img.shields.io/badge/docs-latest-blue.svg)](https://rubydoc.info/gems/ruby-gr)
 
-[GR framework](https://github.com/sciapp/gr) - the graphics library for visualisation - for Ruby
-
-:construction: Under construction.
+:bar_chart:  [GR framework](https://github.com/sciapp/gr) - the graphics library for visualisation - for Ruby
 
 ## Installation
 Install [GR](https://github.com/sciapp/gr/releases).

data/lib/gr.rb

@@ -1402,7 +1402,7 @@ module GR
         # data is a pointer of a pointer
         super(path, width, height, data.ref)
       end
-      d = data.to_str(w * h * 8).unpack('L*') # UINT8
+      d = data.to_str(w * h * 4).unpack('L*') # UINT8
       [w, h, d]
     end
 

data/lib/gr/plot.rb

@@ -40,6 +40,11 @@ module GR
                  xlog yflip ylabel ylim ylog zflip zlabel zlim zlog clim
                  subplot].freeze
 
+    @@last_plot
+    def self.last_plot
+      @@last_plot
+    end
+
     def initialize(*args)
       @kvs = if args[-1].is_a? Hash
                args.pop
@@ -55,6 +60,7 @@ module GR
       @scheme = 0
       @background = 0xffffff
       @handle = nil
+      @@last_plot = self
     end
     attr_accessor :args, :kvs, :scheme
 
@@ -893,6 +899,11 @@ module GR
       end
     end
 
+    def to_svg
+      ## Need IRuby improvemend.
+      GR.show(false) if ENV['GKSwstype'] == 'svg'
+    end
+
     private
 
     def hasline(mask)
@@ -1165,7 +1176,8 @@ module GR
 
     alias _tricontour_ tricontour
     def tricontour(*args)
-      create_plot(:tricont, *args)
+      x, y, z, kv = parse_args(*args)
+      create_plot(:tricont, x, y, z, kv)
     end
 
     alias _surface_ surface
@@ -1180,11 +1192,13 @@ module GR
 
     alias _trisurface_ trisurface
     def trisurface(*args)
-      create_plot(:trisurf, *args)
+      x, y, z, kv = parse_args(*args)
+      create_plot(:trisurf, x, y, z, kv)
     end
 
     def wireframe(*args)
-      create_plot(:wireframe, *args)
+      x, y, z, kv = parse_args(*args)
+      create_plot(:wireframe, x, y, z, kv)
     end
 
     def plot3(*args)
@@ -1233,6 +1247,12 @@ module GR
       end
     end
 
+    def savefig(filename)
+      GR.beginprint(filename)
+      GR::Plot.last_plot.plot_data(false)
+      GR.endprint
+    end
+
     private
 
     def create_plot(type, *args, &block)
@@ -1240,6 +1260,7 @@ module GR
       plt.kvs[:kind] = type
       block.call(plt) if block_given?
       plt.plot_data
+      plt
     end
 
     def parse_args(*args)
@@ -1272,7 +1293,12 @@ module GR
 
     def hist(x, nbins = 0)
       nbins = (3.3 * Math.log10(x.length)).round + 1 if nbins <= 1
-      require 'histogram/array' # dependency
+      begin
+        require 'histogram/array'
+      rescue LoadError => e
+        e.message << " Please add gem 'histogram' to your project's Gemfile."
+        raise e
+      end
       x = x.to_a if narray?(x)
       x, y = x.histogram(nbins, bin_boundary: :min)
       x.push(x[-1] + x[1] - x[0])

data/lib/gr_commons/gr_common_utils.rb

@@ -22,9 +22,29 @@ module GRCommons
     # NOTE: The following method converts Ruby Array or NArray into packed string.
     SUPPORTED_TYPES.each do |type|
       define_method(type) do |data|
-        # FIXME: Use NArray#to_string
-        data = data.to_a.flatten
-        Fiddley::Utils.array2str(type, data)
+        case data
+        when Array
+          data = data.flatten
+          Fiddley::Utils.array2str(type, data)
+        when ->(x) { narray?(x) }
+          case type
+          when :uint8
+            Numo::UInt8.cast(data).to_binary
+          when :uint16
+            Numo::UInt16.cast(data).to_binary
+          when :int
+            Numo::Int32.cast(data).to_binary
+          when :uint
+            Numo::UInt32.cast(data).to_binary
+          when :double
+            Numo::DFloat.cast(data).to_binary
+          when :float
+            Numo::SFloat.cast(data).to_binary
+          end
+        else
+          data = data.to_a.flatten
+          Fiddley::Utils.array2str(type, data)
+        end
       end
     end
 

data/lib/gr_commons/jupyter_support.rb

@@ -13,24 +13,26 @@ module GRCommons
       end
 
       # Display your plot in Jupyter Notebook / Lab
-      def show
+      def show(display = true)
         emergencyclosegks
         sleep 0.5
         type = ENV['GKSwstype']
         case type
         when 'svg'
           data = File.read(ENV['GKS_FILEPATH'] + '.svg')
-          IRuby.display(data, mime: 'image/svg+xml')
+          IRuby.display(data, mime: 'image/svg+xml') if display
         when 'webm', 'ogg', 'mp4', 'mov'
           require 'base64'
           data = File.binread(ENV['GKS_FILEPATH'] + '.' + type)
-          IRuby.display(
-            "<video controls autoplay type=\"video/#{type}\" " \
-            "src=\"data:video/#{type};base64,#{Base64.encode64(data)}\">",
-            mime: 'text/html'
-          )
+          if display
+            IRuby.display(
+              "<video controls autoplay type=\"video/#{type}\" " \
+              "src=\"data:video/#{type};base64,#{Base64.encode64(data)}\">",
+              mime: 'text/html'
+            )
+          end
         end
-        nil
+        data unless display
       end
     end
   end

data/lib/gr_commons/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GRCommons
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-07 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler