extcsv 0.12.0 → 0.12.1

data/gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "extcsv"
-  s.version           = "0.12.0"
+  s.version           = "0.12.1"
   s.date              = Time.new.strftime("%Y-%m-%d")
   s.author            = "Ralf Mueller"
   s.email             = "stark.dreamdetective@gmail.com"

data/lib/extcsv_diagram.rb

@@ -1,8 +1,6 @@
 require 'rubygems'
 require 'gnuplot'
 require 'win32ole' if RUBY_PLATFORM =~ /(win32|cygwin)/i
-require 'extcsv_units'
-
 ################################################################################
 # Author: Ralf Müller
 #
@@ -159,7 +157,7 @@ module ExtCsvDiagram
   def ExtCsvDiagram.setOutput(plot,options)
     size = (options[:size].nil?) ? '' : " size #{options[:size]}"
     plot.terminal options[:terminal] + size
-    plot.output outputfilename + "." + options[:terminal].split(" ")[0]
+    plot.output options[:filename] + "." + options[:terminal].split(" ")[0]
   end
 
   def ExtCsvDiagram.addDataToPlot(plot,obj,xColumn,yColumn,groupBy,options)

data/test/test_extcsv_diagram.rb

@@ -16,6 +16,16 @@ class TestExtCsvDisplay < Test::Unit::TestCase
   DATALOGGER_DATA = TEST_DIR + ""
   IMPORT_TYPE     = "file"
   ICON = "/home/ram/src/git/icon/experiments/xom.r8563.tsrel_R2B02_linDesity/xomFldminT.dat"
+  ICON = "/home/ram/src/git/icon/experiments/xom.r8563.tsrel_R2B02_200mThickness/xomFldmin.dat"
+  ICON = "/home/ram/src/git/icon/experiments/xom.r8563.tsrel_R2B02_500mThickness/xomFldmin.dat"
+  ICON = "/home/ram/src/git/icon/experiments/xom.r8563.tsrel_R2B02/xomFldmaxVert_Mixing_V.dat"
+  ICON = "/home/ram/src/git/icon/experiments/xom.r8563.tsrel_R2B02_200mThickness/xomFldmaxVert_Mixing_V.dat"
+  ICON = "/home/ram/src/git/icon/experiments/xom.r8563.tsrel_R2B02_500mThickness/xomFldmaxVert_Mixing_V.dat"
+  ICON = "/home/ram/src/git/icon/experiments/xom.r8563.tsrel_R2B02_dev/xomFldmaxVert_Mixing_V.dat"
+  ICON = "/home/ram/src/git/icon/experiments/xom.r8563.tsrel_R2B02_dev/xomFldmaxT.dat"
+  VAR = "Vert_Mixing_Vel"
+  VAR = "Vert_Mixing_V"
+  VAR = "T"
 
   def test_simple
     f=ExtCsv.new("file","txt",TEST_DATA)
@@ -24,21 +34,22 @@ class TestExtCsvDisplay < Test::Unit::TestCase
   def test_icon
     icon = ExtCsv.new(IMPORT_TYPE,"psv",ICON)
 
-
-
-
-
     icon.datetime = []
     icon.date.each_with_index{|date,i| icon.datetime << [date,icon.time[i]].join(' ') }
 
-    [:date,:time,:depth,:temp].each {|col| pp [col.to_s,icon.send(col).max].join('[max]: ') }
-    ExtCsvDiagram.plot_xy(icon,"datetime","temp",'ICON OCE_BASE (lin. Desity): Min. Tempratures at different depths',
-                       :label_position => 'outside',:skipColumnCheck => true,
+    [:date,:time,:depth,VAR.downcase.to_sym].each {|col| puts [col.to_s,icon.send(col).max].join('[max]: ') }
+    ExtCsvDiagram.plot_xy(icon,"datetime",VAR.downcase,'ICON OCE_BASE: Mean. Temperatur (uneven levels, r8656, full run: 2001-2012)',
+                       :label_position => 'below',:skipColumnCheck => true,
                          :type => 'lines',:groupBy => ["depth"],
-                         :yrange => '[-2.5:0.5]',:onlyGroupTitle => true,
-#                         :terminal => "png",
+#                         :yrange => '[0.0001:10]',
+#                         :xrange => "",
+                         :onlyGroupTitle => true,
+#                         :addSettings => ["logscale y"],
+                         :terminal => "png",
+                         :ylabel => "#{VAR} [degC]",
                          :input_time_format => "'%Y%m%d %H:%M:%S'",
-                         :filename => "icon",:output_time_format => "'%Y'",:size => "800,600")
+                         :filename => "icon-OCE_BASE_uneven-r8656-fullrun-Mean#{VAR}",
+                         :output_time_format => "'%m.%y'",:size => "800,600")
 
   end
   def test_plotxy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extcsv
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: stark.dreamdetective@gmail.com