SimpleOutput 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c43ac995639242acb36652731cccb9b1c5308285
-  data.tar.gz: c246a5a67964804ed11a752cd78a88bad69d4144
+  metadata.gz: 465d6f7a8e2d6052323ad71fd384a8b623e6c932
+  data.tar.gz: 8db7514414c0bf09374a197e38c671d18e5773cc
 SHA512:
-  metadata.gz: f3175c5785140c1e50f38d4c3b4e67041b93702ebf24af97ef31d2549f4ec1782151b226714c430d48f9d3d6d053146138e91968e1ca12c7f92b3aa813c37e70
-  data.tar.gz: 80cdbfe19577e94d90ecb9b2ab2ac13c26040932df3cfa72cc51c2b069f2d5a53313966205208bef94276be21ec544af09c9f8191060beabd52a7a6367d545ca
+  metadata.gz: 97fffa2db7b4d1b238337b8d8e8bc62de53d8ccee4d1839a88477517e478c970a3cfc9907e9fa303360439d3b74c63c2cdc1b57b140bb6b190b6a3048077ab56
+  data.tar.gz: d54fdf640e1c75eeaed646a2cebfaec9c0f552971533183e923fc4aa4af6f143bfc48da4c20bdd606c046f8f04b1b6eec59dff7f3d6c0cfb1f9a80c806bc839a

data/lib/simpleoutput.rb

@@ -264,35 +264,35 @@ module SimpleOutput
       # array [x,y ]
       #Interface Functions
       def appendXY( x=[], y=[],name=nil, options={})
-         @plugins.each {|plugin| plugin.appendXY(x,y,name, options)}
+         @plugins.each {|plugin| plugin.appendXY(x.clone,y.clone,name, options)}
       end
 
       def appendXYarray(data=[], name=nil, options={})
-         @plugins.each {|plugin| plugin.appendXY(data[0],data[1],name, options)}
+         @plugins.each {|plugin| plugin.appendXY(data[0].clone,data[1].clone,name, options)}
       end
 
       def setXYarray(data = [], name=nil, options={})
-         @plugins.each {|plugin| plugin.setXY(data[0],data[1], name, options)}
+         @plugins.each {|plugin| plugin.setXY(data[0].clone,data[1].clone, name, options)}
       end
 
       def setXY(x=[], y=[], name=nil, options={})
-         @plugins.each {|plugin| plugin.setXY(x,y,name, options)}
+         @plugins.each {|plugin| plugin.setXY(x.clone,y.clone,name, options)}
       end
 
       def appendPoints(points =[], name=nil, options={})
-         @plugins.each {|plugin| plugin.appendPoints(points,name, options)}
+         @plugins.each {|plugin| plugin.appendPoints(points.clone,name, options)}
       end
 
       def setPoints(points = [], name=nil, options={})
-         @plugins.each {|plugin| plugin.setPoints(points,name, options)}
+         @plugins.each {|plugin| plugin.setPoints(points.clone,name, options)}
       end
 
       def appendHash(hash = {}, name=nil, options={})
-         @plugins.each {|plugin| plugin.appendHash(hash,name, options)}
+         @plugins.each {|plugin| plugin.appendHash(hash.clone,name, options)}
       end
 
       def setHash(hash ={}, name=nil, options={})
-         @plugins.each {|plugin| plugin.setHash(hash,name, options)}
+         @plugins.each {|plugin| plugin.setHash(hash.clone,name, options)}
       end
 
       def setArray(data = [], name=nil, options={})
@@ -305,12 +305,12 @@ module SimpleOutput
       def appendArray(data = [], name=nil, options={})
           x = []
          data.count.times {|i| x << i}
-         y = data
+         y = data.clone
          self.appendXY(x,y,name,options)
       end
 
       def annotate(annotation, name=nil, options={})
-         @plugins.each {|plugin| plugin.annotate(annotation, name, options)}
+         @plugins.each {|plugin| plugin.annotate(annotation.clone, name, options)}
       end
 
       def save()

data/lib/simpleplot.rb

@@ -68,6 +68,7 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
   end
 
   def new_data_callback(name)
+    name = translate_name(name)
     @metadata[name] = {'length' => 0, 'xlabel' => 'x', 'ylabel' => 'y', 'xmin' => 0 , 'xmax' => 10, 'ymin' => 0, 'ymax' => 10, 'series_titles' => [], 'histogram' => false, 'bincount' => 10, 'normalized' => false}
   end
 
@@ -106,11 +107,12 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
 
   def save()
     data = self.getDataAsXY()
-    Gnuplot.open do |gp|
-      data.each do |set_name, series|
+    data.each do |set_name, series|
+      Gnuplot.open do |gp|
         Gnuplot::Plot.new(gp) do |plot|
           plot.terminal "png"
           #plot.size 0.95
+         
           plot.output "#{set_name+@name}.png"
 
           plot.title set_name
@@ -118,12 +120,14 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
           plot.xlabel @metadata[set_name]['xlabel']
           plot.ylabel @metadata[set_name]['ylabel']
           plot.data = []
+         
           if @metadata[set_name]['histogram']
             size = @metadata[set_name]['length']
             bins = @metadata[set_name]['bincount']
             max = @metadata[set_name]['ymax']
             min = @metadata[set_name]['ymin']
-            width = (max-min).to_f/bins.to_f
+           
+            width = (max.to_f-min.to_f).to_f/bins.to_f
             #bins = size.to_f/width.to_f
             plot.yrange '[0:]'
             plot.xrange "[#{min}:#{max}]"
@@ -137,19 +141,22 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
             plot.yrange "[#{@metadata[set_name]['ymin']}:#{@metadata[set_name]['ymax']}]"
           end
           series.each_with_index do |line, index|
+            
             if @metadata[set_name]['histogram']
-              line = line[1]
+              data_pts = line[1]
+            else
+              data_pts = line
             end
-            d = Gnuplot::DataSet.new(line) 
+             
+            d = Gnuplot::DataSet.new(data_pts) 
             d.title = @metadata[set_name]['series_titles'][index]
            
             if @metadata[set_name]['histogram']
-              d.using = "(#{width}*floor($1/#{width})+#{width}/2.0):(1.0) smooth freq w boxes lc rgb\"blue\""
+              d.using = "(#{width.to_f}*floor($1/#{width.to_f})+#{width.to_f}/2.0):(1.0) smooth freq w boxes lc rgb\"blue\""
             else
                d.with = "linespoints"
                d.linewidth = 2
             end
-            
             plot.data << d
             
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SimpleOutput
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Austen Higgins-Cassidy
@@ -14,40 +14,40 @@ dependencies:
   name: gnuplot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
 description: A pluging based graphing and report rendering system with multiple simultanous
@@ -73,12 +73,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []