ruby-gr 0.73.24.0 → 0.73.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160f844394c8d7094012ff62b591a217cc427b8a39c5750bd9b092829e632795
-  data.tar.gz: ec2cb05bb3a9b4997691d0e2db4faf88e5c69873f31986a24add3a7f2f8bb9f9
+  metadata.gz: d7b564823c22dddeb8ea0ae722a04d5339475dd85d048bb95d32116e3ffb95d4
+  data.tar.gz: cabe5b7131262dc2871ad4a2a4f836eba22f0a005bc77d7e97362177bd70fae6
 SHA512:
-  metadata.gz: 077e1c882ccdea72597faf657dd41de18f3a3c004b3236f9fe96de81857cf4838ff46f3a43dd75784d157ca096475d39885a49ef2784733ddea6aac1ffa21cc2
-  data.tar.gz: 6d82381e5d6c8172361d4a0af3bc6a4c747d5d7498d6671d95ebe291c190d2bb10e17539850cf1b4e0d8def478dfee8bebc434b2a14e73246353cdae9749ed6e
+  metadata.gz: 3f8643a6b2f367d444c2a1d03426d514309a1a5beff5ee07541e33f6769455776d3f11fdeed3936318bf44b9f9fd772b25a569a1f11ff24ec7b6d0802c41f7fc
+  data.tar.gz: d3c5f8a042f3d232741dda9e52db9fc2f4abc81d45100dff3beee5007f8ea98e75616834fbd79f4b703d02f18515746d1b72ad64713a78ed06bf76e5501fcc21

data/lib/gr/ffi.rb

@@ -79,6 +79,7 @@ module GR
     ]
 
     Axis = struct [
+      'char *spec',
       'double min_val', # min conflict with Enumerable min
       'double max_val', # max conflict with Enumerable max
       'double tick',
@@ -96,8 +97,8 @@ module GR
     ]
 
     FormatReference = struct [
-      'char *format',
-      'int length'
+      'int scientific',
+      'int decimal_digits'
     ]
 
     try_extern 'void gr_initgr(void)'
@@ -105,7 +106,7 @@ module GR
     try_extern 'void gr_opengks(void)'
     try_extern 'void gr_closegks(void)'
     try_extern 'void gr_inqdspsize(double *, double *, int *, int *)'
-    try_extern 'void gr_openws(int, char *, int)'
+    try_extern 'void gr_openws(int, const char *, int)'
     try_extern 'void gr_closews(int)'
     try_extern 'void gr_activatews(int)'
     try_extern 'void gr_deactivatews(int)'
@@ -114,10 +115,10 @@ module GR
     try_extern 'void gr_updatews(void)'
     try_extern 'void gr_polyline(int, double *, double *)'
     try_extern 'void gr_polymarker(int, double *, double *)'
-    try_extern 'void gr_text(double, double, char *)'
-    try_extern 'void gr_textx(double, double, char *, int)'
-    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_text(double, double, const char *)'
+    try_extern 'void gr_textx(double, double, const char *, int)'
+    try_extern 'void gr_inqtext(double, double, const char *, double *, double *)'
+    try_extern 'void gr_inqtextx(double, double, const 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 *)'
@@ -183,15 +184,15 @@ module GR
     try_extern 'void gr_inqspace(double *, double *, int *, int *)'
     try_extern 'int gr_setscale(int)'
     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 'int gr_textext(double, double, const char *)'
+    try_extern 'void gr_inqtextext(double, double, const 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))'
-    try_extern 'void gr_axis(char, axis_t *)'
-    try_extern 'void gr_drawaxis(char, axis_t *)'
+    try_extern 'void gr_axis(const char *, axis_t *)'
+    try_extern 'void gr_drawaxis(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)'
@@ -201,8 +202,8 @@ module GR
     try_extern 'void gr_polyline3d(int, double *, double *, double *)'
     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_titles3d(const char *, const char *, const char *)'
+    try_extern 'void gr_settitles3d(const char *, const char *, const 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)'
@@ -221,8 +222,8 @@ module GR
     try_extern 'int gr_validaterange(double, double)'
     try_extern 'void gr_adjustlimits(double *, double *)'
     try_extern 'void gr_adjustrange(double *, double *)'
-    try_extern 'void gr_beginprint(char *)'
-    try_extern 'void gr_beginprintext(char *, char *, char *, char *)'
+    try_extern 'void gr_beginprint(const char *)'
+    try_extern 'void gr_beginprintext(const char *, const char *, const char *, const char *)'
     try_extern 'void gr_endprint(void)'
     try_extern 'void gr_ndctowc(double *, double *)'
     try_extern 'void gr_wctondc(double *, double *)'
@@ -235,24 +236,24 @@ module GR
     try_extern 'void gr_setarrowstyle(int)'
     try_extern 'void gr_setarrowsize(double)'
     try_extern 'void gr_drawarrow(double, double, double, double)'
-    try_extern 'int gr_readimage(char *, int *, int *, int **)'
+    try_extern 'int gr_readimage(const char *, int *, int *, int **)'
     try_extern 'void gr_drawimage(double, double, double, double, int, int, int *, int)'
-    try_extern 'int gr_importgraphics(char *)'
+    try_extern 'int gr_importgraphics(const 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_begingraphics(const char *)'
     try_extern 'void gr_endgraphics(void)'
     try_extern 'char *gr_getgraphics(void)'
-    try_extern 'int gr_drawgraphics(char *)'
+    try_extern 'int gr_drawgraphics(const char *)'
     try_extern 'int gr_startlistener(void)'
     try_extern 'int gr_inqgrplotport(void)'
     try_extern 'int gr_setgrplotport(int)'
-    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_mathtex(double, double, const char *)'
+    try_extern 'void gr_inqmathtex(double, double, const char *, double *, double *)'
+    try_extern 'void gr_mathtex3d(double, double, double, const char *, int)'
+    try_extern 'void gr_inqmathtex3d(double, double, double, const 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),' \
@@ -276,7 +277,7 @@ module GR
     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 'int gr_uselinespec(const 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 *)'
     try_extern 'void gr_trisurface(int, double *, double *, double *)'
@@ -319,11 +320,11 @@ module GR
     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_text3d(double, double, double, const char *, int axis)'
+    try_extern 'void gr_inqtext3d(double, double, double, const char *, int axis, double *, double *)'
     try_extern 'void gr_settextencoding(int)'
     try_extern 'void gr_inqtextencoding(int *)'
-    try_extern 'void gr_loadfont(char *, int *)'
+    try_extern 'void gr_loadfont(const char *, int *)'
     try_extern 'void gr_setcallback(char *(*)(const char *))'
     try_extern 'void gr_setthreadnumber(int)'
     try_extern 'void gr_setpicturesizeforvolume(int, int)'
@@ -353,5 +354,11 @@ module GR
     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)'
+    try_extern 'void gr_setcolorlimits(double, double)'
+    try_extern 'void gr_inqcolorlimits(double *, double *)'
+    try_extern 'void gr_setmetadata(const char *)'
+    try_extern 'char *gr_getmetadata(const char *)'
+    typealias 'FILE', 'void'
+    try_extern 'char *gr_getmetadatafromstream(FILE *fp)'
   end
 end

data/lib/gr.rb

@@ -100,17 +100,18 @@ module GR
   end
 
   class GRAxis
-    attr_accessor :min, :max, :tick, :org, :position,
+    attr_accessor :spec, :min, :max, :tick, :org, :position,
                   :major_count, :num_ticks, :ticks,
                   :tick_size, :tick_labels, :label_position,
                   :draw_axis_line, :label_orientation
 
-    def initialize(min: Float::NAN, max: Float::NAN, tick: Float::NAN,
+    def initialize(spec: nil, min: Float::NAN, max: Float::NAN, tick: Float::NAN,
                    org: Float::NAN, position: Float::NAN,
                    major_count: 1, num_ticks: 0, ticks: nil,
                    tick_size: Float::NAN, tick_labels: nil,
                    label_position: Float::NAN,
                    draw_axis_line: 1, label_orientation: 0)
+      @spec = spec
       @min = min
       @max = max
       @tick = tick
@@ -1158,34 +1159,35 @@ module GR
 
     alias axes2d axes
 
-    def axis(option, **opts)
+    def axis(spec, **opts)
+      spec = spec.to_s
+      raise ArgumentError, 'axis spec must not be empty' if spec.empty?
+
       axis = GRAxis.new
       opts.each do |k, v|
         setter = "#{k}="
         axis.public_send(setter, v) if axis.respond_to?(setter)
       end
 
-      c_axis = __axis_to_c_axis(axis)
-
-      str = option.to_s
-      raise ArgumentError, "axis option must be a single character, got #{str.inspect}" unless str.length == 1
-
-      FFI.gr_axis(str.ord, c_axis)
-      __axis_from_c_axis(c_axis)
+      c_axis = __axis_to_c_axis(axis, for_generation: true)
+      begin
+        FFI.gr_axis(spec, c_axis)
+        __axis_from_c_axis(c_axis)
+      ensure
+        FFI.gr_freeaxis(c_axis)
+      end
     end
 
-    def drawaxis(option, axis)
-      c_axis = __axis_to_c_axis(axis)
-
-      str = option.to_s
-      raise ArgumentError, "axis option must be a single character, got #{str.inspect}" unless str.length == 1
+    def drawaxis(axis)
+      raise ArgumentError, 'axis spec must not be empty' if axis.spec.to_s.empty?
 
-      FFI.gr_drawaxis(str.ord, c_axis)
+      c_axis = __axis_to_c_axis(axis)
+      FFI.gr_drawaxis(c_axis)
     end
 
     def drawaxes(x_axis = nil, y_axis = nil, option = 1)
-      c_x = x_axis && __axis_to_c_axis(x_axis)
-      c_y = y_axis && __axis_to_c_axis(y_axis)
+      c_x = x_axis && __axis_to_c_axis(x_axis, default_spec: 'X')
+      c_y = y_axis && __axis_to_c_axis(y_axis, default_spec: 'Y')
       FFI.gr_drawaxes(c_x&.to_ptr, c_y&.to_ptr, option)
     end
 
@@ -2557,6 +2559,17 @@ module GR
       end
     end
 
+    def inqcolorlimits
+      inquiry %i[double double] do |*pts|
+        super(*pts)
+      end
+    end
+
+    def getmetadata(path)
+      metadata = super
+      metadata.to_s unless metadata.null?
+    end
+
     def getformat(origin, min, max, tick_width, major)
       ref = FFI::FormatReference.malloc
       super(ref, origin, min, max, tick_width, major)
@@ -2572,11 +2585,22 @@ module GR
     private
 
     # Convert high-level GRAxis into low-level FFI::Axis
-    def __axis_to_c_axis(axis)
+    def __axis_to_c_axis(axis, for_generation: false, default_spec: nil)
       c_axis = FFI::Axis.malloc
       # Keep references to allocated memory to prevent GC
       memory_refs = []
 
+      spec = axis.spec || default_spec
+      if !for_generation && spec
+        spec_string = "#{spec}\0"
+        spec_ptr = Fiddle::Pointer.malloc(spec_string.bytesize, Fiddle::RUBY_FREE)
+        spec_ptr[0, spec_string.bytesize] = spec_string
+        memory_refs << spec_ptr
+        c_axis.spec = spec_ptr.to_i
+      else
+        c_axis.spec = 0
+      end
+
       c_axis.min_val = axis.min
       c_axis.max_val = axis.max
       c_axis.tick = axis.tick
@@ -2585,7 +2609,7 @@ module GR
       c_axis.major_count = axis.major_count
 
       # ticks
-      if axis.ticks && !axis.ticks.empty?
+      if !for_generation && axis.ticks && !axis.ticks.empty?
         count = axis.ticks.size
         mem = Fiddle::Pointer.malloc(FFI::Tick.size * count, Fiddle::RUBY_FREE)
         memory_refs << mem
@@ -2604,7 +2628,7 @@ module GR
       c_axis.tick_size = axis.tick_size
 
       # tick labels
-      if axis.tick_labels && !axis.tick_labels.empty?
+      if !for_generation && axis.tick_labels && !axis.tick_labels.empty?
         count = axis.tick_labels.size
         mem = Fiddle::Pointer.malloc(FFI::TickLabel.size * count, Fiddle::RUBY_FREE)
         memory_refs << mem
@@ -2612,7 +2636,7 @@ module GR
           lbl = FFI::TickLabel.new(mem + i * FFI::TickLabel.size)
           lbl.tick = tl.tick
           # Allocate persistent memory for label string
-          label_str = tl.label.to_s + "\0"
+          label_str = "#{tl.label}\0"
           label_ptr = Fiddle::Pointer.malloc(label_str.bytesize, Fiddle::RUBY_FREE)
           memory_refs << label_ptr
           label_ptr[0, label_str.bytesize] = label_str
@@ -2638,6 +2662,9 @@ module GR
 
     # Convert low-level FFI::Axis back into high-level GRAxis
     def __axis_from_c_axis(c_axis)
+      spec_ptr = Fiddle::Pointer[c_axis.spec]
+      spec = spec_ptr.to_s unless spec_ptr.null?
+
       ticks = if c_axis.num_ticks.positive? && !Fiddle::Pointer[c_axis.ticks].null?
                 Array.new(c_axis.num_ticks) do |i|
                   tick = FFI::Tick.new(c_axis.ticks + i * FFI::Tick.size)
@@ -2660,6 +2687,7 @@ module GR
                     end
 
       GRAxis.new(
+        spec: spec,
         min: c_axis.min_val,
         max: c_axis.max_val,
         tick: c_axis.tick,

data/lib/gr_commons/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.73.24.0
+  version: 0.73.27.0
 platform: ruby
 authors:
 - kojix2
@@ -9,6 +9,20 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fiddle
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.21
 specification_version: 4
 summary: GR for Ruby
 test_files: []