ruby-gr 0.66.0.0 → 0.72.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f62d57c43711e0e23533d38287699d89479a21071c362ff162f2106dfcc550e
-  data.tar.gz: 9be23f52f87aa7b61680142bc648049cbfa2c4b683bf082d47679daf430ff9dc
+  metadata.gz: 052e290dece0bbfbfb770da33ed8b55fbc9cb6bcf54e508245696d77bcc0138b
+  data.tar.gz: 21d69942fcd3414a9367167b5d89dd48151a1019cf213b1e78293954439fb901
 SHA512:
-  metadata.gz: fd728fb1457f78827d8ce1ecf77ef7cd87df51f1ecbc4a1165d371a67e04cac130294dbe9e8b6d947a69a6c1385818f7aa041df3d4de9a883aec7e11f62742f6
-  data.tar.gz: f6e6af01b74bfe6f6b373477d1a7cb917b52c8cb941d530fd1a90986927e241a4c75048cf49f2c1c4fbabebf59ea763d01de418768d67ebbafd9a19dabaf7b1c
+  metadata.gz: 53c0cef5add5333e520a34ab2fa923361a44acb0b3bc50ccfaf847153a9d0e404357904947fc2fa3abb125951eb967bcc1c78fb504c6bc9a5d9323f8238ebd31
+  data.tar.gz: 0f3c0d93ff46b9f850154ee4e9318f55b9f20f9cfa546472c556cc7b2e41e7dc0b53090041f043e95993e2b2a15b9a884a27d1adfec3e661a05bd89024b58e6d

data/README.md

@@ -25,8 +25,6 @@
 
 ## Installation
 
-GR.rb supports Ruby 2.5+.
-
 First, [install GR](#gr-installation). Then install [`gr-plot`](https://github.com/red-data-tools/gr-plot) gem.
 
 ```sh

data/lib/gr/ffi.rb

@@ -19,7 +19,54 @@ module GR
 
     # https://github.com/sciapp/gr/blob/master/lib/gr/gr.h
     # keep same order
+
+    Vertex = struct [
+      'double x',
+      'double y'
+    ]
+
+    # Three-dimensional coordinate
+    Point3d = struct [
+      'double x',
+      'double y',
+      'double z'
+    ]
+
+    # Data point for `gr_volume_nogrid`
+    DataPoint3d = struct [
+      { 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
+    ]
+
+    # 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_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
+    ]
+
+    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)'
+    try_extern 'int gr_debug(void)'
     try_extern 'void gr_opengks(void)'
     try_extern 'void gr_closegks(void)'
     try_extern 'void gr_inqdspsize(double *, double *, int *, int *)'
@@ -67,6 +114,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_setwscharheight(double chh, double height)'
     try_extern 'void gr_inqcharheight(double *)'
     try_extern 'void gr_setcharup(double, double)'
     try_extern 'void gr_settextpath(int)'
@@ -93,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)'
@@ -119,6 +168,7 @@ module GR
     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)'
@@ -155,6 +205,7 @@ module GR
     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_beginselection(int, int)'
@@ -168,8 +219,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 *)'
@@ -221,7 +274,18 @@ 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 *)'
   end
 end

data/lib/gr.rb

@@ -278,7 +278,7 @@ module GR
     # GR_TEXT_ENABLE_INLINE_MATH)
     #
     # The values for `x` and `y` specify the text position. If the GR_TEXT_USE_WC
-    # option is set, they are interpreted as world cordinates, otherwise as
+    # option is set, they are interpreted as world coordinates, otherwise as
     # normalized device coordinates. The string may contain new line characters
     # and inline math expressions ($...$). The latter are only taken into account,
     # if the GR_TEXT_ENABLE_INLINE_MATH option is set.
@@ -407,7 +407,7 @@ module GR
     # @param nrow  [Integer] total number of rows in the color index array and the radii array
     # @param color [Integer] color index array
     #
-    # The mapping of the polar coordinates and the drawing is performed simialr
+    # The mapping of the polar coordinates and the drawing is performed similar
     # to `gr_polarcellarray` with the difference that the individual cell sizes
     # are specified allowing nonuniform sized cells.
     #
@@ -556,7 +556,7 @@ module GR
     #  * -27 : MARKERTYPE_STAR_6          - 6-pointed star (hexagram)
     #  * -28 : MARKERTYPE_STAR_7          - 7-pointed star (heptagram)
     #  * -29 : MARKERTYPE_STAR_8          - 8-pointed star (octagram)
-    #  * -30 : MARKERTYPE_VLINE           - verical line
+    #  * -30 : MARKERTYPE_VLINE           - vertical line
     #  * -31 : MARKERTYPE_HLINE           - horizontal line
     #  * -32 : MARKERTYPE_OMARK           - o-mark
     #
@@ -1544,10 +1544,10 @@ module GR
 
     def beginprint(file_path)
       super(file_path)
-      if block_given?
-        yield
-        endprint
-      end
+      return unless block_given?
+
+      yield
+      endprint
     end
 
     # Open and activate a print device with the given layout attributes.
@@ -1586,7 +1586,7 @@ module GR
     #  * Folio : 0.210 x 0.330
     #  * Ledger : 0.432 x 0.279
     #  * Tabloid : 0.279 x 0.432
-    # @param orientation [String] Page orientation (Landscape, Portait)
+    # @param orientation [String] Page orientation (Landscape, Portrait)
     #
     # @!method beginprintext
 

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)'
@@ -100,6 +118,8 @@ module GR3
                ' const float *colors, const float *scales)'
     try_extern 'void gr3_drawsurface(int mesh)'
     try_extern 'void gr3_surface(int nx, int ny, float *px, float *py, float *pz, int option)'
+    try_extern 'void gr3_isosurface(int nx, int ny, int nz, const float *data, float isovalue, const float *color,' \
+               ' const int *strides)'
     try_extern 'int gr3_drawtubemesh(int n, float *points, float *colors, float *radii,' \
                ' int num_steps, int num_segments)'
     try_extern 'int gr3_createtubemesh(int *mesh, int n,' \
@@ -142,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)'
@@ -150,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

@@ -302,7 +302,7 @@ module GR3
     # @!method drawmesh
 
     # This function marks a mesh for deletion and removes the user’s reference
-    # from the mesh’s referenc counter, so a user must not use the mesh after
+    # from the mesh’s reference counter, so a user must not use the mesh after
     # calling this function.
     #
     # @param mesh [Integer] The mesh that should be marked for deletion
@@ -587,10 +587,10 @@ module GR3
 
       super(n, positions, colors, radii, bond_radius, bond_color, bond_delta)
 
-      if spins
-        spins = Numo::SFloat.cast(spins).reshape(n, 3)
-        drawspins(positions, spins, colors)
-      end
+      return unless spins
+
+      spins = Numo::SFloat.cast(spins).reshape(n, 3)
+      drawspins(positions, spins, colors)
     end
 
     # Creates meshes for slices through the given data, using the current GR
@@ -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/gr_logger.rb

@@ -5,7 +5,6 @@
 # It should not be loaded when gr_commons/gr_commons is loaded.
 
 require 'logger'
-require 'pp'
 
 module GRCommons
   # Convenience class methods

data/lib/gr_commons/try_extern.rb

@@ -8,15 +8,15 @@ module GRCommons
     # Improved extern method.
     # 1. Ignore functions that cannot be attached.
     # 2. Available function (names) are stored in @ffi_methods.
-    # For compatiblity with older versions of GR.
+    # For compatibility with older versions of GR.
     def try_extern(signature, *opts)
       @ffi_methods ||= []
       begin
         func = extern(signature, *opts)
         @ffi_methods << func.name
         func
-      rescue StandardError => e
-        warn "#{e.class.name}: #{e.message}"
+      rescue Fiddle::DLError => e
+        warn "#{e.class.name}: #{e.message}" if $VERBOSE
       end
     end
   end

data/lib/gr_commons/version.rb

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

data/lib/grm/ffi.rb

@@ -20,40 +20,42 @@ module GRM
     # Currently, the declarations of GRM functions are distributed in several
     # header files.
 
-    # https://github.com/sciapp/gr/blob/master/lib/grm/args.h
+    # https://github.com/sciapp/gr/blob/master/lib/grm/include/grm/args.h
     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, ...)'
     try_extern 'int grm_args_push_buf(grm_args_t *args, const char *key, const char *value_format, const void *buffer, int apply_padding)'
     try_extern 'int grm_args_contains(const grm_args_t *args, const char *keyword)'
+    try_extern 'int grm_args_first_value(const grm_args_t *args, const char *keyword, const char *first_value_format, void *first_value, unsigned int *array_length)'
+    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)'
     typealias 'grm_args_ptr_t', 'void*'
     try_extern 'grm_args_ptr_t grm_length(double value, const char *unit)'
 
-    # https://github.com/sciapp/gr/blob/master/lib/grm/dump.h
+    # https://github.com/sciapp/gr/blob/master/lib/grm/include/grm/dump.h
     try_extern 'void grm_dump(const grm_args_t *args, FILE *f)'
     try_extern 'void grm_dump_json(const grm_args_t *args, FILE *f)'
     try_extern 'char *grm_dump_json_str(void)'
 
-    # https://github.com/sciapp/gr/blob/master/lib/grm/event.h
+    # https://github.com/sciapp/gr/blob/master/lib/grm/include/grm/event.h
     typealias 'grm_event_type_t', 'int' # enum
     typealias 'grm_event_callback_t', 'void*'
     try_extern 'int grm_register(grm_event_type_t type, grm_event_callback_t callback)'
     try_extern 'int grm_unregister(grm_event_type_t type)'
 
-    # https://github.com/sciapp/gr/blob/master/lib/grm/interaction.h
-    # FIXME: https://github.com/ruby/fiddle/issues/68
-    typealias 'const_int', 'int' # FIXME
+    # https://github.com/sciapp/gr/blob/master/lib/grm/include/grm/interaction.h
     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)' # FIXME
+    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)' # FIXME
+    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)'
 
-    # https://github.com/sciapp/gr/blob/master/lib/grm/net.h
-    try_extern 'void *grm_open(int is_receiver, const char *name, unsigned int id,
-                               const char *(*custom_recv)(const char *, unsigned int),
-                               int (*custom_send)(const char *, unsigned int, const char *))'
+    # 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, ' \
+                              'const char *(*custom_recv)(const char *, unsigned int), ' \
+                              'int (*custom_send)(const char *, unsigned int, const char *))'
     try_extern 'grm_args_t *grm_recv(const void *p, grm_args_t *args)'
     try_extern 'int grm_send(const void *p, const char *data_desc, ...)'
     try_extern 'int grm_send_buf(const void *p, const char *data_desc, const void *buffer, int apply_padding)'
@@ -61,7 +63,7 @@ module GRM
     try_extern 'int grm_send_args(const void *p, const grm_args_t *args)'
     try_extern 'void grm_close(const void *p)'
 
-    # https://github.com/sciapp/gr/blob/master/lib/grm/plot.h
+    # 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 'unsigned int grm_max_plotid(void)'
@@ -70,6 +72,7 @@ module GRM
     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_export(const char *file_path)'
     try_extern 'int grm_switch(unsigned int id)'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.66.0.0
+  version: 0.72.9.0
 platform: ruby
 authors:
 - kojix2
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-09 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: numo-narray
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ licenses:
 - MIT
 metadata:
   msys2_mingw_dependencies: gr
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,15 +94,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.4.14
+signing_key:
 specification_version: 4
 summary: GR for Ruby
 test_files: []