extcsv 0.11.3 → 0.12.0

data/gemspec

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

data/lib/extcsv.rb

@@ -1,5 +1,6 @@
 require 'csv'
 require 'ostruct'
+require 'extcsv_diagram'
 
 class Nil
   def to_s; ''; end
@@ -29,7 +30,7 @@ end
 # ==== License: BSD - see {license file}[http:/extcsv.rubyforge.org/svn/extcsv/trunk/LICENSE]
 ################################################################################
 class ExtCsv < OpenStruct
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 
   include Comparable
   include Enumerable
@@ -684,7 +685,11 @@ class ExtCsv < OpenStruct
   def ExtCsv.combine(obj, obj_=nil)
     obj.combine(obj_)
   end
-  private :deep_copy, :deep_split, :set_separators, :parse_content, :change_time_format
+
+  def plot(*args)
+    ExtCsvDiagram.plot(self,*args)
+  end
+  private :deep_copy, :set_separators, :parse_content, :change_time_format
 end
 
 class ExtCsvExporter

data/lib/extcsv_diagram.rb

@@ -3,6 +3,35 @@ require 'gnuplot'
 require 'win32ole' if RUBY_PLATFORM =~ /(win32|cygwin)/i
 require 'extcsv_units'
 
+################################################################################
+# Author: Ralf Müller
+#
+# ==== TODO: Units are automatically selected from the column name. You could add
+# units here and they will be used for graphs. I think, this is a premature
+# solution, because the file will be edited by nearly every user, so it
+# actually is a configutration file. But without units, the graphs loose much
+# of their information. There are separate packages for units like
+# units.rubyforge.org. But there will allways be the problem, that column names
+# cannot be restricted to find a appropriate unit.
+################################################################################
+module ExtCsvUnits
+  Units = 
+    {
+      :col1  => "kV",
+      :col2  => "kV",
+      :col3  => "kV",
+      :col4  => "kV",
+      :col5  => "kV",
+      :col6  => "kV",
+      :col7  => "kV",
+      :col8  => "kV",
+      :zeit  => "yyyy-mm-dd hh:mm:ss",
+      :time  => "yyyy-mm-dd hh:mm:ss",
+      :depth => "m",
+      :Temp  => "degC"
+    }
+end
+################################################################################
 # This module provides separate plotting methods 
 module ExtCsvDiagram
   include ExtCsvUnits
@@ -13,6 +42,7 @@ module ExtCsvDiagram
                     :size           => nil,
                     :filename       => nil,
                     :title          => nil,
+                    :addSettings    => [],
                     :label_position => "left",
                     :label?         => true,
                     :grid           => true,
@@ -27,9 +57,10 @@ module ExtCsvDiagram
                     :logscale       => nil,
                     :add_settings   => [], 
                     :point_label?   => false,
-                    :time_format    => '"%d.%m\n%H:%M:%S"'
+                    :output_time_format => '"%Y-%m-%d\n%H:%M:%S"',
+                    :input_time_format  => '"%Y-%m-%d\n%H:%M:%S"'
   }
-  @@timeColumns = %w[time time_camera zeit]
+  @@timeColumns = %w[time time_camera zeit date datetime timestamp]
 
   def ExtCsvDiagram.set_pointlabel(obj, plot, x_col, x, y, label_col=nil, size='10')
     timemode = (%w[zeit zeitstempel time timestamp].include?(x_col.to_s))
@@ -68,14 +99,111 @@ module ExtCsvDiagram
   def ExtCsvDiagram.enhanceTitleByGroup(group_by,ob)
     title = ''
     group_by.each {|col|
-      colunit = Units[col.to_sym].nil? ? col.to_s : "[#{Units[col.to_sym]}]"
-      name = [ob.send(col)[0],colunit]
-      title += (col.to_sym == :focus) ? name.reverse.join('') : name[0]
-      title += " " unless col == group_by.last
+      unit    = Units[col.to_sym]
+      colunit = unit.nil? ? col.to_s : unit
+      name    = [ob.send(col)[0],colunit]
+      title  += (col.to_sym != :focus) ? name.join('') : name[0]
+      title  += " " unless col == group_by.last
     }
     title
   end
 
+  def ExtCsvDiagram.checkColumns(obj,*cols)
+    cols.each {|col|
+      next if col.kind_of?(Hash)
+      unless obj.datacolumns.include?(col)
+        print "[plot] Input data does NOT contain column '#{col.to_s}'\n"
+        raise ArgumentError
+      end
+    }
+  end
+
+  def ExtCsvDiagram.setRangeAndLabel(plot,options)
+    plot.xrange  options[:xrange]  unless options[:xrange].nil?
+    plot.yrange  options[:yrange]  unless options[:yrange].nil?
+    plot.xlabel  options[:xlabel]  unless options[:xlabel].nil?
+    plot.ylabel  options[:ylabel]  unless options[:ylabel].nil?
+    plot.x2range options[:x2range] unless options[:x2range].nil?
+    plot.y2range options[:y2range] unless options[:y2range].nil?
+    plot.x2label options[:x2label] unless options[:x2label].nil?
+    plot.y2label options[:y2label] unless options[:y2label].nil?
+  end
+  def ExtCsvDiagram.setXTimeAxis(plot,input_time_format,output_time_format,*xColumns)
+    xColumns.each_with_index {|xcol,i|
+      next if xcol.nil? or xcol.kind_of?(Hash)
+      if @@timeColumns.include?(xcol.to_s)
+        plot.timefmt input_time_format
+        if 0 == i
+          plot.xdata 'time'
+          plot.format 'x ' + output_time_format
+        else
+          plot.x2data 'time'
+          plot.format 'x2 ' + output_time_format
+        end
+      end
+    }
+  end
+
+  def ExtCsvDiagram.addSettings(plot,settings)
+    settings.each {|setting|
+      md = /^(\w+)/.match(setting)
+      plot.set(md[1],md.post_match) unless md.nil?
+    }
+  end
+
+  def ExtCsvDiagram.setKeys(plot,options)
+    plot.key options[:label_position]
+    plot.key 'off' unless options[:label?]
+  end
+
+  def ExtCsvDiagram.setOutput(plot,options)
+    size = (options[:size].nil?) ? '' : " size #{options[:size]}"
+    plot.terminal options[:terminal] + size
+    plot.output outputfilename + "." + options[:terminal].split(" ")[0]
+  end
+
+  def ExtCsvDiagram.addDataToPlot(plot,obj,xColumn,yColumn,groupBy,options)
+    x = obj.send(xColumn)
+    y = obj.send(yColumn)
+    title = enhanceTitleByGroup(groupBy,obj)
+    plot.data << Gnuplot::DataSet.new([x,y]) {|ds|
+      unit = Units[yColumn.to_sym].nil? ? '' : "[#{Units[yColumn.to_sym]}]"
+      ds.using = @@timeColumns.include?(xColumn.to_s) ? '1:3' : '1:2'
+      ds.with  = options[:type]
+      ds.title =  options[:onlyGroupTitle] ? "#{title}" : "#{yColumn} #{unit}, #{title}"
+    }
+    return [x,y]
+  end
+  def ExtCsvDiagram.plot_xy(obj,xColumn,yColumn,title,options={})
+    checkColumns(obj,xColumn,yColumn) unless options[:skipColumnCheck]
+    options        = GRAPH_OPTIONS.merge(options)
+    outputfilename = (options[:filename].nil?) ? obj.filename : options[:filename]
+    groupBy        = (options[:groupBy]).nil? ? [] : options[:groupBy]
+    Gnuplot.open {|gp|
+      Gnuplot::Plot.new(gp) {|plot|
+        plot.title "'" + title + "'"
+        setKeys(plot,options)
+
+        setOutput(plot,options) unless 'x11' == options[:terminal]
+
+        plot.grid if options[:grid]
+
+        addSettings(plot,options[:addSettings]) unless options[:addSettings].empty?
+
+        setRangeAndLabel(plot,options)
+
+        setXTimeAxis(plot,options[:input_time_format],options[:output_time_format],xColumn)
+
+        # Data for first x-axes
+        obj.split(*groupBy) {|obj|
+          x,y = ExtCsvDiagram.addDataToPlot(plot,obj,xColumn,yColumn,groupBy,options)
+
+          # set labels if requested
+          set_pointlabel(ob,plot, xColumn, x,y, options[:label_column],options[:label_fsize]) if options[:point_label?]
+        }
+      }
+    }
+  end
   def ExtCsvDiagram.plot(obj,
            group_by, # array[col0, ..., colN]
            x1_col,
@@ -84,9 +212,12 @@ module ExtCsvDiagram
            y2_cols=[],
            title='',
            options={})
-  
-    options = GRAPH_OPTIONS.merge(options)
+
+    ExtCsvDiagram.checkColumns(obj,*([group_by,x1_col,y1_cols,x2_col,y2_cols].flatten.uniq.compact))
+
+    options        = GRAPH_OPTIONS.merge(options)
     outputfilename = (options[:filename].nil?) ? obj.filename : options[:filename]
+
     Gnuplot.open {|gp|
       Gnuplot::Plot.new(gp) {|plot|
         plot.title "'" + title + "'"
@@ -100,52 +231,23 @@ module ExtCsvDiagram
 
         plot.grid if options[:grid]
 
-        options[:add_settings].each {|setting|
-          md = /^(\w+)/.match(setting)
-          plot.set(md[1],md.post_match) unless md.nil?
-        }
+        addSettings(plot,options[:addSettings]) unless options[:addSettings].empty?
 
         # handling of axes
-        plot.y2tics 'in'     unless ( y2_cols.nil? or y2_cols.empty? )
-        plot.x2tics 'in'     unless ( (x2_col.respond_to?(:empty?) and x2_col.empty?) or x2_col == nil)
-
-        plot.xrange  options[:xrange] unless options[:xrange].nil?
-        plot.yrange  options[:yrange] unless options[:yrange].nil?
-        plot.x2range options[:x2range] unless options[:x2range].nil?
-        plot.y2range options[:y2range] unless options[:y2range].nil?
-        plot.xlabel  options[:xlabel]  unless options[:xlabel].nil?
-        plot.ylabel  options[:ylabel]  unless options[:ylabel].nil?
-        plot.x2label options[:x2label] unless options[:x2label].nil?
-        plot.y2label options[:y2label] unless options[:y2label].nil?
+        plot.y2tics 'in' unless ( y2_cols.nil? or y2_cols.empty? )
+        plot.x2tics 'in' unless ( x2_col.nil? or x2_col.kind_of?(Hash) )
 
+        setRangeAndLabel(plot,options)
 
-        if @@timeColumns.include?(x1_col.to_s)
-          plot.xdata 'time'
-          plot.timefmt '"%Y-%m-%d %H:%M:%S"'
-          plot.format 'x ' + options[:time_format]
-        end
-        if @@timeColumns.include?(x2_col.to_s)
-          plot.x2data 'time'
-          plot.timefmt '"%Y-%m-%d %H:%M:%S"'
-          plot.format 'x2 ' + options[:time_format]
-        end
+        setXTimeAxis(plot,options[:input_time_format],options[:output_time_format],x1_col,x2_col)
 
         # Data for first x-axes
         obj.split(*group_by) {|ob|
           y1_cols.each {|y_col|
-            x = ob.send(x1_col)
-            y = ob.send(y_col)
-            title = enhanceTitleByGroup(group_by,ob)
-            plot.data << Gnuplot::DataSet.new([x,y]) {|ds|
-              unit = Units[y_col.to_sym].nil? ? '' : "[#{Units[y_col.to_sym]}]"
-              ds.using = @@timeColumns.include?(x1_col.to_s) ? '1:3' : '1:2'
-              ds.with  = options[:type] + " axes x1y1 lw #{options[:linewidth]}"
-              ds.title =  options[:onlyGroupTitle] ? "#{title}" : "#{y_col} #{unit}, #{title}"
-            }
+            x,y = ExtCsvDiagram.addDataToPlot(plot,ob,x1_col,y_col,group_by,options)
 
             # set labels if requested
             set_pointlabel(ob,plot, x1_col, x,y, options[:label_column],options[:label_fsize]) if options[:point_label?]
-
           }
           y2_cols.each {|y_col|
             x = ob.send(x1_col)

data/test/test_extcsv.rb

@@ -12,17 +12,16 @@ class ExtCsv
   def setmode(mode)
     @mode = mode
   end
-  public :deep_split
 end
 
 class TestExtCsv < Test::Unit::TestCase
-  TEST_DIR        = "test/"
-  TEST_DIR        = ""
-  TEST_DATA_DIR   = TEST_DIR + "data/"
-  TEST_DATA       = TEST_DIR + "data/file00.txt"
-  TEST_DATA_NEW   = TEST_DIR + "data/file01.txt"
-  TEST_FD_DATA    = TEST_DATA_NEW
-  ERG_CSV_DATA    = TEST_DIR + "data/file04.csv"
+  TEST_DIR         = "test/"
+  TEST_DATA_DIR    = TEST_DIR + "data/"
+  TEST_DATA        = TEST_DIR + "data/file00.txt"
+  TEST_DATA_NEW    = TEST_DIR + "data/file01.txt"
+  TEST_DATA_GERMAN = TEST_DIR + "data/german.txt"
+  TEST_FD_DATA     = TEST_DATA_NEW
+  ERG_CSV_DATA     = TEST_DIR + "data/file04.csv"
   ERG_CSV_DATA_    = TEST_DIR + "data/file05.csv"
   ERG_CSV_DATA.freeze
   TEST_OUTOUT_DIR = TEST_DIR + "output"
@@ -31,6 +30,10 @@ class TestExtCsv < Test::Unit::TestCase
     test_simple = ExtCsv.new(IMPORT_TYPE,"txt",TEST_DATA)
     assert_equal("txt",test_simple.datatype)
   end
+  def test_respond
+    test_simple = ExtCsv.new(IMPORT_TYPE,"txt",TEST_DATA)
+    %w|step try col1 col2 col4|.each {|col|  assert_respond_to(test_simple,col.to_sym)}
+  end
   def test_create_csv
     test_simple = ExtCsv.new(IMPORT_TYPE,"ssv",ERG_CSV_DATA)
   end
@@ -302,8 +305,6 @@ class TestExtCsv < Test::Unit::TestCase
     assert_equal(ExtCsv.concat(obj0, obj1),ExtCsv.concat(*[obj0, obj1]))
     newobj01 = ExtCsv.concat(obj0, obj1)
     assert_equal(228,newobj01.size)
-    obj0.delete_field(:step)
-    obj2.delete_field(:step)
     #pp obj0.rsize
     #pp obj2.rsize
     newobj02 = ExtCsv.concat(obj0, obj2)
@@ -494,7 +495,7 @@ class TestExtCsv < Test::Unit::TestCase
     assert_nil(csv + simple0)
   end
   def test_version
-    assert_equal('0.11.0',ExtCsv::VERSION)
+    assert_equal('0.12.0',ExtCsv::VERSION)
   end
 
   def test_add
@@ -509,7 +510,7 @@ class TestExtCsv < Test::Unit::TestCase
   end
 
   def test_umlaut
-    simple = ExtCsv.new(IMPORT_TYPE, "txt", "./data/german.txt")
+    simple = ExtCsv.new(IMPORT_TYPE, "txt", TEST_DATA_GERMAN)
     #pp simple
   end
   def test_columns

data/test/test_extcsv_diagram.rb

@@ -8,142 +8,113 @@ require 'pp'
 # Author:: Ralf M�ller
 ################################################################################
 class TestExtCsvDisplay < Test::Unit::TestCase
-#  include ExtCsvDiagram
+  include ExtCsvDiagram
 
   TEST_DIR        = "test"
   TEST_DATA       = TEST_DIR + "/data/file00.txt"
   TEST_DATA_NEW   = TEST_DIR + "/data/file01.txt"
   DATALOGGER_DATA = TEST_DIR + ""
   IMPORT_TYPE     = "file"
+  ICON = "/home/ram/src/git/icon/experiments/xom.r8563.tsrel_R2B02_linDesity/xomFldminT.dat"
 
-   def test_gnuplot
-     test_file = TEST_DIR + ""
-     drift_test_file = TEST_DIR + ""
-     qpol = ExtCsv.new(IMPORT_TYPE,"txt",test_file)
-     qpol_drift = ExtCsv.new(IMPORT_TYPE,"txt",drift_test_file)
-     qpol.select_by(:col1 => "(5|4)").gnuplot("col1",
-                                           ["col2"],
-                                           :graph_title => "SIZEMODE",
-                                           :point_label? => true,
-                                           :label_positions => 'outside',
-                                           :dataset_title => 'notitle',
-                                           :mode => "size",
-                                           :xrange => "[1.0:1.4]",
-                                           :yrange => "[1.0:1.4]"
-                                          )
-     qpol.select_by(:col1 => 5).gnuplot("zeit",["col2"],:mode => "drift")
-     qpol.select_by(:col1 => "5").gnuplot("col3",
-                                           ["col7","col8"])
-     qpol.select_by(:col2 => "5",:col3 => "(140|80)").gnuplot(
-          "col4",
-          ["col7","col8"],
-          {
-            :point_label? => true,
-            :xrange => "[0:1200]",
-            :label_position => "right",
-            :datasets => {:using => [nil,'1:($2*10)']},
-            :graph_title => "USING-TEST",
-            :mode => "qp"
-          }
-        )
-     qpol_drift.select_by(:col2 => "5").gnuplot(
-       "zeit",
-       ["col2","col3"],
-       {
-         :yrange => "[0.7:1.4]",
-         :graph_title => "Plotted from one File",
-         :mode => "drift",
-         :time_format => "'%H:%M'"
-       }
-     )
-     qpol_drift.select_by(:focus => "5").gnuplot(["zeit","zeit"],
-                                           ["iqa","iqc"],
-                                           {
-                                             #:yrange => "[0.7:1.4]",
-                                             :graph_title => "Multi-Graph",
-                                             :mode => "multi",
-                                             :label_column => "col5",
-                                             :point_label? => true,
-                                             :time_format => "'%H:%M'"
-                                           })
-    qpol_drift.select_by(:col2 => "5",:col4 => "120").operate_on(:col1,"*rand(10.0)").operate_on(:x2,"*10.2*rand(1.0)").operate_on(:z1,"/rand(8.0)").operate_on(:z2,"*rand(10.0)").gnuplot(["col1","col2"],["col1","col2"],
-                                                :graph_type => 'vectors',
-                                                :mode => "multi",
-                                                :arrowstyle => " arrow 1 head filled size screen 0.2, 30, 45 ",
-                                                :linewidth => "1",
-                                                #:linetype => "rgb '#ffee33'",
-                                                :dataset_title => ["t3","t1"],
-                                                :drawBox => "0,0,5,5,gray,1",
-                                                :drawCurve => "1,1,6,6,blue,2",
-                                                :graph_title => "Multi-Vectors"
-                                               ) #if false
-   end
-   def test_ExtCsv_gnuplot
-     test_data       = TEST_DIR + ""
-     test_data = TEST_DIR + ""
-     qpol = ExtCsv.new(IMPORT_TYPE,"txt",TEST_DATA).select_by(:col3 => "5",
-                                                              :col2 => "100")
-     qpol_ = ExtCsv.new(IMPORT_TYPE,"txt",test_data).select_by(:col3 => "5",
-                                                               :col2 => "100")
-      ExtCsv.gnuplot([qpol,qpol_],
-                       ["9416 Gen1","9416 Gen3"],
-                       "col1",
-                       ["col7","col8"])
-      ExtCsv.gnuplot([qpol,qpol_],
-                       ["9416 Gen1","9416 Gen3"],
-                       "col1",
-                       ["col5"])
-   end
- 
-   def _test_gnuplot_with_combined_qpols
-     qpols_const = []
-     qpols_kv_const = []
-     qpols_ = []
-     # mA = const
-     drift_files = [ "test/data/file02.txt" , "test/data/file03.txt"]
-     drift_files.each {|dfile|
-       qpols_const << ExtCsv.new(IMPORT_TYPE,"txt",dfile).selectBy(:col4 => "5")
-     }
-     
-     ExtCsv.gnuplot(qpols_const,
-                      ["Title0","Title1","Title2"],
-                      "zeit",
-                      ["col8","col7"],
-                      {:graph_type => "points",
-                       :graph_title => "Display more than one ExtCsv object"}
-                     )
-     qpol = ExtCsv.concat(*qpols_ma_const)
-     qpol.gnuplot("zeit",
-                  ["col2","col2"],
-                  { :mode => "drift",
-                    :yrange => "[0.7:1.4]",
-                    :graph_title => "Plotted from a combined Object: col2 = const"
-                  }
-                 )
-   end
-   
-   def test_tube_diagram_labels
-     erg_csv = ExtCsv.new("file","txt",TEST_DATA_NEW)[0..10]
-     ExtCsvDiagram.plot(erg_csv,[],:col2,[:col7,:col8],'',[],'',:point_label? => true,:label_column => :string)
-   end
-   def test_extcsv_diagram_limits
-     td = ExtCsv.new("file","txt",TEST_DATA_NEW)
-     ExtCsvDiagram.plot(td[0,21],
-                        [:col1],
-                        :index,
-                        [:col3],
-                        :zeit,
-                        [:col8],
-                        'limit test', 
-                        :y1limits       => [1.9],
-                        :y1limitname    => "y1 Limit",
-                        :y2limits       => [8.2],
-                        :y2limitname    => "y2 Limit",
-                        :xlabel         => "index",
-                        :ylabel         => "YLabel",
-                        :y2label        => "'Y2Label'",
-                        :label_position => "out horiz bot",
-                        :time_format    => "'%H:%M'",
-                                      :linewidth      => 1)
-   end
+  def test_simple
+    f=ExtCsv.new("file","txt",TEST_DATA)
+    ExtCsvDiagram.plot(f,["col4"],"col0",["col1"])
+  end
+  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,
+                         :type => 'lines',:groupBy => ["depth"],
+                         :yrange => '[-2.5:0.5]',:onlyGroupTitle => true,
+#                         :terminal => "png",
+                         :input_time_format => "'%Y%m%d %H:%M:%S'",
+                         :filename => "icon",:output_time_format => "'%Y'",:size => "800,600")
+
+  end
+  def test_plotxy
+    f = ExtCsv.new(IMPORT_TYPE,"txt",TEST_DATA)
+    ExtCsvDiagram.plot_xy(f,"step","col5",'test',
+                       :label_position => 'outside',
+                       :groupBy => [:col4],
+                         :type => 'lines')
+  end
+  def test_gnuplot
+    test_file = TEST_DATA
+    drift_test_file = TEST_DATA_NEW
+    qpol = ExtCsv.new(IMPORT_TYPE,"txt",test_file)
+    qpol_drift = ExtCsv.new(IMPORT_TYPE,"txt",drift_test_file)
+
+    f = qpol.selectBy(:col4 => /(5|4)/)
+    assert_not_equal(0,f.size)
+    ExtCsvDiagram.plot(f,["col4"],"col1",
+                       ["col5"],nil,[],'',
+                       :graph_title => "SIZEMODE",
+                       :point_label? => true,
+                       :label_positions => 'outside',
+                       :dataset_title => 'notitle',
+                       :mode => "size"                       )
+   f = qpol_drift.selectBy(:col4 => 5)
+    f.plot([],"zeit",["col6"],:type => 'lines')
+    qpol.plot([],
+      "step",
+      ["col7","col8"],
+      {
+      :point_label? => true,
+      :xrange => "[0:1200]",
+      :label_position => "right",
+      :datasets => {:using => [nil,'1:($2*10)']},
+      :graph_title => "USING-TEST",
+      :mode => "qp" })
+#   qpol_drift.selectBy(:focus => "5").plot(["zeit","zeit"],
+#                                           ["iqa","iqc"],
+#                                           {
+#     #:yrange => "[0.7:1.4]",
+#     :graph_title => "Multi-Graph",
+#     :mode => "multi",
+#     :label_column => "col5",
+#     :point_label? => true,
+#     :time_format => "'%H:%M'"
+#   })
+#   qpol.selectBy(:col2 => "5",:col4 => "120").operate_on(:col1,"*rand(10.0)").operate_on(:x2,"*10.2*rand(1.0)").operate_on(:z1,"/rand(8.0)").operate_on(:z2,"*rand(10.0)").plot(["col1","col2"],["col1","col2"],
+#                                                                                                                                                                                      :graph_type => 'vectors',
+#                                                                                                                                                                                      :mode => "multi",
+#                                                                                                                                                                                      :arrowstyle => " arrow 1 head filled size screen 0.2, 30, 45 ",
+#                                                                                                                                                                                      :linewidth => "1",
+#                                                                                                                                                                                      #:linetype => "rgb '#ffee33'",
+#                                                                                                                                                                                      :dataset_title => ["t3","t1"],
+#                                                                                                                                                                                      :drawBox => "0,0,5,5,gray,1",
+#                                                                                                                                                                                      :drawCurve => "1,1,6,6,blue,2",
+#                                                                                                                                                                                      :graph_title => "Multi-Vectors"
+#                                                                                                                                                                                     ) #if false
+  end
+  def test_extcsv_diagram_limits
+    td = ExtCsv.new("file","txt",TEST_DATA_NEW)
+    ExtCsvDiagram.plot(td[0,21],
+                       [:col1],
+                       :index,
+                       [:col3],
+                       :zeit,
+                       [:col8],
+                       'limit test', 
+                       :y1limits       => [1.9],
+                       :y1limitname    => "y1 Limit",
+                       :y2limits       => [8.2],
+                       :y2limitname    => "y2 Limit",
+                       :xlabel         => "index",
+                       :ylabel         => "YLabel",
+                       :y2label        => "'Y2Label'",
+                       :label_position => "out horiz bot",
+                       :time_format    => "'%H:%M'",
+                       :linewidth      => 1)
+  end
 end

metadata

@@ -1,34 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: extcsv
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 11
-  - 3
-  version: 0.11.3
+version: !ruby/object:Gem::Version
+  version: 0.12.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ralf Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-12 14:20:20 +02:00
-default_executable: 
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: stark.dreamdetective@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/lsmodel.rb
-- lib/extcsv_units.rb
 - lib/extcsv_diagram.rb
 - lib/extcsv.rb
 - rakefile
@@ -44,39 +33,32 @@ files:
 - test/data/file03.txt
 - test/data/german.txt
 - test/data/file01.txt
-has_rdoc: true
 homepage: http://extcsv.rubyforge.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: extcsv
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: "Let CSV-like files behave like DB-tables: selection, data operations on columns.  Easy plotting with gnuplot and modelling"
-test_files: 
+summary: ! 'Let CSV-like files behave like DB-tables: selection, data operations on
+  columns.  Easy plotting with gnuplot and modelling'
+test_files:
 - test/test_lsmodel.rb
 - test/test_extcsv_diagram.rb
 - test/test_extcsv.rb

data/lib/extcsv_units.rb

@@ -1,26 +0,0 @@
-################################################################################
-# Author: Ralf M�ller
-#
-# ==== TODO: Units are automatically selected from the column name. You could add
-# units here and they will be used for graphs. I think, this is a premature
-# solution, because the file will be edited by nearly every user, so it
-# actually is a configutration file. But without units, the graphs loose much
-# of their information. There are separate packages for units like
-# units.rubyforge.org. But there will allways be the problem, that column names
-# cannot be restricted to find a appropriate unit.
-################################################################################
-module ExtCsvUnits
-  Units = 
-    {
-      :col1             => "kV",
-      :col2             => "kV",
-      :col3             => "kV",
-      :col4             => "kV",
-      :col5             => "kV",
-      :col6             => "kV",
-      :col7             => "kV",
-      :col8             => "kV",
-      :zeit           => "yyyy-mm-dd hh:mm:ss",
-      :time           => "yyyy-mm-dd hh:mm:ss"
-    }
-end