rchart 2.0.2 → 2.0.4

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.4

data/lib/color_palette.rb

@@ -4,9 +4,7 @@ module ColorPalette
   # You must provide an rgb color.
   def set_color_palette(id,r,g,b)
     b,g,r=validate_color(b, g, r)
-    @palette[id]["r"] = r
-    @palette[id]["g"] = g
-    @palette[id]["b"] = b
+    set_palette(id, r, g, b)
   end
 
   # Create a color palette shading from one color to another
@@ -17,12 +15,11 @@ module ColorPalette
     b_factor = (b2-b1)/shades
     i= 0
     while(i<= shades-1)
-      @palette[i]["r"] = r1+r_factor*i
-      @palette[i]["g"] = g1+g_factor*i
-      @palette[i]["b"] = b1+b_factor*i
+      set_palette(i, r1+r_factor*i, g1+g_factor*i, b1+b_factor*i)
       i = i+1
     end
   end
+
   # This function will load the color scheme from a text file.
   # This file must be formatted with three values per line ( r,g,b ).
   # By default the delimiter is a coma but you can specify it.
@@ -32,9 +29,7 @@ module ColorPalette
       while (line = infile.gets)
         values = line.split(",")
         if ( values.length == 3 )
-          @palette[color_id]["r"] = values[0].to_i
-          @palette[color_id]["g"] = values[1].to_i
-          @palette[color_id]["b"] = values[2].to_i
+          set_palette(color_id, values[0].to_i, values[1].to_i, values[2].to_i)
           color_id+=1
         end
       end
@@ -46,11 +41,17 @@ module ColorPalette
     color_id = 0
     color_palette.each do |palette|
       if palette.length == 3
-        @palette[color_id]["r"] = palette[0].to_i
-        @palette[color_id]["g"] = palette[1].to_i
-        @palette[color_id]["b"] = palette[2].to_i
+        set_palette(
+            color_id, palette[0].to_i, palette[1].to_i, palette[2].to_i)
         color_id+=1
       end
     end
   end
+
+  private
+
+  def set_palette(id,r,g,b)
+    @palette[id] = { "r" => r, "g" => g, "b" => b }
+  end
+
 end

data/lib/line_chart.rb

@@ -149,10 +149,10 @@ module LineChart
     x_last = -1
     data.each do |key|
       if ( !key[y_serie_name].nil? && !key[x_serie_name].nil? )
-        x= 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)
+        x = @g_area_x1 + ((x-@v_x_min) * @x_division_ratio)
         if (x_last != -1 && y_last != -1)
           draw_line(x_last,y_last,x,y,@palette[palette_id]["r"],@palette[palette_id]["g"],@palette[palette_id]["b"],true)
         end

data/lib/plot_chart.rb

@@ -113,38 +113,38 @@ module PlotChart
     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 )
-            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)
+      next if (key[y_serie_name].nil? or key[x_serie_name].nil?)
 
-        if ( r2 !=-1 && g2 !=-1 && b2 !=-1 )
-          draw_filled_circle(x+1,y+1,small_radius,r2,g2,b2)
+      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
-          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)
+          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
   def draw_limits_graph(data,data_description,r=0,g=0,b=0)

data/lib/scale.rb

@@ -14,14 +14,14 @@ module Scale
   # Allow you to fix the scale, use this to bypass the automatic scaling
   # You can use this function to skip the automatic scaling.
   # vmin and vmax will be used to render the graph.
-  def set_fixed_scale(v_min,v_max,divisions=5,v_x_min=0,v_x_max=0,x_divisions=5)
+  def set_fixed_scale(v_min,v_max,divisions=5,v_x_min=nil,v_x_max=nil,x_divisions=5)
     @vmin      = v_min.to_f
     @vmax      = v_max.to_f
     @divisions = divisions.to_f
 
-    if (!v_x_min == 0 )
+    if (!v_x_min.nil?)
       @v_x_min      = v_x_min.to_f
-      @v_x_max      = v_x_max.to_f
+      @v_x_max      = v_x_max.nil? ? 0.0 : v_x_max.to_f
       @x_divisions = x_divisions.to_f
     end
   end
@@ -330,8 +330,8 @@ module Scale
             scale = 2
           end
           if (!scale_ok)
-            factor = factor * 10  if ( scale2 > 1 )
-            factor = factor / 10  if ( scale2 < 1 )
+            factor = factor * 10.0  if ( scale2 > 1 )
+            factor = factor / 10.0  if ( scale2 < 1 )
           end
         end
         if ((((@vmax*1.0 / scale) / factor)).floor != ((@vmax*1.0 / scale) / factor))
@@ -358,7 +358,7 @@ module Scale
         divisions+=1
       end
     else
-      divisions =@divisions
+      divisions = @divisions
     end
     @division_count = divisions
 
@@ -373,8 +373,8 @@ module Scale
     while(i<= divisions+1)
       self.draw_line(@g_area_x1,ypos,@g_area_x1-5,ypos,r,g,b)
       value     = @vmin*1.0 + (i-1) * (( @vmax - @vmin ) / divisions)
-      value     = (round_of(value * (10**decimals),2)) / (10**decimals)
-      value= value.round if value.floor == value.ceil
+      value = value.round(decimals)
+      value = value.round if value.floor == value.ceil
       value = "#{value} #{data_description['unit']['y']}"  if ( data_description["format"]["y"]== "number")
       value = self.to_time(value)                  if ( data_description["format"]["y"] == "time" )
       value = self.to_date(value)                  if ( data_description["format"]["y"] == "date" )
@@ -489,10 +489,10 @@ module Scale
 
     while(i<= x_divisions+1)
       self.draw_line(xpos,@g_area_y2,xpos,@g_area_y2+5,r,g,b)
-      value     = @v_x_min + (i-1) * (( @v_x_max - @v_x_min ) / x_divisions)
-      value     = (round_of(value * (10**decimals),2)) / (10**decimals)
-      value= value.round if value.floor == value.ceil
-      value = "#{value}#{data_description['unit']['y']}"  if ( data_description["format"]["y"]== "number")
+      value = @v_x_min + (i-1) * (( @v_x_max - @v_x_min ) / x_divisions)
+      value = value.round(decimals)
+      value = value.round if value.floor == value.ceil
+      value = "#{value}#{data_description['unit']['y']}"  if ( data_description["format"]["y"] == "number")
       value = self.to_time(value)                  if ( data_description["format"]["y"] == "time" )
       value = self.to_date(value)                  if ( data_description["format"]["y"] == "date" )
       value = self.to_metric(value)                if ( data_description["format"]["Y"] == "metric" )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rchart
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 4
+  version: 2.0.4
 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 
@@ -100,8 +100,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 
@@ -125,31 +125,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: []
+