ruby-gr 0.0.2 → 0.0.3

data/lib/gr3/ffi.rb

@@ -8,7 +8,7 @@ module GR3
 
     begin
       ffi_lib GR3.ffi_lib
-    rescue LoadError => e
+    rescue LoadError
       raise LoadError, 'Could not find GR Framework'
     end
 
@@ -55,33 +55,40 @@ module GR3
     attach_function :gr3_setviewmatrix, %i[pointer], :void
     attach_function :gr3_getprojectiontype, %i[], :int
     attach_function :gr3_setprojectiontype, %i[int], :void
-    # attach_function gr3_triangulate
+    # attach_function :gr3_triangulate,
     # %i[pointer ushort uint uint uint uint uint uint double double double double double double pointer], :void
-    # attach_function gr3_triangulateindexed
+    # attach_function :gr3_triangulateindexed,
     # %i[pointer ushort uint uint uint uint uint uint double double double double double double pointer pointer pointer pointer poiter], :void
-    # attach_function :gr3_createisosurfacemesh,
-    # %i[pointer pointer ushort uint uint uint uint uint uint double double double double double double], :int
+    attach_function :gr3_createisosurfacemesh,
+                    %i[pointer pointer ushort uint uint uint uint uint uint double double double double double double],
+                    :int
     attach_function :gr3_createsurfacemesh, %i[pointer int int pointer pointer pointer int], :int
     attach_function :gr3_drawmesh_grlike, %i[int int pointer pointer pointer pointer pointer], :void
     attach_function :gr3_drawsurface, %i[int], :void
-    # attach_function gr3_surface, %i[int int pointer pointer pointer int], :void
+    attach_function :gr3_surface, %i[int int pointer pointer pointer int], :void
     attach_function :gr3_drawtubemesh, %i[int pointer pointer pointer int int], :int
-    # attach_function :gr3_createtubemesh, %i[pointer int pointer pointer pointer int int], :int
-    # attach_function gr3_drawspins, %i[int pointer pointer pointer float float float float], :void
-    # attach_function gr3_drawmolecule, %i[int pointer pointer pointer float pointer float], :void
-    # attach_function gr3_createxslicemesh,
-    # %i[pointer pointer uint uint uint uint uint uint uint double double double double double double], :void
-    # attach_function gr3_createyslicemesh
-    # %i[pointer pointer uint uint uint uint uint uint uint double double double double double double], :void
-    # attach_function gr3_createzslicemesh
-    # %i[pointer pointer uint uint uint uint uint uint uint double double double double double double], :void
-    # attach_function gr3_drawxslicemesh
-    # %i[pointer uint uint uint uint uint uint uint double double double double double double], :void
-    # attach_function gr3_drawyslicemesh
-    # %i[pointer uint uint uint uint uint uint uint double double double double double double], :void
-    # attach_function gr3_drawzslicemesh
-    # %i[pointer uint uint uint uint uint uint uint double double double double double double], :void
-    # attach_function gr3_drawtrianglesurface, %i[int pointer], :void
-    # attach_function gr_volume, %i[int int int pointer int pointer pointer], :void
+    attach_function :gr3_createtubemesh, %i[pointer int pointer pointer pointer int int], :int
+    attach_function :gr3_drawspins, %i[int pointer pointer pointer float float float float], :void
+    attach_function :gr3_drawmolecule, %i[int pointer pointer pointer float pointer float], :void
+    attach_function :gr3_createxslicemesh,
+                    %i[pointer pointer uint uint uint uint uint uint uint double double double double double double],
+                    :void
+    attach_function :gr3_createyslicemesh,
+                    %i[pointer pointer uint uint uint uint uint uint uint double double double double double double],
+                    :void
+    attach_function :gr3_createzslicemesh,
+                    %i[pointer pointer uint uint uint uint uint uint uint double double double double double double],
+                    :void
+    attach_function :gr3_drawxslicemesh,
+                    %i[pointer uint uint uint uint uint uint uint double double double double double double],
+                    :void
+    attach_function :gr3_drawyslicemesh,
+                    %i[pointer uint uint uint uint uint uint uint double double double double double double],
+                    :void
+    attach_function :gr3_drawzslicemesh,
+                    %i[pointer uint uint uint uint uint uint uint double double double double double double],
+                    :void
+    # attach_function :gr3_drawtrianglesurface, %i[int pointer], :void
+    attach_function :gr_volume, %i[int int int pointer int pointer pointer], :void
   end
 end

data/lib/gr3/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module GR3
+  VERSION = GRCommons::VERSION
+end

data/lib/gr_commons.rb

@@ -7,3 +7,4 @@ require 'gr_commons/attach_function'
 require 'gr_commons/define_methods'
 require 'gr_commons/gr_common_utils'
 require 'gr_commons/jupyter_support'
+require 'gr_commons/version'

data/lib/gr_commons/attach_function.rb

@@ -2,6 +2,7 @@
 
 module GRCommons
   module AttachFunction
+    # Remember added method name
     def attach_function(name, *args)
       @ffi_methods ||= []
       @ffi_methods << name

data/lib/gr_commons/gr_common_utils.rb

@@ -5,44 +5,36 @@ module GRCommons
     private
 
     def equal_length(*args)
-      lengths = args.map { |arg| length(arg) }
+      lengths = args.map(&:length)
       raise ArgumentError, 'Sequences must have same length.' unless lengths.all? { |l| l == lengths[0] }
 
       lengths[0]
     end
 
-    def length(pt, dtype = :double)
-      case pt
-      when Array
-        pt.size
-      when ->(x) { narray? x }
-        pt.size
-      when ::FFI::MemoryPointer
-        case dtype
-        when :int
-          pt.size / ::FFI::Type::INT.size
-        when :double
-          pt.size / ::FFI::Type::DOUBLE.size
-        else
-          raise "Unknown type: #{dtype}"
-        end
-      else
-        raise
-      end
-    end
-
     def uint8(data)
       data = data.to_a.flatten
       pt = ::FFI::MemoryPointer.new(:uint8, data.size)
       pt.write_array_of_uint8 data
     end
 
+    def uint16(data)
+      data = data.to_a.flatten
+      pt = ::FFI::MemoryPointer.new(:uint16, data.size)
+      pt.write_array_of_uint16 data
+    end
+
     def int(data)
       data = data.to_a.flatten
       pt = ::FFI::MemoryPointer.new(:int, data.size)
       pt.write_array_of_int data
     end
 
+    def uint(data)
+      data = data.to_a.flatten
+      pt = ::FFI::MemoryPointer.new(:uint, data.size)
+      pt.write_array_of_uint data
+    end
+
     def double(data)
       data = data.to_a.flatten
       pt = ::FFI::MemoryPointer.new(:double, data.size)
@@ -63,6 +55,10 @@ module GRCommons
       inquiry(:int, &block)
     end
 
+    def inquiry_uint(&block)
+      inquiry(:uint, &block)
+    end
+
     def inquiry_double(&block)
       inquiry(:double, &block)
     end
@@ -105,3 +101,12 @@ module GRCommons
     end
   end
 end
+
+# Ruby 2.4.0 introduces Comparable#clamp
+if RUBY_VERSION.to_f <= 2.3
+  class Numeric
+    def clamp(min, max)
+      [[self, max].min, min].max
+    end
+  end
+end

data/lib/gr_commons/jupyter_support.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module GRCommons
+  # Jupyter Notebook and Jpyter Lab.
   module JupyterSupport
-    # For IRuby Notebook
-
     if defined? IRuby
       def self.extended(_obj)
         require 'tempfile'

data/lib/gr_commons/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wavefile
+  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: []
@@ -119,14 +133,17 @@ files:
 - lib/gr.rb
 - lib/gr/ffi.rb
 - lib/gr/grbase.rb
+- lib/gr/version.rb
 - lib/gr3.rb
 - lib/gr3/ffi.rb
 - lib/gr3/gr3base.rb
+- lib/gr3/version.rb
 - lib/gr_commons.rb
 - lib/gr_commons/attach_function.rb
 - lib/gr_commons/define_methods.rb
 - lib/gr_commons/gr_common_utils.rb
 - lib/gr_commons/jupyter_support.rb
+- lib/gr_commons/version.rb
 homepage: https://github.com/kojix2/GR.rb
 licenses:
 - MIT