basis-processing 0.5.1 → 0.5.2

data/.gitignore

@@ -1,3 +1,4 @@
 *.*~
 *~
 *.gem
+*.jpg

data/README

@@ -22,13 +22,19 @@ To use Basis functionality in your code, it is enough to:
 
 Here's some example code, which plots random points.
 
+	require 'rubygems'
+
+	Gem.clear_paths
+	ENV['GEM_HOME'] = '/home/avishek/jruby/jruby-1.6.4/lib/ruby/gems/1.8'
+	ENV['GEM_PATH'] = '/home/avishek/jruby/jruby-1.6.4/lib/ruby/gems/1.8'
+
 	require 'basis_processing'
 
 	class Demo < Processing::App
-		include Interactive
 		app = self
 		def setup
 			smooth
+			no_loop
 			background(0,0,0)
 			color_mode(RGB, 1.0)
 			stroke(1,1,0,1)
@@ -50,13 +56,13 @@ Here's some example code, which plots random points.
 			200.times {|n|points << {:x => n, :y => random(300)}}
 
 			x_basis_vector = {:x => 1.0, :y => 0.0}
-			y_basis_vector = {:x => 0.0, :y => 1.0}
+			y_basis_vector = {:x => 0.2, :y => 1.0}
 
 			x_range = ContinuousRange.new({:minimum => 0, :maximum => 200})
 			y_range = ContinuousRange.new({:minimum => 0, :maximum => 300})
 
-			@basis = CoordinateSystem.new(Axis.new(x_basis_vector,x_range), Axis.new(y_basis_vector,y_range), [[4,0],[0,2]], self)
-			screen_transform = SignedTransform.new({:x => 1, :y => -1}, {:x => 300, :y => 900})
+			@basis = CoordinateSystem.new(Axis.new(x_basis_vector,x_range), Axis.new(y_basis_vector,y_range), [[1,0],[0,1]], self)
+			screen_transform = Transform.new({:x => 3, :y => -2}, {:x => 300, :y => 900})
 			@screen = Screen.new(screen_transform, self, @basis)
 			@screen.join=true
 			@screen.draw_axes(10,10)
@@ -66,13 +72,13 @@ Here's some example code, which plots random points.
 			points.each do |p|
 				@screen.plot(p, :track => true) {|p| rect(p[:x], p[:y], 5, 5)}
 			end
-			@index = @screen.build
 		end
 	end
 
 	w = 1200
 	h = 1000
 
+	Demo.send :include, Interactive
 	Demo.new(:title => "My Sketch", :width => w, :height => h)
 
 You have a few options when plotting a point. If you specify ':bar => true', like the line below:
@@ -107,10 +113,8 @@ Experimental support exists for mouseover interactivity without (too much) extra
 
 To actually enable interactivity, you must do a few things:
 
-* 'include' the Interactive module in your sketch class, as in the demonstration code above.
-* Build the data sample index from the data, by calling `@index = @screen.build`.
+* 'include' the Interactive module in your sketch class, as in the demonstration code above, namely the line `Demo.send :include, Interactive`
 * `@highlight_block` specifies what to plot when the data point is hovered upon.
-* `@passive_block` specifies what to plot when the data point is **not** being hovered on.
 
 Interactivity is a work in progress at the moment; some of the above steps may change or be removed.
 

data/basis.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s| 
   s.name = "basis-processing"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
   s.add_dependency('knnball', '>= 0.0.6')
   s.author = "Avishek Sen Gupta"
   s.email = "avishek.sen.gupta@gmail.com"

data/lib/cache.rb

@@ -0,0 +1,17 @@
+class Cache
+	def initialize(artist)
+		@artist = artist
+	end
+
+	def refresh
+		@artist.save("buffer.jpg")
+		@cached_image = @artist.loadImage("buffer.jpg")
+		self
+	end
+	
+	def restore
+		@artist.image(@cached_image, 0, 0)
+		self
+	end
+end
+

data/lib/coordinate_system.rb

@@ -1,6 +1,7 @@
 require 'ranges'
 require 'ruby-processing'
 require 'matrix_operations'
+require 'hash_vector'
 
 include Math
 
@@ -13,6 +14,7 @@ class Axis
 end
 
 class CoordinateSystem
+	CROSSHAIR_SCALE = 5000
 	include MatrixOperations
 	attr_accessor :x_basis_vector, :y_basis_vector
 
@@ -46,16 +48,12 @@ class CoordinateSystem
 		}
 	end
 
-	def sum(v1, v2)
-		{:x => v1[:x] + v2[:x], :y => v1[:y] + v2[:y]}
-	end
-
 	def x_ticks(x_basis_interval)
 		lines = []
 		t_vectors = tick_vectors
 		@x_axis.range.run(x_basis_interval) do |i,v|
 			tick_origin = standard_basis({:x => i, :y => 0})
-			lines << {:label => v, :from => tick_origin, :to => sum(tick_origin, t_vectors[:x_tick_vector])}
+			lines << {:label => v, :from => tick_origin, :to => tick_origin + t_vectors[:x_tick_vector]}
 		end
 		lines
 	end
@@ -65,7 +63,7 @@ class CoordinateSystem
 		t_vectors = tick_vectors
 		@y_axis.range.run(y_basis_interval) do |i,v|
 			tick_origin = standard_basis({:x => 0, :y => i})
-			lines << {:label => v, :from => tick_origin, :to => sum(tick_origin, t_vectors[:y_tick_vector])}
+			lines << {:label => v, :from => tick_origin, :to => tick_origin + t_vectors[:y_tick_vector]}
 		end
 		lines
 	end
@@ -96,5 +94,13 @@ class CoordinateSystem
 		]
 		MatrixOperations::into2Dx1D(MatrixOperations::inverse2D(basis_matrix), p1)
 	end
+	
+	def crosshairs(p)
+		crosshair_x_p1 = (@x_basis_vector*CROSSHAIR_SCALE) + standard_basis(p)
+		crosshair_x_p2 = (@x_basis_vector*(-CROSSHAIR_SCALE)) + standard_basis(p)
+		crosshair_y_p1 = (@y_basis_vector*CROSSHAIR_SCALE) + standard_basis(p)
+		crosshair_y_p2 = (@y_basis_vector*(-CROSSHAIR_SCALE)) + standard_basis(p)
+		[{:from => crosshair_x_p1, :to => crosshair_x_p2}, {:from => crosshair_y_p1, :to => crosshair_y_p2}]
+	end
 end
 

data/lib/demo.rb

@@ -1,10 +1,16 @@
+require 'rubygems'
+
+Gem.clear_paths
+ENV['GEM_HOME'] = '/home/avishek/jruby/jruby-1.6.4/lib/ruby/gems/1.8'
+ENV['GEM_PATH'] = '/home/avishek/jruby/jruby-1.6.4/lib/ruby/gems/1.8'
+
 require 'basis_processing'
 
 class Demo < Processing::App
-	include Interactive
 	app = self
 	def setup
 		smooth
+		no_loop
 		background(0,0,0)
 		color_mode(RGB, 1.0)
 		stroke(1,1,0,1)
@@ -26,13 +32,13 @@ class Demo < Processing::App
 		200.times {|n|points << {:x => n, :y => random(300)}}
 
 		x_basis_vector = {:x => 1.0, :y => 0.0}
-		y_basis_vector = {:x => 0.0, :y => 1.0}
+		y_basis_vector = {:x => 0.2, :y => 1.0}
 
 		x_range = ContinuousRange.new({:minimum => 0, :maximum => 200})
 		y_range = ContinuousRange.new({:minimum => 0, :maximum => 300})
 
-		@basis = CoordinateSystem.new(Axis.new(x_basis_vector,x_range), Axis.new(y_basis_vector,y_range), [[4,0],[0,2]], self)
-		screen_transform = SignedTransform.new({:x => 1, :y => -1}, {:x => 300, :y => 900})
+		@basis = CoordinateSystem.new(Axis.new(x_basis_vector,x_range), Axis.new(y_basis_vector,y_range), [[1,0],[0,1]], self)
+		screen_transform = Transform.new({:x => 3, :y => -2}, {:x => 300, :y => 900})
 		@screen = Screen.new(screen_transform, self, @basis)
 		@screen.join=true
 		@screen.draw_axes(10,10)
@@ -42,12 +48,12 @@ class Demo < Processing::App
 		points.each do |p|
 			@screen.plot(p, :track => true) {|p| rect(p[:x], p[:y], 5, 5)}
 		end
-		@index = @screen.build
 	end
 end
 
 w = 1200
 h = 1000
 
+Demo.send :include, Interactive
 Demo.new(:title => "My Sketch", :width => w, :height => h)
 

data/lib/hash_vector.rb

@@ -0,0 +1,9 @@
+class Hash
+	def *(scalar)
+		{:x => self[:x] * scalar.to_f, :y => self[:y] * scalar.to_f}
+	end
+	def +(vector)
+		{:x => self[:x] + vector[:x], :y => self[:y] + vector[:y]}
+	end
+end
+

data/lib/interactive.rb

@@ -1,5 +1,18 @@
+require 'cache'
+
 module Interactive
 	attr :screen, :basis, :index
+	def self.included(base)
+		base.class_eval do
+			alias :old_setup :setup
+			def setup
+				puts "LoL"
+				old_setup
+				@index = @screen.build
+				@cache = Cache.new(self).refresh
+			end
+		end
+	end
 
 	def mouseMoved(p)
 		p = {:x => p.getX(), :y => p.getY()}
@@ -8,13 +21,15 @@ module Interactive
 		original_point = @screen.original(p)
 		closest_point = @index.nearest([original_point[:x], original_point[:y]])
 		closest = @screen.points[closest_point[:id]]
-		distance = (closest[:x] - original_point[:x])**2 + (closest[:y] - original_point[:y])**2
-		if distance > 1.0
+		closest_onscreen_point = @screen.transformed(closest)
+		distance = (closest_onscreen_point[:x] - p[:x])**2 + (closest_onscreen_point[:y] - p[:y])**2
+		if distance > 14.0
 			@points_to_highlight = []
 			redraw
 			return
 		end
 		@points_to_highlight = [closest]
+		@screen.write(closest)
 		redraw
 	end
 
@@ -22,11 +37,13 @@ module Interactive
 		@screen.join = false
 		@old_points ||= []
 		@points_to_highlight ||= []
-		@old_points.each do |old|
-			@screen.plot(old) {|p| @passive_block.call(p) if @passive_block}
-		end
+		@cache.restore if @old_points.count > 0
+#		@old_points.each do |old|
+#			@screen.plot(old) {|p| @passive_block.call(p) if @passive_block}
+#		end
 		@points_to_highlight.each do |new_rectangle|
 			@screen.plot(new_rectangle) {|p| @highlight_block.call(p) if @highlight_block}
+			@screen.draw_crosshairs(new_rectangle)
 		end
 		@old_points = @points_to_highlight
 	end

data/lib/screen.rb

@@ -1,5 +1,6 @@
 require 'transform'
 require 'knnball'
+require 'text_output'
 
 class Screen
 	attr_accessor :points
@@ -9,24 +10,34 @@ class Screen
 		@buffer = nil if !@should_join
 	end
 	
-	def initialize(transform, artist, basis)
+	def initialize(transform, artist, basis, output=TextOutput.new)
 		@transform = transform
 		@artist = artist
 		@basis = basis
 		join = false
 		@points = []
 		@data = []
+		@output = output
+		p output
 	end
 
 	def build
 		KnnBall.build(@data)
 	end
 
+	def draw_crosshairs(p)
+		@basis.crosshairs(p).each do |hair|
+			from = @transform.apply(hair[:from])
+			to = @transform.apply(hair[:to])
+			@artist.line(from[:x], from[:y], to[:x], to[:y])
+		end
+	end
+
 	def plot(point, options = {:bar => false, :track => false}, &block)
 		@points << point if options[:track]
 		@data << {:id => @points.count - 1, :point => [point[:x], point[:y]]}
 		p = transformed(point)
-		standard_x_axis_point = @transform.apply(@basis.standard_basis({:x => point[:x], :y => 0}))
+		standard_x_axis_point = transformed({:x => point[:x], :y => 0})
 		if (block)
 			block.call(p)
 		else
@@ -87,5 +98,9 @@ class Screen
 		draw_ticks(x_ticks, {:x => 0, :y => 20})
 		draw_ticks(y_ticks, {:x => -50, :y => 0})
 	end
+	
+	def write(p)
+		@output.notify(p)
+	end
 end
 

data/lib/text_output.rb

@@ -0,0 +1,7 @@
+class TextOutput
+	def notify(point)
+		$stdout.print("\r#{point.inspect}")
+		$stdout.flush
+	end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basis-processing
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000Z
+date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knnball
-  requirement: &8267900 !ruby/object:Gem::Requirement
+  requirement: &8852080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *8267900
+  version_requirements: *8852080
 description: Basis provides a set of classes for easily plotting and transforming
   arbitrary 2D coordinate systems by specifying their basis vectors in Ruby-Processing.
 email: avishek.sen.gupta@gmail.com
@@ -33,12 +33,15 @@ files:
 - README
 - basis.gemspec
 - lib/basis_processing.rb
+- lib/cache.rb
 - lib/coordinate_system.rb
 - lib/demo.rb
+- lib/hash_vector.rb
 - lib/interactive.rb
 - lib/matrix_operations.rb
 - lib/ranges.rb
 - lib/screen.rb
+- lib/text_output.rb
 - lib/transform.rb
 homepage: http://avishek.net/blog
 licenses: []