gerbilcharts 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.7 2009-08-15
+* Changes
+  * Bug fixes with stacked area
+
 == 0.0.5 2009-06-05
 * Changes
   * Support render_to_string to inline render in browser

data/lib/gerbilcharts/models/graph_model_group.rb

@@ -109,9 +109,7 @@ class GraphModelGroup
   # rounds both x and y scales, returns two ranges 
   def effective_round_range
     
-    if @models.length==0
-      return 0,0
-    end
+    return 0,0 if  @models.empty?
     
     reffx = RawRange.new
     reffy = RawRange.new
@@ -127,11 +125,19 @@ class GraphModelGroup
 
   # round the x ranges of all models
   def effective_round_range_x
+
+    return 0,0 if  @models.empty?
     
     reffx = RawRange.new
     @models.each do |m|
       reffx.update_r(m.xrange)
     end    
+
+	if reffx.invalid?
+		reffx.update 10
+	end
+
+
     return models[0].round_given_x(reffx)
   end
   
@@ -162,7 +168,7 @@ class GraphModelGroup
     reffy = RawRange.new
     reffy.zeromin
     @models.each do |m|
-      reffy.update_r(m.yrange)
+      reffy.update_r(m.yrange) 
     end    
     return @models[0].round_given_y(reffy)
   end
@@ -179,6 +185,9 @@ class GraphModelGroup
   
   # sum of model ranges  with min y being 0
   def cumulative_round_range_y0
+
+    return 0,100 if models.empty?
+
     reffy = RawRange.new
     reffy.update(0)
     @models.each do |m|
@@ -215,9 +224,7 @@ class GraphModelGroup
 
   def cumulative_round_range
     
-    if @models.length==0
-      return 0,0
-    end
+    return 0,0 if  @models.empty?
     
     reffx = RawRange.new
     reffy = RawRange.new

data/lib/gerbilcharts/models/monotonous_graph_model.rb

@@ -78,7 +78,7 @@ class MonotonousGraphModel < GraphModel
   end
   
   def latest_x_dbtime
-    return @xarr.last<<32
+    return (@xarr.last.tv_sec) << 32
   end
   
   def first

data/lib/gerbilcharts/models/raw_range.rb

@@ -10,13 +10,19 @@ class RawRange  < Presets
   def  initialize
     @rmax,@rmin=nil,nil
   end
+
+  def invalid?
+  	@rmin.nil?
+  end
   
   # update - updates the range
   # 	newval - new incoming value
   #
   def update(newval)
-    @rmax=newval if @rmax.nil? or newval > @rmax 
-    @rmin=newval if @rmin.nil? or newval < @rmin 
+	if not newval.nil?
+	    @rmax=newval if @rmax.nil? or newval > @rmax 
+	    @rmin=newval if @rmin.nil? or newval < @rmin 
+	end 
   end
   
   # update - updates the range (using another range)

data/lib/gerbilcharts/models/round_range.rb

@@ -10,9 +10,9 @@ class RoundRange < RawRange
   # given a raw range, we calculate a round range
   def initialize(raw_range)
     super()
-    @rmin=round_min(raw_range.rmin)
-    @rmax=round_max(raw_range.rmax)
-    @lmax=label_step
+    @rmin=round_min(raw_range.rmin) if not raw_range.rmin.nil?
+    @rmax=round_max(raw_range.rmax) if not raw_range.rmax.nil?
+    @lmax=label_step  if not raw_range.rmax.nil?
   end
  
    # provide labels
@@ -24,6 +24,8 @@ class RoundRange < RawRange
    # 	end
    #
    def each_label
+
+	return if not @lmax
      
     raise "Range not aligned with presets (call round range first)" if not @lmax
     raise "No data points in model" if @rmax == -1  

data/lib/gerbilcharts/models/sampled_timeseries_graph_model.rb

@@ -73,6 +73,11 @@ class SampledTimeSeriesGraphModel < TimeSeriesGraphModel
   def bucket_diff(tv1,tv2)
     return (tv2-tv1).abs / @bucketsize
   end
+
+  def bucket_size_secs
+  	return @bucketsize
+  end
+
   
 end
 

data/lib/gerbilcharts/models/time_series_graph_model.rb

@@ -15,8 +15,13 @@ class TimeSeriesGraphModel < MonotonousGraphModel
     @roundery=RoundRange
   end
 
+  # we add Timeval objects (those that respond to tv_sec)
   def add(timeobj, val)
-	super timeobj, val
+	if timeobj.is_a? Time
+		super timeobj, val
+	elsif timeobj.is_a? Fixnum
+		super Time.at(timeobj),val
+	end
   end
   
   # crop older than the given timestamp

data/lib/gerbilcharts/surfaces/grid.rb

@@ -9,6 +9,8 @@ class Grid < GraphElement
     end
     
     def int_render(g)
+		return
+
       ry = grid_range_y
       ry.each_label do |val,label|
           yp = scale_y val,ry

data/lib/gerbilcharts/surfaces/tracker.rb

@@ -13,7 +13,7 @@ class Tracker < GraphElement
     
     def int_render(dc)
       
-      dc.addshape(SVGCustomWin.new("GerbilTracker",self))
+      dc.addshape(GerbilCharts::SVGDC::SVGCustomWin.new("GerbilTracker",self))
       
     end
     

data/lib/gerbilcharts/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gerbilcharts
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Vivek Rajagopalan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 +05:30
+date: 2009-08-17 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.3
     version: 
 description: SVG based charting library for timeseries data
 email: