ruby-gr 0.72.9.0 → 0.73.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 052e290dece0bbfbfb770da33ed8b55fbc9cb6bcf54e508245696d77bcc0138b
-  data.tar.gz: 21d69942fcd3414a9367167b5d89dd48151a1019cf213b1e78293954439fb901
+  metadata.gz: c49cfd6712b94567eebb2ae2b4e2f67c227acc0bce428c15d777419d4b6ba31b
+  data.tar.gz: ecd7816d1e8f9784169ee9b917189361b18f6424958c70498279731c42c985c0
 SHA512:
-  metadata.gz: 53c0cef5add5333e520a34ab2fa923361a44acb0b3bc50ccfaf847153a9d0e404357904947fc2fa3abb125951eb967bcc1c78fb504c6bc9a5d9323f8238ebd31
-  data.tar.gz: 0f3c0d93ff46b9f850154ee4e9318f55b9f20f9cfa546472c556cc7b2e41e7dc0b53090041f043e95993e2b2a15b9a884a27d1adfec3e661a05bd89024b58e6d
+  metadata.gz: 63bcc49377529b51fbf7d8005ee75c6b3af6961fd96ffd5ae769dbf495b75fbe064f6c50a3e180e1e8030dfa97297abdd4442c89e17b0fea49865e045dbfb464
+  data.tar.gz: 40024235f7e6599a5a9555dacac610a74e4abf1ee07332c7a82a834e3b070d9096d79408e453078014f7f59bdc58182f29a39e8e2afbf5d8b8536a3a6b86eabf

data/lib/gr/ffi.rb

@@ -155,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 *)'
@@ -163,6 +167,7 @@ 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)'
@@ -200,6 +205,7 @@ 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)'
@@ -208,8 +214,12 @@ module GR
     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 *)'
@@ -230,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)'
@@ -262,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)'
@@ -287,5 +299,12 @@ module GR
     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/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.72.9.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)'
 
@@ -51,6 +53,7 @@ module GRM
     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, ' \
@@ -66,13 +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.72.9.0
+  version: 0.73.6.0
 platform: ruby
 authors:
 - kojix2
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-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.14
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: GR for Ruby
 test_files: []