ruby-gr 0.58.1.0 → 0.61.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f620965108eafb5f65fc8b1c946db5abea180708db175b88246a2ecd97a66b53
-  data.tar.gz: 8ff0c1b787c4b3e70a29ace39eb2fb39abaf60d71afc05b4b382edfcb6f570fa
+  metadata.gz: bacbabae072c86f3b7b227a82043d4ff8e0aaad4df9da3234582270491790d4c
+  data.tar.gz: 033e92c26281e32cc5b4a9d42d79c56953fac00b1da5a9479b472ce94f77c995
 SHA512:
-  metadata.gz: cb816d775831c8e05f43e0ded3d15a22328ff0b7e5810c484782393b4fe06ee5aa03fbf431b3cbbe6c8bac2763b07ef377e42dd5d9024da1aec819251b264951
-  data.tar.gz: 9e12f1fa434d64b1f202a3198afa30be70ee1b4961493cde92d308134b146703ff21e2e1915cd01ed286f476f7e6900425aaa5ebdc8f1b33fd550a3d3567a14f
+  metadata.gz: f181ff21a1254fd0791ec2e8862586be634b2ecdb4e5bec76298e22b5bf7dd59e727159cfc9c9b2fde6fc739b99cb889f25041b3592dad93ca2c1b183cb8153e
+  data.tar.gz: b4441cc2dbc8f2e7067d80c13407feff556f8fcb5cdb993b936df797ccfd8edd67c9db98a17fff9bf62c7a2f546877e065ba38f6bd0752e2d743473c5cbbeebd

data/README.md

@@ -188,31 +188,20 @@ macOS : Please  the section "How to open apps from un-notarized or unidentified
 
 ```sh
 brew install libgr
-export GKS_WSTYPE=411 # gksqt (recommended)
 ```
 
-#### Linux - APT
-
-[packages.red-data-tools.org](https://github.com/red-data-tools/packages.red-data-tools.org) provides `libgr-dev`, `libgr3-dev` and `libgrm-dev`
-
-Debian GNU/Linux and Ubuntu 
+Set the workstation type to gksqt.
 
 ```sh
-sudo apt install -y -V ca-certificates lsb-release wget
-wget https://packages.red-data-tools.org/$(lsb_release --id --short | tr 'A-Z' 'a-z'\
-  )/red-data-tools-apt-source-latest-$(lsb_release --codename --short).deb
-sudo apt install -y -V ./red-data-tools-apt-source-latest-$(lsb_release --codename --short).deb
-sudo apt update
-sudo apt install libgrm-dev
+export GKS_WSTYPE=411 # gksqt (recommended)
 ```
 
-#### Linux - Yum
+#### Linux - openSUSE Build service
 
-CentOS
+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).
 
 ```sh
-(. /etc/os-release && sudo dnf install -y https://packages.red-data-tools.org/centos/${VERSION_ID}/red-data-tools-release-latest.noarch.rpm)
-sudo dnf install -y gr-devel
+export GRDIR="/usr/gr" # Check the location with `dpkg -L gr`
 ```
 
 #### Windows - MSYS2
@@ -244,7 +233,7 @@ bundle exec rake test
 
 ## Future plans
 
-* GR.rb will be the default backend for [Charty](https://github.com/red-data-tools/charty).
+* Creating a backend for [Charty](https://github.com/red-data-tools/charty).
 * [Object-oriented interface](https://github.com/kojix2/GRUtils.rb) based on [GRUtils.jl](https://github.com/heliosdrm/GRUtils.jl). 
 
 ## Acknowledgements

data/lib/gr/ffi.rb

@@ -209,5 +209,13 @@ module GR
     try_extern 'void gr_inqtextencoding(int *)'
     try_extern 'void gr_loadfont(char *, int *)'
     # gr_setcallback(char *(*)(const char *));
+    try_extern 'void gr_setthreadnumber(int)'
+    try_extern 'void gr_setpicturesizeforvolume(int, int)'
+    try_extern 'void gr_setvolumebordercalculation(int)'
+    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 'void gr_inqvpsize(int *, int *, double *)'
+    try_extern 'void gr_polygonmesh3d(int, const double *, const double *, const double *, int, const int *, const int *)'
   end
 end

data/lib/gr/plot.rb

@@ -89,7 +89,8 @@ module GR
     attr_accessor :args, :kvs, :scheme
 
     def initialize(*raw_args)
-      @kvs = raw_args.last.is_a?(Hash) ? raw_args.pop : {}
+      # Keywords are cloned to avoid disruptive changes
+      @kvs = raw_args.last.is_a?(Hash) ? raw_args.pop.clone : {}
       @args = plot_args(raw_args) # method name is the same as Julia/Python
 
       # Check keyword options.
@@ -324,7 +325,7 @@ module GR
     def draw_axes(kind, pass = 1)
       viewport = kvs[:viewport]
       vp = kvs[:vp]
-      ratio = kvs[:ratio]
+      _ratio = kvs[:ratio]
       xtick, xorg, majorx = kvs[:xaxis]
       ytick, yorg, majory = kvs[:yaxis]
       drawgrid = kvs.has_key?(:grid) ? kvs[:grid] : true
@@ -1161,7 +1162,8 @@ module GR
           xmin = [x0, xmin].min
           xmax = [x1, xmax].max
         elsif kind == :volume
-          xmin, xmax = -1, 1
+          xmin = -1
+          xmax = 1
         else
           xmin = 0
           xmax = 1
@@ -1174,7 +1176,8 @@ module GR
           ymin = [y0, ymin].min
           ymax = [y1, ymax].max
         elsif kind == :volume
-          ymin, ymax = -1, 1
+          ymin = -1
+          ymax = 1
         else
           ymin = 0
           ymax = 1
@@ -1228,7 +1231,7 @@ module GR
       i = tick_size.find_index do |tsize|
         ((amax - amin) / scale / tsize) > 7 # maximum number of tick marks
       end
-      tick = tick_size[i - 1] * scale
+      tick_size[i - 1] * scale
     end
 
     def legend_size

data/lib/gr.rb

@@ -66,6 +66,7 @@ module GR
     when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
       [['libGR.dll'], 'gr']
     when /darwin|mac os/
+      ENV['GKSwstype'] ||= 'gksqt'
       [['libGR.dylib', 'libGR.so'], 'gr']
     else
       [['libGR.so'], 'gr']
@@ -1703,7 +1704,7 @@ module GR
     def readimage(path)
       # Feel free to make a pull request if you catch a mistake
       # or you have an idea to improve it.
-      data = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T)
+      data = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T, Fiddle::RUBY_FREE)
       w, h = inquiry [:int, :int] do |width, height|
         # data is a pointer of a pointer
         super(path, width, height, data.ref)
@@ -1841,7 +1842,7 @@ module GR
       # Feel free to make a pull request if you catch a mistake
       # or you have an idea to improve it.
       npoints = equal_length(x, y)
-      triangles = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T)
+      triangles = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T, Fiddle::RUBY_FREE)
       dim = 3
       n_tri = inquiry_int do |ntri|
         super(npoints, x, y, ntri, triangles.ref)
@@ -2148,9 +2149,9 @@ module GR
     #
     # @param flag [Integer] projection type
     #  The available options are:
-    #  * 0 : GR_PROJECTION_DEFAULT      - default
-    #  * 1 : GR_PROJECTION_ORTHOGRAPHIC - orthographic
-    #  * 2 : GR_PROJECTION_PERSPECTIVE  - perspective
+    #  * 0 : PROJECTION_DEFAULT      - default
+    #  * 1 : PROJECTION_ORTHOGRAPHIC - orthographic
+    #  * 2 : PROJECTION_PERSPECTIVE  - perspective
     #
     # @!method setprojectiontype
 
@@ -2314,6 +2315,76 @@ module GR
         super(str, font)
       end
     end
+
+    # Set the number of threads which can run parallel.
+    # The default value is the number of threads the cpu has.
+    #
+    # @param num [Integer] num number of threads
+    #
+    # @!method setthreadnumber
+
+    # Set the width and height of the resulting picture.
+    # These values are only used for gr_volume and gr_cpubasedvolume.
+    # The default values are 1000 for both.
+    #
+    # @param width  [Integer] width of the resulting image
+    # @param height [Integer] height of the resulting image
+    #
+    # @!method setpicturesizeforvolume
+
+    # Set the gr_volume border type with this flag.
+    # This inflicts how the volume is calculated. When the flag is set to
+    # GR_VOLUME_WITH_BORDER the border will be calculated the same as the points
+    # inside the volume.
+    #
+    # @param flag [Integer] calculation of the gr_volume border
+    #  The available options are:
+    #  * 0 : VOLUME_WITHOUT_BORDER - default value
+    #  * 1 : VOLUME_WITH_BORDER    - gr_volume with border
+    #
+    # @!method setvolumebordercalculation    # @!method setthreadnumber
+
+    # Set if gr_cpubasedvolume is calculated approximative or exact.
+    # To use the exact calculation set approximative_calculation to 0.
+    # The default value is the approximative version, which can be set with the
+    # number 1.
+    #
+    # @param approximative_calculation [Integer] exact or approximative calculation
+    #                                            of the volume
+    #
+    # @!method setapproximativecalculation
+
+    # Inquire the parameters which can be set for cpubasedvolume.
+    # The size of the resulting image, the way the volumeborder is calculated and
+    # the amount of threads which are used.
+    #
+    # @return [Array]
+    #  * border -                    flag which tells how the border is calculated
+    #  * max_threads -               number of threads
+    #  * picture_width -             width of the resulting image
+    #  * picture_height -            height of the resulting image
+    #  * approximative_calculation - exact or approximative calculation of gr_cpubasedvolume
+    #
+    def inqvolumeflags
+      inquiry([:int] * 5) do |*pts|
+        super(*pts)
+      end
+    end
+
+    # FIXME! (#61)
+    # @!method cpubasedvolume
+
+    def inqvpsize
+      inquiry %i[int int double] do |*pts|
+        super(*pts)
+      end
+    end
+
+    def polygonmesh3d(px, py, pz, connections, colors)
+      n_points = equal_length(px, py, pz)
+      n_connections = colors.length
+      super(n_points, px, py, pz, n_connections, int(connections), int(colors))
+    end
   end
 
   ASF_BUNDLED    = 0

data/lib/gr3/ffi.rb

@@ -91,6 +91,8 @@ module GR3
            '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)'
@@ -140,5 +142,7 @@ module GR3
            '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)'
+    try_extern 'void gr3_setsurfaceoption(int option)'
+    try_extern 'int gr3_getsurfaceoption(void)'
   end
 end

data/lib/gr3.rb

@@ -76,6 +76,7 @@ module GR3
     when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
       [['libGR3.dll'], 'gr3']
     when /darwin|mac os/
+      ENV['GKSwstype'] ||= 'gksqt'
       [['libGR3.dylib', 'libGR3.so'], 'gr3']
     else
       [['libGR3.so'], 'gr3']

data/lib/gr_commons/fiddley.rb

@@ -188,7 +188,7 @@ module GRCommons
           @size = @ptr.size
         else
           @size = type2size(type) * num
-          @ptr = Fiddle::Pointer.malloc(@size)
+          @ptr = Fiddle::Pointer.malloc(@size, Fiddle::RUBY_FREE)
         end
       end
 

data/lib/gr_commons/version.rb

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

data/lib/grm.rb

@@ -35,6 +35,7 @@ module GRM
     when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
       [['libGRM.dll'], 'grm']
     when /darwin|mac os/
+      ENV['GKSwstype'] ||= 'gksqt'
       [['libGRM.dylib', 'libGRM.so'], 'grm']
     else
       [['libGRM.so'], 'grm']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.58.1.0
+  version: 0.61.0.0
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: histogram
@@ -52,90 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: GR framework - the graphics library for visualisation - for Ruby
 email: 2xijok@gmail.com
 executables: []
@@ -186,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.26
 signing_key: 
 specification_version: 4
 summary: GR for Ruby