gerbilcharts 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d029786a988fb9db2da4f048c2aaf142e34dbc5
-  data.tar.gz: dfb2ae9401f4e592b87cf400216c209af55212b7
+  metadata.gz: 463652e497be145b0f44cef398008ed555b7f0da
+  data.tar.gz: 05a9cdaa19116dbf6c56d8c85c8bab62cf55948d
 SHA512:
-  metadata.gz: 3de4722ffee541a1c66559e933c28dd9ac48b341517ea3e557208c6a035ba77cf8b8eeaf748389a118af18fe5c75d08dbe237c5d16e7216569ee5457ca79b120
-  data.tar.gz: 57297f9eca55aeb093caabc91df9059a97e399ab98ed95f877c9135236bc6833a3d066dbb11adb0ef2689eb2beae9398a7e55839f5f7bf63bcfb4f519a140562
+  metadata.gz: af622b8b57abb84ee854306abdaf11e30b5a9fc265f71ff1bbd4d49b790f67b70350f7fb2caff1daed2dcbae30384116752e045eed996bcc62193f28112cb7e3
+  data.tar.gz: 78236e46462ae49bfd94bbac1a7853072e8f0ec485d07a2386c9fcb41c90c4f07cfd0bcae8b4ddd98f5078faeb5f17e51167f5d54fb112f73bc08fc85c2583a4

data/lib/gerbilcharts/charts/area_chart.rb

@@ -21,6 +21,7 @@ class AreaChart < ChartBase
 
     # other elements
     @thechart.add_child(GerbilCharts::Surfaces::SurfaceBackground.new(:orient => ORIENT_OVERLAY))
+    @thechart.add_child(GerbilCharts::Surfaces::MarkBand.new(:orient => ORIENT_OVERLAY))
     @thechart.add_child(GerbilCharts::Surfaces::BasicGrid.new(:orient => ORIENT_OVERLAY))
     @thechart.add_child(GerbilCharts::Surfaces::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30))
     @thechart.add_child(GerbilCharts::Surfaces::AreaSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)

data/lib/gerbilcharts/models/graph_model_group.rb

@@ -11,14 +11,19 @@ class GraphModelGroup
   attr_accessor :emptycaption
   attr_accessor :units
   attr_accessor :x_markers
-  attr_accessor :ref_model
+  attr_accessor :ref_models 
+  attr_accessor :annotations
+  attr_accessor :range_bands 
   
   def initialize(n="Untitled-Group",opts={})
     @models=[]
     @name=n
     @units=opts[:units] || ""
+	@ref_models=[]
+	@annotations=[] # array of [{:x, :y, :label}] 
+	@range_bands=[] # array of models [{:upper=>nil,:lower=>nil} ]
   end
-  
+
   def <<(m)
     @models << m
   end
@@ -26,7 +31,7 @@ class GraphModelGroup
   def add(m)
     @models << m
   end
-  
+
   def delete(m)
     @models.delete(m)
   end
@@ -197,7 +202,15 @@ class GraphModelGroup
       reffy.update(m.yrange.rmax+reffy.rmax) if m.yrange.rmax
     end    
 
- 	reffy.update(ref_model.yrange.rmax)  if has_ref_model?
+	@ref_models.each do |ref_model| 
+		reffy.update(ref_model.yrange.rmax)  
+	end 
+
+	@range_bands.each do |range_band|
+		reffy.update(range_band[:upper].yrange.rmax)  
+		reffy.update(range_band[:lower].yrange.rmax)  
+	end 
+
     return models[0].round_given_y(reffy)
 
   end
@@ -208,7 +221,16 @@ class GraphModelGroup
     @models.each do |m|
       reffy.update(m.yrange.rmax+reffy.rmax)
     end    
- 	reffy.update(ref_model.yrange.rmax)  if has_ref_model?
+
+	@ref_models.each do |ref_model| 
+		reffy.update(ref_model.yrange.rmax)  
+	end
+
+	@range_bands.each do |range_band|
+		reffy.update(range_band[:upper].yrange.rmax)  
+		reffy.update(range_band[:lower].yrange.rmax)  
+	end
+
     return models[0].round_given_y(reffy)
   end
 
@@ -302,11 +324,6 @@ class GraphModelGroup
 	not x_markers.nil?
   end
 
-  def has_ref_model?
-  	not @ref_model.nil?
-  end
-
-
 
 private
 
@@ -333,7 +350,15 @@ private
 		reffy.update(acc_y)
 	end
 
- 	reffy.update(ref_model.yrange.rmax)  if has_ref_model?
+	
+	@ref_models.each do |ref_model|
+		reffy.update(ref_model.yrange.rmax)
+	end
+
+	@range_bands.each do |range_band|
+		reffy.update(range_band[:upper].yrange.rmax)  
+		reffy.update(range_band[:lower].yrange.rmax)  
+	end
 
     return models[0].round_given_y(reffy)
       

data/lib/gerbilcharts/models/monotonous_graph_model.rb

@@ -117,6 +117,12 @@ class MonotonousGraphModel < GraphModel
       yield @xarr[i],@yarr[i]
     end
   end
+
+  def each_tuple_reverse
+  	@xarr.length.downto(1) do  |i|
+      yield @xarr[i-1],@yarr[i-1]
+    end
+  end
   
   # crop all tuples older than a cutoff window
   #

data/lib/gerbilcharts/surfaces/area_surface.rb

@@ -77,7 +77,9 @@ class AreaSurface < Surface
       g.end_polygon(:id => "item#{i}", "opacity"=>"0.8")
     end
 
-    draw_ref_model_line(g,rx,ry) if parent.modelgroup.has_ref_model?
+    draw_ref_model_lines(g,rx,ry) 
+    draw_range_bands(g,rx,ry) 
+    draw_annotations(g,rx,ry) 
 
   end
 

data/lib/gerbilcharts/surfaces/legend.rb

@@ -68,6 +68,10 @@ class Legend < GraphElement
 		opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
 		opts.store(:gerbiltooltip1, mod.name) 
 		opts.store(:gerbiltooltip2, "Latest Value = #{mod.latest_val}")
+
+		if mod.hasHref? 
+			opts.store(:href, mod.href)
+		end
 	
 	    # Selector
         ctlbox = Rect.new

data/lib/gerbilcharts/surfaces/line_surface.rb

@@ -55,7 +55,11 @@ class LineSurface < Surface
       g.endline(:id => "lineitem#{i}")
     end
 
-	  draw_ref_model_line(g,rx,ry) if parent.modelgroup.has_ref_model?
+	  draw_ref_model_lines(g,rx,ry) 
+
+      draw_range_bands(g,rx,ry) 
+
+      draw_annotations(g,rx,ry) 
 
   end
 

data/lib/gerbilcharts/surfaces/mark_band.rb

@@ -10,21 +10,21 @@ class MarkBand < GraphElement
     
     def int_render(g)
 
-	return unless parent.modelgroup.has_x_markers?
+		return unless parent.modelgroup.has_x_markers?
 
-        range_options_x = parent.get_global_option(:scaling_x,:auto)
-        range_options_y = parent.get_global_option(:scaling_y,:auto)
+		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)
+		rx = parent.modelgroup.effective_range_x(range_options_x)
+		ry = parent.modelgroup.effective_range_y(range_options_y)
 
-        mx_arr = parent.modelgroup.x_markers
+		mx_arr = parent.modelgroup.x_markers
 
-	band_r=@bounds.clone
-	band_r.left = scale_x mx_arr[0],rx
-	band_r.right = scale_x mx_arr[1],rx
+		band_r=@bounds.clone
+		band_r.left = scale_x mx_arr[0],rx
+		band_r.right = scale_x mx_arr[1],rx
 
-        g.rectangle_r(band_r, {:class => 'x_mk'})
+		g.rectangle_r(band_r, {:class => 'x_mk'})
 
     end
 end

data/lib/gerbilcharts/surfaces/square_line_surface.rb

@@ -49,7 +49,10 @@ class SquareLineSurface < Surface
       g.endline(:id => "lineitem#{i}")
     end
       
-    draw_ref_model_line(g,rx,ry) if parent.modelgroup.has_ref_model?
+    draw_ref_model_lines(g,rx,ry) 
+    draw_range_bands(g,rx,ry) 
+    draw_annotations(g,rx,ry) 
+
   end
 
 end

data/lib/gerbilcharts/surfaces/stacked_area_surface.rb

@@ -21,8 +21,8 @@ class StackedAreaSurface < Surface
 
 
 	  # draw reference if any
-	  if parent.modelgroup.has_ref_model?
-	   		ref_model = parent.modelgroup.ref_model
+	  if parent.modelgroup.ref_models.size > 0 
+	   		ref_model = parent.modelgroup.ref_models[0]
 
 	  		y_zero = scale_y 0,ry
         	g.begin_polygon

data/lib/gerbilcharts/surfaces/surface.rb

@@ -17,31 +17,97 @@ class Surface < GraphElement
       parent.set_ajaxContext(:axmxx => mxx, :axmxy => mxy, :axsurface => type)
     end
 
-	def draw_ref_model_line(g,rx,ry)
-      ref_model = parent.modelgroup.ref_model
+	def draw_ref_model_lines(g,rx,ry)
+
+
+      parent.modelgroup.ref_models.each do |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"  })
+		  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"  })
+
+			g.textout(@bounds.right-5, scale_y(y,ry)+15, ref_model.name,
+				{:class => "reflinelabel", "text-anchor" => "end"  })
+		  end
+
+
+	  end
+
+
+	end
+
+	
+	def draw_range_bands(g,rx,ry)
+
+	  parent.modelgroup.range_bands.each do |range_band|
+
+		  rb_upper = range_band[:upper]
+		  rb_lower = range_band[:lower]
+
+		  g.begin_polygon
+
+		  firstpoint = nil
+
+		  rb_upper.each_tuple do |x,y|
+
+				xpos = scale_x x,rx
+				ypos = scale_y y,ry
+
+				g.polygon_point xpos,ypos
+
+				firstpoint = [xpos,ypos] if firstpoint.nil?
+		  end
+
+		  rb_lower.each_tuple_reverse  do |x,y|
+
+				xpos = scale_x x,rx
+				ypos = scale_y y,ry
+
+				g.polygon_point xpos,ypos
+		  end
+		  g.polygon_point firstpoint[0],firstpoint[1]
+
+		  g.end_polygon(:id => "ref_mod")
+
 	  end
 
+	end
+
+	def draw_annotations(g,rx,ry)
+
+
+      parent.modelgroup.annotations.each do |anno|
+    
+			xpos = scale_x anno[:x],rx
+			ypos = scale_y anno[:y],ry
+
+			g.line  xpos,ypos, xpos, ypos-20 
+
+			g.textout(xpos, ypos-20, 
+				anno[:label],
+				{:class => "reflinelabel"})
+
+			g.circle(xpos,ypos,5)
+
+	  end
 
 	end
 
+
 end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gerbilcharts
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda