gerbilcharts 0.5.9 → 0.6.8

data/lib/gerbilcharts/surfaces/square_line_surface.rb

@@ -10,50 +10,47 @@ module GerbilCharts::Surfaces
 # [+scaling+]               :auto, :auto_y0
 #
 class SquareLineSurface < Surface
-    def initialize(opts={})
-      super(opts)
-    end
+  def initialize(opts={})
+    super(opts)
+  end
     
-    def int_render(g)
+  def int_render(g)
       
-	  range_options_x = parent.get_global_option(:scaling_x,:auto)
-	  range_options_y = parent.get_global_option(:scaling_y,:auto)
-      rx = parent.modelgroup.effective_range_x(range_options_x)
-      ry = parent.modelgroup.effective_range_y(range_options_y)
+    range_options_x = parent.get_global_option(:scaling_x,:auto)
+    range_options_y = parent.get_global_option(:scaling_y,:auto)
+    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,"LINE")
-      end
+    set_ajaxSurfaceContext(rx.rmax,ry.rmax,"LINE") if parent.usesAjax?
 
-      parent.modelgroup.each_model_with_index do | mod, i|
+    parent.modelgroup.each_model_with_index do | mod, i|
       
 	  	prev_ypos=nil
-        mod.each_tuple do |x,y|
+      mod.each_tuple do |x,y|
 
-		  # the basic line 
-          xpos = scale_x x,rx
-          ypos = scale_y y,ry
+		    # the basic line 
+        xpos = scale_x x,rx
+        ypos = scale_y y,ry
 
-		  prev_ypos ||= ypos 
-          g.lineto xpos,prev_ypos
-		  g.lineto xpos,ypos
-		  prev_ypos=ypos
+		    prev_ypos ||= ypos 
+        g.lineto xpos,prev_ypos
+		    g.lineto xpos,ypos
+		    prev_ypos=ypos
 
-		  # datapoint and a tooltip 
-       	  opts = {:id => "item#{i}"}
-		  if parent.get_global_option(:auto_tooltips,false)
+		    # datapoint and a tooltip 
+       	opts = {:id => "item#{i}"}
+		    if parent.get_global_option(:auto_tooltips,false)
 				  opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
 				  opts.store(:gerbiltooltip1, mod.name) 
 				  opts.store(:gerbiltooltip2, "Val = #{y}")
-		  end
-		  g.circle(xpos,ypos,4,opts) if parent.get_global_option(:circle_data_points,false)
-        end
-        g.endline(:id => "lineitem#{i}")
+		    end
+		    g.circle(xpos,ypos,4,opts) if parent.get_global_option(:circle_data_points,false)
       end
-      
-      #draw each model in the group
+      g.endline(:id => "lineitem#{i}")
     end
+      
+    draw_ref_model_line(g,rx,ry) if parent.modelgroup.has_ref_model?
+  end
 
 end
 

data/lib/gerbilcharts/surfaces/surface.rb

@@ -16,6 +16,32 @@ class Surface < GraphElement
     def set_ajaxSurfaceContext(mxx, mxy, type)
       parent.set_ajaxContext(:axmxx => mxx, :axmxy => mxy, :axsurface => type)
     end
-end
+
+	def draw_ref_model_line(g,rx,ry)
+      ref_model = parent.modelgroup.ref_model
+    
+      ref_model.each_tuple do |x,y|
+        xpos = scale_x x,rx
+        ypos = scale_y y,ry
+        g.lineto xpos,ypos
+      end
+
+      g.endline(:class  => "refline")
+
+      # show latest pt   & label
+      ref_model.first do |x,y|
+        g.textout(@bounds.left+5, scale_y(y,ry)-5, 
+            ref_model.latest_formatted_val, 
+            {:class => "reflinelabel"})
+      end
+	  ref_model.latest do |x,y|
+	    g.textout(@bounds.right-5, scale_y(y,ry)-5, ref_model.latest_formatted_val,
+			{:class => "reflinelabel", "text-anchor" => "end"  })
+	  end
+
+
+	end
 
 end
+end
+

data/lib/gerbilcharts/svgdc/svg_polygon.rb

@@ -6,18 +6,23 @@ module GerbilCharts::SVGDC
 # The oper string consists of M x y L x y style commands. See SVG spec.
 # todo : accept an array of coords and automatically construct the oper string
 #
+POLYGON_RESOLUTION="%.1f"
+
 class SVGPolygon < SVGShape
 
   attr_reader :operstring
   
   def initialize
     @operstring = ""
+	@last_svg = ""
   end
   
   def addpoint(x,y)
     # truncate to 2 significant places (cuts down SVG size)
-    xf,yf = "%.2f"%x, "%.2f"%y
-    @operstring << "#{xf},#{yf} "
+    xf,yf = POLYGON_RESOLUTION%x, POLYGON_RESOLUTION%y
+	s = "#{xf},#{yf} "
+    @operstring << "#{xf},#{yf} " unless s == @last_svg
+	@last_svg = s
   end
   
   def render(xfrag)
@@ -38,14 +43,16 @@ class SVGSquarizedPolygon < SVGPolygon
   def addpoint(x,y)
   	@lastpt ||= [] 
 	
-	unless @lastpt.empty?
-			xf,yf = "%.2f"%x, "%.2f"%@lastpt[1]
-			@operstring << "#{xf},#{yf} "
-			xf,yf = "%.2f"%x, "%.2f"%y
-			@operstring << "#{xf},#{yf} "
+    # truncate to 2 significant places (cuts down SVG size)
+    s = " #{POLYGON_RESOLUTION%x}, #{POLYGON_RESOLUTION%y} "
+
+	unless s == @last_svg  or  @lastpt.empty?
+			@operstring << " #{POLYGON_RESOLUTION%x}, #{POLYGON_RESOLUTION%@lastpt[1]} "
+			@operstring << s
 	end
 
 	@lastpt = [x,y]
+	@last_svg = s
   end
   
 end

data/lib/gerbilcharts/svgdc/svg_polyline.rb

@@ -5,17 +5,23 @@ module GerbilCharts::SVGDC
 #
 # Send this a series of lineto messages
 #
+#
+
 class SVGPolyline < SVGShape
   
+  POLYLINE_RESOLUTION="%.1f"
+
   attr_reader :operstring
   
   def initialize
     @operstring = ""
+	@last_svg = ""
   end
   
   def lineto(x,y)
-    fmt="%.2f"
-    @operstring << "#{fmt%x},#{fmt%y} "
+    s = "#{POLYLINE_RESOLUTION%x},#{POLYLINE_RESOLUTION%y} "
+    @operstring.concat(s) unless @last_svg == s
+	@last_svg=s
   end
   
   def render(xfrag)

data/lib/gerbilcharts/svgdc/svgdc.rb

@@ -289,6 +289,10 @@ class SVGDC
     @curr_win << prime_object(SVGCircle.new(x,y,r),opt)
   end
   
+  def ellipse(x,y,r1,r2,opt={})
+    @curr_win << prime_object(SVGEllipse.new(x,y,r1,r2),opt)
+  end
+
   def moveto(x,y)
     @curr_polyline=SVGPolyline.new
     @curr_polyline.lineto(x,y)
@@ -309,6 +313,10 @@ class SVGDC
   def begin_polygon
     @curr_polygon=SVGPolygon.new
   end
+
+  def begin_squarized_polygon
+    @curr_polygon=SVGSquarizedPolygon.new
+  end
   
   def polygon_point(x,y)
   	  @curr_polygon ||= SVGPolygon.new

data/lib/gerbilcharts/version.rb

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

metadata

@@ -1,79 +1,127 @@
 --- !ruby/object:Gem::Specification 
 name: gerbilcharts
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
-- Vivek Rajagopalan
+- vivek
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 +05:30
+date: 2012-06-30 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: shoulda
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-description: SVG based charting library for timeseries data
-email: 
-- vivek at unleashnetworks
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+description: Gerbilcharts is a server side charting library that outputs SVG text
+email: vivek_rajagopal@yahoo.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
+- LICENSE.txt
+- README.rdoc
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- Rakefile
-- setup.rb
-- test/trafgen.rb
-- test/test_noob.rb
-- test/test_render_string.rb
-- test/test_helper.rb
-- test/test_scaling.rb
 - lib/gerbilcharts.rb
-- lib/gerbilcharts/version.rb
-- lib/gerbilcharts/models.rb
-- lib/gerbilcharts/svgdc.rb
-- lib/gerbilcharts/surfaces.rb
 - lib/gerbilcharts/charts.rb
-- lib/gerbilcharts/public/brushmetal.css
-- lib/gerbilcharts/public/gerbil.js
+- lib/gerbilcharts/charts/area_chart.rb
+- lib/gerbilcharts/charts/bar_chart.rb
+- lib/gerbilcharts/charts/bar_chart_compact.rb
+- lib/gerbilcharts/charts/bubble_chart.rb
+- lib/gerbilcharts/charts/chart_base.rb
+- lib/gerbilcharts/charts/conversation_ring.rb
+- lib/gerbilcharts/charts/impulse_chart.rb
+- lib/gerbilcharts/charts/line_chart.rb
+- lib/gerbilcharts/charts/line_chart_table.rb
+- lib/gerbilcharts/charts/matrix_chart.rb
+- lib/gerbilcharts/charts/pie_chart.rb
+- lib/gerbilcharts/charts/square_line_chart.rb
+- lib/gerbilcharts/charts/stacked_area_chart.rb
+- lib/gerbilcharts/charts/stacked_area_chart_table.rb
+- lib/gerbilcharts/models.rb
 - lib/gerbilcharts/models/bucketized_timeseries_graph_model.rb
-- lib/gerbilcharts/models/graph_model_group.rb
+- lib/gerbilcharts/models/discrete_time_range.rb
 - lib/gerbilcharts/models/graph_model.rb
+- lib/gerbilcharts/models/graph_model_group.rb
+- lib/gerbilcharts/models/matrix_model.rb
 - lib/gerbilcharts/models/monotonous_graph_model.rb
 - lib/gerbilcharts/models/presets.rb
 - lib/gerbilcharts/models/raw_range.rb
 - lib/gerbilcharts/models/round_range.rb
 - lib/gerbilcharts/models/round_time_range.rb
-- lib/gerbilcharts/models/discrete_time_range.rb
 - lib/gerbilcharts/models/sampled_timeseries_graph_model.rb
-- lib/gerbilcharts/models/time_series_graph_model.rb
 - lib/gerbilcharts/models/simple_timeseries_model_group.rb
-- lib/gerbilcharts/models/matrix_model.rb
+- lib/gerbilcharts/models/time_series_graph_model.rb
+- lib/gerbilcharts/surfaces.rb
 - lib/gerbilcharts/surfaces/area_surface.rb
 - lib/gerbilcharts/surfaces/axis.rb
 - lib/gerbilcharts/surfaces/bar_surface.rb
 - lib/gerbilcharts/surfaces/basic_grid.rb
+- lib/gerbilcharts/surfaces/bubble_surface.rb
 - lib/gerbilcharts/surfaces/chart.rb
+- lib/gerbilcharts/surfaces/conversation_ring.rb
+- lib/gerbilcharts/surfaces/detailed_legend.rb
 - lib/gerbilcharts/surfaces/graph_element.rb
 - lib/gerbilcharts/surfaces/grid.rb
 - lib/gerbilcharts/surfaces/horizontal_axis.rb
@@ -81,100 +129,73 @@ files:
 - lib/gerbilcharts/surfaces/horizontal_time_axis.rb
 - lib/gerbilcharts/surfaces/impulse_surface.rb
 - lib/gerbilcharts/surfaces/legend.rb
-- lib/gerbilcharts/surfaces/detailed_legend.rb
 - lib/gerbilcharts/surfaces/line_surface.rb
 - lib/gerbilcharts/surfaces/mark_band.rb
+- lib/gerbilcharts/surfaces/matrix_surface.rb
 - lib/gerbilcharts/surfaces/panel.rb
 - lib/gerbilcharts/surfaces/pie_surface.rb
 - lib/gerbilcharts/surfaces/rect.rb
+- lib/gerbilcharts/surfaces/square_line_surface.rb
 - lib/gerbilcharts/surfaces/stacked_area_surface.rb
 - lib/gerbilcharts/surfaces/stacked_grid.rb
-- lib/gerbilcharts/surfaces/surface_background.rb
 - lib/gerbilcharts/surfaces/surface.rb
+- lib/gerbilcharts/surfaces/surface_background.rb
 - lib/gerbilcharts/surfaces/title_panel.rb
-- lib/gerbilcharts/surfaces/bubble_surface.rb
 - lib/gerbilcharts/surfaces/tracker.rb
 - lib/gerbilcharts/surfaces/vertical_axis.rb
-- lib/gerbilcharts/surfaces/square_line_surface.rb
-- lib/gerbilcharts/surfaces/matrix_surface.rb
-- lib/gerbilcharts/surfaces/conversation_ring.rb
-- lib/gerbilcharts/charts/area_chart.rb
-- lib/gerbilcharts/charts/bar_chart_compact.rb
-- lib/gerbilcharts/charts/bar_chart.rb
-- lib/gerbilcharts/charts/chart_base.rb
-- lib/gerbilcharts/charts/impulse_chart.rb
-- lib/gerbilcharts/charts/line_chart.rb
-- lib/gerbilcharts/charts/stacked_area_chart.rb
-- lib/gerbilcharts/charts/pie_chart.rb
-- lib/gerbilcharts/charts/square_line_chart.rb
-- lib/gerbilcharts/charts/matrix_chart.rb
-- lib/gerbilcharts/charts/conversation_ring.rb
-- lib/gerbilcharts/charts/bubble_chart.rb
-- lib/gerbilcharts/svgdc/svgdc.rb
-- lib/gerbilcharts/svgdc/svg_element.rb
+- lib/gerbilcharts/svgdc.rb
+- lib/gerbilcharts/svgdc/css_inliner.rb
 - lib/gerbilcharts/svgdc/filters.rb
-- lib/gerbilcharts/svgdc/transformations.rb
 - lib/gerbilcharts/svgdc/presentation_attributes.rb
-- lib/gerbilcharts/svgdc/svg_win.rb
-- lib/gerbilcharts/svgdc/svg_custom_win.rb
-- lib/gerbilcharts/svgdc/svg_shape.rb
+- lib/gerbilcharts/svgdc/svg_arc.rb
 - lib/gerbilcharts/svgdc/svg_circle.rb
+- lib/gerbilcharts/svgdc/svg_custom_win.rb
+- lib/gerbilcharts/svgdc/svg_element.rb
 - lib/gerbilcharts/svgdc/svg_ellipse.rb
 - lib/gerbilcharts/svgdc/svg_line.rb
 - lib/gerbilcharts/svgdc/svg_polygon.rb
 - lib/gerbilcharts/svgdc/svg_polyline.rb
 - lib/gerbilcharts/svgdc/svg_rect.rb
+- lib/gerbilcharts/svgdc/svg_shape.rb
 - lib/gerbilcharts/svgdc/svg_text.rb
-- lib/gerbilcharts/svgdc/svg_arc.rb
-- lib/gerbilcharts/svgdc/css_inliner.rb
+- lib/gerbilcharts/svgdc/svg_win.rb
+- lib/gerbilcharts/svgdc/svgdc.rb
+- lib/gerbilcharts/svgdc/transformations.rb
+- lib/gerbilcharts/version.rb
+- LICENSE.txt
+- README.rdoc
 has_rdoc: true
-homepage: http://gerbilcharts.rubyforge.org
-licenses: []
+homepage: http://github.com/vivekrajan/gerbilcharts
+licenses: 
+- MIT
+post_install_message: 
+rdoc_options: []
 
-post_install_message: |+
-  Thanks for installing GerbilCharts SVG
-  
-rdoc_options: 
-- --main
-- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 117781501
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: gerbilcharts
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: SVG based charting library for timeseries data
-test_files: 
-- test/test_conversation.rb
-- test/test_bubble.rb
-- test/test_embed_styles.rb
-- test/test_gerbilcharts.rb
-- test/test_ranges.rb
-- test/test_sa.rb
-- test/test_helper.rb
-- test/test_matrix.rb
-- test/test_svgdc.rb
-- test/test_noob.rb
-- test/test_lines.rb
-- test/test_pie.rb
-- test/test_render_string.rb
-- test/test_bar.rb
-- test/test_models.rb
-- test/test_charts.rb
-- test/test_negatives.rb
-- test/test_scaling.rb
-- test/test_Scratch.rb
+summary: SVG timeseries charting
+test_files: []
+