ruby-gr 0.64.0.1 → 0.64.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4227a0ab868cbed63c7d88eaa5d74f95d319bf13aaaf27f6a69864aac452320
-  data.tar.gz: 6fd396df74a2192b5bdb3e2cb02105bd96d9436bbccfce5cca092cb41e9f1980
+  metadata.gz: b1174559ffb58dc220fd3e47db3bd8e684f5a60270c4fc0f376570e27ccc7407
+  data.tar.gz: 4dc48873c8ff41574333f1dcd5fff826fabaaf0d5bf263520eabdb4292446c9b
 SHA512:
-  metadata.gz: 3c50e7d93397d4349919810f0c954e8a63c1b3c7ac2cd8a861cb51e2a6efcb22543a99c7b6bde1023e04fc0e86f4b0a6b393b91d272006effe64075cbd9a34bb
-  data.tar.gz: 50ec885a694e5d4383638bf538cb792ea0d0d0c6120ccca2079d304fc81c7f0e07e7842fc5382c9607e740e4ff0c51553dc2409838170330d501d00c86c29165
+  metadata.gz: 401bb86f4ad5f479ed2fddcbc1a7a81ebd9491df12c6d732c3e73f5308cdf9719757698580d5a70570dda52c8f77e1fdf6f5228056268cd497e8f280673660f2
+  data.tar.gz: b3b11048b30d20ae60bcf310bc4ff0fbab447df9e4bd22f8a9629e5e4aeae190228042bdfff37ab3ea714f7bf3273d6ee70b27a699387cce08b3128541251d01

data/README.md

@@ -166,10 +166,16 @@ export GKS_WSTYPE=411 # Set the workstation type to gksqt (recommended)
 
 GR releases are also available from the [openSUSE Build service](https://software.opensuse.org//download.html?project=science%3Agr-framework&package=gr) for CentOS, Debian, Fedora openSUSE and Ubuntu. Obtain a packaged release [here](https://software.opensuse.org//download.html?project=science%3Agr-framework&package=gr).
 
+GR will be installed in `/usr/gr`. Set one of the following environment variables so that GR.rb can find the library.
+
 ```sh
 export GRDIR="/usr/gr" # Check the location with `dpkg -L gr`
 ```
 
+```sh
+export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/gr/lib/pkgconfig"
+```
+
 #### Windows - MSYS2
 
 If you are using Rubyinstaller, pacman will automatically install [mingw-w64-gr](https://packages.msys2.org/base/mingw-w64-gr) when the gem is installed.

data/lib/gr/ffi.rb

@@ -37,18 +37,18 @@ module GR
     try_extern 'void gr_inqtext(double, double, char *, double *, double *)'
     try_extern 'void gr_inqtextx(double, double, char *, int, double *, double *)'
     try_extern 'void gr_fillarea(int, double *, double *)'
-    try_extern 'void gr_cellarray(double, double, double, double, ' \
-               'int, int, int, int, int, int, int *)'
-    try_extern 'void gr_nonuniformcellarray(double *, double *, ' \
-               'int, int, int, int, int, int, int *)'
-    try_extern 'void gr_polarcellarray(double, double, double, double, double, double, ' \
-               'int, int, int, int, int, int, int *)'
-    try_extern 'void gr_nonuniformpolarcellarray(double, double, double *, double *, ' \
-               'int, int, int, int, int, int, int *);'
+    try_extern 'void gr_cellarray(double, double, double, double,' \
+               ' int, int, int, int, int, int, int *)'
+    try_extern 'void gr_nonuniformcellarray(double *, double *,' \
+               ' int, int, int, int, int, int, int *)'
+    try_extern 'void gr_polarcellarray(double, double, double, double, double, double,' \
+               ' int, int, int, int, int, int, int *)'
+    try_extern 'void gr_nonuniformpolarcellarray(double, double, double *, double *,' \
+               ' int, int, int, int, int, int, int *)'
     try_extern 'void gr_gdp(int, double *, double *, int, int, int *)'
     try_extern 'void gr_spline(int, double *, double *, int, int)'
-    try_extern 'void gr_gridit(int, double *, double *, double *, int, int, ' \
-               'double *, double *, double *)'
+    try_extern 'void gr_gridit(int, double *, double *, double *, int, int,' \
+               ' double *, double *, double *)'
     try_extern 'void gr_setlinetype(int)'
     try_extern 'void gr_inqlinetype(int *)'
     try_extern 'void gr_setlinewidth(double)'
@@ -99,10 +99,11 @@ module GR
     try_extern 'void gr_inqscale(int *)'
     try_extern 'int gr_textext(double, double, char *)'
     try_extern 'void gr_inqtextext(double, double, char *, double *, double *)'
+    try_extern 'void gr_setscientificformat(int)'
     try_extern 'void gr_axes(double, double, double, double, int, int, double)'
     try_extern 'void gr_axeslbl(double, double, double, double, int, int, double,' \
-               'void (*)(double, double, const char *, double),' \
-               'void (*)(double, double, const char *, double))'
+               ' void (*)(double, double, const char *, double),' \
+               ' void (*)(double, double, const char *, double))'
     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 *)'
@@ -160,6 +161,7 @@ module GR
     try_extern 'void gr_resizeselection(int, double, double)'
     try_extern 'void gr_inqbbox(double *, double *, double *, double *)'
     try_extern 'double gr_precision(void)'
+    try_extern 'int gr_text_maxsize(void)'
     try_extern 'void gr_setregenflags(int)'
     try_extern 'int gr_inqregenflags(void)'
     try_extern 'void gr_savestate(void)'
@@ -173,30 +175,30 @@ 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, int 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)'
     try_extern 'void gr_shadelines(int, double *, double *, int, int, int)'
     try_extern 'void gr_panzoom(double, double, double, double, double *, double *, double *, double *)'
     try_extern 'int gr_findboundary(int, double *, double *, double, double (*)(double, double), int, int *)'
-    try_extern 'void gr_setresamplemethod(unsigned int flag)'
-    try_extern 'void gr_inqresamplemethod(unsigned int *flag)'
+    try_extern 'void gr_setresamplemethod(unsigned int)'
+    try_extern 'void gr_inqresamplemethod(unsigned int *)'
     try_extern 'void gr_path(int, double *, double *, const char *)'
     try_extern 'void gr_setborderwidth(double)'
     try_extern 'void gr_inqborderwidth(double *)'
     try_extern 'void gr_setbordercolorind(int)'
     try_extern 'void gr_inqbordercolorind(int *)'
     try_extern 'void gr_selectclipxform(int)'
-    try_extern 'void gr_inqclipxform(int *);'
+    try_extern 'void gr_inqclipxform(int *)'
     try_extern 'void gr_setprojectiontype(int)'
     try_extern 'void gr_inqprojectiontype(int *)'
     try_extern 'void gr_setperspectiveprojection(double, double, double)'
     try_extern 'void gr_inqperspectiveprojection(double *, double *, double *)'
-    try_extern 'void gr_settransformationparameters(double, double, double, ' \
-               'double, double, double, double, double, double)'
-    try_extern 'void gr_inqtransformationparameters(double *, double *, double *, ' \
-               'double *, double *, double *, double *, double *, double *);'
+    try_extern 'void gr_settransformationparameters(double, double, double,' \
+               ' double, double, double, double, double, double)'
+    try_extern 'void gr_inqtransformationparameters(double *, double *, double *,' \
+               ' double *, double *, double *, double *, double *, double *)'
     try_extern 'void gr_setorthographicprojection(double, double, double, double, double, double)'
     try_extern 'void gr_inqorthographicprojection(double *, double *, double *, double *, double *, double *)'
     try_extern 'void gr_camerainteraction(double, double, double, double)'
@@ -210,7 +212,7 @@ module GR
     try_extern 'void gr_settextencoding(int)'
     try_extern 'void gr_inqtextencoding(int *)'
     try_extern 'void gr_loadfont(char *, int *)'
-    # gr_setcallback(char *(*)(const char *));
+    try_extern 'void gr_setcallback(char *(*)(const char *))'
     try_extern 'void gr_setthreadnumber(int)'
     try_extern 'void gr_setpicturesizeforvolume(int, int)'
     try_extern 'void gr_setvolumebordercalculation(int)'

data/lib/gr.rb

@@ -1846,7 +1846,9 @@ module GR
     end
 
     # @return [Numeric]
-    # @!method precision
+    # @!method
+
+    # @!method text_maxsize
 
     # @!method setregenflags
 

data/lib/gr3/ffi.rb

@@ -32,41 +32,41 @@ module GR3
     try_extern 'int gr3_setquality(int quality)'
     try_extern 'int gr3_getimage(int width, int height, int use_alpha, char *pixels)'
     try_extern 'int gr3_export(const char *filename, int width, int height)'
-    try_extern 'int gr3_drawimage(float xmin, float xmax, float ymin, float ymax, ' \
-           'int width, int height, int drawable_type)'
-    try_extern 'int gr3_createmesh_nocopy(int *mesh, int n, ' \
-           'float *vertices, float *normals, float *colors)'
-    try_extern 'int gr3_createmesh(int *mesh, int n, ' \
-           'const float *vertices, const float *normals, const float *colors)'
-    try_extern 'int gr3_createindexedmesh_nocopy(int *mesh, int number_of_vertices, ' \
-           'float *vertices, float *normals, float *colors, int number_of_indices, int *indices)'
-    try_extern 'int gr3_createindexedmesh(int *mesh, int number_of_vertices, ' \
-           'const float *vertices, const float *normals, const float *colors, ' \
-           'int number_of_indices, const int *indices)'
-    try_extern 'void gr3_drawmesh(int mesh, int n, ' \
-           'const float *positions, const float *directions, const float *ups, ' \
-           'const float *colors, const float *scales)'
+    try_extern 'int gr3_drawimage(float xmin, float xmax, float ymin, float ymax,' \
+               ' int width, int height, int drawable_type)'
+    try_extern 'int gr3_createmesh_nocopy(int *mesh, int n,' \
+               ' float *vertices, float *normals, float *colors)'
+    try_extern 'int gr3_createmesh(int *mesh, int n,' \
+               ' const float *vertices, const float *normals, const float *colors)'
+    try_extern 'int gr3_createindexedmesh_nocopy(int *mesh, int number_of_vertices,' \
+               ' float *vertices, float *normals, float *colors, int number_of_indices, int *indices)'
+    try_extern 'int gr3_createindexedmesh(int *mesh, int number_of_vertices,' \
+               ' const float *vertices, const float *normals, const float *colors,' \
+               ' int number_of_indices, const int *indices)'
+    try_extern 'void gr3_drawmesh(int mesh, int n,' \
+               ' const float *positions, const float *directions, const float *ups,' \
+               ' const float *colors, const float *scales)'
     try_extern 'void gr3_deletemesh(int mesh)'
-    try_extern 'void gr3_cameralookat(float camera_x, float camera_y, float camera_z, ' \
-           'float center_x, float center_y, float center_z, ' \
-           'float up_x, float up_y, float up_z)'
-    try_extern 'int gr3_setcameraprojectionparameters(float vertical_field_of_view, ' \
-           'float zNear, float zFar)'
+    try_extern 'void gr3_cameralookat(float camera_x, float camera_y, float camera_z,' \
+               ' float center_x, float center_y, float center_z,' \
+               ' float up_x, float up_y, float up_z)'
+    try_extern 'int gr3_setcameraprojectionparameters(float vertical_field_of_view,' \
+               ' float zNear, float zFar)'
     try_extern 'int gr3_getcameraprojectionparameters(float *vfov, float *znear, float *zfar)'
     try_extern 'void gr3_setlightdirection(float x, float y, float z)'
     try_extern 'void gr3_setbackgroundcolor(float red, float green, float blue, float alpha)'
     try_extern 'int gr3_createheightmapmesh(const float *heightmap, int num_columns, int num_rows)'
-    try_extern 'void gr3_drawheightmap(const float *heightmap, ' \
-           'int num_columns, int num_rows, const float *positions, const float *scales)'
-    try_extern 'void gr3_drawconemesh(int n, const float *positions, const float *directions, ' \
-           'const float *colors, const float *radii, const float *lengths)'
-    try_extern 'void gr3_drawcylindermesh(int n, const float *positions, const float *directions, ' \
-           'const float *colors, const float *radii, const float *lengths)'
-    try_extern 'void gr3_drawspheremesh(int n, const float *positions, ' \
-           'const float *colors, const float *radii)'
-    try_extern 'void gr3_drawcubemesh(int n, ' \
-           'const float *positions, const float *directions, const float *ups, ' \
-           'const float *colors, const float *scales)'
+    try_extern 'void gr3_drawheightmap(const float *heightmap,' \
+               ' int num_columns, int num_rows, const float *positions, const float *scales)'
+    try_extern 'void gr3_drawconemesh(int n, const float *positions, const float *directions,' \
+               ' const float *colors, const float *radii, const float *lengths)'
+    try_extern 'void gr3_drawcylindermesh(int n, const float *positions, const float *directions,' \
+               ' const float *colors, const float *radii, const float *lengths)'
+    try_extern 'void gr3_drawspheremesh(int n, const float *positions,' \
+               ' const float *colors, const float *radii)'
+    try_extern 'void gr3_drawcubemesh(int n,' \
+               ' const float *positions, const float *directions, const float *ups,' \
+               ' const float *colors, const float *scales)'
     try_extern 'void gr3_setobjectid(int id)'
     try_extern 'int gr3_selectid(int x, int y, int width, int height, int *selection_id)'
     try_extern 'void gr3_getviewmatrix(float *m)'
@@ -84,64 +84,64 @@ module GR3
     #      'double step_x, double step_y, double step_z, double offset_x, double offset_y, double offset_z, ' \
     #      'unsigned int *num_vertices, gr3_coord_t **vertices, gr3_coord_t **normals, ' \
     #      'unsigned int *num_indices, unsigned int **indices)'
-    try_extern 'int gr3_createisosurfacemesh(int *mesh, unsigned short *data, ' \
-           'unsigned short isolevel, unsigned int dim_x, unsigned int dim_y, unsigned int dim_z, ' \
-           'unsigned int stride_x, unsigned int stride_y, unsigned int stride_z, ' \
-           'double step_x, double step_y, double step_z, ' \
-           'double offset_x, double offset_y, double offset_z)'
-    try_extern 'int gr3_createsurfacemesh(int *mesh, int nx, int ny, ' \
-           'float *px, float *py, float *pz, int option)'
-    try_extern 'int gr3_createsurface3dmesh(int *mesh, int ncols, int nrows, ' \
-           'float *px, float *py, float *pz);'
-    try_extern 'void gr3_drawmesh_grlike(int mesh, int n, ' \
-           'const float *positions, const float *directions, const float *ups, ' \
-           'const float *colors, const float *scales)'
+    try_extern 'int gr3_createisosurfacemesh(int *mesh, unsigned short *data,' \
+               ' unsigned short isolevel, unsigned int dim_x, unsigned int dim_y, unsigned int dim_z,' \
+               ' unsigned int stride_x, unsigned int stride_y, unsigned int stride_z,' \
+               ' double step_x, double step_y, double step_z,' \
+               ' double offset_x, double offset_y, double offset_z)'
+    try_extern 'int gr3_createsurfacemesh(int *mesh, int nx, int ny,' \
+               ' float *px, float *py, float *pz, int option)'
+    try_extern 'int gr3_createsurface3dmesh(int *mesh, int ncols, int nrows,' \
+               ' float *px, float *py, float *pz)'
+    try_extern 'void gr3_drawmesh_grlike(int mesh, int n,' \
+               ' const float *positions, const float *directions, const float *ups,' \
+               ' 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 '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, ' \
-           'const float *points, const float *colors, const float *radii, ' \
-           'int num_steps, int num_segments)'
-    try_extern 'void gr3_drawspins(int n, const float *positions, const float *directions, const float *colors, ' \
-           'float cone_radius, float cylinder_radius, float cone_height, float cylinder_height)'
-    try_extern 'void gr3_drawmolecule(int n, const float *positions, const float *colors, const float *radii, ' \
-           'float bond_radius, const float bond_color[3], float bond_delta)'
-    try_extern 'void gr3_createxslicemesh(int *mesh, const unsigned short *data, ' \
-           'unsigned int ix, unsigned int dim_x, unsigned int dim_y, unsigned int dim_z, ' \
-           'unsigned int stride_x, unsigned int stride_y, unsigned int stride_z, ' \
-           'double step_x, double step_y, double step_z, ' \
-           'double offset_x, double offset_y, double offset_z)'
-    try_extern 'void gr3_createyslicemesh(int *mesh, const unsigned short *data, ' \
-           'unsigned int iy, unsigned int dim_x, unsigned int dim_y, unsigned int dim_z, ' \
-           'unsigned int stride_x, unsigned int stride_y, unsigned int stride_z, ' \
-           'double step_x, double step_y, double step_z, ' \
-           'double offset_x, double offset_y, double offset_z)'
-    try_extern 'void gr3_createzslicemesh(int *mesh, const unsigned short *data, ' \
-           'unsigned int iz, unsigned int dim_x, unsigned int dim_y, unsigned int dim_z, ' \
-           'unsigned int stride_x, unsigned int stride_y, unsigned int stride_z, ' \
-           'double step_x, double step_y, double step_z, ' \
-           'double offset_x, double offset_y, double offset_z)'
+    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,' \
+               ' const float *points, const float *colors, const float *radii,' \
+               ' int num_steps, int num_segments)'
+    try_extern 'void gr3_drawspins(int n, const float *positions, const float *directions, const float *colors,' \
+               ' float cone_radius, float cylinder_radius, float cone_height, float cylinder_height)'
+    try_extern 'void gr3_drawmolecule(int n, const float *positions, const float *colors, const float *radii,' \
+               ' float bond_radius, const float bond_color[3], float bond_delta)'
+    try_extern 'void gr3_createxslicemesh(int *mesh, const unsigned short *data,' \
+               ' unsigned int ix, unsigned int dim_x, unsigned int dim_y, unsigned int dim_z,' \
+               ' unsigned int stride_x, unsigned int stride_y, unsigned int stride_z,' \
+               ' double step_x, double step_y, double step_z,' \
+               ' double offset_x, double offset_y, double offset_z)'
+    try_extern 'void gr3_createyslicemesh(int *mesh, const unsigned short *data,' \
+               ' unsigned int iy, unsigned int dim_x, unsigned int dim_y, unsigned int dim_z,' \
+               ' unsigned int stride_x, unsigned int stride_y, unsigned int stride_z,' \
+               ' double step_x, double step_y, double step_z,' \
+               ' double offset_x, double offset_y, double offset_z)'
+    try_extern 'void gr3_createzslicemesh(int *mesh, const unsigned short *data,' \
+               ' unsigned int iz, unsigned int dim_x, unsigned int dim_y, unsigned int dim_z,' \
+               ' unsigned int stride_x, unsigned int stride_y, unsigned int stride_z,' \
+               ' double step_x, double step_y, double step_z,' \
+               ' double offset_x, double offset_y, double offset_z)'
     try_extern 'void gr3_drawxslicemesh(const unsigned short *data, unsigned int ix,' \
-           'unsigned int dim_x, unsigned int dim_y, unsigned int dim_z, ' \
-           'unsigned int stride_x, unsigned int stride_y, unsigned int stride_z, ' \
-           'double step_x, double step_y, double step_z, ' \
-           'double offset_x, double offset_y, double offset_z)'
-    try_extern 'void gr3_drawyslicemesh(const unsigned short *data, unsigned int iy, ' \
-           'unsigned int dim_x, unsigned int dim_y, unsigned int dim_z, ' \
-           'unsigned int stride_x, unsigned int stride_y, unsigned int stride_z, ' \
-           'double step_x, double step_y, double step_z, ' \
-           'double offset_x, double offset_y, double offset_z)'
-    try_extern 'void gr3_drawzslicemesh(const unsigned short *data, unsigned int iz, ' \
-           'unsigned int dim_x, unsigned int dim_y, unsigned int dim_z, ' \
-           'unsigned int stride_x, unsigned int stride_y, unsigned int stride_z, ' \
-           'double step_x, double step_y, double step_z, ' \
-           'double offset_x, double offset_y, double offset_z)'
-    # 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)'
+               ' unsigned int dim_x, unsigned int dim_y, unsigned int dim_z,' \
+               ' unsigned int stride_x, unsigned int stride_y, unsigned int stride_z,' \
+               ' double step_x, double step_y, double step_z,' \
+               ' double offset_x, double offset_y, double offset_z)'
+    try_extern 'void gr3_drawyslicemesh(const unsigned short *data, unsigned int iy,' \
+               ' unsigned int dim_x, unsigned int dim_y, unsigned int dim_z,' \
+               ' unsigned int stride_x, unsigned int stride_y, unsigned int stride_z,' \
+               ' double step_x, double step_y, double step_z,' \
+               ' double offset_x, double offset_y, double offset_z)'
+    try_extern 'void gr3_drawzslicemesh(const unsigned short *data, unsigned int iz,' \
+               ' unsigned int dim_x, unsigned int dim_y, unsigned int dim_z,' \
+               ' unsigned int stride_x, unsigned int stride_y, unsigned int stride_z,' \
+               ' double step_x, double step_y, double step_z,' \
+               ' double offset_x, double offset_y, double offset_z)'
+    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 'void gr3_setorthographicprojection' \
-           '(float left, float right, float bottom, float top, float znear, float zfar)'
+               '(float left, float right, float bottom, float top, float znear, float zfar)'
     try_extern 'void gr3_setsurfaceoption(int option)'
     try_extern 'int gr3_getsurfaceoption(void)'
     try_extern 'int gr3_getlightsources(int max_num_lights, float *positions, float *colors)'

data/lib/gr_commons/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.64.0.1
+  version: 0.64.3.0
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-30 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="