ruby-gr 0.0.20 → 0.0.25

data/lib/grm/ffi.rb

@@ -15,21 +15,21 @@ module GRM
       raise LoadError, 'Could not find GR Framework'
     end
 
-    extend GRCommons::Extern
+    extend GRCommons::TryExtern
 
     # Currently, the declarations of GRM functions are distributed in several
     # header files.
 
     # https://github.com/sciapp/gr/blob/master/lib/grm/args.h
-
     try_extern 'grm_args_t *grm_args_new(void)'
     try_extern 'void grm_args_delete(grm_args_t *args)'
-    # Fiddle does not currently support variable-length arguments in C.
     try_extern 'int grm_args_push(grm_args_t *args, const char *key, const char *value_format, ...)'
     try_extern 'int grm_args_push_buf(grm_args_t *args, const char *key, const char *value_format, const void *buffer, int apply_padding)'
     try_extern 'int grm_args_contains(const grm_args_t *args, const char *keyword)'
     try_extern 'void grm_args_clear(grm_args_t *args)'
     try_extern 'void grm_args_remove(grm_args_t *args, const char *key)'
+    typealias 'grm_args_ptr_t', 'void*'
+    try_extern 'grm_args_ptr_t grm_length(double value, const char *unit)'
 
     # https://github.com/sciapp/gr/blob/master/lib/grm/dump.h
     try_extern 'void grm_dump(const grm_args_t *args, FILE *f)'
@@ -37,27 +37,41 @@ module GRM
     try_extern 'char *grm_dump_json_str(void)'
 
     # https://github.com/sciapp/gr/blob/master/lib/grm/event.h
-    # grm_event_type_t is an enum.
-    # In the original fiddley, there is code for an enum.
-    # But GR's fiddley doesn't have it.
-    # try_extern 'int grm_register(grm_event_type_t type, grm_event_callback_t callback)'
-    # try_extern 'int grm_unregister(grm_event_type_t type)'
+    typealias 'grm_event_type_t', 'int' # enum
+    typealias 'grm_event_callback_t', 'void*'
+    try_extern 'int grm_register(grm_event_type_t type, grm_event_callback_t callback)'
+    try_extern 'int grm_unregister(grm_event_type_t type)'
 
     # https://github.com/sciapp/gr/blob/master/lib/grm/interaction.h
+    # FIXME: https://github.com/ruby/fiddle/issues/68
+    typealias 'const_int', 'int' # FIXME
     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 'grm_tooltip_info_t *grm_get_tooltip(const int, const int)'
+    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)' # FIXME
+    try_extern 'grm_tooltip_info_t *grm_get_tooltip(const_int, const_int)' # FIXME
 
     # https://github.com/sciapp/gr/blob/master/lib/grm/net.h
-    # try_extern 'void *grm_open(int is_receiver, const char *name, unsigned int id,
-    #                            const char *(*custom_recv)(const char *, unsigned int),
-    #                            int (*custom_send)(const char *, unsigned int, const char *))
+    try_extern 'void *grm_open(int is_receiver, const char *name, unsigned int id,
+                               const char *(*custom_recv)(const char *, unsigned int),
+                               int (*custom_send)(const char *, unsigned int, const char *))'
     try_extern 'grm_args_t *grm_recv(const void *p, grm_args_t *args)'
-    # Fiddle does not currently support variable-length arguments in C.
     try_extern 'int grm_send(const void *p, const char *data_desc, ...)'
     try_extern 'int grm_send_buf(const void *p, const char *data_desc, const void *buffer, int apply_padding)'
     try_extern 'int grm_send_ref(const void *p, const char *key, char format, const void *ref, int len)'
     try_extern 'int grm_send_args(const void *p, const grm_args_t *args)'
     try_extern 'void grm_close(const void *p)'
+
+    # https://github.com/sciapp/gr/blob/master/lib/grm/plot.h
+    try_extern 'void grm_finalize(void)'
+    try_extern 'int grm_clear(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_switch(unsigned int id)'
+
+    # https://github.com/sciapp/gr/blob/master/lib/grm/util.h
+    try_extern 'FILE *grm_get_stdout(void)'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.25
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: histogram
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pkg-config
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,18 +148,19 @@ files:
 - lib/gr/ffi.rb
 - lib/gr/grbase.rb
 - lib/gr/plot.rb
-- lib/gr/plot.rb.md
 - lib/gr/version.rb
 - lib/gr3.rb
 - lib/gr3/ffi.rb
 - lib/gr3/gr3base.rb
 - lib/gr3/version.rb
 - lib/gr_commons/define_methods.rb
-- lib/gr_commons/extern.rb
 - lib/gr_commons/fiddley.rb
 - lib/gr_commons/gr_common_utils.rb
 - lib/gr_commons/gr_commons.rb
+- lib/gr_commons/gr_lib.rb
+- lib/gr_commons/gr_logger.rb
 - lib/gr_commons/jupyter_support.rb
+- lib/gr_commons/try_extern.rb
 - lib/gr_commons/version.rb
 - lib/grm.rb
 - lib/grm/ffi.rb
@@ -164,14 +179,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: GR for Ruby

data/lib/gr/plot.rb.md

@@ -1,172 +0,0 @@
-This is a memo to think about the structure of Plot/Figure. 
-
-````ruby
-
-module GR
-  # object oriented way
-  class PlotBase
-  end
-
-  class Line < PlotBase
-  end
-
-  class << self
-    def set_viewport; end
-
-    def minmax; end
-
-    def set_window; end
-
-    def draw_axes; end
-
-    def draw_polar_axes; end
-
-    def _inqtext; end
-
-    def _text; end
-
-    def draw_legend; end
-
-    def draw_colorbar; end
-
-    def colormap; end
-
-    def to_rgba; end
-
-    # Ruby is object-oriented language.
-    # Julia is more functional...
-    # def create_context
-    # end
-    # def restore_context
-    # end
-    # def figure
-    # end
-
-    # def hold
-    # end
-    # def usecolorscheme
-    # end
-
-    # Set current subplot index.
-    def subplot; end
-
-    # draw_grid
-
-    # xticks
-    # yticks
-    # zticks
-
-    # xticklabels
-    # yticklabels
-
-    def plot_img; end # should be private?
-
-    def plot_iso; end # should be private?
-
-    def plot_polar; end # should be private?
-
-    # send_meta
-
-    def plot_data; end # should be private?
-
-    def plot_args; end # should be private?
-
-    # Draw one or more line plots.
-    def plot; end
-
-    # def plot_line_over oplot_line ?
-
-    # Draw one or more step or staircase plots.
-    def step; end
-
-    # Draw one or more scatter plots.
-    def scatter; end
-
-    # Draw a stem plot.
-    def stem; end
-
-    # Draw a bar plot.
-    def barplot; end
-
-    def hist; end # should be private?
-
-    # Draw a histogram.
-    def histgram; end
-
-    # Draw a polar histogram.
-    def polarhistogram; end
-
-    # Draw a contour plot.
-    def contour; end
-    # GR.contour is already defined in GR::FFI class.
-
-    # Draw a filled contour plot.
-    def contourf; end
-    # GR.contourf is already defined in GR::FFI class.
-
-    # Draw a hexagon binning plot.
-    def hexbin; end
-    # GR.hexbin is already defined in GR::FFI class.
-
-    # Draw a heatmap.
-    def heatmap; end
-
-    def polarheatmap; end
-
-    # Draw a three-dimensional wireframe plot.
-    def wireframe; end
-
-    # Draw a three-dimensional surface plot.
-    def surface; end
-
-    def volume; end
-
-    # Draw one or more three-dimensional line plots.
-    def plot3; end
-
-    # Draw one or more three-dimensional scatter plots.
-    def scatter3; end
-
-    def redraw; end
-
-    def title; end
-
-    def xlabel; end
-
-    def ylabel; end
-
-    def legend; end
-
-    def xlim; end
-
-    def ylim; end
-
-    def savefig; end
-
-    def meshgrid; end # should be private ?
-
-    def peaks; end # should be private ?
-
-    def imshow; end
-
-    # Draw an isosurface.
-    def isosurface; end
-
-    # Draw one or more polar plots.
-    def polar; end
-
-    # Draw a triangular surface plot.
-    def trisurf; end
-
-    # Draw a triangular contour plot.
-    def tricont; end
-
-    def shade; end
-
-    # def set_panzoom ?
-
-    # mainloop
-  end
-end
-
-```