middleman-gnuplot 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 15fda679ea252f213b2952d616710ff9e8967f93
-  data.tar.gz: bb5c0a442a12bda847cd88406b7ff5b65855a487
+SHA256:
+  metadata.gz: d296d148bd098ee2ea558b7d38d9c42206e63ad989b4c62d9c97a726757e1ec9
+  data.tar.gz: b9729966785e245cf29abc49f2bfe7cc09af349775417ae489c81276cf653b3e
 SHA512:
-  metadata.gz: fd2373b58e1837f009f77c8399eeaec32d85f7d7419f4e37ace228cdeab6c5531c0e082055a74c7993abcbfb0c0fcc6fe8500bf44291e2427bddbdd8f264e69c
-  data.tar.gz: f725dd22211886fa0accd53bac00c9d5f8076167697e735e7ce4dd96f02a09a7b3cff10251f3415ba967f7dd9011bc622db2d879e9c305233d8abad20e0345d4
+  metadata.gz: b2505a038f28b98afa3d9fce1827e5f7e03242bf97e447f206e5217815db9eb2f2ab1f7f28d9f6870416bd0d40932292af179d828bb012d8d98fd0ea5efcc832
+  data.tar.gz: 07dfffddc1fbfd0cb585d07013506857894e68734e5781c7b5dde29b28848f7c81e737b11cfa988306dd2db979273e30e0c1102811d2528703d769af3dc99036

data/README.md

@@ -21,7 +21,7 @@ Update your gem list:
 
 Modify the `config.rb` of your project as follows:
 
-    activate :gnulot do |opts|
+    activate :gnuplot do |opts|
       opts.gp_tmpdir = 'tmp' # path, where plots are stored before copied to build dir
       opts.gp_outdir = 'img' # directory holding plot files with build dir
       opts.gp_format = 'png' # determines output format (currently supports png and pdf)

data/lib/middleman-gnuplot/extension.rb

@@ -16,7 +16,7 @@ module Middleman
     @@plot_names = []
 
     # Initializes the middleman-gnuplot extension.
-    def initialize(app, options_hash={}, &block)
+    def initialize app, options_hash={}, &block
       super
       app.config[:gp_outdir] = options.gp_outdir
       app.config[:gp_tmpdir] = options.gp_tmpdir
@@ -43,11 +43,11 @@ module Middleman
     # @param [Array<Hash>] functions function definition hash
     # @option functions [String] expression expression hat can be processed by gnuplot (e.g. sin(x))
     # @option functions [String] style _lines_ or _points_
-    # @option functions [String] color RGB colro definition in hex format
+    # @option functions [String] color RGB color definition in hex format
     # @option functions [String] title name of trace
     # @param [String] filename base filename for output file
     # @param [String] title plot title
-    def plot_functions (functions=[], filename=nil, title=nil)
+    def plot_functions functions=[], filename=nil, title=nil
         # stub method to enable documentation in yard
     end
 
@@ -56,20 +56,35 @@ module Middleman
     # @param [String] script path to the gnuplot script
     # @param [String] filename for output file (can be overridden in script)
     # @param [String] title plot title (can be overridden in script)
-    def plot_script (script, filename=nil, title=nil)
+    def plot_script script, filename=nil, title=nil
         # stub method to enable documentation in yard
     end
 
+    # Generates a plot via gnuplot using the given data array
+    # The data array should be an array of rows that contains arrays of cols.
+    # e.g. [[x1, y1, z1], [x2, y2, z2], [x3, y3, z3]]
+    # @param [Array] data see format above
+    # @param [Array<Hash>] series function definition hash
+    # @option series [Int] x Index of x-column in array (1, 2, ...)
+    # @option series [Int] y Index of y-column in array (1, 2, ...)
+    # @option series [String] style _lines_ or _points_
+    # @option series [String] color RGB color definition in hex format
+    # @option series [String] title name of trace
+    # @param [String] filename base filename for output file
+    # @param [String] title plot title
+		def plot_data data, series=nil, filename=nil, title=nil
+        # stub method to enable documentation in yard
+		end
+
     # Generates a random filename, if the given paramter is nil or empty
     # Returns filename (given or random)
-    # Params.
-    # +filename+:: input filename
-    def random_filename_if_nil (filename=nil)
+    # @param [String] filename input filename
+    def random_filename_if_nil filename=nil
         # stub method to enable documentation in yard
     end
 
     helpers do
-      def plot_functions (functions=[], filename=nil, title=nil)
+      def plot_functions functions=[], filename=nil, title=nil
         filename = random_filename_if_nil(filename)
 
         if title.nil?
@@ -114,7 +129,7 @@ module Middleman
         return outfile
       end
 
-      def plot_script (script, filename=nil, title=nil)
+      def plot_script script, filename=nil, title=nil
         filename = random_filename_if_nil(filename)
         
         outfile = "#{app.config[:gp_outdir]}/#{filename}.#{app.config[:gp_format]}"
@@ -134,6 +149,71 @@ module Middleman
         return outfile
       end
 
+			def plot_data data, series=nil, filename=nil, title=nil
+				unless series.nil?
+					filename = random_filename_if_nil(filename)
+
+					if title.nil?
+							title = ""
+					end
+
+					outfile = "#{app.config[:gp_outdir]}/#{filename}.#{app.config[:gp_format]}"
+
+					@@gp.set output:"./#{@@base_dir}/#{outfile}"
+					@@gp.set title:"#{title}"
+
+					gp_command = []
+
+					series.each do |ser|
+						gp_command << "\"-\" u #{ser[:x]}:#{ser[:y]}"
+
+            if ser[:style].nil? == false
+                gp_command << {w:ser[:style]}
+            else
+                gp_command << {w:'lines'}
+            end
+
+            if ser[:color].nil? == false
+                gp_command << {lc:"rgb '#{ser[:color]}'"}
+            end
+
+            if ser[:title].nil? == false
+                gp_command << {t:"#{ser[:title]}"}
+            else
+                gp_command << {t:''}
+            end
+
+            gp_command << ", "
+					end
+
+					gp_command[-1] = ''
+					gp_command << "\n"
+
+					(1..series.size).each do
+						data.each do |line|
+						tmpstring = ""
+
+						line.each do |col|
+							tmpstring << "#{col}\t"
+						end
+
+							gp_command << "#{tmpstring}\n"
+						end
+
+						gp_command << "e\n"
+					end
+
+					puts "GP cmd: #{gp_command}"
+
+					@@gp.plot gp_command
+
+
+					register_filename(filename)
+
+					return outfile
+				end
+			end
+
 
       private
 
@@ -141,7 +221,7 @@ module Middleman
       # Returns filename (given or random)
       # Params.
       # +filename+:: input filename
-      def random_filename_if_nil (filename=nil)
+      def random_filename_if_nil filename=nil
         if filename.nil? or filename == ""
             loop do
                 filename = ([*('A'..'Z'),*('0'..'9')]).sample(app.config[:gp_rndfilelength]).join
@@ -159,7 +239,7 @@ module Middleman
       # user adds the same filename twice - a warning is issued.
       # Params.
       # +filename+:: filename to be added to array
-      def register_filename (filename)
+      def register_filename filename
         if @@plot_names.include?(filename)
             message "Warning: Filename #{filename} for plot already in use!", :warning
         end
@@ -171,7 +251,7 @@ module Middleman
       # Params.
       # +text+:: the message body to be printed
       # +type+:: :warning (yellow) or :error (red)
-      def message (text, type=:warning)
+      def message text, type=:warning
         colString = ''
         colReset = "\033[0m"
         offset = "\033[14C"

data/lib/middleman-gnuplot/version.rb

@@ -5,7 +5,7 @@
 
 module Middleman
   module Gnuplot
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-gnuplot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Hermann Detz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-gnuplot
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Middleman extension for gnuplot