gerbilcharts 0.2.8 → 0.2.10

data/lib/gerbilcharts/surfaces/area_surface.rb

@@ -2,6 +2,12 @@ module GerbilCharts::Surfaces
 
 # == Area Surface w/ transparency
 # The transparency kind of allows hidden items to be shown
+# 
+# ===Options
+#	:scaling_x		:auto, :auto_0, or array [minval,maxval]
+#   :scaling_y		
+#	:butterfly		true/false for butterfly chart (alternate models on +/- y)
+#	:zbucketsize	if no data for this many 'x', then insert a zero
 #
 class AreaSurface < Surface
     def initialize(opts={})
@@ -9,13 +15,17 @@ class AreaSurface < Surface
     end
     
     def int_render(g)
+
+
 	  range_options_x = parent.get_global_option(:scaling_x,:auto)
 	  range_options_y = parent.get_global_option(:scaling_y,:auto)
 	  butterfly       = parent.get_global_option(:butterfly,false)
+      zbucketsize 	  = parent.get_global_option(:zero_bucketsize,nil)
 
       rx = parent.modelgroup.effective_range_x(range_options_x)
       ry = parent.modelgroup.effective_range_y(range_options_y)
 
+
       # ajax if used
       if parent.usesAjax?
         set_ajaxSurfaceContext(rx.rmax,ry.rmax,"AREA")
@@ -29,18 +39,28 @@ class AreaSurface < Surface
       parent.modelgroup.each_model_with_index do | mod, i|
         g.begin_polygon
         firstpoint=true
-        xpos=0
-        ypos=0
+        xpos,ypos=0,0
+		last_x=nil
         mod.each_tuple do |x,y|
 
 		  y =-y if butterfly and i.odd?
 
           xpos = scale_x x,rx
           ypos = scale_y y,ry
+
           if firstpoint 
             g.polygon_point xpos,y_zero
             firstpoint=false
           end
+
+		  unless zbucketsize.nil?
+		  	if last_x && (x-last_x) > zbucketsize
+        		g.polygon_point scale_x(last_x,rx) ,y_zero
+        		g.polygon_point scale_x(x,rx) ,y_zero
+			end
+			last_x=x
+	      end
+
           g.polygon_point xpos,ypos
         end
         g.polygon_point xpos,y_zero

data/lib/gerbilcharts/surfaces/horizontal_axis.rb

@@ -12,17 +12,23 @@ class HorizontalAxis < Axis
       
       return if parent.modelgroup.empty?
       
-      rx = parent.modelgroup.effective_round_range_x
-      rx.each_label do |val,label|
-        xp = scale_x val,rx
+      range_options_x = parent.get_global_option(:scaling_x,:auto)
+      rawx = parent.modelgroup.effective_range_x(range_options_x)
+
+	  # need roundx for labels
+      roundx = parent.modelgroup.effective_round_range_x
+      roundx.each_label do |val,label|
+        xp = scale_x val,rawx
+
+	    break if val>rawx.rmax
           
-          # make sure edge ones are visible
-          if (xp>=@bounds.right-10)
+        # make sure edge ones are visible
+        if (xp>=@bounds.right-10)
             xp = @bounds.right-10
-          end
+        end
           
-          g.textout(xp, @bounds.top+10, label, {:class => "axislabel", "text-anchor" => "middle"})
-          g.line(xp,@bounds.top-2,xp,@bounds.top+3, {:class => "axistickmajor"})
+        g.textout(xp, @bounds.top+10, label, {:class => "axislabel", "text-anchor" => "middle"})
+        g.line(xp,@bounds.top-2,xp,@bounds.top+3, {:class => "axistickmajor"})
       end
       
     end

data/lib/gerbilcharts/surfaces/horizontal_time_axis.rb

@@ -12,9 +12,11 @@ class HorizontalTimeAxis < HorizontalAxis
     
     def int_render(g)
       super
-      
+
       rx = parent.modelgroup.effective_round_range_x
       sfmt = rx.format_min_value
+
+
       g.textout(@bounds.left-20, @bounds.top+20, sfmt, {:class => "axislabelt0" })
       g.line(@bounds.left,@bounds.top,@bounds.left,@bounds.top+10,{:class => "axistickmajor"})
       

data/lib/gerbilcharts/surfaces/tracker.rb

@@ -21,7 +21,9 @@ class Tracker < GraphElement
     def render_direct(xfrag)
     
       # calculate scaling factors
-      rx = parent.modelgroup.effective_round_range_x
+      range_options_x = parent.get_global_option(:scaling_x,:auto)
+      rx = parent.modelgroup.effective_range_x(range_options_x)
+
       
       xfrag.g(:id=> 'gtrackerrect', :visibility=>'hidden') {
              xfrag.rect(:id=>"trackerrect", :class=>"trackerrect", 
@@ -50,14 +52,14 @@ class Tracker < GraphElement
         }
       }
       
-	  raise "Time Tracker expects X-Axis to be a time interval " unless rx.rmin.is_a? Time
-
+     raise "Time Tracker expects X-Axis to be a time interval " unless rx.rmin.is_a? Time
 
-      xfrag.g(:id=>"gtrackerdata",   :visibility=>'hidden',
+     xfrag.g(:id=>"gtrackerdata",   :visibility=>'hidden',
               :gerb_fromts=>rx.rmin.tv_sec,  
+              :gerb_seconds=>rx.rmax.tv_sec-rx.rmin.tv_sec,  
               :gerb_scale =>(rx.delta)/parent.anchor.bounds.width,
-              :gerb_selts=>"1",
-              :gerb_selsecs=>"1")
+              :gerb_selts=>1,
+              :gerb_selsecs=>1)
       
     end
     

data/lib/gerbilcharts/svgdc.rb

@@ -21,3 +21,4 @@ require 'gerbilcharts/svgdc/svg_polyline'
 require 'gerbilcharts/svgdc/svg_rect'
 require 'gerbilcharts/svgdc/svg_text'
 require 'gerbilcharts/svgdc/svg_arc'
+require 'gerbilcharts/svgdc/css_inliner'

data/lib/gerbilcharts/svgdc/css_inliner.rb

@@ -0,0 +1,59 @@
+require 'rexml/document'
+
+module GerbilCharts::SVGDC
+
+# = CssInliner - dead simple css inliner
+#
+class CssInliner 
+  
+  attr_reader		:class_table
+  attr_reader		:selector_table
+
+  # need a css string
+  def initialize(css_string)
+
+	css_string.tr!("\r\n\t","")
+	@class_table = {}
+	@selector_table  = {}
+
+	css_string.split('}').each do |rec|
+
+			parts = rec.split('{')
+			parts.each { |p| p.strip!; p.squeeze!(' ');}
+
+			case  parts[0][0]
+				when 35; @selector_table.store(parts[0][1..-1],parts[1])
+				when 46; @class_table.store(parts[0][1..-1],parts[1])
+			end
+	end
+  end
+
+
+  # inline_doc
+  # 	inline the incoming svg string using the css
+  # return
+  # 	the transformed svg string with inlined styles
+ def inline_doc(doc_string)
+	rxdoc = REXML::Document.new doc_string 
+	proc_ele(rxdoc.root)
+	return rxdoc.to_s
+ end
+
+
+private
+
+
+	def proc_ele(ele)
+		ele.each_element_with_attribute('id') { |e| inline_style(e,e.attributes['id'],@selector_table) }
+		ele.each_element_with_attribute('class') { |e| inline_style(e,e.attributes['class'],@class_table) }
+		ele.each_element { |e| proc_ele(e)}
+	end
+
+	def inline_style(ele, key, tbl)
+		stylestr  = tbl[key]
+		ele.add_attribute('style',stylestr) if stylestr
+	end
+  
+end
+
+end

data/lib/gerbilcharts/svgdc/svgdc.rb

@@ -32,6 +32,7 @@ class SVGDC
   attr_reader       :ajaxOptions
   attr_reader       :ajaxContext
   attr_reader       :use_tooltips
+  attr_reader		:embed_style
   
   def initialize(w,h)
     @width,@height=w,h
@@ -41,6 +42,7 @@ class SVGDC
     setactivewindow(@base_win)
     @svg_predefs = [] 
     @use_tooltips=true
+	@embed_style=false
   end
   
   # ==Note on Stylesheet
@@ -48,21 +50,29 @@ class SVGDC
   # 	If you want to use your own stylesheets put them in the working directory, or in the
   # 	public directory of gerbilcharts.
   # To inline stylesheet use "inline:<stylesheetname>" , eg "inline:brushmetal.css"
+  # To embed stylesheet use "embed:<stylesheetname>" , eg "embed:brushmetal.css"
   # Default is to xref a stylesheet 
   def add_stylesheetfile(cssfile_in)
+  	return unless cssfile_in
   	cssfile=cssfile_in.gsub(/^inline:/,'')
 	if cssfile.length <  cssfile_in.length
    	    @svg_styles = get_file_content(cssfile)
 	else
-	    @ref_styles ||= []
-	    @ref_styles << cssfile 
+  		cssfile=cssfile_in.gsub(/^embed:/,'')
+		if cssfile.length < cssfile_in.length
+   	    	@svg_styles = get_file_content(cssfile)
+			@embed_style = true
+		else
+			@ref_styles ||= []
+			@ref_styles << cssfile 
+		end
 	end
-
   end
   
   # To inline javascript use "inline:<javascript-file-name>"
   #
   def add_javascriptfile(jsfile_in)
+  	return unless jsfile_in
   	jsfile=jsfile_in.gsub(/^inline:/,'')
 	if jsfile.length <  jsfile.length
 	      @svg_javascript ||= ""  
@@ -147,7 +157,7 @@ class SVGDC
        doc.svg(svg_attributes)   {
        
        # stylesheet (inlined into SVG)
-       doc.style(@svg_styles, :type => "text/css")  if @svg_styles
+       doc.style(@svg_styles, :type => "text/css")  if @svg_styles and not @embed_style
     
        # javascripts (ajax, etc) hrefed
        @ref_javascripts &&   @ref_javascripts.each do |scr|
@@ -206,6 +216,9 @@ class SVGDC
           }
        end
      }      
+
+	 # convert external stylesheet css to inline styles
+	 
   end
   
   # render the SVG fragments to a string
@@ -227,8 +240,9 @@ class SVGDC
    
    render_to_frag(doc,opts)
    
-   # return the svg_string
-   return svg_string
+   # return the svg_string (inline if embedding desired)
+   return @embed_style ?  do_embed_styles(svg_string) : svg_string
+
   end
   
   # render the SVG to a file
@@ -359,6 +373,22 @@ private
 	   raise "Resource #{fname} not found in current directory or in the gerbilcharts/public folder"
   end
 
+  # external styles to  inline (for svg_web)
+  def do_embed_styles(svgdoc_string)
+
+  	if @ref_styles
+		css_string = File.read('@ref_styles')
+	else
+		css_string = @svg_styles
+	end
+
+	css_inliner = GerbilCharts::SVGDC::CssInliner.new(css_string)
+	return css_inliner.inline_doc(svgdoc_string)
+
+  end
+
+
+
 end
 
 end

data/lib/gerbilcharts/version.rb

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

data/test/test_embed_styles.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestLines  < Test::Unit::TestCase
+
+   attr_reader  :mod1, :mod2, :modbucket1
+  
+   def setup
+     @test_vector_tm1 = []
+     tbeg = Time.local( 1978, "jun", 5, 9, 10, 0, 0)
+     sbeg = tbeg
+     sec_inc = 50
+     
+     for i in (0..20)
+      @test_vector_tm1 << [sbeg + i*sec_inc, i*sec_inc*250*rand() ]
+    end
+
+    @mod1 = GerbilCharts::Models::TimeSeriesGraphModel.new("External Gateway")
+    @mod1.add_tuples @test_vector_tm1
+  
+    @modgroup = GerbilCharts::Models::GraphModelGroup.new("Hosts")
+    @modgroup.add(@mod1)
+
+   end
+  
+
+  # test a line chart
+  def test_line_1
+ 
+    mychart = GerbilCharts::Charts::AreaChart.new( :width => 450, :height => 250, :style => 'embed:brushmetal.css')
+    mychart.setmodelgroup(@modgroup)
+    mychart.render('/tmp/embed_style.svg')
+    
+  end   
+   
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gerbilcharts
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors: 
 - Vivek Rajagopalan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 +05:30
+date: 2009-11-03 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +117,7 @@ files:
 - lib/gerbilcharts/svgdc/svg_rect.rb
 - lib/gerbilcharts/svgdc/svg_text.rb
 - lib/gerbilcharts/svgdc/svg_arc.rb
+- lib/gerbilcharts/svgdc/css_inliner.rb
 has_rdoc: true
 homepage: http://gerbilcharts.rubyforge.org
 licenses: []
@@ -149,6 +150,7 @@ signing_key:
 specification_version: 3
 summary: SVG based charting library for timeseries data
 test_files: 
+- test/test_embed_styles.rb
 - test/test_gerbilcharts.rb
 - test/test_ranges.rb
 - test/test_helper.rb