grada 2.1.5 → 2.2.0

data/lib/grada/gnuplot.rb

@@ -1,4 +1,5 @@
 require 'matrix'
+require 'open3'
 
 class NoGnuPlotExecutableFound < RuntimeError; end 
 
@@ -26,25 +27,33 @@ class Gnuplot
     nil
   end
   
-  def self.gnuplot(persist)
+  def self.gnuplot
     gnu_exec = find_exec( ENV['RB_GNUPLOT'] || 'gnuplot' )
-
     raise NoGnuPlotExecutableFound unless gnu_exec
-
-    "#{gnu_exec} #{'-persist' if persist}"
+    gnu_exec
   end
 
-  def self.open(persist = true)
-    output = nil
-    gnuplot_cmd = gnuplot(persist)
+  def self.open(persist = true, &block)
+    gnuplot_cmd = gnuplot
 
-    IO::popen( gnuplot_cmd, 'w+' ) do |io|
-      yield io
-      io.close_write
-      output = io.read
-    end
+    commands = yield
 
-    output
+    output = StringIO.new
+    Open3::popen3(gnuplot_cmd, '-persist') do |data_in, data_out, stderr, wait_th|
+      data_in << commands[:plot_settings]
+      data_in << commands[:plot_data]
+
+      data_in.flush
+      sleep 1
+      
+      while true do
+        window = IO::popen('xprop -name "Gnuplot" WM_NAME 2>/dev/null').gets
+        break unless window
+        sleep 1
+      end
+    end
+    
+    output.string
   end
 end
 
@@ -53,18 +62,19 @@ class Plot
 
   QUOTED_METHODS = [ "title", "output", "xlabel", "x2label", "ylabel", "y2label", "clabel", "cblabel", "zlabel" ]
 
-  def initialize(io = nil, cmd = 'plot')
-    @cmd = cmd
+  def initialize
     @settings = []
     @arbitrary_lines = []
     @data = []
     @styles = []
-    yield self if block_given?
+  end
 
-    if io
-      io << to_gplot
-      io << store_datasets
-    end
+  def self.construct(&block)
+    plot = new
+    
+    block.call plot if block_given?
+    
+    { plot_settings: plot.to_gplot, plot_data:  plot.store_datasets }
   end
 
   def method_missing(meth, *args)
@@ -90,8 +100,8 @@ class Plot
 
   def store_datasets(io = '')
     if @data.size > 0
-      io +=  @cmd + " #{ @data.map { |element| element.plot_args }.join(', ') } \n" 
-      io += @data.map { |ds| ds.to_gplot }.compact.join("e\n")
+      io +=  'plot' + " #{ @data.map { |element| element.plot_args }.join(', ') } \n" 
+      io += @data.map { |ds| ds.to_gplot }.compact.join("\n") + "\n"
     end
     
     io
@@ -199,7 +209,7 @@ class Array
       self.each { |elem| series_for_plot += "#{elem}\n" }
       series_for_plot + 'e'
     else
-      self[0].zip(self[1]).map{ |elem| elem.join(' ') }.join("\n") + "\ne"
+      self[0].zip(self[1]).map{ |elem| elem.join(' ') }.join("\n") + "\ne\n"
     end
   end
   

data/lib/grada.rb

@@ -1,4 +1,4 @@
-require 'grada/gnuplot'
+require_relative 'grada/gnuplot'
 
 class Grada
   # Not valid the format of the object to construct the graph
@@ -30,10 +30,10 @@ class Grada
  
   #Graph offsets
   #
-  LEFT   =  0.25
-  RIGHT  =  0.25
-  TOP    =  0.25
-  BOTTOM =  0.25
+  LEFT   =  0.05
+  RIGHT  =  0.05
+  TOP    =  0.05
+  BOTTOM =  0.05
   
   # Hello GraDA
   #
@@ -60,7 +60,7 @@ class Grada
     @y = y.nil? ? y : validate(y)  
   end
   
-  # Displays a graph in a window. 
+  # Displays a graph in a X11 window. 
   # You can specify all the options that you need:
   # *width* (Integer)
   # *height* (Integer)
@@ -70,6 +70,20 @@ class Grada
   # *graph_type* (:histogram, :heatmap) default: :default
   # *with* ('points', 'linespoints') default: 'lines'
   #
+  # Also is important to know that you can interact with the graph:
+  # * Zoom in                 =>  right click and drag the mouse to cover the area you want 
+  #                               or 
+  #                               use the scroll wheel
+  # 
+  # * Zoom out                =>  press key 'a'
+  #                               or
+  #                               if you want to go back to a previous state of zoom press key 'p'
+  #
+  #  * Exit interactive mode  =>  press key 'q'
+  #                               or
+  #                               just close the window
+  #
+  #  * Save image             =>  working on it 
   #
   # Example:
   #   >> grada.display
@@ -94,6 +108,7 @@ class Grada
       @opts[:with] = 'image'
       
       plot_heat_map do |plot|
+        plot.set "terminal x11 size #{@opts[:width]},#{@opts[:height]}"
         plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
       end
     else
@@ -107,10 +122,15 @@ class Grada
   end
   
   # Save the graph in a png file. 
-  # You can specify all the options that you need as _display_ but also need to specify the file
+  # You can specify all the options that you need as _display_ but also need to specify the file root-name and extension.
+  # The possible extensions you can use for saving a file are:
+  #  *png*
+  #  *gif*
+  #  *jpeg*
+  #  *svg* => default
   #
   # Example:
-  #   >> grada.save({ filename: 'secret/radiation_levels/ffa/zonex/devicex/radiation_level_malaga.png' ,title: 'Atomic Device X', x_label: 'Day', y_label: 'smSv', with: 'points' }) 
+  #   >> grada.save({ filename: 'secret/radiation_levels/ffa/zonex/devicex/radiation_level_malaga', ext: 'png' ,title: 'Atomic Device X', x_label: 'Day', y_label: 'smSv', with: 'points' }) 
   #   => ""
   # Arguments:
   #   opts: (Hash) *optional*
@@ -119,14 +139,15 @@ class Grada
     @opts = DEFAULT_OPTIONS.merge(opts)
     
     return nil if @opts[:filename].nil?
+
+    ext = @opts[:ext] || 'svg'
     
     if @opts[:graph_type] == :histogram
       population_data?(@x)
       
       plot_histogram do |plot|
-        plot.output @opts[:filename]
-        plot.set "terminal png size #{@opts[:width]}, #{@opts[:height]} crop"
-        plot.terminal 'png'
+        plot.output "#{@opts[:filename]}.#{ext}" 
+        plot.set "terminal #{ext} size #{@opts[:width]}, #{@opts[:height]} crop"
         plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
       end
     elsif @opts[:graph_type] == :heatmap
@@ -134,18 +155,15 @@ class Grada
       @opts[:with] = 'image'
       
       plot_heat_map do |plot|
-        plot.output @opts[:filename]
-        plot.set "terminal png size #{@opts[:width]}, #{@opts[:height]} crop"
-        plot.terminal 'png'
-        plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
+        plot.output "#{@opts[:filename]}.#{ext}" 
+        plot.set "terminal #{ext} size #{@opts[:width]}, #{@opts[:height]} crop"
       end
     else
       raise NoPlotDataError if @y.nil?
       
       plot_and do |plot|
-        plot.output @opts[:filename]
-        plot.set "terminal png size #{@opts[:width]}, #{@opts[:height]} crop"
-        plot.terminal 'png'
+        plot.output "#{@opts[:filename]}.#{ext}" 
+        plot.set "terminal #{ext} size #{@opts[:width]}, #{@opts[:height]} crop"
         plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
       end
     end
@@ -182,9 +200,9 @@ class Grada
   end
   
   def plot_and(&block)
-    Gnuplot.open do |gp|
-      Gnuplot::Plot.new(gp) do |plot|
-        block[plot] if block
+    Gnuplot.open do
+      Gnuplot::Plot.construct do |plot|
+        block.call plot if block
   
         plot.title @opts[:title]
         
@@ -224,9 +242,9 @@ class Grada
   end
   
   def plot_histogram(&block)
-    Gnuplot.open do |gp|
-      Gnuplot::Plot.new(gp) do |plot|
-        block[plot] if block
+    Gnuplot.open do
+      Gnuplot::Plot.construct do |plot|
+        block.call plot if block
         
         width = ( @x.max - @x.min ) / @x.size
   
@@ -237,7 +255,7 @@ class Grada
         plot.ylabel "Frequency"
         plot.set "style fill solid 0.5"
         plot.set "xrange [#{@x.min}:#{@x.max}]"
-        plot.set "boxwidth #{ width * 0.4}"
+        plot.set "boxwidth #{ width * 0.1}"
         plot.set "xtics #{@x.min},#{(@x.max-@x.min)/5},#{@x.max}"
         plot.set "tics out nomirror"
 
@@ -252,9 +270,9 @@ class Grada
   end
   
   def plot_heat_map(&block)
-    Gnuplot.open do |gp|
-      Gnuplot::Plot.new(gp) do |plot|
-        block[plot] if block
+    Gnuplot.open do
+      Gnuplot::Plot.construct do |plot|
+        block.call plot if block
         
         plot.set "pm3d map"
         plot.set "palette color"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grada
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: magritte
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement