basis-processing 0.5.2 → 0.5.3

data/README

@@ -1,4 +1,4 @@
-**NOTE: Starting from version 0.5.1, Basis has been ported to Ruby 1.9.2, because of the kd-tree library dependency. There are no current plans of maintaining Basis compatibility with Ruby 1.8.x.**
+**NOTE: Starting from version 0.5.1, Basis has been ported to Ruby 1.9.2, because of the kd-tree library dependency. Currently, there are no plans of maintaining Basis compatibility with Ruby 1.8.x.**
 
 **Basis** provides a set of classes for easily plotting and transforming arbitrary 2D coordinate systems by specifying their basis vectors. Originally developed to work with Ruby-Processing, it now supports any class which supports Processing-like semantics.
 

data/basis.gemspec

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

data/lib/demo.rb

@@ -40,7 +40,6 @@ class Demo < Processing::App
 		@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)
 		stroke(1,1,0,1)
 		fill(1,1,0)

data/lib/interactive.rb

@@ -5,12 +5,25 @@ module Interactive
 	def self.included(base)
 		base.class_eval do
 			alias :old_setup :setup
+			alias :old_draw :draw
 			def setup
-				puts "LoL"
 				old_setup
 				@index = @screen.build
 				@cache = Cache.new(self).refresh
 			end
+			
+			def draw
+				old_draw
+				@screen.join = false
+				@old_points ||= []
+				@points_to_highlight ||= []
+				@cache.restore if @old_points.count > 0
+				@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
 		end
 	end
 
@@ -21,6 +34,7 @@ module Interactive
 		original_point = @screen.original(p)
 		closest_point = @index.nearest([original_point[:x], original_point[:y]])
 		closest = @screen.points[closest_point[:id]]
+		return if closest.nil?
 		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
@@ -33,19 +47,5 @@ module Interactive
 		redraw
 	end
 
-	def draw
-		@screen.join = false
-		@old_points ||= []
-		@points_to_highlight ||= []
-		@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
 end
 

data/lib/screen.rb

@@ -18,7 +18,6 @@ class Screen
 		@points = []
 		@data = []
 		@output = output
-		p output
 	end
 
 	def build

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basis-processing
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knnball
-  requirement: &8852080 !ruby/object:Gem::Requirement
+  requirement: &20813600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *8852080
+  version_requirements: *20813600
 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