ruby-gr 0.0.23 → 0.58.1.0

data/lib/grm/ffi.rb

@@ -15,7 +15,7 @@ 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.
@@ -28,6 +28,7 @@ module GRM
     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
@@ -36,14 +37,17 @@ module GRM
     try_extern 'char *grm_dump_json_str(void)'
 
     # https://github.com/sciapp/gr/blob/master/lib/grm/event.h
+    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_input(const grm_args_t *input_args)'
-    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,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.58.1.0
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: histogram
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fiddle
-  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
@@ -162,19 +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/search_shared_library.rb
+- lib/gr_commons/try_extern.rb
 - lib/gr_commons/version.rb
 - lib/grm.rb
 - lib/grm/ffi.rb
@@ -200,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 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
-
-```

data/lib/gr_commons/search_shared_library.rb

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-require 'pkg-config'
-
-module GRCommons
-  # This module helps GR, GR and GRM to search the shared library.
-  #
-  # The order of priority:
-  # 1. RubyInstaller ( for Windows only )
-  # 2. Environment variable GRDIR
-  # 3. pkg-config : https://github.com/ruby-gnome/pkg-config
-  # The following packages (should) support pkg-config.
-  # - Linux
-  #   - Red Data Tools https://github.com/red-data-tools/packages.red-data-tools.org
-  #     - libgr-dev
-  #     - libgr3-dev
-  #     - libgrm-dev
-  # - Mac
-  #   - Homebrew https://github.com/Homebrew/homebrew-core
-  #     - libgr
-  # - Windows
-  #   - MinGW https://github.com/msys2/MINGW-packages
-  #     - mingw-w64-gr
-  module SearchSharedLibrary
-    # Search the shared library.
-    # @note This method does not detect the Operating System.
-    #
-    # @param gr_lib_name [String] The actual file name of the shared library.
-    # @param pkg_name [String] The package name to be used when searching with pkg-configg
-    def search_shared_library(gr_lib_name, pkg_name)
-      # Windows + RubyInstaller
-      if Object.const_defined?(:RubyInstaller)
-        ENV['GRDIR'] ||= [
-          RubyInstaller::Runtime.msys2_installation.msys_path,
-          RubyInstaller::Runtime.msys2_installation.mingwarch
-        ].join(File::ALT_SEPARATOR)
-        recursive_search(gr_lib_name, ENV['GRDIR']).tap do |path|
-          RubyInstaller::Runtime.add_dll_directory(File.dirname(path))
-        end
-      # ENV['GRDIR'] (Linux, Mac, Windows)
-      elsif ENV['GRDIR']
-        begin
-          recursive_search(gr_lib_name, ENV['GRDIR'])
-        rescue StandardError => e
-          warn "\nWhile searching for #{gr_lib_name} in the directory specified " \
-               "in the GRDIR environment variable, ENV['GRDIR']=#{ENV['GRDIR']}, " \
-               "the following error occurred : #{e.message}"
-          pkg_config_search(gr_lib_name, pkg_name)
-        end
-      else
-        pkg_config_search(gr_lib_name, pkg_name)
-      end
-    end
-
-    def recursive_search(name, base_dir)
-      Dir.chdir(base_dir) do
-        if path = Dir["**/#{name}"].first # FIXME
-          File.expand_path(path)
-        else
-          raise StandardError "#{name} not found in #{base_dir}"
-        end
-      end
-    end
-
-    def pkg_config_search(gr_lib_name, pkg_name)
-      PKGConfig.variable(pkg_name, 'sopath')
-    rescue PackageConfig::NotFoundError => e
-      raise "#{e.message} Cannot find #{gr_lib_name}. " \
-            "Please Make sure that GR is installed and the environment ” \
-            ”variable GRDIR is set correctly."
-    end
-  end
-end