ruby-gr 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 898535fe254b0d6a4a457f6583e6d969cf10598f040bc64464f4e5458a151e57
-  data.tar.gz: a8d0a53dee6d84f52f73c9e014a38ce9def381492abf55b88867a6fe1e6c639f
+  metadata.gz: 7feff4b6a6607304d914aa29fbd928eb8038373db422bb97ffc7f2f93e716eca
+  data.tar.gz: c1e8c535bcc1f7643654e355d08941aa3b063b08073ab633a271fdb91658250c
 SHA512:
-  metadata.gz: f66234f7d19386f36d3106ec6f7e6e529ca5b0f85f6ea1e0bbd13686b3d5d41d2073f3530436dde1a89d1d0c11cfb6fa5f30839d0022e6e67670f33ea91a8aa4
-  data.tar.gz: 36ca2dca1f723a51d066d063b12601574cf2fb643d4a2221a481642d20f8097982e0fc9500488a2e79b09a01aa8169de7b32237dee75ece63aef39000be5f7a3
+  metadata.gz: 7b11313f004e0e6fe8d8203be2aae5966f91404699179af1170af17fad1f4c0f48f8d8fc221813535bee6ae63fd26583520e18a15c26bac90bb79d2961090a91
+  data.tar.gz: c28961f5c97d923ff9b1ae713d3f04fa4f77538febbf1de2ef44fce2b2d35c639a80fb74f3bed40b8b158ad73110108795a9d5e6ac0f7790032c0274562964b0

data/README.md

@@ -6,9 +6,15 @@
 [![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)
 
+<p align="center">
+  <img src="https://user-images.githubusercontent.com/5798442/70857099-13d57600-1f2c-11ea-8f3c-7d81065f13a5.png">
+</p>
+
 :bar_chart:  [GR framework](https://github.com/sciapp/gr) - the graphics library for visualisation - for Ruby
 
 ## Installation
+GR.rb supports Ruby 2.4+.
+
 Install [GR](https://github.com/sciapp/gr/releases).
 Set environment variable GRDIR.
 
@@ -22,6 +28,8 @@ Add this line to your application's Gemfile:
 gem 'ruby-gr'
 ```
 
+GR3 and GR::Plot require [numo-narray](https://github.com/ruby-numo/numo-narray).
+
 ## Quick Start
 
 <p align="center">

data/lib/gr.rb

@@ -60,7 +60,7 @@ module GR
     @ffi_lib = File.expand_path('lib/libGR.so', ENV['GRDIR'])
   end
 
-  require_relative 'gr_commons'
+  require_relative 'gr_commons/gr_commons'
   require_relative 'gr/version'
   require_relative 'gr/ffi'
   require_relative 'gr/grbase'

data/lib/gr/plot.rb

@@ -40,7 +40,7 @@ module GR
                  xlog yflip ylabel ylim ylog zflip zlabel zlim zlog clim
                  subplot].freeze
 
-    @@last_plot
+    @@last_plot = nil
     def self.last_plot
       @@last_plot
     end
@@ -878,7 +878,8 @@ module GR
       args.each do |_x, _y, _z, _c, spec|
         if i < num_labels
           label = kvs[:labels][i]
-          tbx, tby = inqtext(0, 0, label)
+          label = label.to_s
+          _tbx, tby = inqtext(0, 0, label)
           dy = [(tby[2] - tby[0]) - 0.03, 0].max
           py -= 0.5 * dy
         end
@@ -889,14 +890,14 @@ module GR
         GR.restorestate
         GR.settextalign(GR::TEXT_HALIGN_LEFT, GR::TEXT_VALIGN_HALF)
         if i < num_labels
-          GR.text(px, py, label)
+          text(px, py, label)
           py -= 0.5 * dy
           i += 1
         end
         py -= 0.03
-        GR.selntran(1)
-        GR.restorestate
       end
+      GR.selntran(1)
+      GR.restorestate
     end
 
     def to_svg
@@ -945,9 +946,22 @@ module GR
     end
 
     def plot_args(args, _fmt = :xys)
-      # :construction:
-      x, y, z, c = args
-      [[x, y, z, c]]
+      # FIXME
+      args = [args] unless args.all? { |i| i.is_a? Array }
+      args.map do |xyzc|
+        x, y, z, c = xyzc.map do |i|
+          if i.is_a?(Array) || narray?(i)
+            i
+          elsif i.respond_to?(:to_a)
+            # Convert an Array-like class such as Daru::Vector to an Array
+            i.to_a
+          else
+            # String
+            i
+          end
+        end
+        [x, y, z, c]
+      end
     end
 
     # Normalize a color c with the range [cmin, cmax]
@@ -1066,6 +1080,7 @@ module GR
       w = 0
       h = 0
       kvs[:labels].each do |label|
+        label = label.to_s
         tbx, tby = inqtext(0, 0, label)
         w = [w, tbx[2]].max
         h += [tby[2] - tby[0], 0.03].max

data/lib/gr3.rb

@@ -69,7 +69,7 @@ module GR3
     @ffi_lib = File.expand_path('lib/libGR3.so', ENV['GRDIR'])
   end
 
-  require_relative 'gr_commons'
+  require_relative 'gr_commons/gr_commons'
   require_relative 'gr3/version'
   require_relative 'gr3/ffi'
   require_relative 'gr3/gr3base'

data/lib/gr_commons/fiddley.rb

@@ -185,7 +185,7 @@ module GRCommons
 
       include Fiddley::Utils
 
-      def initialize(type, num = 1, _clear = true)
+      def initialize(type, num = 1)
         if num.is_a?(Fiddle::Pointer)
           @ptr = num
           @size = @ptr.size

data/lib/gr_commons/gr_commons.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# Module with common code for GR, GR3
+module GRCommons
+end
+
+require_relative 'extern'
+require_relative 'define_methods'
+require_relative 'gr_common_utils'
+require_relative 'jupyter_support'
+require_relative 'version'

data/lib/gr_commons/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,11 +154,11 @@ files:
 - lib/gr3/ffi.rb
 - lib/gr3/gr3base.rb
 - lib/gr3/version.rb
-- lib/gr_commons.rb
 - lib/gr_commons/define_methods.rb
 - lib/gr_commons/extern.rb
 - lib/gr_commons/fiddley.rb
 - lib/gr_commons/gr_common_utils.rb
+- lib/gr_commons/gr_commons.rb
 - lib/gr_commons/jupyter_support.rb
 - lib/gr_commons/version.rb
 homepage: https://github.com/red-data-tools/GR.rb

data/lib/gr_commons.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-# Module with common code for GR, GR3
-module GRCommons
-end
-
-require 'gr_commons/extern'
-require 'gr_commons/define_methods'
-require 'gr_commons/gr_common_utils'
-require 'gr_commons/jupyter_support'
-require 'gr_commons/version'