ruby-gr 0.71.7.0 → 0.72.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bcc99a586935b6552accdfb5c93e8e2c11ab9fbe84e7381470d632ba27d75d3
-  data.tar.gz: d788f7c35a41e6522b8a4856abe168a9376acb0f2237d8b6e1490eef340d8ae7
+  metadata.gz: 052e290dece0bbfbfb770da33ed8b55fbc9cb6bcf54e508245696d77bcc0138b
+  data.tar.gz: 21d69942fcd3414a9367167b5d89dd48151a1019cf213b1e78293954439fb901
 SHA512:
-  metadata.gz: fc80ccc8e0a8b1070166d0234d680b3eb227aaacc95005b03fd61449ab3e2d27329abaf9476eaad5fb11a5fda7835b2dc2062a9438982fdf1bb435952b29bc68
-  data.tar.gz: 62e1a5366a7cdad3bbd456f53efc439dd41a661a1601d6b0d63c9e03455d87494888f7dd1e25e11c5c2e550c2808ca01a52c706c08a8c8dda2054cbc04ffdcc2
+  metadata.gz: 53c0cef5add5333e520a34ab2fa923361a44acb0b3bc50ccfaf847153a9d0e404357904947fc2fa3abb125951eb967bcc1c78fb504c6bc9a5d9323f8238ebd31
+  data.tar.gz: 0f3c0d93ff46b9f850154ee4e9318f55b9f20f9cfa546472c556cc7b2e41e7dc0b53090041f043e95993e2b2a15b9a884a27d1adfec3e661a05bd89024b58e6d

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)'
@@ -155,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)'
@@ -191,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)'
@@ -204,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 *)'
@@ -257,8 +274,14 @@ 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 *)'

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/version.rb

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

data/lib/grm/ffi.rb

@@ -48,7 +48,9 @@ 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)'
 
     # 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, ' \
@@ -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.71.7.0
+  version: 0.72.9.0
 platform: ruby
 authors:
 - kojix2
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -86,7 +86,7 @@ licenses:
 - MIT
 metadata:
   msys2_mingw_dependencies: gr
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key: 
+rubygems_version: 3.4.14
+signing_key:
 specification_version: 4
 summary: GR for Ruby
 test_files: []