ruby-gr 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1884c5391124334045320390f35efd167865a6f1f063e6b763228c707cad400
-  data.tar.gz: '07929d47c8a49344fb625526b34f170b1fd0da2cfbddf538bef39f29ef122ec8'
+  metadata.gz: 668fdb6db9526bf6b55fb6b293aa776ec625b76a650be20852efcd2869f1c751
+  data.tar.gz: 3b3a7645021470b12840734506f2a466d32fdff111c0e7dd6762ccf9e374ee92
 SHA512:
-  metadata.gz: 132db88979be43ca20834522630d5970442a3565b7b14d6dafb5d970b7706b39112f56b83ab223c804e129ec9fcc612812ee691fa181d0dcdf7a86643ab7ba4b
-  data.tar.gz: 7bc7e311d1c22d81afada8611c1775b93a477c80d52b545c665975a8736a4fdb25dfcbde2c44604eb616c8018ab918148ba5b280166d228fae6205aa98b31322
+  metadata.gz: 982637afaeb9be0f9b7abb631e1554fd04a2082ec7b019cb55e4f8d4ec870634f734b1b28dda8177e784a593476e0f065a924bd362ba58a881210015a7ec2f4c
+  data.tar.gz: 5bd9205778607854747d7ab9e4c1165600792710a9c3df0452c3c306fceff7ab90d665ccb244aa4761c407f59df9c3f80413bf4663ff81643887966b87109e27

data/README.md

@@ -49,7 +49,8 @@ GR.plot(x, y)
 
 ## Examples
 
-Have a look in the [`examples`](https://github.com/red-data-tools/GR.rb/tree/master/examples) directory. Start with [`fast_plot`](https://github.com/red-data-tools/GR.rb/blob/master/examples/fast_plots.rb).
+Have a look in the [`examples`](https://github.com/red-data-tools/GR.rb/tree/master/examples) directory. 
+* [Example Gallery](https://github.com/red-data-tools/GR.rb/wiki/Example-gallery)
 
 ## Features
 

data/lib/gr.rb

@@ -2,39 +2,39 @@
 
 # OverView of GR.rb
 #
-# +--------------------+  +--------------------+
-# | GR module          |  | GR3 module         |
-# | +----------------+ |  | +----------------+ |
-# | | GR::FFI        | |  | | GR3::FFI       | |
-# | | +   libGR.so   | |  | | +    libGR3.so | |
-# | +----------------+ |  | +----------------+ |
-# |   | define_method  |  |   | define_method  |
-# | +----------------+ |  | +----------------+ |
-# | | | GR::GRBase   | |  | | | GR3::GR3Base | |
-# | | v  (Pri^ate)   | |  | | v  (Pri^ate)   | |
-# | +++--------------+ |  | +++--------------+ |
-# |  | Extend          |  |  | Extend          |
-# |  v                 |  |  v       +-------+ |
-# |      +-----------+ |  |          | Check | |
-# |      | GR::Plot  | |  |       <--+ Error | |
-# |      +-----------+ |  |          +-------+ |
-# +--------------------+  +----------+---------+
-#           ^                        ^
-#           |  +------------------+  |
-#    Extend |  | GRCommons module |  | Extend
-#           |  | +--------------+ |  |
-#           |  | |    Fiddley   | |  |
-#           |  | +--------------+ |  |
-#           |  | +--------------+ |  |
-#           +----+ CommonUtils  +----+
-#           |  | +--------------+ |  |
-#           |  | +--------------+ |  |
-#           +----+    Version   +----+
-#           |  | +--------------+ |
-#           |  | +--------------+ |
-#           +----+JupyterSupport| |
-#              | +--------------+ |
-#              +------------------+
+#  +--------------------+  +--------------------+
+#  | GR module          |  | GR3 module         |
+#  | +----------------+ |  | +----------------+ |
+#  | | GR::FFI        | |  | | GR3::FFI       | |
+#  | | +   libGR.so   | |  | | +    libGR3.so | |
+#  | +----------------+ |  | +----------------+ |
+#  |   | define_method  |  |   | define_method  |
+#  | +----------------+ |  | +----------------+ |
+#  | | | GR::GRBase   | |  | | | GR3::GR3Base | |
+#  | | v  (Pri^ate)   | |  | | v  (Pri^ate)   | |
+#  | +++--------------+ |  | +++--------------+ |
+#  |  | Extend          |  |  | Extend          |
+#  |  v                 |  |  v       +-------+ |
+#  |      +-----------+ |  |          | Check | |
+#  |      | GR::Plot  | |  |       <--+ Error | |
+#  |      +-----------+ |  |          +-------+ |
+#  +--------------------+  +----------+---------+
+#            ^                        ^
+#            |  +------------------+  |
+#     Extend |  | GRCommons module |  | Extend
+#            |  | +--------------+ |  |
+#            |  | |    Fiddley   | |  |
+#            |  | +--------------+ |  |
+#            |  | +--------------+ |  |
+#            +----+ CommonUtils  +----+
+#            |  | +--------------+ |  |
+#            |  | +--------------+ |  |
+#            +----+    Version   +----+
+#            |  | +--------------+ |
+#            |  | +--------------+ |
+#            +----+JupyterSupport| |
+#               | +--------------+ |
+#               +------------------+
 #
 # (You can edit the above AA diagram with http://asciiflow.com/))
 #
@@ -239,6 +239,9 @@ module GR
     # @param dimx [Integer] X dimension of the color index array
     # @param dimy [Integer] Y dimension of the color index array
     # @param color [Array, NArray] Color index array
+    # The values for `x` and `y` are in world coordinates. `x` must contain
+    # `dimx` + 1 elements and `y` must contain `dimy` + 1 elements. The elements
+    # i and i+1 are respectively the edges of the i-th cell in X and Y direction.
     def nonuniformcellarray(x, y, dimx, dimy, color)
       raise ArgumentError unless x.length == dimx + 1 && y.length == dimy + 1
 
@@ -1798,31 +1801,32 @@ module GR
       end
     end
 
-    # Draw paths using given vertices and path codes.
+    # Draw paths using the given vertices and path codes.
     # @param x [Array, NArray] A list containing the X coordinates
     # @param y [Array, NArray] A list containing the Y coordinates
-    # @param codes [String] Path codes
+    # @param codes [String] A list containing the path codes
     #  The following path codes are recognized:
     #  * M, m
-    #    * moveto           x, y
+    #    * moveto                      x, y
     #  * L, l
-    #    * lineto           x, y
+    #    * lineto                      x, y
     #  * Q, q
-    #    * quadratic Bézier x1, y1  x2, y2
+    #    * quadratic Bézier            x1, x2  y1, y2
     #  * C, c
-    #    * cubic Bézier     x1, y1  x2, y2  x3, y3
-    #  * R, r
-    #    * rectangle        w, h
+    #    * cubic Bézier                x1, x2, x3  y1, y2, y3
     #  * A, a
-    #    * arc              w, h  a1, a2
+    #    * arc                         rx, a1, reserved  ry, a2, reserved
     #  * Z
-    #    * closepath        -
+    #    * close path                  -
     #  * s
-    #    * stroke           -
+    #    * stroke                      -
+    #  * s
+    #    * close path and stroke       -
     #  * f
-    #    * fill             -
-    # The values for `x` and `y` are in normalized device coordinates.
-    # The `codes` describe several patch primitives that can be used to create compound paths.
+    #    * close path and fill         -
+    #  * F
+    #    * close path, fill and stroke -
+    # See https://gr-framework.org/python-gr.html#gr.path for more details.
     def path(x, y, codes)
       n = equal_length(x, y)
       super(n, x, y, codes)
@@ -1968,22 +1972,41 @@ module GR
       end
     end
 
-    # This is an interface for REPL based languages to enable an easier way to
-    # rotate around an object.
+    # Set the camera for orthographic or perspective projection.
     # The center of the 3d window is used as the focus point and the camera is
-    # positioned relative to it, using spherical coordinates. This function can
-    # therefore also be used if the user prefers spherical coordinates to setting
-    # the direct camera position, but with reduced functionality in comparison
-    # to gr.settransformationparameters, gr.setperspectiveprojection and
-    # gr.setorthographicprojection.
-    # @param phi [Numeric] phi angle of the spherical coordinates
-    # @param theta [Numeric] theta angle of the spherical coordinates
+    # positioned relative to it, using camera distance, rotation and tilt similar
+    # to gr_setspace. This function can be used if the user prefers spherical
+    # coordinates to setting the camera position directly, but has reduced
+    # functionality in comparison to GR.settransformationparameters,
+    # GR.setperspectiveprojection and GR.setorthographicprojection.
+    # @param phi [Numeric] azimuthal angle of the spherical coordinates
+    # @param theta [Numeric] polar angle of the spherical coordinates
     # @param fov [Numeric] vertical field of view (0 or NaN for orthographic projection)
-    # @param radius [Numeric] distance between the camera and the focus point
+    # @param camera_distance [Numeric] distance between the camera and the focus point
     #   (0 or NaN for the radius of the object's smallest bounding sphere)
-    def transformationinterfaceforrepl(*)
+    def setspace3d(*)
+      super
+    end
+
+    def text3d(*)
       super
     end
+
+    def inqtext3d(x, y, z, string, axis)
+      inquiry [{ double: 16 }, { double: 16 }] do |tbx, tby|
+        super(x, y, z, string, axis, tbx, tby)
+      end
+    end
+
+    def settextencoding(*)
+      super
+    end
+
+    def inqtextencoding
+      inquiry_int do |encoding|
+        super(encoding)
+      end
+    end
   end
 
   ASF_BUNDLED    = 0
@@ -2202,6 +2225,9 @@ module GR
   XFORM_CUBIC     = 4
   XFORM_EQUALIZED = 5
 
+  ENCODING_LATIN1 = 300
+  ENCODING_UTF8 = 301
+
   UPSAMPLE_VERTICAL_DEFAULT     = 0x00000000
   UPSAMPLE_HORIZONTAL_DEFAULT   = 0x00000000
   DOWNSAMPLE_VERTICAL_DEFAULT   = 0x00000000

data/lib/gr/ffi.rb

@@ -63,6 +63,7 @@ module GR
     try_extern 'void gr_settextcolorind(int)'
     try_extern 'void gr_inqtextcolorind(int *)'
     try_extern 'void gr_setcharheight(double)'
+    try_extern 'void gr_inqcharheight(double *)'
     try_extern 'void gr_setcharup(double, double)'
     try_extern 'void gr_settextpath(int)'
     try_extern 'void gr_settextalign(int, int)'
@@ -196,6 +197,10 @@ module GR
     try_extern 'void gr_inqwindow3d(double *, double *, double *, double *, double *, double *)'
     try_extern 'void gr_setscalefactors3d(double, double, double)'
     try_extern 'void gr_inqscalefactors3d(double *, double *, double *)'
-    try_extern 'void gr_transformationinterfaceforrepl(double, double, double, double)'
+    try_extern 'void gr_setspace3d(double, double, double, double)'
+    try_extern 'void gr_text3d(double, double, double, char *, int axis)'
+    try_extern 'void gr_inqtext3d(double, double, double, char *, int axis, double *, double *)'
+    try_extern 'void gr_settextencoding(int)'
+    try_extern 'void gr_inqtextencoding(int *)'
   end
 end

data/lib/gr/plot.rb

@@ -421,7 +421,7 @@ module GR
       if img.is_a? String
         width, height, data = GR.readimage(img)
       else
-        width, height = img.shape
+        height, width = img.shape
         cmin, cmax = kvs[:crange]
         data = img.map { |i| normalize_color(i, cmin, cmax) }
         data = data.map { |i| (1000 + i * 255).round }
@@ -488,7 +488,9 @@ module GR
       end
 
       GR.selntran(0)
-      values = ((v - v.min) / (v.max - v.min) * (2 ^ 16 - 1)).round
+      v = Numo::DFloat.cast(v) if v.is_a? Array
+      values = ((v - v.min) / (v.max - v.min) * (2**16 - 1)).round
+      values = Numo::UInt16.cast(values)
       nx, ny, nz = v.shape
       isovalue = ((kvs[:isovalue] || 0.5) - v.min) / (v.max - v.min)
       rotation = ((kvs[:rotation] || 40) * Math::PI / 180.0)
@@ -497,7 +499,7 @@ module GR
       GR3.clear
       mesh = GR3.createisosurfacemesh(values, [2.0 / (nx - 1), 2.0 / (ny - 1), 2.0 / (nz - 1)],
                                       [-1, -1, -1],
-                                      (isovalue * (2 ^ 16 - 1)).round)
+                                      (isovalue * (2**16 - 1)).round)
       color = kvs[:color] || [0.0, 0.5, 0.8]
       GR3.setbackgroundcolor(1, 1, 1, 0)
       GR3.drawmesh(mesh, 1, [0, 0, 0], [0, 0, 1], [0, 1, 0], color, [1, 1, 1])

data/lib/gr3.rb

@@ -2,39 +2,39 @@
 
 # OverView of GR.rb
 #
-# +--------------------+  +--------------------+
-# | GR module          |  | GR3 module         |
-# | +----------------+ |  | +----------------+ |
-# | | GR::FFI        | |  | | GR3::FFI       | |
-# | | +   libGR.so   | |  | | +    libGR3.so | |
-# | +----------------+ |  | +----------------+ |
-# |   | define_method  |  |   | define_method  |
-# | +----------------+ |  | +----------------+ |
-# | | | GR::GRBase   | |  | | | GR3::GR3Base | |
-# | | v  (Pri^ate)   | |  | | v  (Pri^ate)   | |
-# | +++--------------+ |  | +++--------------+ |
-# |  | Extend          |  |  | Extend          |
-# |  v                 |  |  v       +-------+ |
-# |      +-----------+ |  |          | Check | |
-# |      | GR::Plot  | |  |       <--+ Error | |
-# |      +-----------+ |  |          +-------+ |
-# +--------------------+  +----------+---------+
-#           ^                        ^
-#           |  +------------------+  |
-#    Extend |  | GRCommons module |  | Extend
-#           |  | +--------------+ |  |
-#           |  | |    Fiddley   | |  |
-#           |  | +--------------+ |  |
-#           |  | +--------------+ |  |
-#           +----+ CommonUtils  +----+
-#           |  | +--------------+ |  |
-#           |  | +--------------+ |  |
-#           +----+    Version   +----+
-#           |  | +--------------+ |
-#           |  | +--------------+ |
-#           +----+JupyterSupport| |
-#              | +--------------+ |
-#              +------------------+
+#  +--------------------+  +--------------------+
+#  | GR module          |  | GR3 module         |
+#  | +----------------+ |  | +----------------+ |
+#  | | GR::FFI        | |  | | GR3::FFI       | |
+#  | | +   libGR.so   | |  | | +    libGR3.so | |
+#  | +----------------+ |  | +----------------+ |
+#  |   | define_method  |  |   | define_method  |
+#  | +----------------+ |  | +----------------+ |
+#  | | | GR::GRBase   | |  | | | GR3::GR3Base | |
+#  | | v  (Pri^ate)   | |  | | v  (Pri^ate)   | |
+#  | +++--------------+ |  | +++--------------+ |
+#  |  | Extend          |  |  | Extend          |
+#  |  v                 |  |  v       +-------+ |
+#  |      +-----------+ |  |          | Check | |
+#  |      | GR::Plot  | |  |       <--+ Error | |
+#  |      +-----------+ |  |          +-------+ |
+#  +--------------------+  +----------+---------+
+#            ^                        ^
+#            |  +------------------+  |
+#     Extend |  | GRCommons module |  | Extend
+#            |  | +--------------+ |  |
+#            |  | |    Fiddley   | |  |
+#            |  | +--------------+ |  |
+#            |  | +--------------+ |  |
+#            +----+ CommonUtils  +----+
+#            |  | +--------------+ |  |
+#            |  | +--------------+ |  |
+#            +----+    Version   +----+
+#            |  | +--------------+ |
+#            |  | +--------------+ |
+#            +----+JupyterSupport| |
+#               | +--------------+ |
+#               +------------------+
 #
 # (You can edit the above AA diagram with http://asciiflow.com/)
 #

data/lib/gr_commons/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler