gerbilcharts 0.2.3 → 0.2.4

data/lib/gerbilcharts/models/round_time_range.rb

@@ -123,7 +123,10 @@ private
 
 	case ldelta
 		when (0..1*MINUTE); return 10
-		when (1*MINUTE..2*HOUR); return 15*MINUTE
+		when (1*MINUTE..5*MINUTE); return 1*MINUTE
+		when (5*MINUTE..15*MINUTE); return 3*MINUTE
+		when (15*MINUTE..1*HOUR); return 5*MINUTE
+		when (1*HOUR..2*HOUR); return 15*MINUTE
 		when (2*HOUR..6*HOUR); return 30*MINUTE
 		when (6*HOUR..12*HOUR); return 1*HOUR
 		when (12*HOUR..1*DAY); return 3*HOUR

data/lib/gerbilcharts/surfaces/stacked_area_surface.rb

@@ -9,7 +9,6 @@ class StackedAreaSurface < Surface
     end
     
     def int_render(g)
-   #   debugger
       rx = parent.modelgroup.effective_round_range_x
       ry = parent.modelgroup.cumulative_sweep_round_range_y0
 
@@ -23,7 +22,6 @@ class StackedAreaSurface < Surface
       sweep_to = rx.rmax
       polygons = []
       parent.modelgroup.each_model do | mod|
-#	debugger
           mod.begin_sweep
           polygons << GerbilCharts::SVGDC::SVGPolygon.new
       end
@@ -33,10 +31,8 @@ class StackedAreaSurface < Surface
       
       # perform the sweep
       while (sweep_pos<=sweep_to)  
-  #    debugger
             acc_y = 0
             parent.modelgroup.each_model_with_index do | mod, i|
-  #          debugger
               acc_y +=  mod.sweep(sweep_pos)
               xpos = scale_x sweep_pos,rx
               ypos = scale_y acc_y,ry
@@ -50,10 +46,11 @@ class StackedAreaSurface < Surface
             
             sweep_pos += sweep_interval
      end
-#     debugger
       # layout all polygons in reverse
       i=polygons.length-1
+	  last_x = scale_x sweep_to,rx
       polygons.reverse_each do |p|
+	    p.addpoint(last_x,@bounds.bottom)
         g.addshape(p,{:id => "item#{i}"})
         i -= 1
       end

data/lib/gerbilcharts/version.rb

@@ -2,7 +2,7 @@ module GerbilCharts
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_lines.rb

@@ -12,7 +12,7 @@ class TestLines  < Test::Unit::TestCase
      @test_vector_tm3 = []
      tbeg = Time.local( 1978, "jun", 5, 9, 10, 0, 0)
      sbeg = tbeg
-     sec_inc = 1000
+     sec_inc = 50
      
      for i in (0..20)
       @test_vector_tm1 << [sbeg + i*sec_inc, i*sec_inc*1000 ]
@@ -91,7 +91,7 @@ class TestLines  < Test::Unit::TestCase
   # test a line chart
   def test_line_1
  
-    mychart = GerbilCharts::Charts::AreaChart.new( :width => 450, :height => 400, :style => 'brushmetal.css')
+    mychart = GerbilCharts::Charts::AreaChart.new( :width => 350, :height => 200, :style => 'brushmetal.css')
     mychart.setmodelgroup(@modgroup)
     mychart.render('/tmp/sq_linechart1.svg')
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gerbilcharts
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Vivek Rajagopalan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 +05:30
+date: 2009-10-20 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency