ruby-gr 0.0.26 → 0.58.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd24ca7e167933c74ba77c3185be37e322665f41c4e94d547789d28f7b282d7a
-  data.tar.gz: a3f53215287be5208e2217bc83fc033030aa2067cb438e46343b85b33357adab
+  metadata.gz: f620965108eafb5f65fc8b1c946db5abea180708db175b88246a2ecd97a66b53
+  data.tar.gz: 8ff0c1b787c4b3e70a29ace39eb2fb39abaf60d71afc05b4b382edfcb6f570fa
 SHA512:
-  metadata.gz: f661c8aa91cb27046f66590643a372391c5d9fa1703146b891137f1a0639c3671243679d4f14697e304e737d17408a5c880c8e2399278285b02fddfe08a18e8a
-  data.tar.gz: 32945088f9c0cbf22a8525c36f0dd527fcd5d81a763986a334736331b1d0ad9013d9f6b89a3202118427a85021b261bd0b35caad6690d38e8969efe0299c7c60
+  metadata.gz: cb816d775831c8e05f43e0ded3d15a22328ff0b7e5810c484782393b4fe06ee5aa03fbf431b3cbbe6c8bac2763b07ef377e42dd5d9024da1aec819251b264951
+  data.tar.gz: 9e12f1fa434d64b1f202a3198afa30be70ee1b4961493cde92d308134b146703ff21e2e1915cd01ed286f476f7e6900425aaa5ebdc8f1b33fd550a3d3567a14f

data/README.md

@@ -123,8 +123,6 @@ Some GR module methods are overwritten.
 [`imshow`](../../wiki/Plotting-functions#imshow)
 [`isosurface`](../../wiki/Plotting-functions#isosurface)
 
-We are preparing a [more object-oriented interface](https://github.com/kojix2/GRUtils.rb) based on [GRUtils.jl](https://github.com/heliosdrm/GRUtils.jl) in the future.
-
 #### GR - A module for calling native GR functions.
 
 2-D Plots and common 3-D Plots.
@@ -148,6 +146,16 @@ require 'gr3'
 GR3.cameralookat(-3, 2, -2, 0, 0, 0, 0, 0, -1)
 ```
 
+### Using GR.rb non-interactively
+
+Both APIs will by default start a Qt based window to show the result of the last call.
+This behavior is caused by GR itself as it will [implicitly generate output to a file or application](https://gr-framework.org/workstations.html#no-output).
+If you want to use GR.rb non-interactively, eg., as part of a static site build, you can do this by setting the environment variable `GKS_WSTYPE`to `100`.
+
+```sh
+export GKS_WSTYPE=100
+```
+
 ## Documentation
 
 - [GR.rb Wiki](https://github.com/red-data-tools/GR.rb/wiki)
@@ -168,7 +176,7 @@ Set environment variable GRDIR.
 export GRDIR="your/path/to/gr"
 ```
 
-* macOS Catalina and macOS Mojave: See the "How to open an app that hasn’t been notarized or is from an unidentified developer" section under [Safely open apps on your Mac](https://support.apple.com/en-us/HT202491) in the Apple documentation.
+macOS : Please  the section "How to open apps from un-notarized or unidentified developers" in the Apple documentation ["Safely open apps on your Mac"](https://support.apple.com/en-us/HT202491).
 
 ### Using package managers
 
@@ -180,10 +188,9 @@ export GRDIR="your/path/to/gr"
 
 ```sh
 brew install libgr
-# brew install --build-from-source libgr
+export GKS_WSTYPE=411 # gksqt (recommended)
 ```
 
-
 #### Linux - APT
 
 [packages.red-data-tools.org](https://github.com/red-data-tools/packages.red-data-tools.org) provides `libgr-dev`, `libgr3-dev` and `libgrm-dev`
@@ -192,7 +199,8 @@ Debian GNU/Linux and Ubuntu
 
 ```sh
 sudo apt install -y -V ca-certificates lsb-release wget
-wget https://packages.red-data-tools.org/$(lsb_release --id --short | tr 'A-Z' 'a-z')/red-data-tools-apt-source-latest-$(lsb_release --codename --short).deb
+wget https://packages.red-data-tools.org/$(lsb_release --id --short | tr 'A-Z' 'a-z'\
+  )/red-data-tools-apt-source-latest-$(lsb_release --codename --short).deb
 sudo apt install -y -V ./red-data-tools-apt-source-latest-$(lsb_release --codename --short).deb
 sudo apt update
 sudo apt install libgrm-dev
@@ -207,14 +215,10 @@ CentOS
 sudo dnf install -y gr-devel
 ```
 
-### Windows - MSYS2
+#### Windows - MSYS2
 
 If you are using Rubyinstaller, pacman will automatically install [mingw-w64-gr](https://packages.msys2.org/base/mingw-w64-gr) when the gem is installed.
 
-## Backend for Charty
-
-GR.rb will be the default backend for [Charty](https://github.com/red-data-tools/charty).
-
 ## Contributing
 
 GR.rb is a library under development, so even small improvements like fixing typos are welcome!
@@ -227,6 +231,22 @@ Please feel free to send us your PR.
 * Update GR packages ( Homebrew, MinGW, red-data-tools )
 * Create visualization tools based on GR.rb
 
+To get started with development:
+
+```sh
+git clone https://github.com/red-data-tools/GR.rb
+cd GR.rb
+bundle install
+bundle exec rake test
+```
+
+* [I'm new to Ruby](https://github.com/red-data-tools/GR.rb/wiki/I%27m-new-to-Ruby)
+
+## Future plans
+
+* GR.rb will be the default backend for [Charty](https://github.com/red-data-tools/charty).
+* [Object-oriented interface](https://github.com/kojix2/GRUtils.rb) based on [GRUtils.jl](https://github.com/heliosdrm/GRUtils.jl). 
+
 ## Acknowledgements
 
 We would like to thank Josef Heinen, the creator of [GR](https://github.com/sciapp/gr) and [GR.jl](https://github.com/jheinen/GR.jl), Florian Rhiem, the creator of [python-gr](https://github.com/sciapp/python-gr), and all [GR](https://github.com/sciapp/gr) developers.

data/lib/gr.rb

@@ -58,7 +58,7 @@ module GR
 
   # Platforms |  path
   # Windows   |  bin/libgr.dll
-  # MacOSX    |  lib/libGR.so (v0.53.0 .so)
+  # MacOSX    |  lib/libGR.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGR.so
   platform = RbConfig::CONFIG['host_os']
   lib_names, pkg_name = \
@@ -70,6 +70,9 @@ module GR
     else
       [['libGR.so'], 'gr']
     end
+
+  # On Windows + RubyInstaller,
+  # the environment variable GKS_FONTPATH will be set.
   lib_path = GRCommons::GRLib.search(lib_names, pkg_name)
 
   raise NotFoundError, "#{lib_names} not found" if lib_path.nil?
@@ -178,7 +181,7 @@ module GR
     # @param x         [Array, NArray]          A list containing the X coordinates
     # @param y         [Array, NArray]          A list containing the Y coordinates
     # @param linewidth [Array, NArray, Numeric] A list containing the line widths
-    # @param line_z    [Array, NArray]          A list to be converted to colors
+    # @param line_z    [Array, NArray, Numeric] A list to be converted to colors
     #
     # The values for x and y are in world coordinates.
     # The attributes that control the appearance of a polyline are linetype,
@@ -190,13 +193,24 @@ module GR
       if linewidth.nil? && line_z.nil?
         super(n, x, y)
       else
-        linewidth = Array.new(n, linewidth) if linewidth.is_a?(Numeric)
-        linewidth.map! { |i| (100 * i).round }
-        line_z ||= Array.new(n, 0)
-        raise ArgumentError if n != equal_length(linewidth, line_z)
-
-        color = to_rgb_color(line_z)
-        gdp(x, y, GDP_DRAW_LINES, linewidth.zip(color).flatten)
+        linewidth ||= GR.inqlinewidth
+        linewidth = if linewidth.is_a?(Numeric)
+                      Array.new(n, linewidth * 100)
+                    else
+                      raise ArgumentError if n != linewidth.length
+
+                      linewidth.map { |i| (100 * i).round }
+                    end
+        line_z ||= GR.inqcolor(989) # FIXME
+        color = if line_z.is_a?(Numeric)
+                  Array.new(n, line_z)
+                else
+                  raise ArgumentError if n != line_z.length
+
+                  to_rgb_color(line_z)
+                end
+        z = linewidth.to_a.zip(color).flatten # to_a : NArray
+        gdp(x, y, GDP_DRAW_LINES, z)
       end
     end
 
@@ -205,7 +219,7 @@ module GR
     # @param x          [Array, NArray]          A list containing the X coordinates
     # @param y          [Array, NArray]          A list containing the Y coordinates
     # @param markersize [Array, NArray, Numeric] A list containing the marker sizes
-    # @param marker_z   [Array, NArray]          A list to be converted to colors
+    # @param marker_z   [Array, NArray, Numeric] A list to be converted to colors
     #
     # The values for x and y are in world coordinates.
     # The attributes that control the appearance of a polymarker are marker type,
@@ -217,13 +231,24 @@ module GR
       if markersize.nil? && marker_z.nil?
         super(n, x, y)
       else
-        markersize = Array.new(n, markersize) if markersize.is_a?(Numeric)
-        markersize.map! { |i| (100 * i).round }
-        marker_z ||= Array.new(n, 0)
-        raise ArgumentError if n != equal_length(markersize, marker_z)
-
-        color = to_rgb_color(marker_z)
-        gdp(x, y, GDP_DRAW_MARKERS, markersize.zip(color).flatten)
+        markersize ||= GR.inqmarkersize
+        markersize = if markersize.is_a?(Numeric)
+                       Array.new(n, markersize * 100)
+                     else
+                       raise ArgumentError if n != markersize.length
+
+                       markersize.map { |i| (100 * i).round }
+                     end
+        marker_z ||= GR.inqcolor(989) # FIXME
+        color = if marker_z.is_a?(Numeric)
+                  Array.new(n, marker_z)
+                else
+                  raise ArgumentError if n != marker_z.length
+
+                  to_rgb_color(marker_z)
+                end
+        z = markersize.to_a.zip(color).flatten # to_a : NArray
+        gdp(x, y, GDP_DRAW_MARKERS, z)
       end
     end
 
@@ -308,9 +333,9 @@ module GR
     # raidus. The center point of the resulting disk is located at `xorg`, `yorg`
     # and the radius of the disk is `rmax`.
     #
-    # @param xorg    [Numeric]       X coordinate of the disk center in world
+    # @param x_org   [Numeric]       X coordinate of the disk center in world
     #                                coordinates
-    # @param yorg    [Numeric]       Y coordinate of the disk center in world
+    # @param y_org   [Numeric]       Y coordinate of the disk center in world
     #                                coordinates
     # @param phimin  [Numeric]       start angle of the disk sector in degrees
     # @param phimax  [Numeric]       end angle of the disk sector in degrees
@@ -318,7 +343,7 @@ module GR
     #                                coordinates
     # @param rmax    [Numeric]       outer radius of the punctured disk in world
     #                                coordinates
-    # @param dimiphi [Integer]       Phi (X) dimension of the color index array
+    # @param dimphi  [Integer]       Phi (X) dimension of the color index array
     # @param dimr    [Integer]       iR (Y) dimension of the color index array
     # @param color   [Array, NArray] Color index array
     #
@@ -1355,7 +1380,7 @@ module GR
     # @param x      [Array, NArray] A list containing the X coordinates
     # @param y      [Array, NArray] A list containing the Y coordinates
     # @param z      [Array, NArray] A list containing the Z coordinates
-    # @param lavels [Array, NArray] A list of contour levels
+    # @param levels [Array, NArray] A list of contour levels
     #
     def tricontour(x, y, z, levels)
       npoints = x.length # equal_length ?
@@ -1414,6 +1439,16 @@ module GR
       super(n, r, g, b, positions)
     end
 
+    # Inquire the color index range of the current colormap.
+    #
+    # @return [Array] first_color_ind The color index of the first color,
+    #                 last_color_ind The color index of the last color
+    def inqcolormapinds
+      inquiry %i[int int] do |first_color_ind, last_color_ind|
+        super(first_color_ind, last_color_ind)
+      end
+    end
+
     # @!method colorbar
 
     def inqcolor(color)
@@ -1601,14 +1636,14 @@ module GR
     # curves.
     #
     # @param points [Array, NArray] (N, 2) array of (x, y) vertices
-    # @parm codes [Array, NArray] N-length array of path codes
+    # @param codes [Array, NArray] N-length array of path codes
     #  *  STOP      : end the entire path
     #  *  MOVETO    : move to the given vertex
     #  *  LINETO    : draw a line from the current position to the given vertex
     #  *  CURVE3    : draw a quadratic Bézier curve
     #  *  CURVE4    : draw a cubic Bézier curve
     #  *  CLOSEPOLY : draw a line segment to the start point of the current path
-    # @parm fill [Integer]
+    # @param fill [Integer]
     #   A flag indication whether resulting path is to be filled or not
     #
     def drawpath(points, codes, fill)

data/lib/gr/ffi.rb

@@ -117,6 +117,7 @@ module GR
     try_extern 'void gr_setcolormap(int)'
     try_extern 'void gr_inqcolormap(int *)'
     try_extern 'void gr_setcolormapfromrgb(int n, double *r, double *g, double *b, double *x)'
+    try_extern 'void gr_inqcolormapinds(int *, int *)'
     try_extern 'void gr_colorbar(void)'
     try_extern 'void gr_inqcolor(int, int *)'
     try_extern 'int gr_inqcolorfromrgb(double, double, double)'

data/lib/gr/plot.rb

@@ -39,11 +39,11 @@ module GR
     # Keyword options conform to GR.jl.
     KW_ARGS = %i[accelerate algorithm alpha ax backgroundcolor barwidth baseline
                  clabels clear clim color colormap crange figsize font grid
-                 horizontal isovalue kind label labels levels location nbins
-                 ratio rotation scale size spec subplot tilt title update xaxis
-                 xflip xform xlabel xlim xlog xrange xticks yaxis yflip ylabel
-                 ylim ylog zflip yrange yticks viewport vp where window zaxis
-                 zlabel zlim zlog zrange zticks].freeze
+                 horizontal isovalue kind label labels levels linewidth location
+                 nbins ratio rotation scale size spec subplot tilt title update
+                 xaxis xflip xform xlabel xlim xlog xrange xticks yaxis yflip
+                 ylabel ylim ylog zflip yrange yticks viewport vp where window
+                 zaxis zlabel zlim zlog zrange zticks].freeze
 
     FONTS = {
       times_roman: 101,
@@ -152,15 +152,20 @@ module GR
         vp1, vp2, vp3, vp4 = vp
       end
 
-      viewport = [vp1 + 0.125 * (vp2 - vp1),
-                  vp1 + 0.925 * (vp2 - vp1),
-                  vp3 + 0.125 * (vp4 - vp3),
-                  vp3 + 0.925 * (vp4 - vp3)]
-
-      if %i[contour contourf hexbin heatmap nonuniformheatmap polarheatmap
-            nonuniformpolarheatmap surface trisurf volume].include?(kind)
-        viewport[1] -= 0.1
-      end
+      left_margin = kvs.has_key?(:ylabel) ? 0.05 : 0
+      right_margin = if %i[contour contourf hexbin heatmap nonuniformheatmap polarheatmap
+                           nonuniformpolarheatmap surface trisurf volume].include?(kind)
+                       (vp2 - vp1) * 0.1
+                     else
+                       0
+                     end
+      bottom_margin = kvs.has_key?(:xlabel) ? 0.05 : 0
+      top_margin = kvs.has_key?(:title) ? 0.075 : 0
+
+      viewport = [vp1 + (0.075 + left_margin) * (vp2 - vp1),
+                  vp1 + (0.95 - right_margin) * (vp2 - vp1),
+                  vp3 + (0.075 + bottom_margin) * (vp4 - vp3),
+                  vp3 + (0.975 - top_margin) * (vp4 - vp3)]
 
       if %i[line step scatter stem].include?(kind) && kvs[:labels]
         location = kvs[:location] || 1
@@ -218,7 +223,7 @@ module GR
         kvs[:xrange] = [xmin, xmax]
         kvs[:yrange] = [ymin, ymax]
       else
-        minmax
+        minmax(kind)
       end
 
       major_count = if %i[wireframe surface plot3 scatter3 polar polarhist
@@ -246,7 +251,7 @@ module GR
                         if kvs.has_key?(:xticks)
                           kvs[:xticks]
                         else
-                          [GR.tick(xmin, xmax) / major_count, major_count]
+                          [auto_tick(xmin, xmax) / major_count, major_count]
                         end
                       else
                         [1, 1]
@@ -275,7 +280,7 @@ module GR
                         if kvs.has_key?(:yticks)
                           kvs[:yticks]
                         else
-                          [GR.tick(ymin, ymax) / major_count, major_count]
+                          [auto_tick(ymin, ymax) / major_count, major_count]
                         end
                       else
                         [1, 1]
@@ -290,7 +295,7 @@ module GR
                           if kvs.has_key?(:zticks)
                             kvs[:zticks]
                           else
-                            [GR.tick(zmin, zmax) / major_count, major_count]
+                            [auto_tick(zmin, zmax) / major_count, major_count]
                           end
                         else
                           [1, 1]
@@ -300,15 +305,16 @@ module GR
       end
 
       kvs[:window] = xmin, xmax, ymin, ymax
-      if %i[polar polarhist polarheatmap nonuniformpolarheatmap].include?(kind)
+      if %i[polar polarhist polarheatmap nonuniformpolarheatmap trisurf].include?(kind)
         GR.setwindow(-1, 1, -1, 1)
       else
         GR.setwindow(xmin, xmax, ymin, ymax)
       end
       if %i[wireframe surface plot3 scatter3 trisurf volume].include?(kind)
         rotation = kvs[:rotation] || 40
-        tilt     = kvs[:tilt]     || 70
-        GR.setspace(zmin, zmax, rotation, tilt)
+        tilt     = kvs[:tilt]     || 60
+        GR.setwindow3d(xmin, xmax, ymin, ymax, zmin, zmax)
+        GR.setspace3d(-rotation, tilt, 30, 0)
       end
 
       kvs[:scale] = scale
@@ -327,10 +333,10 @@ module GR
       GR.setlinecolorind(1)
       diag = Math.sqrt((viewport[1] - viewport[0])**2 + (viewport[3] - viewport[2])**2)
       GR.setlinewidth(1)
-      charheight = [0.018 * diag, 0.012].max
-      GR.setcharheight(charheight)
       ticksize = 0.0075 * diag
       if %i[wireframe surface plot3 scatter3 trisurf volume].include?(kind)
+        charheight = [0.024 * diag, 0.012].max
+        GR.setcharheight(charheight)
         ztick, zorg, majorz = kvs[:zaxis]
         if pass == 1 && drawgrid
           GR.grid3d(xtick, 0, ztick, xorg[0], yorg[1], zorg[0], 2, 0, 2)
@@ -340,6 +346,8 @@ module GR
           GR.axes3d(0, ytick, 0, xorg[1], yorg[0], zorg[0], 0, majory, 0, ticksize)
         end
       else
+        charheight = [0.018 * diag, 0.012].max
+        GR.setcharheight(charheight)
         if %i[heatmap nonuniformheatmap shade].include?(kind)
           ticksize = -ticksize
         elsif drawgrid
@@ -422,7 +430,7 @@ module GR
       GR.setcharheight(charheight)
       GR.setlinetype(GR::LINETYPE_SOLID)
 
-      tick = 0.5 * GR.tick(rmin, rmax)
+      tick = auto_tick(rmin, rmax)
       n = ((rmax - rmin) / tick + 0.5).round
       (n + 1).times do |i|
         r = i.to_f / n
@@ -584,7 +592,7 @@ module GR
       charheight = [0.016 * diag, 0.012].max
       GR.setcharheight(charheight)
       if kvs[:scale] & GR::OPTION_Z_LOG == 0
-        ztick = 0.5 * GR.tick(zmin, zmax)
+        ztick = auto_tick(zmin, zmax)
         GR.axes(0, ztick, 1, zmin, 0, 1, 0.005)
       else
         GR.setscale(GR::OPTION_Y_LOG)
@@ -661,8 +669,12 @@ module GR
 
         when :line
           mask = GR.uselinespec(spec)
-          GR.polyline(x, y) if hasline(mask)
-          GR.polymarker(x, y) if hasmarker(mask)
+          linewidth = kvs[:linewidth]
+          # Slightly different from Julia,
+          # Because the implementation of polyline and polymarker is different.
+          z ||= linewidth # FIXME
+          GR.polyline(x, y, z, c) if hasline(mask)
+          GR.polymarker(x, y, z, c) if hasmarker(mask)
 
         when :step
           mask = GR.uselinespec(spec)
@@ -698,20 +710,9 @@ module GR
 
         when :scatter
           GR.setmarkertype(GR::MARKERTYPE_SOLID_CIRCLE)
-          if z || c
-            if c
-              cmin, cmax = kvs[:crange]
-              c = c.map { |i| normalize_color(i, cmin, cmax) }
-              cind = c.map { |i| (1000 + i * 255).round }
-            end
-            x.length.times do |i|
-              GR.setmarkersize(z[i] / 100.0) if z
-              GR.setmarkercolorind(cind[i]) if c
-              GR.polymarker([x[i]], [y[i]])
-            end
-          else
-            GR.polymarker(x, y)
-          end
+          z = z&.map { |i| i * 0.01 }
+          c = c&.map { |i| normalize_color(i, *kvs[:crange]) }
+          GR.polymarker(x, y, z, c)
 
         when :stem
           GR.setlinecolorind(1)
@@ -775,7 +776,7 @@ module GR
             GR.polarcellarray(0, 0, 0, 360, 0, 1, w, h, colors)
           when :nonuniformpolarheatmap
             ymax = y.max.to_f
-            ρ = y.map{|i| i / ymax}
+            ρ = y.map { |i| i / ymax }
             θ = x.map { |i| i * 180 / Math::PI }
             GR.nonuniformpolarcellarray(θ, ρ, w, h, colors)
           end
@@ -800,7 +801,7 @@ module GR
             zmin = kvs[:zlim].first if kvs[:zlim].first
             zmax = kvs[:zlim].last if kvs[:zlim].last
           end
-
+          GR.setprojectiontype(0)
           GR.setspace(zmin, zmax, 0, 90)
           levels = kvs[:levels] || 0
           clabels = kvs[:clabels] || false
@@ -1108,8 +1109,8 @@ module GR
 
     # Normalize a color c with the range [cmin, cmax]
     #   0 <= normalize_color(c, cmin, cmax) <= 1
-    # Note: narray.map{|i| normalize_color(i)} There's room for speedup.
     def normalize_color(c, cmin, cmax)
+      # NOTE: narray.map{|i| normalize_color(i)} There's room for speedup.
       c = c.to_f # if c is Integer
       c = c.clamp(cmin, cmax) - cmin
       c /= (cmax - cmin) if cmin != cmax
@@ -1146,7 +1147,7 @@ module GR
       [a, b]
     end
 
-    def minmax
+    def minmax(kind)
       xmin = ymin = zmin = cmin = Float::INFINITY
       xmax = ymax = zmax = cmax = -Float::INFINITY
       scale = kvs[:scale]
@@ -1159,6 +1160,8 @@ module GR
           x0, x1 = x.minmax
           xmin = [x0, xmin].min
           xmax = [x1, xmax].max
+        elsif kind == :volume
+          xmin, xmax = -1, 1
         else
           xmin = 0
           xmax = 1
@@ -1170,6 +1173,8 @@ module GR
           y0, y1 = y.minmax
           ymin = [y0, ymin].min
           ymax = [y1, ymax].max
+        elsif kind == :volume
+          ymin, ymax = -1, 1
         else
           ymin = 0
           ymax = 1
@@ -1211,6 +1216,21 @@ module GR
       end
     end
 
+    def to_wc(wn)
+      xmin, ymin = GR.ndctowc(wn[0], wn[2])
+      xmax, ymax = GR.ndctowc(wn[1], wn[3])
+      [xmin, xmax, ymin, ymax]
+    end
+
+    def auto_tick(amin, amax)
+      scale = 10.0**Math.log10(amax - amin).truncate
+      tick_size = [5.0, 2.0, 1.0, 0.5, 0.2, 0.1, 0.05, 0.02, 0.01]
+      i = tick_size.find_index do |tsize|
+        ((amax - amin) / scale / tsize) > 7 # maximum number of tick marks
+      end
+      tick = tick_size[i - 1] * scale
+    end
+
     def legend_size
       scale = GR.inqscale
       GR.selntran(0)

data/lib/gr3.rb

@@ -68,7 +68,7 @@ module GR3
 
   # Platforms |  path
   # Windows   |  bin/libGR3.dll
-  # MacOSX    |  lib/libGR3.dylib (v0.53.0 .so)
+  # MacOSX    |  lib/libGR3.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGR3.so
   platform = RbConfig::CONFIG['host_os']
   lib_names, pkg_name = \
@@ -80,6 +80,9 @@ module GR3
     else
       [['libGR3.so'], 'gr3']
     end
+
+  # On Windows + RubyInstaller,
+  # the environment variable GKS_FONTPATH will be set.
   lib_path = GRCommons::GRLib.search(lib_names, pkg_name)
 
   raise NotFoundError, "#{lib_names} not found" if lib_path.nil?

data/lib/gr_commons/gr_lib.rb

@@ -23,45 +23,66 @@ module GRCommons
   #     - mingw-w64-gr
   module GRLib
     class << self
+      # Check if using RubyInstaller or not.
+      def ruby_installer?
+        Object.const_defined?(:RubyInstaller)
+      end
+
+      # Return the directory path from the GRDIR environment variable.
+      def get_grdir_from_env(lib_names)
+        return nil unless ENV['GRDIR']
+        return ENV['GRDIR'] if Dir.exist?(ENV['GRDIR'])
+
+        warn "#{lib_names} : Dir GRDIR=#{ENV['GRDIR']} not found." # return nil
+      end
+
       # Search the shared library.
       # @note This method does not detect the Operating System.
       #
       # @param lib_names [Array] The actual file name of the shared library.
       # @param pkg_name [String] The package name to be used when searching with pkg-configg
       def search(lib_names, pkg_name)
+        # FIXME: There may be a better way to do it...
         def lib_names.map_find(&block)
           lazy.map(&block).find { |path| path }
         end
+
+        # ENV['GRDIR']
+        # Verify that the directory exists.
+        grdir = get_grdir_from_env(lib_names)
+
         # Windows + RubyInstaller
-        if Object.const_defined?(:RubyInstaller)
-          dir = ENV['GRDIR'] || [
-            RubyInstaller::Runtime.msys2_installation.msys_path,
-            RubyInstaller::Runtime.msys2_installation.mingwarch
-          ].join(File::ALT_SEPARATOR)
-          lib_names.lazy.map do |lib_name|
-            recursive_search(lib_name, dir)
-          end.find { |i| i }.tap do |path|
-            RubyInstaller::Runtime.add_dll_directory(File.dirname(path)) if path
-          end
-        # ENV['GRDIR'] (Linux, Mac, Windows)
-        elsif ENV['GRDIR']
-          # Search for XXX.dylib and then XXX.so on macOS
-          lib_names.map_find do |lib_name|
-            recursive_search(lib_name, ENV['GRDIR'])
-          end || lib_names.map_find do |lib_name|
-            pkg_config_search(lib_name, pkg_name)
-          end
-        else
-          lib_names.map_find do |lib_name|
-            pkg_config_search(lib_name, pkg_name)
+        if ruby_installer?
+          grdir ||= File.join(RubyInstaller::Runtime.msys2_installation.msys_path,
+                              RubyInstaller::Runtime.msys2_installation.mingwarch)
+        end
+
+        # Search grdir
+        if grdir
+          lib_path = lib_names.map_find do |lib_name|
+            recursive_search(lib_name, grdir)
           end
         end
+
+        # Search with pkg-config
+        lib_path ||= lib_names.map_find do |lib_name|
+          pkg_config_search(lib_name, pkg_name)
+        end
+
+        # Windows + RubyInstaller
+        if ruby_installer?
+          RubyInstaller::Runtime.add_dll_directory(File.dirname(lib_path))
+          # FIXME: Where should I write this code?
+          ENV['GKS_FONTPATH'] ||= grdir
+        end
+
+        lib_path
       end
 
       # Recursive file search in directories
       # @param name [String] File to search for
       # @param base_dir [String] Directory to search
-      # @retrun path [String, NilClass] Returns the first path found.
+      # @return path [String, NilClass] Returns the first path found.
       #                                 If not found, nil is returned.
       def recursive_search(name, base_dir)
         Dir.chdir(base_dir) do

data/lib/gr_commons/gr_logger.rb

@@ -5,10 +5,11 @@
 # It should not be loaded when gr_commons/gr_commons is loaded.
 
 require 'logger'
-require 'rainbow'
-require 'awesome_print'
+require 'pp'
 
 module GRCommons
+  # Convenience class methods
+
   class << self
     # Create a new GRLogger
     # @param out [String]
@@ -16,30 +17,35 @@ module GRCommons
     # @example
     #   require 'gr_commons/gr_logger'
     #   GRCommons.gr_log("log.txt")
+
     def gr_log(out = $stderr)
       GRCommons::GRLogger.new(out)
     end
 
     # Return the last created GRLogger
     # @return [GRLogger]
+
     def gr_logger
       GRCommons::GRLogger.logger
     end
   end
 
-  # Outputs function calls to GR Framework to a log file.
-  # Mainly used for debugging.
-  # @note This module is for those who want to see low-level function calls in GR.
+  # If GR.rb call native functions of the GR framework,
+  # it will be recorded in the log file.
+  #
+  # @note Mainly used by developers for debugging.
   #
   # = How it works　
-  # prepend a module named Inspector to the singular class
-  # of the FFI module. It will inspects the GR function call of the FFI module
+  # It prepend a module named Inspector to the singular class of the FFI module.
+  # It will inspects the GR function call of the FFI module
   #
   # @example
   #   require 'gr_commons/gr_logger'
-  #   GRCommons.gr_log("log.txt")
+  #   GRCommons::GRLogger.new("log.txt")
+
   class GRLogger < Logger
     # Return the last created GRLogger
+
     def self.logger
       @@logger ||= GRCommons::GRLogger.new
     end
@@ -51,13 +57,15 @@ module GRCommons
   end
 end
 
+# GR
+
 if Object.const_defined?(:GR)
   module GR
     module FFI
       module Inspector
         GR::FFI.ffi_methods.each do |s|
           define_method(s) do |*args|
-            GRCommons.gr_logger.info "GR::FFI.#{s}\n" + args.ai + "\n"
+            GRCommons.gr_logger.info "GR::FFI.#{s}\n#{args.pretty_inspect}\n"
             super(*args)
           end
         end
@@ -69,13 +77,15 @@ if Object.const_defined?(:GR)
   end
 end
 
+# GR3
+
 if Object.const_defined?(:GR3)
   module GR3
     module FFI
       module Inspector
         GR3::FFI.ffi_methods.each do |s|
           define_method(s) do |*args|
-            GRCommons.gr_logger.info "GR3::FFI.#{s}\n" + args.ai + "\n"
+            GRCommons.gr_logger.info "GR3::FFI.#{s}\n#{args.pretty_inspect}\n"
             super(*args)
           end
         end
@@ -87,13 +97,15 @@ if Object.const_defined?(:GR3)
   end
 end
 
+# GRM
+
 if Object.const_defined?(:GRM)
   module GRM
     module FFI
       module Inspector
         GRM::FFI.ffi_methods.each do |s|
           define_method(s) do |*args|
-            GRCommons.gr_logger.info "GRM::FFI.#{s}\n" + args.ai + "\n"
+            GRCommons.gr_logger.info "GRM::FFI.#{s}\n#{args.pretty_inspect}\n"
             super(*args)
           end
         end

data/lib/gr_commons/version.rb

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

data/lib/grm.rb

@@ -27,7 +27,7 @@ module GRM
 
   # Platforms |  path
   # Windows   |  bin/libGRM.dll
-  # MacOSX    |  lib/libGRM.dylib (v0.53.0 .so)
+  # MacOSX    |  lib/libGRM.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGRM.so
   platform = RbConfig::CONFIG['host_os']
   lib_names, pkg_name = \
@@ -39,6 +39,9 @@ module GRM
     else
       [['libGRM.so'], 'grm']
     end
+
+  # On Windows + RubyInstaller,
+  # the environment variable GKS_FONTPATH will be set.
   lib_path = GRCommons::GRLib.search(lib_names, pkg_name)
 
   raise NotFoundError, "#{lib_names} not found" if lib_path.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.58.1.0
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: histogram
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: GR for Ruby