ruby-grads 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80635c24ddd173f6c639cb5d3923a93cb3004b99faea550cd8bfff5b5ece5893
-  data.tar.gz: e80ad976dab30b0006287817c36b3630a0e598edc50552074e95f448c0007595
+  metadata.gz: d3ec3f629db574dd3245ce9ed04e371ead7d8646cce6ca964dfda1d8eafaadb1
+  data.tar.gz: bf5b28282a3d11cf3fcc5cbcf1a8fbd3cbadb50fc0195c4636729da957d78b9d
 SHA512:
-  metadata.gz: 4b0740e3148f3d73b9ed1bf94ea35dc2fae48c93c888aa02abc5583f84e230f46f27f7361d4b0381d9b0fadf9a8c3d2e9d12bddfa0e3296b755df839d3ad682b
-  data.tar.gz: 9e3641cfb796507372fdc745b8d541d55f22e3b6a2c56d8298324ff8dd78b595823b30e14427b6bb074690a6aa040d36636c8ed24a551e215bd4d1adda09d7ab
+  metadata.gz: 4e4e8fae8d55ad18f403a5c0c7ee5bef1c9c94f74e4e5efe0c90317838758b9dac3616fb27731b66bd7a1857e0ae286344aa511d94054f976912e71f77049207
+  data.tar.gz: 3e2f6b6d92682e0560e3db04cb27d2e467e10f3a8e90f1388b8d082975a2f5888799d1aa0b1530c6ac20f23a211b75cacb79cd6b458debef3a8d3996534fa530

data/README.md

@@ -15,7 +15,6 @@ Execute grads command sequence
     GrADS#exec filename
     GrADS#exec_string text
 
-
 ### CArray -> GrADS variable
 
 Write block as GrADS::Gridded::Writer definition
@@ -27,5 +26,72 @@ Write block as GrADS::Gridded::Writer definition
 
     GrADS#save_image(filename, size="640", dpi=300)
 
+### parea, vpage
+
+    parea(x1, x2, y1, y2) { |area|
+    
+    }
+
+    vpage(x1, x2, y1, y2) { |area|
+    
+    }
+
+### plot
+
+    plot (expr, type) {
+      ... CONFIG ...
+    }
+    
+### axis
+
+    axis (dummy_expr) {
+      ... CONFIG ...
+    }
+
+#### axis_xtime
+
+    require "grads/lib/axis_xtime"
+    axis_xtime (dummy_expr, OPTIONS) {
+      ... CONFIG__
+    }
+
+      OPTIONS:
+        offset: TIME OFFSET in seconds
+        skip: TIME axis interval to skip labels
+
+#### time_skip    
+
+Use with axis_xtime to calculate skip for x-time in vector plot.
+
+    skp = time_skip()
+    plot("skip(u,1,#{skp});v", :vector) {
+      ...
+    }
+
+### axis label
+
+    draw_ylabel(text, area: area, color: 1, just: "bc", thickness: 3, rot 0, offset: STRING,  side: "l")
+    draw_xlabel(text, area: area, color: 1, just: "bc", thickness: 3, rot: 0, offset: STRING, side: "b")
+
+### COLOR NAMES
+
+    COLOR(COLOR_NAME)
 
+    "background" => 0,
+    "foregraound" => 1,
+    "red" => 2,
+    "green" => 3,
+    "dark blue" => 4,
+    "light blue" => 5,
+    "magenta" => 6,
+    "yellow" => 7,
+    "orange" => 8,
+    "purple" => 9,
+    "yellow green" => 10,
+    "medium blue" => 11,
+    "dark yellow" => 12,
+    "aqua" => 13,
+    "dark purple" => 14,
+    "gray" => 15,
+    
 

data/Rakefile

@@ -0,0 +1,14 @@
+
+GEMSPEC = "ruby-grads.gemspec"
+
+# gem install #{spec.full_name}.gem -- --with-gnuplotting-palette
+
+task :install do
+  spec = eval File.read(GEMSPEC)
+  system %{
+    gem build #{GEMSPEC}; gem install --no-document #{spec.full_name}.gem
+  }
+end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new

data/bin/ncdef2ctl

@@ -0,0 +1,107 @@
+#!/usr/bin/env ruby
+
+require "grads"
+require "stringio"
+
+def scan_vars (vars)
+  items = {:namelist=>[]}
+  nvars = nil
+  vars.each_line do |line|
+    case line
+    when /\A\s*\*/, /\A\s*\Z/
+      next
+    when /\A\s*vars\s+(\d+)/i
+      nvars = $1.to_i
+    when /\A\s*endvars/i
+      break
+    when /\A\s*(\w+)\s*(.*)\Z/
+      name = $1
+      items[:namelist].push(name)
+      items[name] = line
+    end
+  end
+  if items[:namelist].size != nvars
+    raise "invalid vars number"
+  end
+  return items
+end
+
+def scan_control_file (ctltxt)
+  io = StringIO.new(ctltxt)
+  items = {}
+  buffer = ""
+  while line = io.gets
+    case line
+    when /\A\s*\*/, /\A\s*\Z/
+      next
+    when /\A\s*(dtype|dset|title|undef|options|pdef|xdef|ydef|zdef|tdef|vectorpairs)\s*(.*)\Z/i
+      name = $1.downcase
+      if items[name]
+        items[name] = [items[name]]
+        items[name] << $2.rstrip
+        buffer = items[name].last
+      else
+        items[name] = $2.rstrip
+        buffer = items[name]
+      end
+    when /\A\s*(chsub|fileheader|theader|tailerbyts|xyheader)\s*(.*)\Z/i
+      raise "#{$1} entry is not supported, sorry"
+    when /\A\s*vars/
+      vars = scan_vars(line + io.read)
+      break
+    else
+      line = line.chomp.sub(/\\\z/,'').rstrip
+      buffer.replace(buffer + " " + line)
+    end
+  end
+  return items, vars
+end
+
+
+def levels2linear (axis, line)
+  list = line.split(/\s+/)
+  num     = list.shift.to_i
+  type    = list.shift
+  data    = list
+  case type
+  when "levels"
+    case axis
+    when "tdef"
+      return axis + " " + line
+    else
+      data = data.to_ca.double
+      diff = (data[1..-1]-data[0..-2]).mean
+      return format("%s %i %s %f %f", axis, num, "linear", data[0], diff)
+    end
+  when "linear"
+    return axis + " " + line
+  else
+    raise "invalid #{defname} definition"
+  end
+  
+end
+
+GrADS.start("grads -b") {
+  
+  sdfopen(ARGV[0])
+  
+  ctl = query(:ctlinfo)
+  
+  header, var = scan_control_file(ctl)
+
+  header.keys.each do |key|
+    case key
+    when "xdef", "ydef", "zdef", "tdef"
+      puts levels2linear(key, header[key])
+    else
+      puts "#{key} #{header[key]}"
+    end
+  end
+  
+  puts "vars #{var[:namelist].size}"
+  var[:namelist].each do |name|
+    puts var[name]
+  end
+  puts "endvars"
+
+}

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/lib/grads/command.rb

@@ -183,7 +183,11 @@ class GrADS::Command
   attr_reader :log
 
   def method_missing (id, *argv)
-    return id, *argv
+    if argv.empty?
+      return id
+    else
+      super
+    end
   end
 
   def quit
@@ -409,7 +413,6 @@ class GrADS::Command
     "reinit",
     "reset",
     "run",
-    "sdfwrite",
     "swap",
     "undefine",
   ].each do |name|
@@ -420,9 +423,21 @@ class GrADS::Command
      }  
   end
 
+  [
+    "sdfwrite",
+  ].each do |name|
+     class_eval %{
+       def #{name} (*argv)
+         if argv.empty?
+           return :#{name}
+         else
+           put "#{name} " + argv.join(" ")
+         end
+       end
+     }  
+  end
+
   def clear (*argv)
-    @ccols = nil
-    @clevs = nil
     put "clear " + argv.join(" ")
   end
 
@@ -525,13 +540,20 @@ class GrADS::Command
   end
 
   def set_clevs (*argv)
-    @clevs = argv
     set :clevs, *argv
   end
 
   def set_ccols (*argv)
-    @ccols = argv
-    set :ccols, *argv
+    list = []
+    argv.each do |arg|
+      case arg
+      when RGB
+        list << set_rgb(arg)
+      else
+        list << arg
+      end
+    end
+    set :ccols, *list
   end
   
   def import (*args)
@@ -653,7 +675,7 @@ class GrADS::Command
   end
 
   begin
-    require "netcdflib"
+    require "simple-netcdf"
     def get_var (expr)
       @var_id ||= 0
       @var_id += 1
@@ -737,6 +759,395 @@ class GrADS::Command
     end
   end
 
+  class Area
+
+    def initialize (x1, x2, y1, y2)
+      @x1 = x1
+      @x2 = x2
+      @y1 = y1
+      @y2 = y2
+    end
+    
+    attr_reader :x1, :x2, :y1, :y2
+    
+    def w
+      return @x2 - @x1
+    end
+    
+    def h
+      return @y2 - @y1
+    end
+    
+    def center
+      return @x1 + w/2
+    end
+    
+    def mid
+      return @y1 + h/2
+    end
+
+  end
+
+  def len (str)
+    ans = query("string #{str}")
+    return subwrd(ans, 4).to_f
+  end
+
+  def parea (x1, x2, y1, y2)
+    set :parea, x1, x2, y1, y2
+    set :clip, x1, x2, y1, y2
+    yield Area.new(x1, x2, y1, y2)
+  end
+
+  def vpage (x1, x2, y1, y2)
+    set :vpage, x1, x2, y1, y2
+    yield Area.new(x1, x2, y1, y2)
+  end
+  
+  def display_nothing (dummy)
+    ans = query("dims")
+    case ans.scan("varying").size
+    when 2
+      set :gxout, :contour
+      set :clevs, -9.99e99
+      set :ccolor, -1
+      set :clab, :off
+      set :cmark, 0
+    when 1
+      set :gxout, :line
+      set :line, -1
+      set :ylab, :off
+      set :vrange, -9.99e99, -9.99e98
+    end
+    if block_given?
+      yield
+    end
+    case dummy
+    when String
+      put "display #{dummy}"
+    else
+      display dummy
+    end
+  end
+
+  def axis_off
+    set :frame, :off
+    set :xlab, :off
+    set :ylab, :off
+    set :grid, :off
+    set :grads, :off
+    set :mpdraw, :off
+  end
+
+  def axis_on
+    set :frame, :on
+    set :xlab, :on
+    set :ylab, :on
+    set :grid, :on
+    set :grads, :on
+    set :mpdraw, :on
+  end
+  
+  def plot (var, *args)
+    begin
+      axis_off
+      if block_given?
+        yield
+      end
+      set :gxout, *args
+      case var
+      when String
+        put "display #{var}"
+      else
+        display var
+      end
+    ensure
+        axis_on
+    end
+  end
+  
+  def axis (dummy, &block)
+    begin
+      axis_on
+      display_nothing(dummy, &block)
+    ensure
+      axis_off
+    end
+  end
+
+  def draw_ylabel (text, area:, color: 1, just: "bc", thickness: 3, rot: 90, offset: "M", side: "l")
+    set :string, color, just, thickness, rot
+    case side
+    when "l"
+      draw :string, area.x1-len(offset), area.mid, text
+    when "r"
+      draw :string, area.x2+len(offset), area.mid, text
+    else
+      raise "invalid side sepecification"
+    end
+  end
+
+  def draw_xlabel (text, area:, color: 1, just: "bc", thickness: 3, rot: 0, offset: "M", side: "b")
+    set :string, color, just, thickness, rot
+    case side
+    when "b"
+      draw :string, area.center, area.y1-len(offset), text
+    when "t"
+      draw :string, area.center, area.y2+len(offset), text
+    else
+      raise "invalid side sepecification"
+    end
+  end
+  
+  COLOR_TABLE = {
+    "background" => 0,
+    "foregraound" => 1,
+    "red" => 2,
+    "green" => 3,
+    "dark blue" => 4,
+    "light blue" => 5,
+    "magenta" => 6,
+    "yellow" => 7,
+    "orange" => 8,
+    "purple" => 9,
+    "yellow green" => 10,
+    "medium blue" => 11,
+    "dark yellow" => 12,
+    "aqua" => 13,
+    "dark purple" => 14,
+    "gray" => 15,
+  }
+  
+  def COLOR (name)
+    if COLOR_TABLE.has_key?(name)
+      COLOR_TABLE[name]
+    else
+      -1
+    end
+  end
+
+  class LINE
+
+    def initialize (type = 1, color: 1, thickness: 3)
+      case type
+      when "","solid"
+        @type    = 1
+      when "--", "long dash"
+        @type    = 2
+      when "-", "short dash"
+        @type    = 3
+      when "-- -", "long dash short dash"
+        @type    = 4
+      when ".", "dotted"
+        @type    = 5
+      when ". -", "dot dash"
+        @type    = 6
+      when ". . -", "dot dot dash"
+        @type    = 7
+      else
+        @type    = type
+      end
+      @color = color
+      @thickness    = thickness
+    end
+    
+    attr_reader :type, :color
+    
+    def to_a
+      return [@color, @type, @thickness]
+    end
+   
+  end
+  
+  class TILE
+
+    def self.reset
+      @@number = 0
+    end
+    
+    def self.next_number
+      @@number += 1
+      if @@number > 2047
+        reset
+      end
+      return @@number
+    end
+
+    reset
+    
+    def initialize (type, width: 6, height: nil, thickness: 3, color: 1, bgcolor: -1)
+      case type
+      when "."
+        @type    = 2
+      when "\\"
+        @type    = 3
+      when "/"
+        @type    = 4
+      when "x"
+        @type    = 5
+      when "|"
+        @type    = 6
+      when "-"
+        @type    = 7
+      when "#", "+"
+        @type    = 8
+      else
+        @type    = type
+      end
+      @width   = width
+      @height  = height || width
+      @thickness    = thickness
+      @color   = color
+      @bgcolor = bgcolor
+    end
+    
+    attr_reader :type, :color
+    
+    def to_a
+      return [@type, @width, @height, @thickness, @color, @bgcolor]
+    end
+   
+  end
+  
+  class RGB
+    
+    @@number = nil
+    @@table = {}
+    
+    def self.reset
+      @@number = 100
+    end
+    
+    def self.next_number
+      @@number += 1
+      if @@number > 2047
+        reset
+      end
+      return @@number
+    end
+    
+    reset
+    
+    def initialize (r, g, b, a=255)
+      @r = r
+      @g = g
+      @b = b
+      @a = a
+    end
+    
+    attr_reader :r, :g, :b, :a
+    
+    def to_s
+      return format("%i %i %i %i", @r, @g, @b, @a)
+    end
+
+    def to_a
+      return [@r, @g, @b, @a]
+    end
+    
+    def % (alpha)
+      if alpha >= 0 and alpha <= 1
+        a = (@a*alpha).to_i
+      else
+        raise "invalid alpha value"
+      end
+      return RGB.new(@r, @g, @b, a)
+    end
+
+    def * (scale)
+      if scale >= 0 and scale <= 1
+        return RGB.new((@r*scale).to_i, (@g*scale).to_i, (@b*scale).to_i, @a)
+      else
+        raise "invalid scale value"
+      end
+    end
+
+    def / (scale)
+      if scale >= 1
+        return RGB.new((@r/scale).to_i, (@g/scale).to_i, (@b/scale).to_i, @a)
+      else
+        raise "invalid scale value"
+      end
+    end
+    
+    def + (other)
+      r = [self.r, other.r].max
+      g = [self.g, other.g].max
+      b = [self.b, other.b].max
+      a = [self.a, other.a].max
+      return RGB.new(r,g,b,a)
+    end
+    
+  end
+
+  def LINE (*argv)
+    return LINE.new(*argv)
+  end
+
+  def TILE (*argv)
+    return TILE.new(*argv)
+  end
+
+  def RGB (*argv)
+    case argv.size
+    when 1
+      return GrADS::Command::RGB_TABLE[argv[0]]
+    else
+      return GrADS::Command::RGB.new(*argv)
+    end
+  end
+
+  def self.RGB (*argv)
+    case argv.size
+    when 1
+      return GrADS::Command::RGB_TABLE[argv[0]]
+    else
+      return GrADS::Command::RGB.new(*argv)
+    end
+  end
+
+  RGB_TABLE = {
+    "red"   => RGB(255,0,0),
+    "green" => RGB(0,255,0),
+    "blue"  => RGB(0,0,255),
+  }
+  RGB_TABLE.update({
+    "cyan"  => RGB("green") + RGB("blue"),
+  })
+
+  def set_line (obj)
+    args = obj.to_a
+    if obj.color.is_a?(RGB)
+      args[0] = set_rgb(obj.color)
+    end    
+    set :line, *args
+    set :ccolor, args[0]
+    set :cstyle, args[1]
+    set :cthick, args[2]
+  end
+
+  def set_rgb (*argv)
+    list = []
+    argv.each do |obj|
+      num = RGB.next_number
+      case obj
+      when TILE
+        nt = TILE.next_number
+        args = obj.to_a
+        if obj.color.is_a?(RGB)
+          c = set_rgb(obj.color)
+          args[4] = c
+        end
+        set :tile, nt, *args.to_a
+        set :rgb, num, :tile, nt
+      when RGB
+        set :rgb, num, *obj.to_a        
+      end
+      list << num
+    end
+    return list
+  end
+  
 end
 
 def GrADS.start (*argv, &block)
@@ -755,4 +1166,3 @@ def GrADS.script (name, definition)
 end
 
 
-

data/lib/grads/gridded.rb

@@ -34,6 +34,16 @@
 require "carray"
 require "strscan"
 
+begin
+  require "simple-proj"
+  require "simple-proj-carray"
+rescue LoadError
+  begin
+    require "proj4r"
+  rescue LoadError
+  end
+end
+
 module GrADS
 end
 
@@ -320,7 +330,13 @@ class GrADS::Gridded
   end
 
   def parse_pdef_lcc (args)
-    require "proj4r"
+    if defined? PROJ4 and defined? PROJ4::Proj
+      projlib = "proj4r"
+    elsif defined? PROJ 
+      projlib = "simple-proj"
+    else
+      raise "can't find proj related library"
+    end
     rlat  = args[1].to_f
     rlon  = args[2].to_f
     xi    = args[3].to_f
@@ -331,29 +347,57 @@ class GrADS::Gridded
     dx    = args[8].to_f
     dy    = args[9].to_f
     slat0 = slat1 > 0 ? 90 : -90
-    if @radius
-      proj = PROJ4::Proj.new %{
-        +ellps=sphere +a=#{@radius} +b=#{@radius} +proj=lcc \
-        +lat_1=#{slat1} +lat_2=#{slat2} +lon_0=#{slon}
-      }
-    else
-      proj = PROJ4::Proj.new %{
-        +ellps=sphere +proj=lcc \
-        +lat_1=#{slat1} +lat_2=#{slat2} +lon_0=#{slon}
-      }
+    case projlib
+    when "proj4r"
+      if @radius
+        proj = PROJ4::Proj.new %{
+          +ellps=sphere +a=#{@radius} +b=#{@radius} +proj=lcc \
+          +lat_1=#{slat1} +lat_2=#{slat2} +lon_0=#{slon}
+        }
+      else
+        proj = PROJ4::Proj.new %{
+          +ellps=sphere +proj=lcc \
+          +lat_1=#{slat1} +lat_2=#{slat2} +lon_0=#{slon}
+        }
+      end
+    when "simple-proj"
+      if @radius
+        proj = PROJ.new %{
+          +ellps=sphere +a=#{@radius} +b=#{@radius} +proj=lcc \
+          +lat_1=#{slat1} +lat_2=#{slat2} +lon_0=#{slon}
+        }
+      else
+        proj = PROJ.new %{
+          +ellps=sphere +proj=lcc \
+          +lat_1=#{slat1} +lat_2=#{slat2} +lon_0=#{slon}
+        }
+      end
     end
     rx, ry = proj.forward(rlon, rlat)
     rx0 = rx - (xi-1)*dx
     ry0 = ry - (yi-1)*dy
-    @forward = lambda { |lon, lat|
-      mx, my = proj.forward(lon, lat)
-      [(mx - rx0)/dx, (my - ry0)/dy]
-    }
-    @inverse = lambda { |fi, fj|
-      mx = fi*dx + rx0
-      my = fj*dy + ry0
-      proj.inverse(mx, my)
-    }
+    case projlib
+    when "proj4r"
+      @forward = lambda { |lon, lat|
+        mx, my = proj.forward(lon, lat)
+        [(mx - rx0)/dx, (my - ry0)/dy]
+      }
+      @inverse = lambda { |fi, fj|
+        mx = fi*dx + rx0
+        my = fj*dy + ry0
+        proj.inverse(mx, my)
+      }      
+    when "simple-proj"
+      @forward = lambda { |lon, lat|
+        mx, my = proj.forward_carray(lon, lat)
+        [(mx - rx0)/dx, (my - ry0)/dy]
+      }
+      @inverse = lambda { |fi, fj|
+        mx = fi*dx + rx0
+        my = fj*dy + ry0
+        proj.inverse_carray(mx, my)
+      }
+    end
     @xy = lambda {
       x = CArray.float(xsize).seq(rx0, dx)
       y = CArray.float(ysize).seq(ry0, dy)

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,49 +32,32 @@ 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
-    end
+    io = IO::popen("makecpt -Fr #{args.join(' ')}", "r")
     bgrb = nil
     frgb = nil
     list = []
@@ -89,12 +66,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 +80,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/ruby-grads.gemspec

@@ -1,6 +1,6 @@
 
 Gem::Specification::new do |s|
-  version = "1.0.3"
+  version = "1.0.6"
 
   files = Dir.glob("**/*") - [ 
                                Dir.glob("ruby-grads*.gem"), 
@@ -18,5 +18,6 @@ Gem::Specification::new do |s|
   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

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,32 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: ruby-grads
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2021-02-03 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
@@ -47,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