unifiedPlot 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e9d7f49741bbd243b7474f5995ae126c9f8e6d5
-  data.tar.gz: 47ba0e9b81999bcd464628907ca6e612ebae06a7
+  metadata.gz: 304311035a530de07e6cafc0ec9ceadacb004fe9
+  data.tar.gz: ec01987014080b3bcb05ad1e0256c5f503975c21
 SHA512:
-  metadata.gz: 67d63b5d812c4a427bd1ee7a5533904662630a7e905892c9d7a716c11473d34519a868e07e4e9a62aaf83dfb95162e58fc3525108e9476f19009f098d601f1b2
-  data.tar.gz: 172539447d007e9ebb700d4a6a5d139d85ce4c4e6b30114ee93cee05c4a9fadc0d7ee11f593738b758d96fc1f598ced5692ce25e033a6f9f839f2b180df3f09a
+  metadata.gz: 0bdbb5432b3d625b72aee36a41043aa3840e6890a38bdd0c772f9e373a6f556f4307d216086c6d5dd5523fa280e1b174ee09c8b2029b41bd4da6bbd10ef57a4c
+  data.tar.gz: cb08346500cfbddf704a9bb79889833c0c8d4317d4b09991d57a74a8002f25606195094350a1817c7ade4ef3a0cb0ad33bb3437f45c3e8dbd9cddc6a66375e67

data/gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 GEM_SPEC = Gem::Specification.new do |s|
   s.name              = "unifiedPlot"
-  s.version           = '0.0.3'
+  s.version           = '0.0.4'
   s.date              = Time.new.strftime("%Y-%m-%d")
 
   s.description       = 'single interface to line-plotting data in [],NArray and GSL::Vector format'

data/lib/unifiedPlot.rb

@@ -10,7 +10,7 @@ module UnifiedPlot
     :y2label => nil,
     :xlabel  => nil,
     :x2label => nil,
-    :label_position => 'bottom out',
+    :key => 'bottom out',
     :xsize => 1200,
     :ysize => 800,
     :font => 'arial',
@@ -35,36 +35,25 @@ module UnifiedPlot
   #   :title  => '',
   #   :grid   => false,
   # }
-  def UnifiedPlot.setPlotDefaults(plot,plotConf,title,oType,oName)
-    plotConf = PLOT_DEFAULTS.merge(plotConf)
-    unless 'x11' == oType
-      plot.terminal "#{oType} size #{plotConf[:xsize]},#{plotConf[:ysize]} font #{plotConf[:font]} #{plotConf[:fontsize]}"
-      plot.output "#{oName}.#{oType}"
-    end
-    plot.title   title
-    plot.key     plotConf[:label_position]
-
-    plot.xrange  plotConf[:xrange]  unless plotConf[:xrange].nil?
-    plot.x2range plotConf[:x2range] unless plotConf[:x2range].nil?
-    plot.yrange  plotConf[:yrange]  unless plotConf[:yrange].nil?
-    plot.y2range plotConf[:y2range] unless plotConf[:y2range].nil?
-
-    plot.xtics
-    plot.ytics
-
-    plot.xlabel  plotConf[:xlabel]
-    plot.x2label plotConf[:x2label]
-    plot.ylabel  plotConf[:ylabel]
-    plot.y2label plotConf[:y2label]
-  end
-
   def UnifiedPlot.linePlot(inputs, plotConf: PLOT_DEFAULTS, title: '', oType: 'x11',oName: 'test')
     # allow hash input
     inputs = [inputs] if inputs.kind_of? Hash
 
+    plotConf = PLOT_DEFAULTS.merge(plotConf) unless plotConf == PLOT_DEFAULTS 
+
     Gnuplot.open do |gp|
       Gnuplot::Plot.new( gp ) do |plot|
-        setPlotDefaults(plot,plotConf,title,oType,oName)
+        unless 'x11' == oType
+          plot.terminal "#{oType} size #{plotConf[:xsize]},#{plotConf[:ysize]} font #{plotConf[:font]} #{plotConf[:fontsize]}"
+          plot.output "#{oName}.#{oType}"
+        end
+
+        plot.title   title
+
+	UnifiedPlot.applyConf(plot,plotConf)
+
+        plot.xtics
+        plot.ytics
 
         inputs.each {|data|
           data = DATA_DEFAULTS.merge(data)
@@ -80,20 +69,26 @@ module UnifiedPlot
         plot.grid
       end
     end
+    return ('x11' != oType) ? [oName,oType].join('.') : nil
   end
   def UnifiedPlot.pm3d(inputs,plotConf: PLOT_DEFAULTS,title: '',oType: 'x11',oName: 'test')
-    # allow hash input
-    inputs = [inputs] if inputs.kind_of? Hash
-
-    # tempfile for holding the data (ugly, but works)
-    filename = `tempfile`.chomp
     Gnuplot.open do |gp|
       Gnuplot::SPlot.new( gp ) do |plot|
-        setPlotDefaults(plot,plotConf,title,oType,oName)
+        unless 'x11' == oType
+          plot.terminal oType
+          plot.output "#{oName}.#{oType}"
+        end
+
+        plotConf = PLOT_DEFAULTS.merge(plotConf)
+        plot.title   title
+
+	UnifiedPlot.applyConf(plot,plotConf)
 
+        plot.xtics
+        plot.ytics
 
-        plot.nokey
         # write stuff to a file
+        filename = `tempfile`.chomp
         File.open(filename,'w') {|f|
           inputs.each {|data|
             f << data.join(' ')
@@ -103,12 +98,42 @@ module UnifiedPlot
 
         plot.view "map"
         plot.data << Gnuplot::DataSet.new("'"+filename+"'") do |ds|
-          ds.with   = "image"
+          ds.with = "image"
           ds.matrix = true
         end
       end
     end
-    FileUtils.rm(filename)
+    return ('x11' != oType) ? [oName,oType].join('.') : nil
+  end
+  def UnifiedPlot.heatMap(inputs,plotConf: PLOT_DEFAULTS,title: '',oType: 'x11',oName: 'test')
+    plotConf = PLOT_DEFAULTS.merge(plotConf)
+    Gnuplot.open do |gp|
+      Gnuplot::Plot.new( gp ) do |plot|
+        unless 'x11' == oType
+          plot.terminal oType
+          plot.output "#{oName}.#{oType}"
+        end
+
+        plot.title   title
+
+	UnifiedPlot.applyConf(plot,plotConf)
+
+        plot.xtics
+        plot.ytics
+
+        inputs.each {|data|
+          data = DATA_DEFAULTS.merge(data)
+          dataset = [data[:x].to_a,data[:y].to_a,data[:z].to_a]
+          plot.data << Gnuplot::DataSet.new( dataset ) do |ds|
+            ds.with  = 'image'
+            ds.axes  = data[:axes]
+            ds.title = data[:title]
+          end
+        }
+        plot.grid
+      end
+    end
+    return ('x11' != oType) ? [oName,oType].join('.') : nil
   end
   def UnifiedPlot.fieldPlot(inputs)
     RubyPython.start
@@ -116,4 +141,16 @@ module UnifiedPlot
     pl.imshow(inputs.to_a.reverse)
     pl.show()
   end
+  private
+  def UnifiedPlot.applyConf(plot,config)
+    config.each {|k,v| 
+      # avoid image settings
+      next if [:font,:fontsize,:xsize,:ysize,:label_position].include?(k)
+      unless [true,false].include?(v) then
+	plot.send(k,v)
+      else
+	plot.send(k)
+      end
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unifiedPlot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ralf Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies: []
 description: single interface to line-plotting data in [],NArray and GSL::Vector format
 email: stark.dreamdetective@gmail.com
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: simple line plot for array-based inputs