ruby-gr 0.0.14 → 0.0.19

data/lib/gr/ffi.rb

@@ -61,7 +61,9 @@ module GR
     try_extern 'void gr_setcharexpan(double)'
     try_extern 'void gr_setcharspace(double)'
     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)'
@@ -160,7 +162,7 @@ module GR
     try_extern 'void gr_selectcontext(int)'
     try_extern 'void gr_destroycontext(int)'
     try_extern 'int gr_uselinespec(char *)'
-    # try_extern 'void gr_delaunay(int, const double *, const double *, int *, int **)'
+    try_extern 'void gr_delaunay(int, const double *, const double *, int *, int **)'
     try_extern 'void gr_reducepoints(int, const double *, const double *, int, double *, double *)'
     try_extern 'void gr_trisurface(int, double *, double *, double *)'
     try_extern 'void gr_gradient(int, int, double *, double *, double *, double *, double *)'
@@ -193,5 +195,12 @@ module GR
     try_extern 'void gr_camerainteraction(double, double, double, double)'
     try_extern 'void gr_setwindow3d(double, double, double, double, double, double)'
     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_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/grbase.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module GR
-  # This module automatically converts Ruby arrays and Numo::Narray into pointers.
+  # This module automatically converts Ruby arrays and Numo::Narray into
+  # Fiddley::MemoryPointer.
   module GRBase
     extend GRCommons::DefineMethods
     define_ffi_methods(FFI,
@@ -9,6 +10,4 @@ module GR
                        default_type: :double)
   end
   private_constant :GRBase
-
-  extend GRCommons::GRCommonUtils
 end

data/lib/gr/plot.rb

@@ -37,15 +37,16 @@ module GR
                    volume].freeze # the name might be changed in the future.
 
     # Keyword options conform to GR.jl.
-    KW_ARGS = %i[accelerate algorithm alpha backgroundcolor barwidth baseline
-                 clabels color colormap figsize horizontal isovalue label labels
-                 levels location nbins rotation size tilt title where xflip
-                 xform xlabel xlim xlog yflip ylabel ylim ylog zflip zlabel zlim
-                 zlog clim subplot].freeze
-
-    @@last_plot = nil
-    def self.last_plot
-      @@last_plot
+    KW_ARGS = %i[accelerate algorithm alpha ax backgroundcolor barwidth baseline
+                 clabels clear clim color colormap crange figsize horizontal
+                 isovalue kind label labels levels location nbins ratio rotation
+                 scale size spec subplot tilt title update xaxis xflip xform
+                 xlabel xlim xlog xrange yaxis yflip ylabel ylim ylog zflip
+                 yrange viewport vp where window zaxis zlabel zlim zlog zrange].freeze
+
+    @last_plot = nil
+    class << self
+      attr_accessor :last_plot
     end
 
     def initialize(*args)
@@ -64,14 +65,14 @@ module GR
 
       @args = plot_args(args) # method name is the same as Julia/Python
       @kvs[:size] ||= [600, 450]
-      @kvs[:ax] ||= false
+      @kvs[:ax] = false if @kvs[:ax].nil?
       @kvs[:subplot] ||= [0, 1, 0, 1]
-      @kvs[:clear] ||= true
-      @kvs[:update] ||= true
+      @kvs[:clear] = true if @kvs[:clear].nil?
+      @kvs[:update] = true if @kvs[:update].nil?
       @scheme = 0
       @background = 0xffffff
       @handle = nil
-      @@last_plot = self
+      self.class.last_plot = self
     end
     attr_accessor :args, :kvs, :scheme
 
@@ -172,6 +173,7 @@ module GR
         scale |= GR::OPTION_FLIP_Y if kvs[:yflip]
         scale |= GR::OPTION_FLIP_Z if kvs[:zflip]
       end
+      kvs[:scale] = scale
       if kvs.has_key?(:panzoom)
         xmin, xmax, ymin, ymax = GR.panzoom(*kvs[:panzoom])
         kvs[:xrange] = [xmin, xmax]
@@ -180,12 +182,8 @@ module GR
         minmax
       end
 
-      major_count = if %i[wireframe surface plot3 scatter3 polar polarhist
-                          polarheatmap trisurf volume].include?(kind)
-                      2
-                    else
-                      5
-                    end
+      major_count = %i[wireframe surface plot3 scatter3 polar polarhist
+                       polarheatmap trisurf volume].include?(kind) ? 2 : 5
 
       xmin, xmax = kvs[:xrange]
       if (scale & GR::OPTION_X_LOG) == 0
@@ -271,7 +269,7 @@ module GR
       ratio = kvs[:ratio]
       xtick, xorg, majorx = kvs[:xaxis]
       ytick, yorg, majory = kvs[:yaxis]
-      drawgrid = kvs[:grid] || true
+      drawgrid = kvs.has_key?(:grid) ? kvs[:grid] : true
       xtick = 10 if kvs[:scale] & GR::OPTION_X_LOG != 0
       ytick = 10 if kvs[:scale] & GR::OPTION_Y_LOG != 0
       GR.setlinecolorind(1)
@@ -292,8 +290,8 @@ module GR
       else
         if %i[heatmap nonuniformheatmap shade].include?(kind)
           ticksize = -ticksize
-        else
-          drawgrid && GR.grid(xtick, ytick, 0, 0, majorx, majory)
+        elsif drawgrid
+          GR.grid(xtick, ytick, 0, 0, majorx, majory)
         end
         if kvs.has_key?(:xticklabels) || kvs.has_key?(:yticklabels)
           fx = if kvs.has_key?(:xticklabels)
@@ -331,7 +329,7 @@ module GR
         GR.axes(xtick, ytick, xorg[1], yorg[1], -majorx, -majory, -ticksize)
       end
 
-      if kvs.has_key?(:title)
+      if kvs[:title]
         GR.savestate
         GR.settextalign(GR::TEXT_HALIGN_CENTER, GR::TEXT_VALIGN_TOP)
         text(0.5 * (viewport[0] + viewport[1]), vp[3], kvs[:title])
@@ -420,7 +418,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 }
@@ -487,7 +485,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)
@@ -496,7 +496,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])
@@ -561,6 +561,8 @@ module GR
         # Not yet.
       end
 
+      GR.settextfontprec(232, 3)
+
       set_viewport(kind, kvs[:subplot])
       unless kvs[:ax]
         set_window(kind)
@@ -579,8 +581,7 @@ module GR
 
       GR.uselinespec(' ')
       args.each do |x, y, z, c, spec|
-        # FIXME
-        spec ||= ''
+        spec ||= kvs[:spec] ||= ''
         GR.savestate
         GR.settransparency(kvs[:alpha]) if kvs.has_key?(:alpha)
 
@@ -682,9 +683,10 @@ module GR
           cmap = colormap
           cmin, cmax = kvs[:zrange]
           data = z.map { |i| normalize_color(i, cmin, cmax) }
-          colors = data.map { |i| 1000 + i * 255 }
-          # if kvs[:xflip]
-          # if kvs[;yflip]
+          data.reverse(axis: 0) if kvs[:xflip]
+          data.reverse(axis: 1) if kvs[:yflip]
+          colors = data * 255 + 1000
+          colors = colors.transpose # Julia is column major
           GR.polarcellarray(0, 0, 0, 360, 0, 1, w, h, colors)
           draw_polar_axes
           kvs[:zrange] = [cmin, cmax]
@@ -696,11 +698,18 @@ module GR
             a, b = z.shape
             x = (1..b).to_a
             y = (1..a).to_a
-            zmin, zmax = kvs[:zlim] || z.minmax
+            zmin, zmax = z.minmax
           elsif equal_length(x, y, z)
             x, y, z = GR.gridit(x, y, z, 200, 200)
-            zmin, zmax = kvs[:zlim] || z.compact.minmax # compact : removed nil
+            zmin, zmax = z.compact.minmax # compact : removed nil
+          end
+
+          # kvs[:zlim] is supposed to be Array or Range
+          if kvs.has_key?(:zlim)
+            zmin = kvs[:zlim].first if kvs[:zlim].first
+            zmax = kvs[:zlim].last if kvs[:zlim].last
           end
+
           GR.setspace(zmin, zmax, 0, 90)
           levels = kvs[:levels] || 0
           clabels = kvs[:clabels] || false
@@ -792,7 +801,9 @@ module GR
           colorbar(0.05)
 
         when :plot3
-          GR.polyline3d(x, y, z)
+          mask = GR.uselinespec(spec)
+          GR.polyline3d(x, y, z) if hasline(mask)
+          GR.polymarker3d(x, y, z) if hasmarker(mask)
           draw_axes(kind, 2)
 
         when :scatter3
@@ -821,7 +832,7 @@ module GR
           plot_polar(x, y)
 
         when :trisurf
-          GR._trisurface_(x, y, z)
+          GR.trisurface(x, y, z)
           draw_axes(kind, 2)
           colorbar(0.05)
 
@@ -855,7 +866,7 @@ module GR
 
       draw_legend if %i[line step scatter stem].include?(kind) && kvs.has_key?(:labels)
 
-      if kvs.has_key?(:update)
+      if kvs[:update]
         GR.updatews
         # if GR.isinline()
         #  restore_context()
@@ -975,24 +986,31 @@ module GR
       [*0..(num - 1)].collect { |i| low + i.to_f * (high - low) / (num - 1) }
     end
 
-    def plot_args(args, _fmt = :xys)
+    def plot_args(args)
       # FIXME
       args = [args] unless args.all? do |i|
                              i.is_a?(Array) && (i[0].is_a?(Array) || narray?(i[0]))
                            end
       args.map do |xyzc|
+        spec = nil
+        case xyzc.last
+        when String
+          spec = xyzc.pop
+        when Hash
+          spec = xyzc.pop[:spec]
+        end
+
         x, y, z, c = xyzc.map do |i|
-          if i.is_a?(Array) || narray?(i)
+          if i.is_a?(Array) || narray?(i) || i.nil?
             i
           elsif i.respond_to?(:to_a)
             # Convert an Array-like class such as Daru::Vector to an Array
             i.to_a
-          else
-            # String
+          else # String
             i
           end
         end
-        [x, y, z, c]
+        [x, y, z, c, spec]
       end
     end
 
@@ -1035,9 +1053,12 @@ module GR
     def minmax
       xmin = ymin = zmin = cmin = Float::INFINITY
       xmax = ymax = zmax = cmax = -Float::INFINITY
-
+      scale = kvs[:scale]
       args.each do |x, y, z, c|
         if x
+          if scale & GR::OPTION_X_LOG != 0
+            x.map! { |v| v > 0 ? v : Float::NAN }
+          end
           x0, x1 = x.minmax
           xmin = [x0, xmin].min
           xmax = [x1, xmax].max
@@ -1046,6 +1067,9 @@ module GR
           xmax = 1
         end
         if y
+          if scale & GR::OPTION_Y_LOG != 0
+            y.map! { |v| v > 0 ? v : Float::NAN }
+          end
           y0, y1 = y.minmax
           ymin = [y0, ymin].min
           ymax = [y1, ymax].max
@@ -1054,6 +1078,9 @@ module GR
           ymax = 1
         end
         if z
+          if scale & GR::OPTION_Z_LOG != 0
+            z.map! { |v| v > 0 ? v : Float::NAN }
+          end
           z0, z1 = z.minmax
           zmin = [z0, zmin].min
           zmax = [z1, zmax].max
@@ -1071,30 +1098,12 @@ module GR
       xmin, xmax = fix_minmax(xmin, xmax)
       ymin, ymax = fix_minmax(ymin, ymax)
       zmin, zmax = fix_minmax(zmin, zmax)
-      if kvs.has_key?(:xlim)
-        x0, x1 = kvs[:xlim]
-        x0 ||= xmin
-        x1 ||= xmax
-        kvs[:xrange] = [x0, x1]
-      else
-        kvs[:xrange] = [xmin, xmax]
-      end
-      if kvs.has_key?(:ylim)
-        y0, y1 = kvs[:ylim]
-        y0 ||= ymin
-        y1 ||= ymax
-        kvs[:yrange] = [y0, y1]
-      else
-        kvs[:yrange] = [ymin, ymax]
-      end
-      if kvs.has_key?(:zlim)
-        z0, z1 = kvs[:zlim]
-        z0 ||= zmin
-        z1 ||= zmax
-        kvs[:zrange] = [z0, z1]
-      else
-        kvs[:zrange] = [zmin, zmax]
-      end
+
+      # kvs[:xlim], kvs[:ylim], kvs[:zlim] is supposed to be Array or Range
+      kvs[:xrange] = [(kvs[:xlim]&.first || xmin), (kvs[:xlim]&.last || xmax)]
+      kvs[:yrange] = [(kvs[:ylim]&.first || ymin), (kvs[:ylim]&.last || ymax)]
+      kvs[:zrange] = [(kvs[:zlim]&.first || zmin), (kvs[:zlim]&.last || zmax)]
+
       if kvs.has_key?(:clim)
         c0, c1 = kvs[:clim]
         c0 ||= cmin
@@ -1114,7 +1123,7 @@ module GR
       kvs[:labels].each do |label|
         label = label.to_s
         tbx, tby = inqtext(0, 0, label)
-        w = [w, tbx[2]].max
+        w = [w, tbx[2] - tbx[0]].max
         h += [tby[2] - tby[0], 0.03].max
       end
       GR.setscale(scale)
@@ -1140,26 +1149,27 @@ module GR
   end
 
   class << self
-    # Draw one or more line plots.
+    # (Plot) Draw one or more line plots.
     def plot(*args)
       create_plot(:line, *args)
     end
 
-    # Draw one or more step or staircase plots.
+    # (Plot) Draw one or more step or staircase plots.
     def step(*args)
       create_plot(:step, *args)
     end
 
-    # Draw one or more scatter plots.
+    # (Plot) Draw one or more scatter plots.
     def scatter(*args)
       create_plot(:scatter, *args)
     end
 
-    # Draw a stem plot.
+    # (Plot) Draw a stem plot.
     def stem(*args)
       create_plot(:stem, *args)
     end
 
+    # (Plot)
     def polarhistogram(x, kv = {})
       plt = GR::Plot.new(x, kv)
       plt.kvs[:kind] = :polarhist
@@ -1169,10 +1179,11 @@ module GR
       plt.plot_data
     end
 
-    # Draw a heatmap.
+    # (Plot) Draw a heatmap.
     def heatmap(*args)
       # FIXME
-      _x, _y, z, kv = parse_args(*args)
+      args, kv = format_xyzc(*args)
+      _x, _y, z = args
       ysize, xsize = z.shape
       z = z.reshape(xsize, ysize)
       create_plot(:heatmap, kv) do |plt|
@@ -1182,6 +1193,7 @@ module GR
       end
     end
 
+    # (Plot) Draw a polarheatmap.
     def polarheatmap(*args)
       d = args.shift
       # FIXME
@@ -1197,83 +1209,78 @@ module GR
     end
 
     alias _contour_ contour
-    # Draw a contour plot.
+    # (Plot) Draw a contour plot.
     def contour(*args)
-      x, y, z, kv = parse_args(*args)
-      create_plot(:contour, x, y, z, kv)
+      create_plot(:contour, *format_xyzc(*args))
     end
 
     alias _contourf_ contourf
-    # Draw a filled contour plot.
+    # (Plot) Draw a filled contour plot.
     def contourf(*args)
-      x, y, z, kv = parse_args(*args)
-      create_plot(:contourf, x, y, z, kv)
+      create_plot(:contourf, *format_xyzc(*args))
     end
 
     alias _hexbin_ hexbin
-    # Draw a hexagon binning plot.
+    # (Plot) Draw a hexagon binning plot.
     def hexbin(*args)
       create_plot(:hexbin, *args)
     end
 
-    # Draw a triangular contour plot.
+    # (Plot) Draw a triangular contour plot.
     def tricont(*args)
-      x, y, z, kv = parse_args(*args)
-      create_plot(:tricont, x, y, z, kv)
+      create_plot(:tricont, *format_xyzc(*args))
     end
 
-    # Draw a three-dimensional wireframe plot.
+    # (Plot) Draw a three-dimensional wireframe plot.
     def wireframe(*args)
-      x, y, z, kv = parse_args(*args)
-      create_plot(:wireframe, x, y, z, kv)
+      create_plot(:wireframe, *format_xyzc(*args))
     end
 
-    # Draw a three-dimensional surface plot.
+    # (Plot) Draw a three-dimensional surface plot.
     alias _surface_ surface
     def surface(*args)
-      x, y, z, kv = parse_args(*args)
-      create_plot(:surface, x, y, z, kv)
+      create_plot(:surface, *format_xyzc(*args))
     end
 
+    # (Plot)
     def polar(*args)
       create_plot(:polar, *args)
     end
 
-    alias _trisurface_ trisurface
-    # Draw a triangular surface plot.
-    def trisurface(*args)
-      x, y, z, kv = parse_args(*args)
-      create_plot(:trisurf, x, y, z, kv)
+    # (Plot) Draw a triangular surface plot.
+    def trisurf(*args)
+      create_plot(:trisurf, *format_xyzc(*args))
     end
 
-    # Draw one or more three-dimensional line plots.
+    # (Plot) Draw one or more three-dimensional line plots.
     def plot3(*args)
       create_plot(:plot3, *args)
     end
 
-    # Draw one or more three-dimensional scatter plots.
+    # (Plot) Draw one or more three-dimensional scatter plots.
     def scatter3(*args)
       create_plot(:scatter3, *args)
     end
 
     alias _shade_ shade
+    # (Plot)
     def shade(*args)
       create_plot(:shade, *args)
     end
 
+    # (Plot)
     def volume(v, kv = {})
       create_plot(:volume, v, kv) do |plt|
         plt.args = [[nil, nil, v, nil, '']]
       end
     end
 
-    # Draw a bar plot.
+    # (Plot) Draw a bar plot.
     def barplot(labels, heights, kv = {})
       labels = labels.map(&:to_s)
       wc, hc = barcoordinates(heights)
-      horizontal = kv[:horizontal] || false
       create_plot(:bar, labels, heights, kv) do |plt|
-        if horizontal
+        if kv[:horizontal]
           plt.args = [[hc, wc, nil, nil, '']]
           plt.kvs[:yticks] = [1, 1]
           plt.kvs[:yticklabels] = labels
@@ -1285,7 +1292,7 @@ module GR
       end
     end
 
-    # Draw a histogram.
+    # (Plot) Draw a histogram.
     def histogram(x, kv = {})
       create_plot(:hist, x, kv) do |plt|
         nbins = plt.kvs[:nbins] || 0
@@ -1294,7 +1301,7 @@ module GR
       end
     end
 
-    # Draw an image.
+    # (Plot) Draw an image.
     def imshow(img, kv = {})
       img = Numo::DFloat.cast(img) # Umm...
       create_plot(:imshow, img, kv) do |plt|
@@ -1302,7 +1309,7 @@ module GR
       end
     end
 
-    # Draw an isosurface.
+    # (Plot) Draw an isosurface.
     def isosurface(v, kv = {})
       v = Numo::DFloat.cast(v) # Umm...
       create_plot(:isosurface, v, kv) do |plt|
@@ -1310,6 +1317,35 @@ module GR
       end
     end
 
+    def hold(flag = true)
+      plt = GR::Plot.last_plot
+      plt.kvs.slice(:window, :scale, :xaxis, :yaxis, :zaxis).merge({ ax: flag, clear: !flag })
+    end
+
+    # Set current subplot index.
+    def subplot(nr, nc, p)
+      xmin = 1
+      xmax = 0
+      ymin = 1
+      ymax = 0
+      p = [p] if p.is_a? Integer
+      p.each do |i|
+        r = (nr - (i - 1) / nc).to_f
+        c = ((i - 1) % nc + 1).to_f
+        xmin = [xmin, (c - 1) / nc].min
+        xmax = [xmax, c / nc].max
+        ymin = [ymin, (r - 1) / nr].min
+        ymax = [ymax, r / nr].max
+      end
+      {
+        subplot: [xmin, xmax, ymin, ymax],
+        # The policy of clearing when p[0]==1 is controversial
+        clear: p[0] == 1,
+        update: p[-1] == nr * nc
+      }
+    end
+
+    # (Plot) Save the current figure to a file.
     def savefig(filename, kv = {})
       GR.beginprint(filename)
       plt = GR::Plot.last_plot
@@ -1320,40 +1356,41 @@ module GR
 
     private
 
-    def create_plot(type, *args, &block)
+    def create_plot(type, *args)
       plt = GR::Plot.new(*args)
       plt.kvs[:kind] = type
-      block.call(plt) if block_given?
+      yield(plt) if block_given?
       plt.plot_data
       plt
     end
 
-    def parse_args(*args)
+    def format_xyzc(*args)
       kv = if args[-1].is_a? Hash
              args.pop
            else
              {}
            end
-      if args.size == 1
-        if args[0].is_a? Array
-          z = Numo::DFloat.cast(args[0])
-        elsif narray?(args[0])
-          z = args[0]
+
+      args = [args] unless args.all? do |i|
+                             i.is_a?(Array) && (i[0].is_a?(Array) || narray?(i[0]))
+                           end
+      args.map! do |xyzc|
+        if xyzc.size == 1
+          if xyzc[0].is_a? Array
+            z = Numo::DFloat.cast(xyzc[0])
+          elsif narray?(xyzc[0])
+            z = xyzc[0]
+          end
+          xsize, ysize = z.shape
+          x = (1..ysize).to_a * xsize
+          y = (1..xsize).map { |i| Array.new(ysize, i) }.flatten
+          [x, y, z]
+        else
+
+          xyzc
         end
-        xsize, ysize = z.shape
-        # NOTE:
-        # See
-        # https://github.com/jheinen/GR.jl/pull/246
-        # https://github.com/jheinen/GR.jl/issues/241
-        x = (1..ysize).to_a * xsize
-        y = (1..xsize).map { |i| Array.new(ysize, i) }.flatten
-
-      elsif args.size == 3
-        x, y, z = args
-      else
-        raise
       end
-      [x, y, z, kv]
+      [*args, kv]
     end
 
     def hist(x, nbins = 0)