ruby-gr 0.71.7.0 → 0.73.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bcc99a586935b6552accdfb5c93e8e2c11ab9fbe84e7381470d632ba27d75d3
-  data.tar.gz: d788f7c35a41e6522b8a4856abe168a9376acb0f2237d8b6e1490eef340d8ae7
+  metadata.gz: c49cfd6712b94567eebb2ae2b4e2f67c227acc0bce428c15d777419d4b6ba31b
+  data.tar.gz: ecd7816d1e8f9784169ee9b917189361b18f6424958c70498279731c42c985c0
 SHA512:
-  metadata.gz: fc80ccc8e0a8b1070166d0234d680b3eb227aaacc95005b03fd61449ab3e2d27329abaf9476eaad5fb11a5fda7835b2dc2062a9438982fdf1bb435952b29bc68
-  data.tar.gz: 62e1a5366a7cdad3bbd456f53efc439dd41a661a1601d6b0d63c9e03455d87494888f7dd1e25e11c5c2e550c2808ca01a52c706c08a8c8dda2054cbc04ffdcc2
+  metadata.gz: 63bcc49377529b51fbf7d8005ee75c6b3af6961fd96ffd5ae769dbf495b75fbe064f6c50a3e180e1e8030dfa97297abdd4442c89e17b0fea49865e045dbfb464
+  data.tar.gz: 40024235f7e6599a5a9555dacac610a74e4abf1ee07332c7a82a834e3b070d9096d79408e453078014f7f59bdc58182f29a39e8e2afbf5d8b8536a3a6b86eabf

data/lib/gr/ffi.rb

@@ -22,35 +22,47 @@ module GR
 
     Vertex = struct [
       'double x',
-      'double y',
+      'double y'
     ]
 
     # Three-dimensional coordinate
     Point3d = struct [
       'double x',
       'double y',
-      'double z',
+      'double z'
     ]
 
     # Data point for `gr_volume_nogrid`
     DataPoint3d = struct [
-      { pt: Point3d },  # Coordinates of data point
-      'double data',    # Intensity of data point
+      { pt: Point3d }, # Coordinates of data point
+      'double data' # Intensity of data point
     ]
 
     # Provides optional extra data for `gr_volume_interp_gauss`
     Guess = struct [
       'double sqrt_det', # Square root of determinant of covariance matrix
-      {gauss_sig_1: Point3d},
-      {gauss_sig_2: Point3d},
-      {gauss_sig_3: Point3d}, # \f$\Sigma^{-\frac{1}{2}}\f$ encoded as three column vectors
+      { gauss_sig_1: Point3d },
+      { gauss_sig_2: Point3d },
+      { gauss_sig_3: Point3d } # \f$\Sigma^{-\frac{1}{2}}\f$ encoded as three column vectors
     ]
 
     # Provides optional extra data for `gr_volume_interp_tri_linear`
     TriLinear = struct [
-      'double grid_x_re', # Reciproke of interpolation kernel extent in x-directionGrid resolution in x direction 
+      'double grid_x_re', # Reciproke of interpolation kernel extent in x-directionGrid resolution in x direction
       'double grid_y_re', # Reciproke of interpolation kernel extent in y-directionGrid resolution in y direction
-      'double grid_z_re', # Reciproke of interpolation kernel extent in z-directionGrid resolution in z direction
+      'double grid_z_re' # Reciproke of interpolation kernel extent in z-directionGrid resolution in z direction
+    ]
+
+    CpuBasedVolume2Pass = struct [
+      'double dmin',
+      'double dmax',
+      'cpubasedvolume_2pass_priv_t *priv'
+    ]
+
+    Hexbin2Pass = struct [
+      'int nc',
+      'int nntmax',
+      'hexbin_2pass_priv_t *priv'
     ]
 
     try_extern 'void gr_initgr(void)'
@@ -129,6 +141,7 @@ module GR
     try_extern 'void gr_redrawsegws(void)'
     try_extern 'void gr_setsegtran(int, double, double, double, double, double, double, double)'
     try_extern 'void gr_closeseg(void)'
+    try_extern 'void gr_samplelocator(double *, double *, int *)'
     try_extern 'void gr_emergencyclosegks(void)'
     try_extern 'void gr_updategks(void)'
     try_extern 'int gr_setspace(double, double, int, int)'
@@ -142,6 +155,10 @@ module GR
     try_extern 'void gr_axeslbl(double, double, double, double, int, int, double,' \
                ' void (*)(double, double, const char *, double),' \
                ' void (*)(double, double, const char *, double))'
+    try_extern 'void gr_axis(char, axis_t *)'
+    try_extern 'void gr_drawaxis(char, axis_t *)'
+    try_extern 'void gr_drawaxes(axis_t *, axis_t *, int)'
+    try_extern 'void gr_freeaxis(axis_t *)'
     try_extern 'void gr_grid(double, double, double, double, int, int)'
     try_extern 'void gr_grid3d(double, double, double, double, double, double, int, int, int)'
     try_extern 'void gr_verrorbars(int, double *, double *, double *, double *)'
@@ -150,11 +167,13 @@ module GR
     try_extern 'void gr_polymarker3d(int, double *, double *, double *)'
     try_extern 'void gr_axes3d(double, double, double, double, double, double, int, int, int, double)'
     try_extern 'void gr_titles3d(char *, char *, char *)'
+    try_extern 'void gr_settitles3d(char *, char *, char *)'
     try_extern 'void gr_surface(int, int, double *, double *, double *, int)'
     try_extern 'void gr_contour(int, int, int, double *, double *, double *, double *, int)'
     try_extern 'void gr_contourf(int, int, int, double *, double *, double *, double *, int)'
     try_extern 'void gr_tricontour(int, double *, double *, double *, int, double *)'
     try_extern 'int gr_hexbin(int, double *, double *, int)'
+    try_extern 'const hexbin_2pass_t *gr_hexbin_2pass(int, double *, double *, int, const hexbin_2pass_t *)'
     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)'
@@ -186,15 +205,21 @@ module GR
     try_extern 'int gr_importgraphics(char *)'
     try_extern 'void gr_setshadow(double, double, double)'
     try_extern 'void gr_settransparency(double)'
+    try_extern 'void gr_inqtransparency(double *)'
     try_extern 'void gr_setcoordxform(double[3][2])'
     try_extern 'void gr_begingraphics(char *)'
     try_extern 'void gr_endgraphics(void)'
     try_extern 'char *gr_getgraphics(void)'
     try_extern 'int gr_drawgraphics(char *)'
+    try_extern 'int gr_startlistener(void)'
     try_extern 'void gr_mathtex(double, double, char *)'
     try_extern 'void gr_inqmathtex(double, double, char *, double *, double *)'
+    try_extern 'void gr_mathtex3d(double, double, double, char *, int)'
+    try_extern 'void gr_inqmathtex3d(double, double, double, char *, int, double *, double *, double *, double *)'
     try_extern 'void gr_beginselection(int, int)'
     try_extern 'void gr_endselection(void)'
+    try_extern 'void gr_setbboxcallback(int, void (*)(int, double, double, double, double))'
+    try_extern 'void gr_cancelbboxcallback(void)'
     try_extern 'void gr_moveselection(double, double)'
     try_extern 'void gr_resizeselection(int, double, double)'
     try_extern 'void gr_inqbbox(double *, double *, double *, double *)'
@@ -204,8 +229,10 @@ module GR
     try_extern 'int gr_inqregenflags(void)'
     try_extern 'void gr_savestate(void)'
     try_extern 'void gr_restorestate(void)'
+    try_extern 'void gr_savecontext(int)'
     try_extern 'void gr_selectcontext(int)'
     try_extern 'void gr_destroycontext(int)'
+    try_extern 'void gr_unselectcontext(void)'
     try_extern 'int gr_uselinespec(char *)'
     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 *)'
@@ -213,7 +240,8 @@ module GR
     try_extern 'void gr_gradient(int, int, double *, double *, double *, double *, double *)'
     try_extern 'void gr_quiver(int, int, double *, double *, double *, double *, 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, int method, double extrapval)'
+               ' int nxq, int nyq, const double *xq, const double *yq, double *zq,' \
+               ' interp2_method_t method, double extrapval)'
     try_extern 'const char *gr_version(void)'
     try_extern 'void gr_shade(int, double *, double *, int, int, double *, int, int, int *)'
     try_extern 'void gr_shadepoints(int, double *, double *, int, int, int)'
@@ -245,6 +273,7 @@ module GR
     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_inqspace3d(int *, 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)'
@@ -257,12 +286,25 @@ module GR
     try_extern 'void gr_setapproximativecalculation(int)'
     try_extern 'void gr_inqvolumeflags(int *, int *, int *, int *, int *)'
     try_extern 'void gr_cpubasedvolume(int, int, int, double *, int, double *, double *, double *, double *)'
+    try_extern 'const cpubasedvolume_2pass_t *gr_cpubasedvolume_2pass(int, int, int, double *, int, double *, double *, double *, double *, const cpubasedvolume_2pass_t *)'
     try_extern 'void gr_inqvpsize(int *, int *, double *)'
     try_extern 'void gr_polygonmesh3d(int, const double *, const double *, const double *, int, const int *, const int *)'
+    # FIXME:
+    # typedef double (*kernel_f)(const data_point3d_t *, const void *, const point3d_t *, const point3d_t *);
+    # typedef double (*radius_f)(const data_point3d_t *, const void *);
+    typealias 'kernel_f', 'void*'
+    typealias 'radius_f', 'void*'
     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 *)'
     try_extern 'double gr_volume_interp_tri_linear(const data_point3d_t *, const void *, const point3d_t *, const point3d_t *)'
     try_extern 'double gr_volume_interp_gauss(const data_point3d_t *, const void *, const point3d_t *, const point3d_t *)'
+    try_extern 'void gr_setmathfont(int font)'
+    try_extern 'void gr_inqmathfont(int *font)'
+    try_extern 'void gr_setclipregion(int region)'
+    try_extern 'void gr_inqclipregion(int *region)'
+    try_extern 'void gr_settextoffset(double xoff, double yoff)'
+    try_extern 'char *gr_ftoa(char *string, double value, format_reference_t *reference)'
+    try_extern 'void gr_getformat(format_reference_t *result, double origin, double min, double max, double tick_width, int major)'
   end
 end

data/lib/gr3/ffi.rb

@@ -17,10 +17,28 @@ module GR3
 
     extend GRCommons::TryExtern
 
-    typealias('GR3_MC_DTYPE', 'unsigned short')
-
     # https://github.com/sciapp/gr/blob/master/lib/gr3/gr3.h
     # keep same order
+
+    typealias('GR3_MC_DTYPE', 'unsigned short')
+
+    Coord = struct [
+      'float x',
+      'float y',
+      'float z'
+    ]
+
+    Triangle = struct [
+      { 'vertices[3]' => Coord },
+      { 'normal[3]' => Coord }
+    ]
+
+    Volume2Pass = struct [
+      'double dmin',
+      'double dmax',
+      'gr3_volume_2pass_priv_t *priv'
+    ]
+
     try_extern 'int gr3_init(int *attrib_list)'
     try_extern 'void gr3_free(void *pointer)'
     try_extern 'void gr3_terminate(void)'
@@ -29,7 +47,7 @@ module GR3
     try_extern 'const char *gr3_geterrorstring(int error)'
     try_extern 'void gr3_setlogcallback(void (*gr3_log_func)(const char *log_message))'
     try_extern 'int gr3_clear(void)'
-    try_extern 'void gr3_usecurrentframebuffer()'
+    try_extern 'void gr3_usecurrentframebuffer(void)'
     try_extern 'void gr3_useframebuffer(unsigned int framebuffer)'
     try_extern 'int gr3_setquality(int quality)'
     try_extern 'int gr3_getimage(int width, int height, int use_alpha, char *pixels)'
@@ -144,6 +162,8 @@ module GR3
     try_extern 'void gr3_drawtrianglesurface(int n, const float *triangles)'
     try_extern 'void gr_volume(int nx, int ny, int nz, double *data,' \
                ' int algorithm, double *dmin_ptr, double *dmax_ptr)'
+    try_extern 'const gr3_volume_2pass_t *gr_volume_2pass(int nx, int ny, int nz, double *data,' \
+               ' int algorithm, double *dmin_ptr, double *dmax_ptr, const gr3_volume_2pass_t *context)'
     try_extern 'void gr3_setorthographicprojection' \
                '(float left, float right, float bottom, float top, float znear, float zfar)'
     try_extern 'void gr3_setsurfaceoption(int option)'
@@ -152,7 +172,9 @@ module GR3
     try_extern 'int gr3_setlightsources(int num_lights, float *positions, float *colors)'
     try_extern 'void gr3_setlightparameters(float ambient, float diffuse, float specular, float specular_power)'
     try_extern 'void gr3_getlightparameters(float *ambient, float *diffuse, float *specular, float *specular_power)'
-    try_extern 'void gr3_setdefaultlightparameters()'
+    try_extern 'void gr3_setdefaultlightparameters(void)'
+    try_extern 'int gr3_getalphamode(int *mode)'
+    try_extern 'void gr3_setalphamode(int mode)'
     try_extern 'void gr3_setclipping(float xmin, float xmax, float ymin, float ymax, float zmin, float zmax)'
     try_extern 'void gr3_getclipping(float *xmin, float *xmax, float *ymin, float *ymax, float *zmin, float *zmax)'
   end

data/lib/gr3.rb

@@ -871,6 +871,14 @@ module GR3
   SURFACE_GRCOLOR     =  8
   SURFACE_GRZSHADED   = 16
 
+  TRANSPARENCY_OPAQUE   = 0
+  TRANSPARENCY_TRANSMIT = 1
+  TRANSPARENCY_FILTER   = 2
+
+  VOLUME_EMISSION   = 0
+  VOLUME_ABSORPTION = 1
+  VOLUME_MIP        = 2
+
   ATOM_COLORS =
     [[0, 0, 0],
      [255, 255, 255], [217, 255, 255], [204, 128, 255],

data/lib/gr_commons/define_methods.rb

@@ -20,7 +20,11 @@ module GRCommons
             when ->(x) { defined?(Numo::NArray) && x.is_a?(Numo::NArray) }
               GRCommonUtils.public_send(default_type, arg)
             else
-              arg
+              if arg.respond_to?(:to_gr)
+                arg.to_gr
+              else
+                arg
+              end
             end
           end
           ffi_module.public_send(method, *args)

data/lib/gr_commons/fiddley.rb

@@ -198,6 +198,10 @@ module GRCommons
         @ptr
       end
 
+      def address
+        @ptr.to_i
+      end
+
       { 8 => 'c', 16 => 's', 32 => 'l', 64 => 'q' }.each do |bits, form|
         bytes = bits / 8
 

data/lib/gr_commons/version.rb

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

data/lib/grm/ffi.rb

@@ -21,6 +21,7 @@ module GRM
     # header files.
 
     # https://github.com/sciapp/gr/blob/master/lib/grm/include/grm/args.h
+    try_extern 'grm_args_value_iterator_t *grm_arg_value_iter(const arg_t *arg)'
     try_extern 'grm_args_t *grm_args_new(void)'
     try_extern 'void grm_args_delete(grm_args_t *args)'
     try_extern 'int grm_args_push(grm_args_t *args, const char *key, const char *value_format, ...)'
@@ -30,6 +31,7 @@ module GRM
     try_extern 'int grm_args_values(const grm_args_t *args, const char *keyword, const char *expected_format, ...)'
     try_extern 'void grm_args_clear(grm_args_t *args)'
     try_extern 'void grm_args_remove(grm_args_t *args, const char *key)'
+    try_extern 'grm_args_iterator_t *grm_args_iter(const grm_args_t *args)'
     typealias 'grm_args_ptr_t', 'void*'
     try_extern 'grm_args_ptr_t grm_length(double value, const char *unit)'
 
@@ -48,7 +50,10 @@ module GRM
     try_extern 'int grm_input(const grm_args_t *input_args)'
     try_extern 'int grm_get_box(const int x1, const int y1, const int x2, const int y2, const int keep_aspect_ratio, int *x, int *y, int *w, int *h)'
     try_extern 'int grm_is3d(const int x, const int y)'
-    try_extern 'grm_tooltip_info_t *grm_get_tooltip(const int, const int)'
+    try_extern 'grm_tooltip_info_t *grm_get_tooltip(int mouse_x, int mouse_y)'
+    try_extern 'grm_tooltip_info_t **grm_get_tooltips_x(int mouse_x, int mouse_y, unsigned int *array_length)'
+    try_extern 'grm_accumulated_tooltip_info_t *grm_get_accumulated_tooltip_x(int mouse_x, int mouse_y)'
+    try_extern 'int grm_get_hover_mode(int mouse_x, int mouse_y, int disable_movable_xform)'
 
     # https://github.com/sciapp/gr/blob/master/lib/grm/include/grm/net.h
     try_extern 'void *grm_open(int is_receiver, const char *name, unsigned int id, ' \
@@ -64,12 +69,18 @@ module GRM
     # https://github.com/sciapp/gr/blob/master/lib/grm/include/grm/plot.h
     try_extern 'void grm_finalize(void)'
     try_extern 'int grm_clear(void)'
+    try_extern 'void grm_dump_graphics_tree(FILE *f)'
+    try_extern 'char *grm_dump_graphics_tree_str(void)'
     try_extern 'unsigned int grm_max_plotid(void)'
     try_extern 'int grm_merge(const grm_args_t *args)'
     try_extern 'int grm_merge_extended(const grm_args_t *args, int hold, const char *identificator)'
     try_extern 'int grm_merge_hold(const grm_args_t *args)'
     try_extern 'int grm_merge_named(const grm_args_t *args, const char *identificator)'
     try_extern 'int grm_plot(const grm_args_t *args)'
+    try_extern 'int grm_render(void)'
+    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_load_graphics_tree(FILE *file)'
   end
 end

data/lib/grm.rb

@@ -61,6 +61,112 @@ module GRM
   # a Fiddley::MemoryPointer in the GRBase class.
   extend GRMBase
 
+  class Args
+    class << self
+      def try_convert(value)
+        case value
+        when Hash
+          new(**value)
+        else
+          nil
+        end
+      end
+    end
+
+    def initialize(**args)
+      @args = GRM.args_new
+      @args.free = FFI["grm_args_delete"]
+      @references = []
+      args.each do |key, value|
+        push(key, value)
+      end
+    end
+
+    def push(key, value)
+      key = key.to_s if key.is_a?(Symbol)
+      case value
+      when String
+        GRM.args_push(@args, key, "s", :const_string, value)
+      when Integer
+        GRM.args_push(@args, key, "i", :int, value)
+      when Float
+        GRM.args_push(@args, key, "d", :double, value)
+      when Args
+        GRM.args_push(@args, key, "a", :voidp, value.address)
+        value.to_gr.free = nil
+      when Array
+        case value[0]
+        when String
+          addresses = value.collect {|v| Fiddle::Pointer[v].to_i}
+          GRM.args_push(@args, key, "nS",
+                        :int, value.size,
+                        :voidp, addresses.pack("J*"))
+        when Integer
+          GRM.args_push(@args, key, "nI",
+                        :int, value.size,
+                        :voidp, value.pack("i*"))
+        when Float
+          GRM.args_push(@args, key, "nD",
+                        :int, value.size,
+                        :voidp, value.pack("d*"))
+        when Args
+          GRM.args_push(@args, key, "nA",
+                        :int, value.size,
+                        :voidp, value.collect(&:address).pack("J*"))
+          value.each do |v|
+            v.to_gr.free = nil
+          end
+        else
+          vs = value.collect {|v| Args.new(**v)}
+          @references.concat(vs)
+          GRM.args_push(@args, key, "nA",
+                        :int, value.size,
+                        :voidp, vs.collect(&:address).pack("J*"))
+          vs.each do |v|
+            v.to_gr.free = nil
+          end
+        end
+      else
+        v = Args.new(**value)
+        @references << v
+        GRM.args_push(@args, key, "a", :voidp, v.address)
+        v.to_gr.free = nil
+      end
+    end
+
+    def clear
+      GRM.args_clear(@args)
+      @references.clear
+    end
+
+    def address
+      @args.to_i
+    end
+
+    def to_gr
+      @args
+    end
+  end
+
   class << self
+    def merge(args=nil)
+      super(Args.try_convert(args) || args)
+    end
+
+    def merge_extended(args=nil, hold=0, identifiator=nil)
+      super(Args.try_convert(args) || args, hold, identificator)
+    end
+
+    def merge_hold(args=nil)
+      super(Args.try_convert(args) || args)
+    end
+
+    def merge_named(args=nil, identifiator=nil)
+      super(Args.try_convert(args) || args, identificator)
+    end
+
+    def plot(args=nil)
+      super(Args.try_convert(args) || args)
+    end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.71.7.0
+  version: 0.73.6.0
 platform: ruby
 authors:
 - kojix2
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -86,7 +85,6 @@ licenses:
 - MIT
 metadata:
   msys2_mingw_dependencies: gr
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: GR for Ruby
 test_files: []