basis-processing 0.5.3 → 0.5.4

data/basis.gemspec

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

data/lib/coordinate_system.rb

@@ -15,10 +15,22 @@ end
 
 class CoordinateSystem
 	CROSSHAIR_SCALE = 5000
+	UNIT_TRANSFORM = [[1,0],[0,1]]
+
 	include MatrixOperations
 	attr_accessor :x_basis_vector, :y_basis_vector
 
-	def initialize(x_axis, y_axis, transform, artist)
+	def self.standard(x_range, y_range, artist)
+		x_basis_vector = {:x => 1.0, :y => 0.0}
+		y_basis_vector = {:x => 0.0, :y => 1.0}
+
+		x_range = ContinuousRange.new(x_range)
+		y_range = ContinuousRange.new(y_range)
+
+		CoordinateSystem.new(Axis.new(x_basis_vector,x_range), Axis.new(y_basis_vector,y_range), artist, UNIT_TRANSFORM)
+	end
+	
+	def initialize(x_axis, y_axis, artist, transform = UNIT_TRANSFORM)
 		@artist = artist
 		@x_axis = x_axis
 		@y_axis = y_axis
@@ -102,5 +114,22 @@ class CoordinateSystem
 		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
+	
+	def grid_lines(x_basis_interval, y_basis_interval)
+		lines = []
+		@x_axis.range.run(x_basis_interval) do |i,v|
+			raw_origin = {:x => i, :y => @y_axis.range.minimum}
+			hair_origin = standard_basis(raw_origin)
+			hair_end = standard_basis((@y_basis_vector*@y_axis.range.interval) + raw_origin)
+			lines << {:from => hair_origin, :to => hair_end}
+		end
+		@y_axis.range.run(y_basis_interval) do |i,v|
+			raw_origin = {:x => @x_axis.range.minimum, :y => i}
+			hair_origin = standard_basis(raw_origin)
+			hair_end = standard_basis((@x_basis_vector*@x_axis.range.interval) + raw_origin)
+			lines << {:from => hair_origin, :to => hair_end}
+		end
+		lines
+	end
 end
 

data/lib/demo.rb

@@ -31,14 +31,15 @@ class Demo < Processing::App
 		points = []
 		200.times {|n|points << {:x => n, :y => random(300)}}
 
-		x_basis_vector = {:x => 1.0, :y => 0.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), [[1,0],[0,1]], self)
-		screen_transform = Transform.new({:x => 3, :y => -2}, {:x => 300, :y => 900})
+#		Long-winded way of doing the same thing
+
+#		@x_unit_vector = {:x => 1.0, :y => 1.0}
+#		@y_unit_vector = {:x => -1.0, :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_unit_vector,x_range), Axis.new(@y_unit_vector,y_range), [[1,0],[0,1]], self)
+		@basis = CoordinateSystem.standard({:minimum => 0, :maximum => 200}, {:minimum => 0, :maximum => 300}, self)
+		screen_transform = Transform.new({:x => 2, :y => -2}, {:x => 300, :y => 900})
 		@screen = Screen.new(screen_transform, self, @basis)
 		@screen.draw_axes(10,10)
 		stroke(1,1,0,1)
@@ -48,6 +49,9 @@ class Demo < Processing::App
 			@screen.plot(p, :track => true) {|p| rect(p[:x], p[:y], 5, 5)}
 		end
 	end
+	
+	def draw
+	end
 end
 
 w = 1200

data/lib/ranges.rb

@@ -24,9 +24,12 @@ class ContinuousRange
 end
 
 class DiscreteRange
+	attr_accessor :minimum, :maximum
 	attr_accessor :values
 	def initialize(v)
 		@values = v[:values]
+		@minimum = @values.first
+		@maximum = @values.last
 	end
 
 	def interval

data/lib/screen.rb

@@ -96,6 +96,12 @@ class Screen
 
 		draw_ticks(x_ticks, {:x => 0, :y => 20})
 		draw_ticks(y_ticks, {:x => -50, :y => 0})
+		
+		@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])}}
+		grid_lines.each do |l|
+			@artist.line(l[:from][:x],l[:from][:y],l[:to][:x],l[:to][:y])
+		end
 	end
 	
 	def write(p)

metadata

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