basis-processing 0.5.7 → 0.5.8

data/basis.gemspec

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

data/lib/screen.rb

@@ -38,6 +38,19 @@ class Screen
 		end
 	end
 
+	def at(point, &block)
+		if (!point[:x] || !point[:y])
+			@artist.reset_matrix
+			block.call(point, self) if block
+			return
+		end
+		p = transformed(point)
+		if (block)
+			@artist.reset_matrix
+			block.call(point, p, self)
+		end
+	end
+
 	def plot(point, options = {:bar => false, :track => false}, &block)
 		if (!point[:x] || !point[:y])
 			@artist.reset_matrix
@@ -55,8 +68,7 @@ class Screen
 			@artist.ellipse(p[:x], p[:y], 5, 5)
 		end
 		@artist.line(standard_x_axis_point[:x], standard_x_axis_point[:y], p[:x], p[:y]) if options[:bar]
-		return if !@should_join
-		@artist.line(@buffer[:x], @buffer[:y], p[:x], p[:y]) if @buffer
+		@artist.line(@buffer[:x], @buffer[:y], p[:x], p[:y]) if @should_join && @buffer
 		@buffer = p
 	end
 	
@@ -72,20 +84,16 @@ class Screen
 	end
 	
 	def transformed(data_point)
-#		standard_point = @basis.standard_basis(data_point)
-#		@transform.apply(standard_point)
 		transformed_p = @affine_transform.mult([data_point[:x], data_point[:y]].to_java(:float), nil)
 		{:x => transformed_p[0], :y => transformed_p[1]}
 	end
 
 	def original(onscreen_point)
-#		p = @transform.unapply(onscreen_point)
-#		@basis.original(p)
 		transformed_p = @inverse_affine_transform.mult([onscreen_point[:x], onscreen_point[:y]].to_java(:float), nil)
 		{:x => transformed_p[0], :y => transformed_p[1]}
 	end
 
-	def draw_ticks(ticks, displacement)
+	def draw_ticks(ticks, displacement, block)
 		ticks.each do |l|
 			from = l[:from]
 			to = l[:to]
@@ -93,7 +101,7 @@ class Screen
 			to = {:x => from[:x] + tick_vector[:x], :y => from[:y] + tick_vector[:y]}
 			@artist.line(from[:x],from[:y],to[:x],to[:y])
 			@artist.fill(1)
-			@artist.text(l[:label], to[:x]+displacement[:x], to[:y]+displacement[:y])
+			@artist.text((block ? block.call(l[:label]) : l[:label]), to[:x]+displacement[:x], to[:y]+displacement[:y])
 		end
 	end
 
@@ -103,7 +111,7 @@ class Screen
 		{:x => 5*vector[:x]/magnitude, :y => 5*vector[:y]/magnitude}
 	end
 
-	def draw_axes(x_interval, y_interval)
+	def draw_axes(x_interval, y_interval, labelling_blocks = {})
 		f = @artist.createFont("Georgia", 24, true);
 		@artist.text_font(f,16)
 		axis_screen_transform = Transform.new({:x => 800, :y => -800}, @transform.origin)
@@ -121,8 +129,8 @@ class Screen
 		@artist.line(x_ticks.first[:from][:x],x_ticks.first[:from][:y],x_ticks.last[:from][:x],x_ticks.last[:from][:y])
 		@artist.line(y_ticks.first[:from][:x],y_ticks.first[:from][:y],y_ticks.last[:from][:x],y_ticks.last[:from][:y])
 
-		draw_ticks(x_ticks, {:x => 0, :y => 20})
-		draw_ticks(y_ticks, {:x => -50, :y => 0})
+		draw_ticks(x_ticks, {:x => 0, :y => 20}, labelling_blocks[:x])
+		draw_ticks(y_ticks, {:x => -50, :y => 0}, labelling_blocks[:y])
 		
 		@artist.stroke(0.4, 1.0, 0.5, 0.2)
 		grid_lines = @basis.grid_lines(x_interval, y_interval).collect {|gl| {:from => @transform.apply(gl[:from]), :to => @transform.apply(gl[:to])}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basis-processing
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-09 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knnball
-  requirement: &9073420 !ruby/object:Gem::Requirement
+  requirement: &17679680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *9073420
+  version_requirements: *17679680
 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