ruby-grads 1.0.0 → 1.0.7

data/lib/grads/lib/axis_xtime.rb

@@ -0,0 +1,217 @@
+#
+#  
+#  draw_xlab_time(dummy, offset: nil, skip: nil)
+#
+#
+#
+#
+
+class GrADS::Command
+
+  def time_skip 
+    ans = query("dims")
+    t1 = subwrd(sublin(ans, 5), 11).to_i
+    t2 = subwrd(sublin(ans, 5), 13).to_i
+    d1 = Time.parse(subwrd(sublin(ans, 5), 6).sub(/Z/," "))
+    d2 = Time.parse(subwrd(sublin(ans, 5), 8).sub(/Z/," "))
+    nt = t2 - t1 + 1
+    nd = (d2 - d1)/86400.0
+    dt = ((d2-d1)/(t2-t1)).round
+
+    type = nil
+    skip = nil
+
+    if nd <= 1
+      type = "day"
+    elsif nd <= 3
+      type = "3days"
+    elsif nd <= 7
+      type = "week"
+    elsif nd <= 14
+      type = "2weeks"
+    elsif nd <= 31
+      type = "month"
+    elsif nd <= 120
+      type = "season"
+    elsif nd <= 360
+      type = "year"
+    else
+      type = "years"
+    end
+
+    unless skip
+      case type
+      when "day"
+        skip = dt.to_i/3600
+      when "3days"
+        skip = 3*dt.to_i/3600
+      when "week"
+        skip = 6*dt.to_i/3600
+      when "2weeks"
+        skip = 12*dt.to_i/3600
+      when "month"
+        skip = 24*dt.to_i/3600
+      when "season"
+        skip = 3*24*dt.to_i/3600
+      when "year", "years"
+        skip = 10*24*dt.to_i/3600
+      end
+    end
+    
+    return skip
+  end
+
+
+  def axis_xtime (dummy, offset: nil, skip: nil, &block)
+    puts ans = query("dims")
+    t1 = subwrd(sublin(ans, 5), 11).to_i
+    t2 = subwrd(sublin(ans, 5), 13).to_i
+    d1 = Time.parse(subwrd(sublin(ans, 5), 6).sub(/Z/," "))
+    d2 = Time.parse(subwrd(sublin(ans, 5), 8).sub(/Z/," "))
+    nt = t2 - t1 + 1
+    nd = (d2 - d1)/86400.0
+    dt = ((d2-d1)/(t2-t1)).round
+    time = CArray.object(nt).seq(d1,dt)
+
+    type = nil
+    skip = nil
+
+    if offset
+      time = time + offset
+    end
+
+    if nd <= 1
+      type = "day"
+    elsif nd <= 3
+      type = "3days"
+    elsif nd <= 7
+      type = "week"
+    elsif nd <= 14
+      type = "2weeks"
+    elsif nd <= 31
+      type = "month"
+    elsif nd <= 120
+      type = "season"
+    elsif nd <= 360
+      type = "year"
+    else
+      type = "years"
+    end
+    
+    unless skip
+      case type
+      when "day"
+        skip = dt.to_i/3600
+      when "3days"
+        skip = 3*dt.to_i/3600
+      when "week"
+        skip = 6*dt.to_i/3600
+      when "2weeks"
+        skip = 12*dt.to_i/3600
+      when "month"
+        skip = 24*dt.to_i/3600
+      when "season"
+        skip = 3*24*dt.to_i/3600
+      when "year", "years"
+        skip = 10*24*dt.to_i/3600
+      end
+    end
+
+    xlabs = []
+    xlabs2 = []
+    flag = false
+
+    case type
+    when "day", "3days", "week"
+      hour0 = 0
+      time[[nil,skip]].each do |t|
+        if not flag 
+          xlabs << t.strftime("%d%b%Y").upcase            
+          flag = true
+        elsif hour0 > t.hour
+          xlabs << t.strftime("%d%b").upcase       
+        else
+          xlabs << t.strftime("")
+        end
+        hour0 = t.hour
+      end
+      time[[nil,skip]].each do |t|
+        if nt > 73
+          if t.hour % 3 == 0
+            xlabs2 << t.strftime("%H")      
+          end
+        else
+          xlabs2 << t.strftime("%H")            
+        end
+      end
+      units = ["hour", "day"]
+    when "2weeks"
+      hour0 = 0
+      time[[nil,skip]].each do |t|
+        if not flag 
+          xlabs << t.strftime("%d%b%Y").upcase            
+          flag = true
+        elsif hour0 > t.hour
+          xlabs << t.strftime("%d").upcase       
+        else
+          xlabs << t.strftime("")
+        end
+        hour0 = t.hour
+      end
+      time[[nil,skip]].each do |t|
+        if nt > 73
+          if t.hour % 3 == 0
+            xlabs2 << t.strftime("%H")      
+          end
+        else
+          xlabs2 << t.strftime("%H")            
+        end
+      end
+      units = ["hour", "day"]
+    when "month","season", "year"
+      day0 = 1
+      time[[nil,skip]].each do |t|
+        if not flag
+          xlabs << t.strftime("%d%b%Y").upcase            
+          flag = true
+        elsif day0 > t.day
+          xlabs << t.strftime("%b").upcase       
+        else
+          xlabs << t.strftime("")
+        end
+        day0 = t.day
+      end
+      time[[nil,skip]].each do |t|
+        if nt > 73
+          if t.hour % 3 == 0
+            xlabs2 << t.strftime("%d")      
+          end
+        else
+          xlabs2 << t.strftime("%d")            
+        end
+      end
+      units = ["day", "month"]
+    end
+
+    begin
+      axis_off
+      set :xlab, :on
+      set :xlabs, xlabs2.join(" | ")
+      set :xlpos, 0, :b
+
+      display_nothing(dummy)
+    
+      axis_on
+      set :xlab, :on
+      set :xlabs, xlabs.join(" | ")
+      set :xlpos, -0.3, :b
+
+      display_nothing(dummy, &block) 
+    ensure
+      set :xlpos, 0, b
+    end
+    
+    return units
+  end
+  
+end

data/lib/grads/lib/makecpt.rb

@@ -10,12 +10,6 @@ class GrADS::Command
 
   def setcpt (file)
     io = Kernel::open(file)
-    while line = io.gets
-      if line =~ /COLOR_MODEL\s*=\s*\+?(HSV|RGB)/
-        model = $1
-        break
-      end
-    end
     bgrb = nil
     frgb = nil
     list = []
@@ -24,12 +18,12 @@ class GrADS::Command
       when /\A[\#N]/
         next
       when /\AB\s/
-        brgb = line.split(/\s+/)[1..3].map{|v| v.to_f}
+        brgb = line.split(/[\s\/]+/)[1..3].map(&:to_f)
       when /\AF\s/
-        frgb = line.split(/\s+/)[1..3].map{|v| v.to_f}
+        frgb = line.split(/[\s\/]+/)[1..3].map(&:to_f)
       else
-        list << line.lstrip.split(/\s+/)[0..3].map{|v| v.to_f}
-        last = line.lstrip.split(/\s+/)[4..7].map{|v| v.to_f}
+        list << line.split(/[\s\/]+/)[0..3].map(&:to_f)
+        last = line.split(/[\s\/]+/)[4..7].map(&:to_f)
       end
     end
     list << last
@@ -38,48 +32,35 @@ class GrADS::Command
     ccols = []
     ic = 16
     if brgb
-      if model == "HSV"
-        set :rgb, ic, *_hsv2rgb(*brgb)
-      else
-        set :rgb, ic, *brgb
-      end
+      set :rgb, ic, *brgb.map(&:round)
       ccols << ic
     else
-      ccols << 0
+      ccols << -1
     end
     ic += 1
     list.each_with_index do |(v,r,g,b),i|
-      if model == "HSV"
-        set :rgb, i+ic, *_hsv2rgb(r, g, b)
-      else
-        set :rgb, i+ic, r, g, b
-      end
+      set :rgb, i+ic, r.round, g.round, b.round
       clevs << v
       if ! frgb and i == list.size - 1 
-        ccols << 0
+        ccols << -1
       else
         ccols << i+ic
       end
     end
     ic += list.size - 1
     if frgb
-      if model == "HSV"
-        set :rgb, ic, *_hsv2rgb(*frgb)
-      else
-        set :rgb, ic, *frgb
-      end
+      set :rgb, ic, *frgb.map(&:round)
     end
     set_clevs *clevs
     set_ccols *ccols
+    return clevs, ccols
   end
 
   def makecpt (*args)
-    io = IO::popen("makecpt #{args.join(' ')}", "r")
-    while line = io.gets
-      if line =~ /COLOR_MODEL\s*=\s*\+?(HSV|RGB)/
-        model = $1
-        break
-      end
+    begin
+      io = IO::popen("makecpt -Fr #{args.join(' ')}", "r")
+    rescue Errno::ENOENT
+      io = IO::popen("gmt makecpt -Fr #{args.join(' ')}", "r")
     end
     bgrb = nil
     frgb = nil
@@ -89,12 +70,12 @@ class GrADS::Command
       when /\A[\#N]/
         next
       when /\AB\s/
-        brgb = line.split(/\s+/)[1..3].map{|v| v.to_f}
+        brgb = line.split(/[\s\/]/)[1..3].map(&:to_f)
       when /\AF\s/
-        frgb = line.split(/\s+/)[1..3].map{|v| v.to_f}
+        frgb = line.split(/[\s\/]/)[1..3].map(&:to_f)
       else
-        list << line.split(/\s+/)[0..3].map{|v| v.to_f}
-        last = line.split(/\s+/)[4..7].map{|v| v.to_f}
+        list << line.split(/[\s\/]/)[0..3].map(&:to_f)
+        last = line.split(/[\s\/]/)[4..7].map(&:to_f)
       end
     end
     list << last
@@ -103,39 +84,28 @@ class GrADS::Command
     ccols = []
     ic = 16
     if brgb
-      if model == "HSV"
-        set :rgb, ic, *_hsv2rgb(*brgb)
-      else
-        set :rgb, ic, *brgb
-      end
+      set :rgb, ic, *brgb.map(&:round)
       ccols << ic
     else
-      ccols << 0
+      ccols << -1
     end
     ic += 1
     list.each_with_index do |(v,r,g,b),i|
-      if model == "HSV"
-        set :rgb, i+ic, *_hsv2rgb(r, g, b)
-      else
-        set :rgb, i+ic, r, g, b
-      end
+      set :rgb, i+ic, r.round, g.round, b.round
       clevs << v
       if ! frgb and i == list.size - 1 
-        ccols << 0
+        ccols << -1
       else
         ccols << i+ic
       end
     end
     ic += list.size - 1
     if frgb
-      if model == "HSV"
-        set :rgb, ic, *_hsv2rgb(*frgb)
-      else
-        set :rgb, ic, *frgb
-      end
+      set :rgb, ic, *frgb.map(&:round)
     end
     set_clevs *clevs
     set_ccols *ccols
+    return clevs, ccols
   end
 
   def _hsv2rgb(h, s, v)

data/lib/grads.rb

@@ -9,3 +9,4 @@ require "grads/command"
 require "grads/lib/makecpt"
 require "grads/lib/colorbar"
 require "grads/lib/save_image"
+require "grads/lib/axis_xtime"

data/ruby-grads.gemspec

@@ -1,9 +1,9 @@
 
 Gem::Specification::new do |s|
-  version = "1.0.0"
+  version = "1.0.7"
 
   files = Dir.glob("**/*") - [ 
-                               Dir.glob("carray*.gem"), 
+                               Dir.glob("ruby-grads*.gem"), 
                              ].flatten
 
   s.platform    = Gem::Platform::RUBY
@@ -18,6 +18,6 @@ Gem::Specification::new do |s|
   s.homepage    = 'https://github.com/himotoyoshi/ruby-grads'
   s.files       = files
 #  s.extensions  = [ "extconf.rb" ]
-  s.has_rdoc    = false
+  s.executables << 'ncdef2ctl'
   s.required_ruby_version = ">= 1.8.1"
 end

data/ruby-grads.gemspec~

@@ -0,0 +1,23 @@
+
+Gem::Specification::new do |s|
+  version = "1.0.5"
+
+  files = Dir.glob("**/*") - [ 
+                               Dir.glob("ruby-grads*.gem"), 
+                             ].flatten
+
+  s.platform    = Gem::Platform::RUBY
+  s.name        = "ruby-grads"
+  s.summary     = "Library for driving GrADS from Ruby"
+  s.description = <<-HERE
+    Library for driving GrADS from Ruby
+  HERE
+  s.version     = version
+  s.author      = "Hiroki Motoyoshi"
+  s.email       = ""
+  s.homepage    = 'https://github.com/himotoyoshi/ruby-grads'
+  s.files       = files
+#  s.extensions  = [ "extconf.rb" ]
+  s.executables << 'ncdef2ctl'
+  s.required_ruby_version = ">= 1.8.1"
+end

metadata

@@ -1,31 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: ruby-grads
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.7
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies: []
 description: "    Library for driving GrADS from Ruby\n"
 email: ''
-executables: []
+executables:
+- ncdef2ctl
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- Rakefile
+- bin/ncdef2ctl
 - extconf.rb
 - lib/grads.rb
+- lib/grads/binary.rb
 - lib/grads/command.rb
 - lib/grads/gridded.rb
+- lib/grads/lib/axis_xtime.rb
 - lib/grads/lib/colorbar.rb
 - lib/grads/lib/makecpt.rb
 - lib/grads/lib/save_image.rb
 - lib/grads/lib/xcbar_with_ccols.rb
 - ruby-grads.gemspec
+- ruby-grads.gemspec~
 - test/gradsdraw.rb
 - test/test.rb
 homepage: https://github.com/himotoyoshi/ruby-grads
@@ -46,8 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Library for driving GrADS from Ruby