ruby-gr 0.73.17.0 → 0.73.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51280dfb8fb8ed2385148658651d3c4109307394f31c270cc715595097ccae3a
-  data.tar.gz: d6231ee72a5027eeb587f3b537568774458e07f336e4aa4363472f88b52f8aa4
+  metadata.gz: 875e34444c38c15bd8d817784ded0a930e3126a3cc57ae90f8ae34e720ea7e06
+  data.tar.gz: d3e8357786782a3da6b2256f40865a82a3408506d605d27692b8f52e5f8d787f
 SHA512:
-  metadata.gz: 197d1aa2c250e109aae5c56973ff8ae1baa7bbdb963708763c789b286a5810c5a239f166507b72f75efc69f9b440db39a4b5df4c702a7a117ffeca6f4a8c9fc9
-  data.tar.gz: 50f09df9aed163d17b8f5fcea1ebb94f72abfffe28fd83bae262dcd64a706f4a4090203b38e04fc607bb6631ddb6f02c73c823363989e7f549454d110240d19d
+  metadata.gz: 6d49ab20cb176d37d092600164fb29fbb6c762d445c8b18803aca52d557f23873ba6af60126a62ece955a22c4274d7430aeb2e0ba7a31d07af8e211d7077dfda
+  data.tar.gz: f8594bf5ea403ef7cd663ce44919e760f5d79d5d1122e2b29ac45195f9108226407c1953da225667b0f26ed788009fc6e26c983e38902b49cc196dd79860b464

data/README.md

@@ -21,7 +21,7 @@
 [![face](https://i.imgur.com/uLCKi2r.png)](examples/face.rb)
 [![shade](https://i.imgur.com/VJmS3EQ.png)](examples/shade_ex.rb)
 
-:bar_chart:  [GR framework](https://github.com/sciapp/gr) - powerful visualization library - for Ruby
+:bar_chart: [GR framework](https://github.com/sciapp/gr) - powerful visualization library - for Ruby
 
 ## Installation
 
@@ -31,7 +31,7 @@ First, [install GR](#gr-installation). Then install [`gr-plot`](https://github.c
 gem install gr-plot
 ```
 
-[pkg-config](https://github.com/ruby-gnome/pkg-config) will detect the location of the shared library. Otherwise, you need to specify the environment variable. 
+[pkg-config](https://github.com/ruby-gnome/pkg-config) will detect the location of the shared library. Otherwise, you need to specify the environment variable.
 
 ```sh
 export GRDIR="/your/path/to/gr"
@@ -69,7 +69,7 @@ require 'gr/plot'
 GR.plot(x, y)
 ```
 
-List of available functions. 
+List of available functions.
 
 [`plot`](../../wiki/Plotting-functions#plot)
 [`step`](../../wiki/Plotting-functions#step)
@@ -151,7 +151,7 @@ macOS : See ["How to open apps from un-notarized or unidentified developers"](ht
 
 ### Using package managers
 
-The third party GR packages for Mac, Linux and Windows are available for advanced users. However, these packages are provided by OSS volunteers and may not be the latest version or support some features (such as video output). If you find any problem, please report the issue [here](https://github.com/red-data-tools/GR.rb/issues). 
+The third party GR packages for Mac, Linux and Windows are available for advanced users. However, these packages are provided by OSS volunteers and may not be the latest version or support some features (such as video output). If you find any problem, please report the issue [here](https://github.com/red-data-tools/GR.rb/issues).
 
 #### Mac - Homebrew
 
@@ -183,12 +183,12 @@ If you are using Rubyinstaller, pacman will automatically install [mingw-w64-gr]
 GR.rb is a library under development, so even small improvements like fixing typos are welcome!
 Please feel free to send us your PR.
 
-* [Report bugs](https://github.com/red-data-tools/GR.rb/issues)
-* Fix bugs and [submit pull requests](https://github.com/red-data-tools/GR.rb/pulls)
-* Write, clarify, or fix documentation
-* Suggest or add new features
-* Update GR packages ( Homebrew, MinGW, red-data-tools )
-* Create visualization tools based on GR.rb
+- [Report bugs](https://github.com/red-data-tools/GR.rb/issues)
+- Fix bugs and [submit pull requests](https://github.com/red-data-tools/GR.rb/pulls)
+- Write, clarify, or fix documentation
+- Suggest or add new features
+- Update GR packages ( Homebrew, MinGW, red-data-tools )
+- Create visualization tools based on GR.rb
 
 If you are not familiar with Ruby gem development, please see
 [I'm new to Ruby](https://github.com/red-data-tools/GR.rb/wiki/I%27m-new-to-Ruby)

data/lib/gr/ffi.rb

@@ -65,6 +65,39 @@ module GR
       'hexbin_2pass_priv_t *priv'
     ]
 
+    Tick = struct [
+      'double value',
+      'int is_major'
+    ]
+
+    TickLabel = struct [
+      'double tick',
+      'char *label',
+      'double width'
+    ]
+
+    Axis = struct [
+      'double min',
+      'double max',
+      'double tick',
+      'double org',
+      'double position',
+      'int major_count',
+      'int num_ticks',
+      'void *ticks',
+      'double tick_size',
+      'int num_tick_labels',
+      'void *tick_labels',
+      'double label_position',
+      'int draw_axis_line',
+      'int label_orientation'
+    ]
+
+    FormatReference = struct [
+      'char *format',
+      'int length'
+    ]
+
     try_extern 'void gr_initgr(void)'
     try_extern 'int gr_debug(void)'
     try_extern 'void gr_opengks(void)'
@@ -243,6 +276,7 @@ module GR
     try_extern 'void gr_trisurface(int, double *, double *, double *)'
     try_extern 'void gr_gradient(int, int, double *, double *, double *, double *, double *)'
     try_extern 'void gr_quiver(int, int, double *, double *, double *, double *, int)'
+    typealias 'interp2_method_t', 'int'
     try_extern 'void gr_interp2(int nx, int ny, const double *x, const double *y, const double *z,' \
                ' int nxq, int nyq, const double *xq, const double *yq, double *zq,' \
                ' interp2_method_t method, double extrapval)'
@@ -261,6 +295,7 @@ module GR
     try_extern 'void gr_inqbordercolorind(int *)'
     try_extern 'void gr_selectclipxform(int)'
     try_extern 'void gr_inqclipxform(int *)'
+    try_extern 'void gr_inqclip(int *, double *)'
     try_extern 'void gr_setprojectiontype(int)'
     try_extern 'void gr_inqprojectiontype(int *)'
     try_extern 'void gr_setperspectiveprojection(double, double, double)'
@@ -298,7 +333,6 @@ module GR
     # typedef double (*radius_f)(const data_point3d_t *, const void *);
     typealias 'kernel_f', 'void*'
     typealias 'radius_f', 'void*'
-    typealias 'interp2_method_t', 'int'
     try_extern 'void gr_volume_nogrid(unsigned long, const data_point3d_t *, const void *, int, kernel_f, double *, double *, double, radius_f)'
     try_extern 'void gr_volume_interp_tri_linear_init(double, double, double)'
     try_extern 'void gr_volume_interp_gauss_init(double, double *)'

data/lib/gr.rb

@@ -1116,6 +1116,52 @@ module GR
 
     alias axes2d axes
 
+    def axis(option, min: Float::NAN, max: Float::NAN, tick: Float::NAN, org: Float::NAN, position: Float::NAN, major_count: 1,
+             tick_size: Float::NAN, label_position: Float::NAN, draw_axis_line: 1, label_orientation: 0)
+      ax = FFI::Axis.malloc
+      ax[:min] = min
+      ax[:max] = max
+      ax[:tick] = tick
+      ax[:org] = org
+      ax[:position] = position
+      ax[:major_count] = major_count
+      ax[:tick_size] = tick_size
+      ax[:label_position] = label_position
+      ax[:draw_axis_line] = draw_axis_line
+      ax[:label_orientation] = label_orientation
+      ax[:ticks] = 0
+      ax[:num_ticks] = 0
+      ax[:tick_labels] = 0
+      ax[:num_tick_labels] = 0
+      super(option, ax)
+      ax
+    end
+
+    def drawaxis(option, min: Float::NAN, max: Float::NAN, tick: Float::NAN, org: Float::NAN, position: Float::NAN,
+                 major_count: 1, tick_size: Float::NAN, label_position: Float::NAN, draw_axis_line: 1, label_orientation: 0)
+      ax = FFI::Axis.malloc
+      ax[:min] = min
+      ax[:max] = max
+      ax[:tick] = tick
+      ax[:org] = org
+      ax[:position] = position
+      ax[:major_count] = major_count
+      ax[:tick_size] = tick_size
+      ax[:label_position] = label_position
+      ax[:draw_axis_line] = draw_axis_line
+      ax[:label_orientation] = label_orientation
+      ax[:ticks] = 0
+      ax[:num_ticks] = 0
+      ax[:tick_labels] = 0
+      ax[:num_tick_labels] = 0
+      super(option, ax)
+      ax
+    end
+
+    def drawaxes(x_axis, y_axis, option = 1)
+      super(x_axis, y_axis, option)
+    end
+
     # Create axes in the current workspace and supply a custom function for
     # changing the behaviour of the tick labels.
     #
@@ -1348,9 +1394,10 @@ module GR
     #  * 6 SHADED_MESH   - Applies light source shading to the 3-D surface
     #
     def surface(x, y, z, option)
-      # TODO: check: Arrays have incorrect length or dimension.
       nx = x.length
       ny = y.length
+      raise ArgumentError, "z must have length nx * ny (expected #{nx * ny}, got #{z.length})" if z.length != nx * ny
+
       super(nx, ny, x, y, z, option)
     end
 
@@ -1376,10 +1423,11 @@ module GR
     #   of 1000 to `major_h`.
     #
     def contour(x, y, h, z, major_h)
-      # TODO: check: Arrays have incorrect length or dimension.
       nx = x.length
       ny = y.length
       nh = h.length
+      raise ArgumentError, "z must have length nx * ny (expected #{nx * ny}, got #{z.length})" if z.length != nx * ny
+
       super(nx, ny, nh, x, y, h, z, major_h)
     end
 
@@ -1401,10 +1449,11 @@ module GR
     #   array containing the Z coordinates
     #
     def contourf(x, y, h, z, major_h)
-      # TODO: check: Arrays have incorrect length or dimension.
       nx = x.length
       ny = y.length
       nh = h.length
+      raise ArgumentError, "z must have length nx * ny (expected #{nx * ny}, got #{z.length})" if z.length != nx * ny
+
       super(nx, ny, nh, x, y, h, z, major_h)
     end
 
@@ -1416,7 +1465,7 @@ module GR
     # @param levels [Array, NArray] A list of contour levels
     #
     def tricontour(x, y, z, levels)
-      npoints = x.length # equal_length ?
+      npoints = equal_length(x, y, z)
       nlevels = levels.length
       super(npoints, x, y, z, nlevels, levels)
     end
@@ -1919,9 +1968,10 @@ module GR
 
     # @deprecated
     def gradient(x, y, z)
-      # TODO: check: Arrays have incorrect length or dimension.
       nx = x.length
       ny = y.length
+      raise ArgumentError, "z must have length nx * ny (expected #{nx * ny}, got #{z.length})" if z.length != nx * ny
+
       inquiry [{ double: nx * ny }, { double: nx * ny }] do |pu, pv|
         super(nx, ny, x, y, z, pu, pv)
       end
@@ -1942,9 +1992,12 @@ module GR
     # The values for `x` and `y` are in world coordinates.
     #
     def quiver(x, y, u, v, color)
-      # TODO: check: Arrays have incorrect length or dimension.
       nx = x.length
       ny = y.length
+      if u.length != nx * ny || v.length != nx * ny
+        raise ArgumentError, "u and v must have length nx * ny (expected #{nx * ny}, got u: #{u.length}, v: #{v.length})"
+      end
+
       super(nx, ny, x, y, u, v, (color ? 1 : 0))
     end
 
@@ -2419,6 +2472,45 @@ module GR
       n_connections = colors.length
       super(n_points, px, py, pz, n_connections, int(connections), int(colors))
     end
+
+    # @return [Integer]
+    def startlistener
+      inquiry_int do |ret|
+        super(ret)
+      end
+    end
+
+    # @!method setmathfont
+
+    def inqmathfont
+      inquiry_int { |pt| super(pt) }
+    end
+
+    # @!method setclipregion
+
+    def inqclipregion
+      inquiry_int { |pt| super(pt) }
+    end
+
+    # @!method setclipsector
+
+    def inqclipsector
+      inquiry %i[double double] do |*pts|
+        super(*pts)
+      end
+    end
+
+    def getformat(origin, min, max, tick_width, major)
+      ref = FFI::FormatReference.malloc
+      super(ref, origin, min, max, tick_width, major)
+      ref
+    end
+
+    def ftoa(value, format_ref)
+      string = Fiddle::Pointer.malloc(256)
+      super(string, value, format_ref)
+      string.to_s
+    end
   end
 
   ASF_BUNDLED    = 0
@@ -2506,12 +2598,29 @@ module GR
   MARKERTYPE_HLINE           = -31
   MARKERTYPE_OMARK           = -32
 
+  AXES_SIMPLE_AXES = 1
+  AXES_TWIN_AXES   = 2
+  AXES_WITH_GRID   = 4
+
+  REGION_RECTANGLE = 0
+  REGION_ELLIPSE   = 1
+
   OPTION_X_LOG  =  1
   OPTION_Y_LOG  =  2
   OPTION_Z_LOG  =  4
   OPTION_FLIP_X =  8
   OPTION_FLIP_Y = 16
   OPTION_FLIP_Z = 32
+  OPTION_X_LOG2 = 64
+  OPTION_Y_LOG2 = 128
+  OPTION_Z_LOG2 = 256
+  OPTION_X_LN   = 512
+  OPTION_Y_LN   = 1024
+  OPTION_Z_LN   = 2048
+
+  SPEC_LINE   = 1
+  SPEC_MARKER = 2
+  SPEC_COLOR  = 4
 
   OPTION_LINES         = 0
   OPTION_MESH          = 1
@@ -2520,6 +2629,7 @@ module GR
   OPTION_COLORED_MESH  = 4
   OPTION_CELL_ARRAY    = 5
   OPTION_SHADED_MESH   = 6
+  OPTION_3D_MESH       = 7
 
   MODEL_RGB = 0
   MODEL_HSV = 1

data/lib/gr3.rb

@@ -593,6 +593,70 @@ module GR3
       drawspins(positions, spins, colors)
     end
 
+    # @!method setalphamode
+
+    # @return [Integer]
+    def getalphamode
+      inquiry_int do |mode|
+        super(mode)
+      end
+    end
+
+    # @!method setlightsources
+
+    # @return [Integer]
+    def getlightsources(max_num_lights = 16)
+      positions = GRCommons::Fiddley::MemoryPointer.new(:float, max_num_lights * 3)
+      colors = GRCommons::Fiddley::MemoryPointer.new(:float, max_num_lights * 3)
+      num_lights = super(max_num_lights, positions, colors)
+      # TODO: Return arrays instead of pointers?
+      # For now, returning pointers as they might be large?
+      # But usually we want ruby objects.
+      # Let's convert them to arrays if num_lights > 0
+      pos_arr = positions.read_array_of_float(num_lights * 3).each_slice(3).to_a
+      col_arr = colors.read_array_of_float(num_lights * 3).each_slice(3).to_a
+      [num_lights, pos_arr, col_arr]
+    end
+
+    # @!method setlightparameters
+
+    # @return [Array<Float>]
+    def getlightparameters
+      inquiry %i[float float float float] do |ambient, diffuse, specular, specular_power|
+        super(ambient, diffuse, specular, specular_power)
+      end
+    end
+
+    # @!method setdefaultlightparameters
+
+    # @!method setclipping
+
+    # @return [Array<Float>]
+    def getclipping
+      inquiry %i[float float float float float float] do |xmin, xmax, ymin, ymax, zmin, zmax|
+        super(xmin, xmax, ymin, ymax, zmin, zmax)
+      end
+    end
+
+    # @!method setsurfaceoption
+
+    # @return [Integer]
+    def getsurfaceoption
+      super
+    end
+
+    # @param data [NArray] 3D narray array containing the voxel data
+    # @param isovalue [Float] isovalue at which the surface will be created
+    # @param color [Array, NArray] the color of the surface
+    # @param strides [Array, NArray] the strides in each direction
+    def isosurface(data, isovalue = 0.5, color = nil, strides = nil)
+      nx, ny, nz = data.shape
+      color ||= [1.0, 1.0, 1.0]
+      strides ||= [1, 1, 1]
+      strides = GRCommons::GRCommonUtils.int(strides)
+      super(nx, ny, nz, data, isovalue, color, strides)
+    end
+
     # Creates meshes for slices through the given data, using the current GR
     # colormap. Use the parameters x, y or z to specify what slices should be
     # drawn and at which positions they should go through the data. If neither

data/lib/gr_commons/version.rb

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

data/lib/grm/ffi.rb

@@ -84,6 +84,7 @@ module GRM
     try_extern 'int grm_process_tree(void)'
     try_extern 'int grm_export(const char *file_path)'
     try_extern 'int grm_switch(unsigned int id)'
+    try_extern 'int grm_get_error_code()'
     try_extern 'int grm_load_graphics_tree(FILE *file)'
     try_extern 'int grm_validate(void)'
     # The following functions use C++ types that cannot be parsed by Fiddle

data/lib/grm.rb

@@ -82,6 +82,28 @@ module GRM
 
     def push(key, value)
       key = key.to_s if key.is_a?(Symbol)
+
+      # Support Numo::NArray transparently when available
+      if defined?(Numo::NArray) && value.is_a?(Numo::NArray)
+        shape = value.shape
+        case shape.length
+        when 1
+          # 1D NArray: delegate to existing Array handling
+          return push(key, value.to_a)
+        when 2
+          # 2D NArray: convert to nested Array and reuse 2D Array path
+          rows, cols = shape
+          nested = Array.new(rows) do |r|
+            Array.new(cols) do |c|
+              value[r, c]
+            end
+          end
+          return push(key, nested)
+        else
+          raise ArgumentError, "Numo::NArray with dimension > 2 is not supported for key '#{key}'"
+        end
+      end
+
       case value
       when String
         GRM.args_push(@args, key, 's', :const_string, value)
@@ -93,6 +115,26 @@ module GRM
         GRM.args_push(@args, key, 'a', :voidp, value.address)
         value.to_gr.free = nil
       when Array
+        raise ArgumentError, "Array value for key '#{key}' cannot be empty" if value.empty?
+
+        # Handle 2D Array (Matrix): flatten and add dimensions
+        if value[0].is_a?(Array)
+          rows = value.size
+          cols = value[0].size
+          # Validate that all rows have the same length
+          unless value.all? { |row| row.size == cols }
+            raise ArgumentError, "All rows in 2D array for key '#{key}' must have the same length"
+          end
+
+          # Flatten in row-major order
+          flattened = value.flatten
+
+          push(key, flattened)
+          # GRM expects dims in [width, height] order (columns, rows)
+          push("#{key}_dims", [cols, rows])
+          return
+        end
+
         case value[0]
         when String
           addresses = value.collect { |v| Fiddle::Pointer[v].to_i }
@@ -148,23 +190,28 @@ module GRM
 
   class << self
     def merge(args = nil)
-      super(Args.try_convert(args) || args)
+      args = Args.try_convert(args) || args
+      super(args)
     end
 
-    def merge_extended(args = nil, hold = 0, _identifiator = nil)
-      super(Args.try_convert(args) || args, hold, identificator)
+    def merge_extended(args = nil, hold = 0, identificator = nil)
+      args = Args.try_convert(args) || args
+      super(args, hold, identificator)
     end
 
     def merge_hold(args = nil)
-      super(Args.try_convert(args) || args)
+      args = Args.try_convert(args) || args
+      super(args)
     end
 
-    def merge_named(args = nil, _identifiator = nil)
-      super(Args.try_convert(args) || args, identificator)
+    def merge_named(args = nil, identificator = nil)
+      args = Args.try_convert(args) || args
+      super(args, identificator)
     end
 
     def plot(args = nil)
-      super(Args.try_convert(args) || args)
+      args = Args.try_convert(args) || args
+      super(args)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.73.17.0
+  version: 0.73.19.1
 platform: ruby
 authors:
 - kojix2
@@ -24,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: numo-narray
+  name: numo-narray-alt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: GR for Ruby
 test_files: []