rchart 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/rchart.rb

@@ -1252,49 +1252,49 @@ class Rchart
 	# You must specify the name of the two series that will be used as x and y coordinates and the color id to use. 
 
 	def draw_xy_plot_graph(data,data_description,y_serie_name,x_serie_name,palette_id=0,big_radius=5,small_radius=2,r2=-1,g2=-1,b2=-1,shadow=true)
-		r = @palette[palette_id]["r"];
-		g = @palette[palette_id]["g"];
-		b = @palette[palette_id]["b"];
-		r3 = -1
-		g3 = -1
-		b3 = -1
-
-		y_last = -1
-		x_last = -1
-		data.each do |key|
-			if (!key[y_serie_name].nil? && !key[x_serie_name])
-				x = key[x_serie_name]
-				y = key[y_serie_name]
-				y = @g_area_y2 - ((y-@vmin) * @division_ratio)
-				x = @g_area_x1 + ((x-@v_x_min) * @x_division_ratio)
-				if ( shadow )
-					if ( r3 !=-1 && g3 !=-1 && b3 !=-1 )
-						self.draw_filled_circle(x+2,y+2,big_radius,r3,g3,b3)
-					else
-						r3 = @palette[palette_id]["r"]-20
-						r = 0 if ( r < 0 )
-						g3 = @palette[palette_id]["g"]-20
-						g = 0 if ( g < 0 )
-						b3 = @palette[palette_id]["b"]-20
-						b = 0  if ( b < 0 )
-						self.draw_filled_circle(x+2,y+2,big_radius,r3,g3,b3)
-					end
-				end
-				self.draw_filled_circle(x+1,y+1,big_radius,r,g,b);
-
-				if ( r2 !=-1 && g2 !=-1 && b2 !=-1 )
-					self.draw_filled_circle(x+1,y+1,small_radius,r2,g2,b2)
-				else
-					r2 = @palette[palette_id]["r"]+20
-					r = 255 if ( r > 255 )
-					g2 = @palette[palette_id]["g"]+20
-					g = 255 if ( g > 255 )
-					b2 = @palette[palette_id]["b"]+20
-					b = 255 if ( b > 255 )
-					self.draw_filled_circle(x+1,y+1,small_radius,r2,g2,b2);
-				end
-			end
-		end
+		r = @palette[palette_id]["r"]
+    g = @palette[palette_id]["g"]
+    b = @palette[palette_id]["b"]
+    r3 = -1
+    g3 = -1
+    b3 = -1
+
+    y_last = -1
+    x_last = -1
+    data.each do |key|
+      next if (key[y_serie_name].nil? or key[x_serie_name].nil?)
+
+      x = key[x_serie_name]
+      y = key[y_serie_name]
+      y = @g_area_y2 - ((y-@vmin) * @division_ratio)
+      x = @g_area_x1 + ((x-@v_x_min) * @x_division_ratio)
+      if ( shadow )
+        if ( r3 !=-1 && g3 !=-1 && b3 !=-1 )
+          self.draw_filled_circle(x+2,y+2,big_radius,r3,g3,b3)
+        else
+          r3 = @palette[palette_id]["r"]-20
+          r = 0 if ( r < 0 )
+          g3 = @palette[palette_id]["g"]-20
+          g = 0 if ( g < 0 )
+          b3 = @palette[palette_id]["b"]-20
+          b = 0  if ( b < 0 )
+          draw_filled_circle(x+2,y+2,big_radius,r3,g3,b3)
+        end
+      end
+      draw_filled_circle(x+1,y+1,big_radius,r,g,b)
+
+      if ( r2 !=-1 && g2 !=-1 && b2 !=-1 )
+        draw_filled_circle(x+1,y+1,small_radius,r2,g2,b2)
+      else
+        r2 = @palette[palette_id]["r"]+20
+        r = 255 if ( r > 255 )
+        g2 = @palette[palette_id]["g"]+20
+        g = 255 if ( g > 255 )
+        b2 = @palette[palette_id]["b"]+20
+        b = 255 if ( b > 255 )
+        draw_filled_circle(x+1,y+1,small_radius,r2,g2,b2)
+      end
+    end
 	end
 
 	#	This function will draw an area between two data series.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rchart
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - amardaxini
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 +05:30
+date: 2011-12-22 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,8 +89,8 @@ homepage: http://github.com/amardaxini/rchart
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -114,31 +114,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - libgd-ruby, libpng-dev, libgd-dev package are required
 rubyforge_project: rchart
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Ruby port of the slick pChart charting library
-test_files: 
-- test/helper.rb
-- test/test_rchart.rb
-- examples/example21.rb
-- examples/example17.rb
-- examples/example20.rb
-- examples/example12.rb
-- examples/example2.rb
-- examples/example18.rb
-- examples/example1.rb
-- examples/example11.rb
-- examples/example7.rb
-- examples/example8.rb
-- examples/example16.rb
-- examples/example5.rb
-- examples/example19.rb
-- examples/example14.rb
-- examples/example3.rb
-- examples/example6.rb
-- examples/example4.rb
-- examples/example9.rb
-- examples/example10.rb
-- examples/example13.rb
-- examples/example15.rb
+test_files: []
+