graphkit 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9da30db14973ca7a94fceb0e1e6ba8cb69adabb
-  data.tar.gz: 50edafcfcb69c93ec85ef6f7427d346127bb25be
+  metadata.gz: 30e1a05bbf7cc899ca1c2e8682de4b93dd6f3870
+  data.tar.gz: 9a8d784fc19bac844f949b7ff49ef1bef9994669
 SHA512:
-  metadata.gz: 822ae424641869f07001bb0ee4ac324173a6c361069c0d4851b57898c858264a8a119745a27c126f4930b2cf5a6a5feeb72c7b10b54b94f37b323d508502ab40
-  data.tar.gz: fd6ebb58c3a3875f2ca653cdee4445d3e65bab375dcfa05b1404bf48bdc891e5eda81eb607e8964ad281e07d7949f8bee838fdf206adb2f4ca82f8edf3ad3930
+  metadata.gz: 872a13313d9af37ccec3636ab625295a03c0523acc5964eacd93cd12779499b01991f5ab4c3be0ba95051d7ee493883dc2ef979b702afa454bc2fdd91e511850
+  data.tar.gz: a3c15244935e8dc67af1b53bd937f7ad7016e591415810a13e5f58fdc715b449ac761f5bdb9d6d8044e055b65c639c2c15cf302fd500e566ab36b690b33546c8

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
    gem "rubyhacks", ">= 0.1.0"
+	 #gem 'sys-proctable'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/graphkit.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: graphkit 0.2.2 ruby lib
+# stub: graphkit 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "graphkit"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2014-03-07"
+  s.date = "2014-03-17"
   s.description = "A GraphKit is a device independent intelligent data container that allows the easy sharing, combining and plotting of graphic data representations. Easily created from data, they can be output in a variety of formats using packages such as gnuplot. "
   s.email = "edmundhighcock@sourceforge.net"
   s.extra_rdoc_files = [

data/lib/graphkit/gnuplot.rb

@@ -88,6 +88,7 @@ class GraphKit
 		end
 	end
 class GnuplotSetOptions < KitHash
+	attr_accessor :multiplot_following
 	alias :hash_key :key
 	undef :key
     QUOTED = [ "title", "output", "xlabel", "ylabel", "zlabel", "x2label", "y2label", "z2label"  ]
@@ -103,7 +104,7 @@ class GnuplotSetOptions < KitHash
     isosamples        key               label             lmargin
     loadpath          locale            log               logscale
     macros            mapping           margin            missing
-    mouse             multiplot         mx2tics           mxtics
+    mouse                     mx2tics           mxtics
     my2tics           mytics            mztics            object
 		nosurface
     offsets           origin            output            palette
@@ -122,7 +123,8 @@ class GnuplotSetOptions < KitHash
     y2zeroaxis        ydata             ydtics            ylabel
     ymtics            yrange            ytics             yzeroaxis
     zdata             zdtics            zero              zeroaxis
-    zlabel            zmtics            zrange            ztics].map{|s| s.to_sym}
+    zlabel            zmtics            zrange            ztics
+	  multiplot ].map{|s| s.to_sym}
 # 		p instance_methods.sort
 		GNUPLOT_SETS.each do |opt|
 			define_method(opt + "=".to_sym) do |str|
@@ -141,12 +143,21 @@ class GnuplotSetOptions < KitHash
 		end
 
 		def apply(io)
+			io << "set term #{GNUPLOT_DEFAULT_TERM}\n" unless self[:term] or self.multiplot_following
 			self.each do |var,val|
 				next unless val
+				next if self.multiplot_following and ["term", "output"].include? var.to_s
+				next if var.to_s == "multiplot"
+				apply_option(io, var, val)
+      end
+			apply_option(io, :multiplot, self[:multiplot]) if self[:multiplot]
+		end
+
+		def apply_option(io, var, val)
 				if val == "unset"
  					#eputs "Unsetting #{var}"
 					io << "unset #{var}\n"
-					next
+					return
 				end
 	      if var.to_s == 'log_axis'
 		      var = 'log'
@@ -161,8 +172,6 @@ class GnuplotSetOptions < KitHash
 				else
 					io << "set #{var} #{val}\n" 
 				end
-      end
-			io << "set term #{GNUPLOT_DEFAULT_TERM}\n" unless self[:term]
 		end
 		
 
@@ -291,45 +300,55 @@ end
 		apply_gnuplot_options(options)
 		apply_graphkit_standard_options_to_gnuplot
 		check_integrity
-		Gnuplot.open(true) do |io|
-				self.pid = io.pid
-				gnuplot_sets.apply(io)
-				gnuplot_variables.apply(io)
-				case naxes
-				when 1,2
-					io << "plot "
-				when 3,4
-					io << "splot "
-				end
-				imax = data.size - 1
-				data.each_with_index do |dk,i|
-					next if i>0 and compress_datakits
-					dk.gnuplot_plot_options.with ||= dk.with #b.c.
-					dk.gnuplot_plot_options.title ||= dk.title #b.c.
-					dk.gnuplot_plot_options.apply(io)
-					#p 'imax', imax, i, i == imax
-					next if compress_datakits
-					io << ", " unless i == imax
-				end
-				io << "\n"
-				data.each_with_index do |dk,i|
-					dk.gnuplot(io)
-					 unless compress_datakits and i<imax
-						io << "e\n\n"
-					 else
-						 io << "\n\n"
-					 end
-				end
-				(STDIN.gets) if live
+		if options[:io]
+			send_gnuplot_commands(io)
+		else
+			Gnuplot.open(true) do |io|
+					send_gnuplot_commands(io)
+					(STDIN.gets) if live
+			end
 		end
 	end
+
+	def send_gnuplot_commands(io)
+			self.pid = io.pid
+			gnuplot_sets.apply(io)
+			gnuplot_variables.apply(io)
+			case naxes
+			when 1,2
+				io << "plot "
+			when 3,4
+				io << "splot "
+			end
+			imax = data.size - 1
+			data.each_with_index do |dk,i|
+				next if i>0 and compress_datakits
+				dk.gnuplot_plot_options.with ||= dk.with #b.c.
+				dk.gnuplot_plot_options.title ||= dk.title #b.c.
+				dk.gnuplot_plot_options.apply(io)
+				#p 'imax', imax, i, i == imax
+				next if compress_datakits
+				io << ", " unless i == imax
+			end
+			io << "\n"
+			data.each_with_index do |dk,i|
+				dk.gnuplot(io)
+				 unless compress_datakits and i<imax
+					io << "e\n\n"
+				 else
+					 io << "\n\n"
+				 end
+			end
+	end
 	
 	def close
 		logf :close
 		begin
+			#require 'sys/proctable'
+			#p Sys::ProcTable.ps.select{ |pe| pe.ppid == pid }
 			Process.kill('TERM', pid) if pid
 		rescue => err
-			puts err
+			puts err, pid
 		end
 		self.pid = nil
 	end
@@ -459,6 +478,8 @@ end
 									 		
 	def gnuplot_write(file_name, options={})
 		logf :gnuplot_write
+		old_gp_term = gp.term
+		old_gp_output = gp.output
 		if file_name
 			gp.output = file_name
 			unless gp.term or options[:terminal]
@@ -497,6 +518,8 @@ end
 				raise 'ps2eps failed' unless system "ps2eps #{name}.ps"
 		end
 # 		ep file_name
+    gp.term = old_gp_term
+		gp.output = old_gp_output
 		return File.basename(file_name, File.extname(file_name))
 	end
 	
@@ -531,6 +554,33 @@ EOF
 
 
 
+	class MultiWindow
+
+		def method_missing(meth, *args)
+			if args[-1].kind_of? Hash
+			options = args.pop 
+			else 
+				options = {}
+			end
+			raise "Nothing to plot: size = 0" if size==0
+			self[0].gp.multiplot = "layout #{size},1"
+			for i in 1...self.size
+				self[i].gp.multiplot_following = true
+			end
+			Gnuplot.open(true) do |io|
+				options[:io] = io
+				each do |gk|
+					#p gk.to_s
+					gk
+					gk.send(meth, *args, options)
+				end
+				options.delete(:io)
+			end
+			for i in 1...self.size
+				self[i].multiplot = false
+			end
+		end
+	end
 
 
 	end

data/lib/graphkit.rb

@@ -274,6 +274,12 @@ end
 
 
 class GraphKit < KitHash
+
+
+	class MultiWindow < Array
+
+	end
+
 	
 	
 	include Kit
@@ -905,70 +911,6 @@ require 'graphkit/vtk_legacy_ruby.rb'
 
 if $0 == __FILE__
 
-	a = GraphKit.autocreate({x: {data: [1,3,5,6], units: 'feet', title: 'Height'}})
-	a.gnuplot
-	gets
-	a.close
-	a = CodeRunner::GraphKit.autocreate({x: {data: [2, 5, 11, 22], units: 'years', title: 'Age'}, y: {data: [1,3,5,6], units: 'feet', title: 'Height'}})
-	
-	puts a.pretty_inspect
-	
-	p a.title
-	p a.label
-	p a.chox
-	p a.xlabel
-	p a.yunits
-	
-# 	a.gnuplot
-# 	gets
-# 	a.close 
-	a.data[0].with = 'lp'
-	datakit = a.data[0].dup
-	datakit.axes[:y].data.map!{|value| value * 0.85}
-	datakit.title += ' of women'
-	a.data.push datakit
-	a.data[0].title += ' of men'
-	pp a
-	a.gnuplot
-	gets
-	a.close
-# 	Gnuplot.open{a.to_gnuplot}
-	
-	b = CodeRunner::GraphKit.autocreate({x: {data: [2, 5, 11, 22], units: 'years', title: 'Age'}, y: {data: [1,3,5,6], units: 'feet', title: 'Height'}, z: {data: [2,4,8,12], units: 'stone', title: 'Weight'}})
-	b.data[0].modify({with: 'lp'})
-	pp b
-# 	d = b.data[0].f.data_for_gnuplot(2)
-# 	p d
-# 	p d[0,1]
-# 	d.delete([0,0])
-# 	p d
-# 	p d[1,1]
-# 	p d[1,2]
-# 	d = SparseTensor.new(3)
-# 	p d
-# 	p d[0,1,4]
-# 	p d[3, 4,6]
-# 
-	b.gnuplot	
-	gets
-	b.close
-	b.gnuplot_write('heights.ps')
-	
-	p b.data[0].plot_area_size
-	
-	c = SparseTensor.new(3)
-	c[1,3,9]= 4
-	c[3,3,34] = 4.346
-	c[23, 234, 293] = 9.234
-	
-	p c
-	
-	d = SparseTensor.new(3)
-	d[1,3,9]= 4
-	d[3,3,34] = 4.346
-	d[23, 234, 294] = 9.234
-	
-	p c + d
 
 end
 

data/test/test_graphkit.rb

@@ -1,7 +1,82 @@
 require 'helper'
 
 class TestGraphkit < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
+
+	def test_basic
+	a = GraphKit.autocreate({x: {data: [1,3,5,6], units: 'feet', title: 'Height'}})
+	#a.gnuplot
+	#gets
+	a.close
+	a = GraphKit.autocreate({x: {data: [2, 5, 11, 22], units: 'years', title: 'Age'}, y: {data: [1,3,5,6], units: 'feet', title: 'Height'}})
+	
+	puts a.pretty_inspect
+	
+	p a.title
+	p a.label
+	p a.chox
+	p a.xlabel
+	p a.yunits
+	
+# 	a.gnuplot
+# 	gets
+# 	a.close 
+	a.data[0].with = 'lp'
+	datakit = a.data[0].dup
+	datakit.axes[:y].data.map!{|value| value * 0.85}
+	datakit.title += ' of women'
+	a.data.push datakit
+	a.data[0].title += ' of men'
+	pp a
+	#a.gnuplot
+	#gets
+	a.close
+# 	Gnuplot.open{a.to_gnuplot}
+	
+	b = GraphKit.autocreate({x: {data: [2, 5, 11, 22], units: 'years', title: 'Age'}, y: {data: [1,3,5,6], units: 'feet', title: 'Height'}, z: {data: [2,4,8,12], units: 'stone', title: 'Weight'}})
+	b.data[0].modify({with: 'lp'})
+	pp b
+# 	d = b.data[0].f.data_for_gnuplot(2)
+# 	p d
+# 	p d[0,1]
+# 	d.delete([0,0])
+# 	p d
+# 	p d[1,1]
+# 	p d[1,2]
+# 	d = SparseTensor.new(3)
+# 	p d
+# 	p d[0,1,4]
+# 	p d[3, 4,6]
+# 
+	#b.gnuplot	
+	#gets
+	b.close
+	b.gnuplot_write('heights.ps')
+	
+	p b.data[0].plot_area_size
+	
+	c = SparseTensor.new(3)
+	c[1,3,9]= 4
+	c[3,3,34] = 4.346
+	c[23, 234, 293] = 9.234
+	
+	p c
+	
+	d = SparseTensor.new(3)
+	d[1,3,9]= 4
+	d[3,3,34] = 4.346
+	d[23, 234, 294] = 9.234
+	
+	p c + d
+
+	multiplot = GraphKit::MultiWindow.new
+	multiplot.push a
+	multiplot.push b
+	 
+
+	pp multiplot
+
+	#multiplot.gnuplot
+	multiplot.gnuplot_write('multiplot.ps')
+	end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphkit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyhacks