ruby-dcl 1.6.3.1 → 1.7.0

data/README.md

@@ -0,0 +1,29 @@
+# Ruby::Dcl::1.7.0
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'ruby-dcl-1.7.0'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install ruby-dcl-1.7.0
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,44 +1,24 @@
-require 'rake/gempackagetask'
+require 'rbconfig' unless defined? RbConfig
+begin
+  require "bundler/gem_tasks"
+  require "rake/testtask"
 
-NAME = 'ruby-dcl'
-VER = '1.6.3.1'
+  Rake::TestTask.new
+  task :default => :test
+rescue LoadError
+end
 
-PKG_FILES = FileList[
-  '**',
-  'lib/**',
-  'GenWrapper/**/**',
-  'obsolete/**',
-  'demo/**/**'
-]
-#gem_load_dir = Gem.default_dir
 
-spec = Gem::Specification.new do |s|
-  s.name             = NAME
-  s.version          = VER
-  s.authors          = ["T. Horinouchi", "K. Kuroi", "K. Goto"\
-    ,"S. Nishizawa", "T. Koshiro",'GFD Dennou Club']
-  s.email            = 'eriko@gfd-dennou.org'
-  s.homepage         = \
-    'http://www.gfd-dennou.org/arch/ruby/products/ruby-dcl/'
-  s.licenses         = ["GFD Dennou Club"]
-  s.platform         = Gem::Platform::RUBY
-  s.summary          = 'one-to-one interface to the DCL graphic library'
-  s.description      = 'RubyDCL is a ruby interface to the scientific graphic library DCL. It supports all the subroutines and functions in DCL on a one-to-one basis. '
-  s.files            = PKG_FILES.to_a
-  s.require_paths    = ['lib']
-  #s.test_files = Dir.glob("test/*")
-  s.has_rdoc         = true
-  s.required_ruby_version = Gem::Requirement.new(">= 1.6")
-  s.add_runtime_dependency(%q<narray>, [">= 0.5.5"])
-  s.add_runtime_dependency(%q<narray_miss>, [">= 0"])
-  s.add_runtime_dependency(%q<gtk2>, [">= 0"])
-  #s.extra_rdoc_files = ['README']
+destdir = ENV["DESTDIR"] || ""
+sitelibdir = ENV["SITELIBDIR"] || RbConfig::CONFIG["sitelibdir"]
 
-  #-- extensions
-  s.extensions << "extconf.rb"
-end
+LIBS = FileList["lib/**/*rb"]
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-  pkg.need_tar = true
+task :nongeminstall do
+  prefix = File.join(destdir, sitelibdir)
+  LIBS.each do |lib|
+    dst = File.join(prefix, File.dirname(lib.sub(/\Alib\//,"")))
+    mkdir_p dst
+    install lib, dst, :mode => 0644
+  end
 end

data/dcl_narrayed_funcs.c

@@ -11,8 +11,9 @@
 #include "libtinyf2c.h"
 #include "narray.h"
 
+/* for compatibility with ruby 1.6 */
 #ifndef RARRAY_LEN
-#  define RARRAY_LEN(ary) (RARRAY(ary)->len)
+#define RARRAY_LEN(a) (RARRAY(a)->len)
 #endif
 
 #define DFLT_SIZE 32
@@ -35,31 +36,31 @@ extern void dcl_freecrealary(real *);
 extern void dcl_freeccomplexary(complex *);
 extern void dcl_freeclogicalary(logical *);
 
-/* for functions which return doublereal */
+/* for functions which return real */
 /* fnclib */
-extern doublereal rd2r_(real *);
-extern doublereal rr2d_(real *);
-extern doublereal rexp_(real *, integer *, integer *);
-extern doublereal rfpi_(void);
-extern doublereal rmod_(real *, real *);
+extern real rd2r_(real *);
+extern real rr2d_(real *);
+extern real rexp_(real *, integer *, integer *);
+extern real rfpi_(void);
+extern real rmod_(real *, real *);
 /* gnmlib */
-extern doublereal rgnlt_(real *);
-extern doublereal rgnle_(real *);
-extern doublereal rgngt_(real *);
-extern doublereal rgnge_(real *);
+extern real rgnlt_(real *);
+extern real rgnle_(real *);
+extern real rgngt_(real *);
+extern real rgnge_(real *);
 /* rfalib */
-extern doublereal rmax_(real *, integer *, integer *);
-extern doublereal rmin_(real *, integer *, integer *);
-extern doublereal rsum_(real *, integer *, integer *);
-extern doublereal rave_(real *, integer *, integer *);
-extern doublereal rvar_(real *, integer *, integer *);
-extern doublereal rstd_(real *, integer *, integer *);
-extern doublereal rrms_(real *, integer *, integer *);
-extern doublereal ramp_(real *, integer *, integer *);
+extern real rmax_(real *, integer *, integer *);
+extern real rmin_(real *, integer *, integer *);
+extern real rsum_(real *, integer *, integer *);
+extern real rave_(real *, integer *, integer *);
+extern real rvar_(real *, integer *, integer *);
+extern real rstd_(real *, integer *, integer *);
+extern real rrms_(real *, integer *, integer *);
+extern real ramp_(real *, integer *, integer *);
 /* rfblib */
-extern doublereal rprd_(real *, real *, integer *, integer *, integer *);
-extern doublereal rcov_(real *, real *, integer *, integer *, integer *);
-extern doublereal rcor_(real *, real *, integer *, integer *, integer *);
+extern real rprd_(real *, real *, integer *, integer *, integer *);
+extern real rcov_(real *, real *, integer *, integer *, integer *);
+extern real rcor_(real *, real *, integer *, integer *, integer *);
 
 
 extern int stftrf_(real*,real*,real*,real*);

data/dcl_rubydcloriginal.c

@@ -27,31 +27,31 @@ extern void dcl_freecrealary(real *);
 extern void dcl_freeccomplexary(complex *);
 extern void dcl_freeclogicalary(logical *);
 
-/* for functions which return doublereal */
+/* for functions which return real */
 /* fnclib */
-extern doublereal rd2r_(real *);
-extern doublereal rr2d_(real *);
-extern doublereal rexp_(real *, integer *, integer *);
-extern doublereal rfpi_(void);
-extern doublereal rmod_(real *, real *);
+extern real rd2r_(real *);
+extern real rr2d_(real *);
+extern real rexp_(real *, integer *, integer *);
+extern real rfpi_(void);
+extern real rmod_(real *, real *);
 /* gnmlib */
-extern doublereal rgnlt_(real *);
-extern doublereal rgnle_(real *);
-extern doublereal rgngt_(real *);
-extern doublereal rgnge_(real *);
+extern real rgnlt_(real *);
+extern real rgnle_(real *);
+extern real rgngt_(real *);
+extern real rgnge_(real *);
 /* rfalib */
-extern doublereal rmax_(real *, integer *, integer *);
-extern doublereal rmin_(real *, integer *, integer *);
-extern doublereal rsum_(real *, integer *, integer *);
-extern doublereal rave_(real *, integer *, integer *);
-extern doublereal rvar_(real *, integer *, integer *);
-extern doublereal rstd_(real *, integer *, integer *);
-extern doublereal rrms_(real *, integer *, integer *);
-extern doublereal ramp_(real *, integer *, integer *);
+extern real rmax_(real *, integer *, integer *);
+extern real rmin_(real *, integer *, integer *);
+extern real rsum_(real *, integer *, integer *);
+extern real rave_(real *, integer *, integer *);
+extern real rvar_(real *, integer *, integer *);
+extern real rstd_(real *, integer *, integer *);
+extern real rrms_(real *, integer *, integer *);
+extern real ramp_(real *, integer *, integer *);
 /* rfblib */
-extern doublereal rprd_(real *, real *, integer *, integer *, integer *);
-extern doublereal rcov_(real *, real *, integer *, integer *, integer *);
-extern doublereal rcor_(real *, real *, integer *, integer *, integer *);
+extern real rprd_(real *, real *, integer *, integer *, integer *);
+extern real rcov_(real *, real *, integer *, integer *, integer *);
+extern real rcor_(real *, real *, integer *, integer *, integer *);
 
 
 extern VALUE mDCL;

data/demo/grph2/uipack/uipk01.rb

@@ -0,0 +1,38 @@
+#
+# uipk01.rb
+#
+# $Id: uipk01.rb,v 1.1 2012-03-30 13:57:40 koshiro Exp $
+#
+
+require "narray"
+require "numru/dcl"
+
+include NumRu
+
+DCL::swiset('WINDOW_HEIGHT', 300)
+DCL::swiset('WINDOW_WIDTH', 300)
+
+iws = (ARGV[0] || (puts ' WORKSTATION ID (I)  ? ;'; DCL::sgpwsn; gets)).to_i
+
+DCL::gropn(iws)
+DCL::grfrm
+DCL::grswnd(0.0, 256.0, 0.0, 256.0)
+DCL::grsvpt(0.1, 0.9, 0.1, 0.9)
+DCL::grstrn(1)
+DCL::grstrf
+
+(1..255).each do |i|
+  a = [i.to_f, i.to_f]
+  (1..255).each do |j|
+    b = [(j-1).to_f, j.to_f]
+
+    DCL::sgplxu(a, b, 1, 1, DCL::isgrgb(i,j,0))
+  end
+end
+
+DCL::uxaxdv('t', 16, 64)
+DCL::uxaxdv('b', 16, 64)
+DCL::uyaxdv('l', 16, 64)
+DCL::uyaxdv('r', 16, 64)
+
+DCL::grcls

data/demo/grph2/uipack/uipk02.rb

@@ -0,0 +1,48 @@
+#
+# uipk02.rb
+#
+# $Id: uipk02.rb,v 1.1 2012-03-09 02:02:12 koshiro Exp $
+#
+
+require "narray"
+require "numru/dcl"
+
+include NumRu
+include Math
+
+
+nx = 50
+ny = 50
+
+z = NArray.sfloat(nx, ny)
+p z.rank
+p z.class
+
+#-- data ---
+for j in 0..ny-1
+  for i in 0..nx-1
+    z[i,j] = - (i-(nx-1)/2.0)**2 - (j-(ny-1)/2.0)**2
+  end
+end
+
+#-- graph ---
+DCL::swiset('WINDOW_HEIGHT', 300)
+DCL::swiset('WINDOW_WIDTH', 300)
+
+iws = (ARGV[0] || (puts ' WORKSTATION ID (I)  ? ;'; DCL::sgpwsn; gets)).to_i
+
+DCL::gropn iws
+DCL::grfrm
+DCL::grswnd(-1.0, 1.0, -1.0, 1.0)
+DCL::grsvpt(0.1, 0.9, 0.1, 0.9)
+DCL::grstrn(1)
+DCL::grstrf
+
+DCL::uipdat(z)
+
+DCL::uxaxdv('t', 0.1, 0.5)
+DCL::uxaxdv('b', 0.1, 0.5)
+DCL::uyaxdv('l', 0.1, 0.5)
+DCL::uyaxdv('r', 0.1, 0.5)
+
+DCL::grcls

data/demo/grph2/umpack/test09_2.rb

@@ -0,0 +1,89 @@
+#
+# test09.rb
+#
+# T Horinouchi  2004/11/11
+
+require "numru/dcl"
+include NumRu
+
+raise "This program is for DCL 5.3 or later" unless DCL::DCLVERSION >= '5.3'
+
+nx=73
+ny=37
+xmin=0.0
+xmax=360.0
+ymin=-90.0
+ymax=90.0
+
+ctr = [ 'CYL','MER','MWD','HMR','EK6','KTD','CON','COA','COC','BON',
+        'OTG','PST','AZM','AZA']
+fct = [ 0.12, 0.12, 0.14, 0.14, 0.14, 0.14,0.11, 0.16, 0.12, 0.12,
+        0.40, 0.12, 0.12, 0.17 ]
+np = ctr.length  # == fct.length
+
+p = NArray.sfloat(nx*ny)
+i = 0
+File.foreach('t811231.dat') do |line|
+  line.split(" ").each do |data|
+    p[i] = data.to_f
+    i += 1
+  end
+end
+p.reshape!(nx, ny)
+
+190.step(245, 5) do |r|
+  amin=r
+  amax=r+5
+#       IDX=(R-180)*1.4*1000+999
+  idx=((r-170)*1.25).to_i*1000+999
+  DCL::uestlv(amin, amax, idx)
+end
+
+#-- graph ---
+
+iws = (ARGV.shift || (puts ' WORKSTATION ID (I)  ? ;'; DCL::sgpwsn; gets)).to_i
+DCL::sglset('LSOFTF', false)
+DCL::swlset('LCMCH', true)
+DCL::sgrset('STLAT1', 75.0)
+DCL::sgrset('STLAT2', 60.0)
+DCL::umlset('LGRIDMJ', false)
+DCL::umrset('DGRIDMN', 30.0)
+
+nn = DCL::sgqcmn
+
+DCL::sgscmn(1)
+DCL::sgopn(iws)
+
+for i in 0..np-1
+  icn= (i % nn) + 1
+  print "colormap ",icn,": ",DCL::swqcmd(icn),"\n"
+  DCL::sgscmn(i+1)
+  DCL::sgfrm
+  DCL::sgssim(fct[i], 0.0, 0.0)
+  DCL::sgsmpl(165.0, 60.0, 0.0)
+  DCL::sgsvpt(0.1, 0.9, 0.1, 0.9)
+  DCL::sgswnd(xmin, xmax, ymin, ymax)
+  if (ctr[i] == 'OTG')
+    DCL::sgstxy(-180.0, 180.0, 0.0, 90.0)
+  else
+    DCL::sgstxy(-180.0, 180.0, -90.0, 90.0)
+  end
+  DCL::sgstrn(DCL::isgtrc(ctr[i]))
+  DCL::sgstrf
+
+  DCL::sglset('LCLIP', true)
+  DCL::slpwwr(1)
+  DCL::slpvpr(1)
+  cttl = DCL::sgtrnl(DCL::isgtrc(ctr[i]))
+  DCL::sgtxzr(0.5, 0.95, cttl, 0.03, 0, 0, 3)
+
+  DCL::uetone(p)
+  DCL::udcntr(p)
+  DCL::umfmap('coast_world')
+  DCL::umpmap('coast_world')
+  DCL::umpglb
+  DCL::slpvpr(1)
+end
+DCL::swpcls
+
+DCL::sgcls

data/demo/math1/clsplib/cslb01.rb

@@ -0,0 +1,55 @@
+#
+# cslb01.rb
+#
+# $Id: cslb01.rb,v 1.2 2012-03-30 13:57:40 koshiro Exp $
+#
+
+require "narray"
+require "numru/dcl"
+include NumRu
+include Math
+
+nx=100
+ny=100
+level=256
+
+r = NArray.float(nx,ny)
+g = NArray.float(nx,ny)
+b = NArray.float(nx,ny)
+
+nx.times do |i|
+  ny.times do |j|
+    r[i,j] = exp(-((i-nx/2.0)**2.0 + (j-ny/2.0)**2.0) / 5000.0)
+    g[i,j] = exp(-((i-nx/1.1)**2.0 + (j-ny/1.2)**2.0) / 1000.0)
+    b[i,j] = exp(-((i-ny/3.0)**2.0 + (j-ny/5.0)**2.0) / 3000.0)
+  end
+end
+
+rc = DCL::rnorml(r,0.0,1.0)
+gc = DCL::rnorml(g,0.2,1.0)
+bc = DCL::rnorml(b,0.0,1.0)
+
+DCL::swiset('WINDOW_HEIGHT', 300)
+DCL::swiset('WINDOW_WIDTH',  300)
+
+iws = (ARGV[0] || (puts ' WORKSTATION ID (I)  ? ;'; DCL::sgpwsn; gets)).to_i
+
+DCL::gropn(iws)
+DCL::grfrm
+DCL::grswnd(-1.0, 1.0, -1.0, 1.0)
+DCL::grsvpt(0.1, 0.9, 0.1, 0.9)
+DCL::grstrn(1)
+DCL::grstrf
+
+DCL::prcopn('DclPaintGrid3')
+
+DCL::uipda3(rc, gc, bc)
+
+DCL::prccls('DclPaintGrid3')
+
+DCL::uxaxdv('t', 0.1, 0.5)
+DCL::uxaxdv('b', 0.1, 0.5)
+DCL::uyaxdv('l', 0.1, 0.5)
+DCL::uyaxdv('r', 0.1, 0.5)
+
+DCL::grcls

data/extconf.rb

@@ -1,15 +1,13 @@
-require "rubygems" unless defined?(Gem)
 require "mkmf"
 require "rbconfig"
-if Config::CONFIG["MINOR"].to_i > 7
-  $rb18 = true
-else
-  $rb18 = false
-end
-if $rb18
+begin
   require "fileutils"
-else
+rescue LoadError
   require "ftools"
+  module FileUtils
+    def copy(src, dst); File.copy(src, dst); end
+    module_function :copy
+  end
 end
 
 #dir_config('narray',$sitearchdir,$sitearchdir)
@@ -31,6 +29,9 @@ if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
    exit(-1)
 end
 
+initcfile_default = "init.c.default"
+initcfile = "init.c"
+
 if(xsystem("which cdclconfig"))
   cflags = `cdclconfig --cflags`.gsub(/\n/, " ")
   ldflags = `cdclconfig --ldflags`.gsub(/\n/, " ")
@@ -40,8 +41,8 @@ if(xsystem("which cdclconfig"))
   print "DCL Version: #{dclversion}\n"
   dclver = dclversion.gsub(/\./,'')
   dclver = dclver+'0' if dclver.length <= 2   # 53 --> 530 etc
-  if dclversion < "5.3"
-    raise "Supported DCL version is 5.3 or later, while you have #{dclversion}"
+  if dclversion < "5.2"
+    raise "Supported DCL version is 5.2 or later, while you have #{dclversion}"
   end
   dclversionmacro = ' -DDCLVER='+dclver
 
@@ -49,35 +50,8 @@ if(xsystem("which cdclconfig"))
   $LOCAL_LIBS += ' ' + ldflags
   $LOCAL_LIBS += ldlibs
 
-  gtkversion = `cdclconfig --gtkversion`.chop
-  if $?.class==Fixnum
-    status = $?
-  else
-    status = $?.exitstatus
-  end
-  if status != 0
-    if ldlibs =~ /gtk/
-      gtkversion = "1"
-    else
-      gtkversion = "no"
-    end
-  end
-  if gtkversion == "no" then
-    initcfile = "init.c.default"
-  else
-    print "**Infomation** compile with gtk+ (ver.#{gtkversion})\n"
-    if $rb18
-      FileUtils.copy("grph1_zgpack.c.org","grph1_zgpack.c")
-    else
-      File.copy("grph1_zgpack.c.org","grph1_zgpack.c")
-    end
-    initcfile = "init.c.gtk"
-    if ldlibs =~ /-lgdk_imlib/ then
-      print "**Infomation** compile with imlib_gdk\n"
-    end
-  end
-  fin = File.open(initcfile)
-  fout = File.open('init.c','w')
+  fin = File.open(initcfile_default)
+  fout = File.open(initcfile,'w')
   while(line = fin.gets)
     fout.puts(line.sub(/DCLVersion/,'"'+dclversion+'"'))
   end
@@ -85,10 +59,7 @@ if(xsystem("which cdclconfig"))
   fin.close
 
 else
-  print "**Warning** cdclconfig is not found. Install C version of DCL 5.3 or later\n"
-=begin
   print "**Warning** cdclconfig is not found. Assume C version of DCL 5.2\n"
-  gtkversion="no"
   dcllibname = "cdcl52"
   f2clibname = "f2c4dcl"
   xlibname = "X11"
@@ -104,15 +75,12 @@ else
   end
   $LOCAL_LIBS += " "+libdir+" "+xlibdir
   $LOCAL_LIBS += " -l"+dcllibname+" -l"+f2clibname+" -l"+xlibname+" -lsocket -lnsl"
-=end
+
+  FileUtils.copy(initcfile_default, initcfile)
 end
 
 if /cygwin|mingw/ =~ RUBY_PLATFORM
    have_library("narray") || raise("ERROR: narray import library is not found")
-   if gtkversion == "2"
-      have_library("ruby-glib2") || 
-                 raise("ERROR: ruby-glib2 import library is not found")
-   end
 end
 
 create_makefile("numru/dcl_raw")
@@ -126,7 +94,7 @@ oldmkfl.each_line{ |line|
    when /^distclean:/
       newmkfl.puts(line)
       newmkfl.puts("\t\t@$(RM) Makefile.orig")
-      newmkfl.puts("\t\t@$(RM) init.c grph1_zgpack.c")
+      newmkfl.puts("\t\t@$(RM) init.c")
    else
       newmkfl.puts(line)
    end