visualisation-utils 0.1 → 0.2

data/README.md

@@ -3,6 +3,13 @@ visualisation-utils
 
 a collection of scripts for standard visualisation tasks
 
+Installing
+==========
+
+~~~ .bash
+gem install visualisation-utils
+~~~
+
 scatter-plot
 ============
 
@@ -24,5 +31,16 @@ This incantation will bring up the gnuplot gui with the following graph:
 
 ![gui](https://raw.github.com/programmiersportgruppe/visualisation-utils/master/doc/gnuplot-gui.png)
 
-
+TODO
+====
+
+* Overriding of autoscale
+* Create nice PNGs
+* Line plots
+* Changing changing the size of the dots
+* Secondary y-axis
+* Bar chart single series
+* Bar chart multiple series
+* Discrete y-values, e.g. to visualise events over time
+* Histogram plotting
 

data/Rakefile

@@ -0,0 +1,5 @@
+task :default => :build
+
+task :build do
+    system "gem build visualisation-utils.gemspec"
+end

data/bin/overlay

@@ -0,0 +1,16 @@
+#/usr/bin/env bash
+
+# Overlaying to pictures and adding white background
+
+FOREGROUND=$1
+BACKGROUND=$2
+set -e
+set -u
+
+basename="$(basename "$FOREGROUND")"
+SIGNED=`dirname "$FOREGROUND"`"/${basename%.*}.branded.png"
+
+convert  "${FOREGROUND}" "${BACKGROUND}"  -gravity center  -compose DstOver -composite -background white -format png /tmp/output.png
+convert  /tmp/output.png  -background white -flatten -format png "$SIGNED"
+
+

data/bin/scatter-plot

@@ -9,9 +9,16 @@ PLOT_FILE_NAME="/tmp/plot-"+`date  "+%s"`.strip+".plt"
     banner "scatter-plot takes whitespace separated tables from stdin and renders them using gnuplot"
     opt :outfile, "Output file name", :type => String, :short => 'o'
     opt :legends, "Legend for columns, pipe separated list", :type => String, :short => 'l'
+    opt :plot_styles, "Style of plot, comma separated list, values as expected by gnuplot, e.g. lines, points, linespoints, defaults to points", :type => String
+    opt :axis_labels,  "Labels for axes, pipe separated list", :type => String
+    opt :axes,  "Axes used for the respective columns, e.g. (1|possible value are ", :type => String
     opt :numc, "Number of data columns", :type => Integer, :short => 'c'
     opt :debug, "debug"
     opt :title, "Title", :type=> String, :short => 't'
+    opt :font, "Font", :type => String, :short => 'f'
+    opt :time, "Time format for time series data, strftime expression", :type => String
+    opt :ranges, "A list comma separated pairs of gnuplot range-expressions, e.g. xrange [-10:10], yrange[0:40], y2range [0:1]", type:String
+    opt :extra_header, "Extra commands to be put in the header of the gnuplot file", :type => String
 end
 
 title = @opts[:title] || ""
@@ -20,19 +27,27 @@ title = @opts[:title] || ""
 input = `cat`
 File.open(DATA_FILE_NAME, "w"){|f| f.write(input)}
 
-numc_input=input.split(/\n/)[0].split(/\w*/).length - 1
+numc_input=input.split(/\n/)[0].split(/\s+/).length - 1
+puts "Detected numc y-columns #{numc_input}"
+
 
 numc = @opts[:numc] || numc_input
 
+axis_labels = (@opts[:axis_labels] || " | ").split("|")
 
 legends = (@opts[:legends] ? @opts[:legends].strip().split(/,/) : (1..(numc)).map{|x| ""}).map{|x| x.strip}
 
-font = "Futura"
-font_size = "12"
+axes = @opts[:axes] ? @opts[:axes].split("|") : [1] * legends.length
+
+plot_styles =  @opts[:plot_styles] ? @opts[:plot_styles].strip().split(/,/)  : [ "points" ] * legends.length
 
-using_list = legends.zip(2..100).map{|text, index| "'#{DATA_FILE_NAME}' using 1:#{index} title \"#{text}\"" }.join(", ")
+ranges = @opts[:ranges] ? @opts[:ranges].split(",").map{ |r| "set #{r}"}.join("\n") : ""
 
+font = @opts[:font] || "Futura"
+font_size = "12"
+using_list = legends.zip((2..100).to_a, axes, plot_styles).map{|text, index, yaxis, plot_style| "'#{DATA_FILE_NAME}' using 1:#{index} title \"#{text}\" with #{plot_style} ps 2.0 lw 2.0 axes x1y#{yaxis}"}.join(", ")
 
+extra_header = @opts[:extra_header] || ""
 
 if (@opts[:outfile])
     filename = @opts[:outfile]
@@ -45,12 +60,17 @@ if (@opts[:outfile])
 EOF
     elsif (extension == "eps")
         terminal=<<EOF
-            set term epscairo font '#{font},#{font_size}'
+            set term epscairo size 1200,800 font '#{font},#{font_size}'
             set output '#{filename}'
 EOF
     elsif (extension == "pdf")
         terminal=<<EOF
-            set term pdfcairo font '#{font},#{font_size}'
+            set term pdfcairo size 22cm,14cm font '#{font},#{font_size}'
+            set output '#{filename}'
+EOF
+    elsif (extension == "svg")
+        terminal=<<EOF
+            set term svg size 1200,800 font '#{font},#{font_size}'
             set output '#{filename}'
 EOF
     else
@@ -60,10 +80,39 @@ EOF
 
 end
 
+if (@opts[:time])
+    timeExpr=@opts[:time]
+    time=<<EOF
+set xdata time
+set timefmt "#{timeExpr}"
+set format x "%H:%M"
+set autoscale x
+EOF
+else
+    time=""
+end
+
+
 script = <<EOF
 #{terminal}
-set key top left
+#{axis_labels.map{ | axis | pair=axis.split(":"); "set #{pair[0]}label '#{pair[1]}';"}.join("\n")}
+set key outside
+set key left top
+#set offsets 1, 1, 1, 0
+set style line 1 lc rgb '#8b1a0e' pt 1 ps 1 lt 1 lw 2 # --- red
+set style line 2 lc rgb '#5e9c36' pt 6 ps 1 lt 1 lw 2 # --- green
+set style line 11 lc rgb '#808080' lt 1
+set border 3 back ls 11
+set tics nomirror
+set style line 12 lc rgb '#808080' lt 0 lw 1
+set grid back ls 12
+set y2tics
+#{extra_header}
+
+#{ranges}
+
 set title "#{title}"
+#{time}
 plot #{using_list}
 
 EOF

data/visualisation-utils.gemspec

@@ -0,0 +1,23 @@
+Gem::Specification.new do |s|
+  s.name         = 'visualisation-utils'
+  s.summary      = 'utilities for quick visualisation'
+  s.description  = 'visualisation-utils provides a number of utilities
+                    for visualising data from the command line.'
+  s.version      = '0.2'
+  s.platform     = Gem::Platform::RUBY
+
+  s.files        = ['bin/scatter-plot']
+
+  s.bindir = 'bin'
+
+  s.files         = `git ls-files`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  s.author      = 'Felix Leipold'
+  s.email       = ''
+  s.homepage    = 'https://github.com/programmiersportgruppe/visualisation-utils'
+
+
+  s.add_dependency('trollop')
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualisation-utils
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2153124320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,20 +21,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153124320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "visualisation-utils provides a number of utilities\n                    for
   visualising data from the command line."
 email: ''
 executables:
+- overlay
 - scatter-plot
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- Rakefile
+- bin/overlay
 - bin/scatter-plot
 - doc/gnuplot-gui.png
 - test-data/test-two-column.dat
 - test-data/test.dat
+- visualisation-utils.gemspec
 homepage: https://github.com/programmiersportgruppe/visualisation-utils
 licenses: []
 post_install_message: 
@@ -55,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: utilities for quick visualisation