gerbilcharts 0.10.16 → 0.10.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d2f9f9545381bfc7955464c3303abc084c9e351
-  data.tar.gz: c29377326bcc2ecc187514870b51c2cc50456b97
+SHA256:
+  metadata.gz: ab4d1e7b91e428def41543bb977bff3461c2ef72d5213ff578b6fba14dc61ea2
+  data.tar.gz: bd656b9672a061fe3b52ca7eef0d4920cf65f9e2cf72802f11de39cc0fde44db
 SHA512:
-  metadata.gz: 75f909a08aa48dc8ab7675f85625d68dcd8c742474808ba680931e29aa5f8d0acd566a22ad377438e9419063d1d80c9208dbcb9acda59db431f055c6f1cd149b
-  data.tar.gz: 932a64c671cee7356ec77a124e260316bb3cf0fe33601d4659338408b2b3d00b273788de18cb25c54ed513760bbb4e1b45cd0e33f49ad03fd10692eb29e268de
+  metadata.gz: 29094bdd20e10c4c29d4120839fb55e8883424b6300a58296eab7ece85cd952aaa3febd407d6ba2709fd8b807bea89f64afba955878e03ab8d8563b3854ce0ac
+  data.tar.gz: 25b5413cf6830914f0f8e1a90e06c0d1da8cdc984e54bad63f4e871a59a90473ed8aa119e50b5ea6ba63c828363ec270496e0b5b8e90f0682e0ca015f6553630

data/lib/gerbilcharts/charts.rb

@@ -22,3 +22,4 @@ require 'gerbilcharts/charts/conversation_ring'
 require 'gerbilcharts/charts/bubble_chart'
 require 'gerbilcharts/charts/line_chart_table'
 require 'gerbilcharts/charts/stacked_area_chart_table'
+require 'gerbilcharts/charts/mrtg_chart_table'

data/lib/gerbilcharts/charts/area_chart.rb

@@ -23,12 +23,15 @@ class AreaChart < ChartBase
     @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::AreaSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
 
-    # optional features
-    if @feature_timetracker
-        @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY ))
-    end
+	# timetracker will consume events to  circle datapoints  tooltips
+	if @feature_circledatapoints 
+		@thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY )) if @feature_timetracker
+		@thechart.add_child(GerbilCharts::Surfaces::AreaSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
+	else
+		@thechart.add_child(GerbilCharts::Surfaces::AreaSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
+		@thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY )) if @feature_timetracker
+	end
 
 	# link pivots
 	if @feature_linkpivots

data/lib/gerbilcharts/charts/chart_base.rb

@@ -63,12 +63,17 @@ class ChartBase
         opt.delete :enabletimetracker
     end
 
-    @enabletimetracker=false
+    @enablelinkpivots=false
     if opt[:enablelinkpivots]
         @feature_linkpivots=opt[:enablelinkpivots]
         opt.delete :enablelinkpivots
     end
     
+    @feature_circledatapoints=false
+    if opt[:circle_data_points]
+        @feature_circledatapoints=opt[:circle_data_points]
+    end
+    
     
     # pass on options to chart object
     @thechart = GerbilCharts::Surfaces::Chart.new(opt)

data/lib/gerbilcharts/charts/line_chart.rb

@@ -10,7 +10,8 @@ module GerbilCharts::Charts
 # [+style+]			Stylesheet file to be applied
 #
 # global visual options
-# [+circle_data_points]	  draw a solid circle around each data point  
+# [+circle_data_points]	      draw a solid circle around each data point  
+# [+show_95th_percentile]	  show a line of 95th pct 
 #
 class LineChart < ChartBase
 
@@ -25,13 +26,14 @@ class LineChart < 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::LineSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
 
     # optional features
     if @feature_timetracker
         @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY ))
     end
+    @thechart.add_child(GerbilCharts::Surfaces::LineSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
 
 	# link pivots
 	if @feature_linkpivots

data/lib/gerbilcharts/charts/line_chart_table.rb

@@ -28,7 +28,7 @@ class LineChartTable  < ChartBase
     @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::LineSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
-    @thechart.add_child(GerbilCharts::Surfaces::DetailedLegend.new(:orient=> ORIENT_SOUTH, :dim => 80 , :always_visible => true ))
+    @thechart.add_child(GerbilCharts::Surfaces::DetailedLegend.new(:orient=> ORIENT_SOUTH, :dim => 100 , :always_visible => true ))
     @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 ))
     @thechart.add_child(GerbilCharts::Surfaces::HorizontalTimeAxis.new(:orient => ORIENT_SOUTH, :dim => 25 ))
   end

data/lib/gerbilcharts/charts/mrtg_chart_table.rb

@@ -0,0 +1,38 @@
+module GerbilCharts::Charts
+
+# =MRTG Chart Table
+# Each model is a separate line & table legend is shown below chart
+#
+# options
+#
+# [+width+]			Width of the chart (pixels)
+# [+height+]		Width of the chart (pixels)
+# [+style+]			Stylesheet file to be applied
+#
+# global visual options
+# [+circle_data_points]	  draw a solid circle around each data point  
+#
+class MrtgChartTable  < ChartBase
+
+  def initialize(opt={})
+    super(opt)
+  end
+  
+  def create_chart_elements
+	
+    # anchor (line surface)
+    @thechart.create_filter(GerbilCharts::SVGDC::LinearGradientVertical.new("vertgrad","rgb(255,255,255)","rgb(192,192,192)"))
+    
+    # other elements
+    @thechart.add_child(GerbilCharts::Surfaces::SurfaceBackground.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::MrtgSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
+    @thechart.add_child(GerbilCharts::Surfaces::DetailedLegend.new(:orient=> ORIENT_SOUTH, :dim => 100 , :always_visible => true ))
+    @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 ))
+    @thechart.add_child(GerbilCharts::Surfaces::HorizontalTimeAxis.new(:orient => ORIENT_SOUTH, :dim => 25 ))
+  end
+
+end
+
+end

data/lib/gerbilcharts/charts/square_line_chart.rb

@@ -28,13 +28,13 @@ class SquareLineChart < ChartBase
     @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::SquareLineSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
 
     # optional features
     if @feature_timetracker
         @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY ))
     end
-
+   
+    @thechart.add_child(GerbilCharts::Surfaces::SquareLineSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
 	# link pivots
 	if @feature_linkpivots
         @thechart.add_child(GerbilCharts::Surfaces::LinkPivots.new(:orient => ORIENT_OVERLAY ))

data/lib/gerbilcharts/charts/stacked_area_chart.rb

@@ -15,19 +15,23 @@ class StackedAreaChart < ChartBase
     @thechart.add_child(GerbilCharts::Surfaces::SurfaceBackground.new(:orient => ORIENT_OVERLAY))
     @thechart.add_child(GerbilCharts::Surfaces::StackedGrid.new(:orient => ORIENT_OVERLAY))
     @thechart.add_child(GerbilCharts::Surfaces::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30))
-    @thechart.add_child(GerbilCharts::Surfaces::StackedAreaSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
 
-    # optional features
-    if @feature_timetracker
-        @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY ))
+    # timetracker will consume events to  circle datapoints  tooltips
+    if @feature_circledatapoints 
+        @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY )) if @feature_timetracker
+        @thechart.add_child(GerbilCharts::Surfaces::StackedAreaSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
+    else
+        @thechart.add_child(GerbilCharts::Surfaces::StackedAreaSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
+        @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY )) if @feature_timetracker
     end
 
-	# link pivots
-	if @feature_linkpivots
+    # link pivots
+    if @feature_linkpivots
         @thechart.add_child(GerbilCharts::Surfaces::LinkPivots.new(:orient => ORIENT_OVERLAY ))
-	end
-    @thechart.add_child(GerbilCharts::Surfaces::Legend.new(:orient=> ORIENT_OVERLAY, :dim => @legend_width))  
-    @thechart.add_child(GerbilCharts::Surfaces::DetailedLegend.new(:orient=> ORIENT_OVERLAY, :dim => 3*@legend_width))  
+    end
+
+    @thechart.add_child(GerbilCharts::Surfaces::Legend.new(:orient=> ORIENT_OVERLAY, :dim => @legend_width, :align => :left ))  
+    @thechart.add_child(GerbilCharts::Surfaces::DetailedLegend.new(:orient=> ORIENT_OVERLAY, :dim => 3*@legend_width, :align => :left))  
     @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 , :cumulative => true ))
     @thechart.add_child(GerbilCharts::Surfaces::HorizontalTimeAxis.new(:orient => ORIENT_SOUTH, :dim => 25 ))
 
@@ -36,7 +40,7 @@ class StackedAreaChart < ChartBase
         @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_SOUTH, :dim => 10 ))
     end
   end
-end
 
-end
+end  # class
+end  # module 
 

data/lib/gerbilcharts/models/graph_model_group.rb

@@ -57,6 +57,15 @@ class GraphModelGroup
       yield m
     end
   end
+
+  def find_model(name)
+    @models.each do |m|
+      if m.name==name
+        return m
+      end
+    end
+    return nil 
+  end
   
   def clear_models
     @models.clear

data/lib/gerbilcharts/models/monotonous_graph_model.rb

@@ -163,12 +163,12 @@ class MonotonousGraphModel < GraphModel
   #
   # mode => :normal or :ninety_fifth
   #
-  # returns array 0 = min, 1 = max, 2 = avg, 3 = total, 4 = latest
+  # returns array 0 = min, 1 = max, 2 = avg, 3 = total, 4 = latest, 5=95th
   #  todo :  5 = stddev  
   #  todo : support :ninety_fifth
   #
   def get_statistical_analysis()
-    return [0,0,0,0,0] if @yarr.size==0
+    return [0,0,0,0,0,0] if @yarr.size==0
 
     a = []
     a[0]= @yrange.rmin
@@ -181,6 +181,11 @@ class MonotonousGraphModel < GraphModel
     a[2] = a[3]/@yarr.size
     a[3] = a[3] * @aggregation_factor
     a[4] = latest_val
+
+    # 95th statistical
+    rank=(@yarr.size * 0.95).round 
+    a[5] = @yarr.sort()[rank-1] 
+    
     return a
   end
  

data/lib/gerbilcharts/surfaces.rb

@@ -36,3 +36,4 @@ require 'gerbilcharts/surfaces/matrix_surface'
 require 'gerbilcharts/surfaces/conversation_ring'
 require 'gerbilcharts/surfaces/bubble_surface'
 require 'gerbilcharts/surfaces/link_pivots'
+require 'gerbilcharts/surfaces/mrtg_surface'

data/lib/gerbilcharts/surfaces/area_surface.rb

@@ -4,10 +4,10 @@ module GerbilCharts::Surfaces
 # 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
+# :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
 
@@ -17,9 +17,9 @@ class AreaSurface < Surface
     
   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)
+    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)
@@ -27,15 +27,15 @@ class AreaSurface < Surface
 
     # any filters ?
     if parent.get_global_option(:filter,false)
-  	  g.curr_win.add_options({:filter => "url(##{parent.get_global_option(:filter,false)})" })
+      g.curr_win.add_options({:filter => "url(##{parent.get_global_option(:filter,false)})" })
     end 
 
     set_ajaxSurfaceContext(rx.rmax,ry.rmax,"AREA") if parent.usesAjax?
 
-	  # butterfly chart
-	  ry.update(-ry.rmax) if butterfly 
+    # butterfly chart
+    ry.update(-ry.rmax) if butterfly 
 
-	  y_zero = scale_y 0,ry
+    y_zero = scale_y 0,ry
 
     f_squarize = parent.get_global_option(:squarize,false)
       
@@ -49,10 +49,10 @@ class AreaSurface < Surface
 
       firstpoint=true
       xpos,ypos=0,0
-	    last_x=nil
+      last_x=nil
       mod.each_tuple do |x,y|
 
-	      y =-y if butterfly and i.odd?
+        y =-y if butterfly and i.odd?
 
         xpos = scale_x x,rx
         ypos = scale_y y,ry
@@ -62,15 +62,25 @@ class AreaSurface < Surface
           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
+        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
+
+  	    # tooltip 
+  		if parent.get_global_option(:circle_data_points,false)
+		  opts = {:id => "item#{i}"}
+    	  opts.store(:gerbiltooltip1, x) 
+    	  opts.store(:gerbiltooltip2, "Val = #{GerbilCharts::Models::Presets.new.format_suffix(y)}")
+		  g.circle(xpos,ypos,2,opts) 
+  		end
 
         g.polygon_point xpos,ypos
+
+        
       end
      
       g.polygon_point xpos,y_zero

data/lib/gerbilcharts/surfaces/detailed_legend.rb

@@ -63,9 +63,17 @@ class DetailedLegend < GraphElement
        
 
 	  stat_label_pos = @bounds.right -  STAT_TABLE_SIZE
-	  lab = %w(Max Min Avg Latest Total).inject("") { |m,ai| m += ai.rjust(9)}  
+	  headers  = %w(Max Min Avg Latest Total)
+  	  if parent.get_global_option(:show_95th_percentile,false) 
+        headers << " 95th"
+        stat_label_pos = stat_label_pos - 25
+      end
+
+	  lab = headers.inject("") { |m,ai| m += ai.rjust(9)}  
 	  if @show_stats
-      	g.textout(stat_label_pos, rbox.bottom-2, lab, {'xml:space' => 'preserve', :class => "legendstats"} )
+      	g.textout(stat_label_pos, 
+                  rbox.bottom-2, lab, 
+                  {'xml:space' => 'preserve', :class => "legendstats"} )
 	  end
 
       rbox.top += 16
@@ -94,6 +102,11 @@ class DetailedLegend < GraphElement
 			   mod.formatted_val(stat_ana[2]).to_s.rjust(9) +
 			   mod.formatted_val(stat_ana[4]).to_s.rjust(9) +
 			   fmt_prefix_2(stat_ana[3]).to_s.rjust(9) 
+
+        if parent.get_global_option(:show_95th_percentile,false) 
+          outs += mod.formatted_val(stat_ana[5]).to_s.rjust(9)
+        end 
+
 		if @show_stats
         	g.textout(stat_label_pos, rbox.bottom-2, outs, {'xml:space' => 'preserve', :class => 'legendstats'} )
 		end

data/lib/gerbilcharts/surfaces/legend.rb

@@ -17,6 +17,10 @@ class Legend < GraphElement
 	  return if not parent.get_global_option(:enable_legend,true) 
 
 	  w=g.newwin("legendpanel_mini")
+
+	  if parent.get_global_option(:align, :right) == :left 
+	  	g.add_option("transform", "translate(#{-@bounds.left+50})")
+	  end
 	  g.setactivewindow(w)
 
       # count determines the bounds

data/lib/gerbilcharts/surfaces/line_surface.rb

@@ -35,7 +35,7 @@ class LineSurface < Surface
       mod.each_tuple do |x,y|
   	    y = -y if butterfly and i.odd?
 
-  	    # the basic line 
+ 	    # the basic line 
         xpos = scale_x x,rx
         ypos = scale_y y,ry
 
@@ -46,18 +46,27 @@ class LineSurface < Surface
         g.lineto xpos,ypos
 
   	    # 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
-
-        # cirle dp
-  	    g.circle(xpos,ypos,4,opts) if parent.get_global_option(:circle_data_points,false)
-
+  		if parent.get_global_option(:auto_tooltips,false) and  parent.get_global_option(:circle_data_points,false)
+		  opts = {:id => "item#{i}"}
+    	  opts.store(:gerbiltooltip1, x) 
+    	  opts.store(:gerbiltooltip2, "Val = #{GerbilCharts::Models::Presets.new.format_suffix(y)}")
+		  g.circle(xpos,ypos,2,opts)
+  		end
       end
       g.endline(:id => "lineitem#{i}")
+
+      # 95th percentile line and label 
+      if parent.get_global_option(:show_95th_percentile,false)
+        metrics=mod.get_statistical_analysis
+        y95  = scale_y metrics[5],ry
+        g.line( @bounds.left,  y95,  @bounds.right, y95,  {:id=>"lineitem#{i}"} )
+        y95label = mod.formatted_val(metrics[5])
+        g.textout(@bounds.right-10, y95-5, y95label, 
+                      {:class => "reflinelabel", "text-anchor" => "end"})
+        g.textout(@bounds.right-10, y95+15, "95th pct", 
+                    {:class => "reflinelabel", "text-anchor" => "end"})
+      end 
+
     end
 
 

data/lib/gerbilcharts/surfaces/mrtg_surface.rb

@@ -0,0 +1,96 @@
+module GerbilCharts::Surfaces
+
+# = Mrtg Line Surface
+# MRTG like surface 
+# First data-point  = SquareArea Green
+# Second data-point = SquareLine Blue
+# Third onwards     = SquareLines with usual color base as if starting from zero 
+#
+# Supported global options
+#
+# [+circle_data_points+]    Draw a solid circle around datapoints
+# [+scaling+]               :auto, :auto_y0
+#
+class MrtgSurface < Surface
+  def initialize(opts={})
+    super(opts)
+  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)
+    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)
+      
+    set_ajaxSurfaceContext(rx.rmax,ry.rmax,"LINE") if parent.usesAjax?
+
+    parent.modelgroup.each_model_with_index do | mod, i|
+
+	if i==0 
+		style=  "mrtg0"
+		surface= :area 
+	elsif i==1
+		style=  "mrtg1"
+	else 
+		style=  "lineitem#{i-2}"
+	end 
+
+
+	if  surface==:area 
+
+		     g.begin_squarized_polygon 
+			 firstpoint=true
+			 xpos,ypos=0,0
+			 last_x=nil
+		     y_zero = scale_y 0,ry
+			 mod.each_tuple do |x,y|
+
+				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
+			  g.end_polygon(:id => "mrtg0", "opacity"=>"0.8")
+	  else
+
+		  prev_ypos=nil
+		  mod.each_tuple do |x,y|
+
+			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
+
+		  end
+		  g.endline(:id => style)
+	  end
+
+      
+
+    end
+      
+  end
+
+end
+
+end

data/lib/gerbilcharts/surfaces/pie_surface.rb

@@ -8,7 +8,7 @@ class PieSurface < Surface
   OUTER_OFFSET_X = 10					# x - distance  offset from pie boundary
 	OUTER_OFFSET_Y = 10   					# y - y offset from pie boundary
 	LEFT_LABEL_OFFSET = 30 					# labels on the left of the PIE offset by this (90-270 deg)
-	PERCENT_OFFSET_X = -4					# pull slice label this much (tweak)
+	PERCENT_OFFSET_X = -10					# pull slice label this much (tweak)
 
   def initialize(opts={})
       super(opts)
@@ -115,10 +115,10 @@ class PieSurface < Surface
 		end
         if(tot_angle > 270)
           g.textout(percent_pos_x,percent_pos_y+5, "#{percent}%", :class => elementvalue_clsn)
-          g.textout(percent_pos_x,percent_pos_y+15, "#{mod.latest_formatted_val}", :class => 'elementlabel' )
+          g.textout(percent_pos_x,percent_pos_y+25, "#{mod.latest_formatted_val}", :class => 'elementlabel' )
         else
           g.textout(percent_pos_x,percent_pos_y, "#{percent}%", :class => elementvalue_clsn)
-          g.textout(percent_pos_x,percent_pos_y+10, "#{mod.latest_formatted_val}", :class => 'elementlabel' )
+          g.textout(percent_pos_x,percent_pos_y+20, "#{mod.latest_formatted_val}", :class => 'elementlabel' )
         end
       end
 

data/lib/gerbilcharts/surfaces/square_line_surface.rb

@@ -25,28 +25,40 @@ class SquareLineSurface < Surface
 
     parent.modelgroup.each_model_with_index do | mod, i|
       
-	  	prev_ypos=nil
+      prev_ypos=nil
       mod.each_tuple do |x,y|
 
-		    # the basic line 
+        # the basic line 
         xpos = scale_x x,rx
         ypos = scale_y y,ry
 
-		    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)
-				  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)
+        g.lineto xpos,ypos
+        prev_ypos=ypos
+
+        # datapoint and a tooltip 
+        opts = {:id => "item#{i}"}
+        if parent.get_global_option(:auto_tooltips,false)
+          opts.store(:gerbiltooltip1, x)
+          opts.store(:gerbiltooltip2, "Val = #{GerbilCharts::Models::Presets.new.format_suffix(y)}")
+        end
+        g.circle(xpos,ypos,2,opts) if parent.get_global_option(:circle_data_points,false)
       end
       g.endline(:id => "lineitem#{i}")
+      
+      # 95th percentile line and label 
+      if parent.get_global_option(:show_95th_percentile,false)
+        metrics=mod.get_statistical_analysis
+        y95  = scale_y metrics[5],ry
+        g.line( @bounds.left,  y95,  @bounds.right, y95,  {:id=>"lineitem#{i}"} )
+        y95label = mod.formatted_val(metrics[5])
+        g.textout(@bounds.right-30, y95-5, y95label, 
+                      {:class => "reflinelabel", "text-anchor" => "end"})
+        g.textout(@bounds.right-30, y95+15, "95th pct", 
+                      {:class => "reflinelabel", "text-anchor" => "end"})
+      end 
+
     end
       
     draw_ref_model_lines(g,rx,ry) 

data/lib/gerbilcharts/surfaces/stacked_area_surface.rb

@@ -9,72 +9,73 @@ class StackedAreaSurface < Surface
     end
     
     def int_render(g)
-	  range_options_x = parent.get_global_option(:scaling_x,:auto)
-
-      rx = parent.modelgroup.effective_range_x(range_options_x)
-      ry = parent.modelgroup.cumulative_sweep_round_range_y0
-	  
-      # ajax if used
-      if parent.usesAjax?
-        set_ajaxSurfaceContext(rx.rmax,ry.rmax,"SA")
-      end
-
-
-	  # draw reference if any
-	  if parent.modelgroup.ref_models.size > 0 
-	   		ref_model = parent.modelgroup.ref_models[0]
-
-	  		y_zero = scale_y 0,ry
-        	g.begin_polygon
-        	firstpoint=true
-        	xpos,ypos=0,0
-			last_x=nil
-        	ref_model.each_tuple do |x,y|
-
-				xpos = scale_x x,rx
-			    ypos = scale_y y,ry
-
-          		if firstpoint 
-					g.polygon_point xpos,y_zero
-					firstpoint=false
-          		end
-
-				if last_x && (x-last_x) > parent.modelgroup.sweep_interval
-					g.polygon_point scale_x(last_x,rx) ,y_zero
-					g.polygon_point scale_x(x,rx) ,y_zero
-				end
-				last_x=x
-
-          		g.polygon_point xpos,ypos
-        	end
-        	g.polygon_point xpos,y_zero
-        	g.end_polygon(:id => "ref_mod")
-      end
+        range_options_x = parent.get_global_option(:scaling_x,:auto)
+
+        rx = parent.modelgroup.effective_range_x(range_options_x)
+        ry = parent.modelgroup.cumulative_sweep_round_range_y0
+
+        # ajax if used
+        if parent.usesAjax?
+            set_ajaxSurfaceContext(rx.rmax,ry.rmax,"SA")
+        end
+
+
+        # draw reference if any
+        if parent.modelgroup.ref_models.size > 0 
+            ref_model = parent.modelgroup.ref_models[0]
+
+            y_zero = scale_y 0,ry
+            g.begin_polygon
+            firstpoint=true
+            xpos,ypos=0,0
+            last_x=nil
+            ref_model.each_tuple do |x,y|
+
+                xpos = scale_x x,rx
+                ypos = scale_y y,ry
+
+                if firstpoint 
+                    g.polygon_point xpos,y_zero
+                    firstpoint=false
+                end
+
+                if last_x && (x-last_x) > parent.modelgroup.sweep_interval
+                    g.polygon_point scale_x(last_x,rx) ,y_zero
+                    g.polygon_point scale_x(x,rx) ,y_zero
+                end
+                last_x=x
+
+                g.polygon_point xpos,ypos
+            end
+            g.polygon_point xpos,y_zero
+            g.end_polygon(:id => "ref_mod")
+        end
+                
+        # prepare models for sweeping
+        sweep_pos= rx.rmin
+        sweep_to = rx.rmax
+        polygons = []
+        modnames = []
+          
+        klass_poly = parent.get_global_option(:squarize,false) ? 
+                            GerbilCharts::SVGDC::SVGSquarizedPolygon :
+                            GerbilCharts::SVGDC::SVGPolygon 
+
+        parent.modelgroup.each_model do | mod|
+            mod.begin_sweep
+            polygons << klass_poly.new
+            modnames << mod.name
+        end
             
-      # prepare models for sweeping
-      sweep_pos= rx.rmin
-      sweep_to = rx.rmax
-      polygons = []
-	  modnames = []
-	  
-	  klass_poly = parent.get_global_option(:squarize,false) ? 
-	  					GerbilCharts::SVGDC::SVGSquarizedPolygon :
-	  					GerbilCharts::SVGDC::SVGPolygon 
-
-      parent.modelgroup.each_model do | mod|
-          mod.begin_sweep
-          polygons << klass_poly.new
-		  modnames << mod.name
-      end
-        
-      # sweep interval
-      sweep_interval = parent.modelgroup.sweep_interval
-      
-      # perform the sweep
-      while (sweep_pos<=sweep_to)  
+          # sweep interval
+        sweep_interval = parent.modelgroup.sweep_interval
+          
+        # perform the sweep
+        while (sweep_pos<=sweep_to)  
             acc_y = 0
             parent.modelgroup.each_model_with_index do | mod, i|
-              acc_y +=  mod.sweep(sweep_pos)
+              t_sweep_pos = mod.sweep(sweep_pos) 
+              acc_y +=  t_sweep_pos
 
               xpos = scale_x sweep_pos,rx
               ypos = scale_y acc_y,ry
@@ -82,31 +83,29 @@ class StackedAreaSurface < Surface
               if polygons[i].isempty?
                   polygons[i].addpoint(xpos,@bounds.bottom)
               end
-              
               polygons[i].addpoint(xpos,ypos)
             end
-            
+                                
             sweep_pos += sweep_interval
-     end
-
-     # 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)
-
-		opts = {:id => "item#{i}" }
-		if parent.get_global_option(:auto_tooltips,false)
-			opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
-			opts.store(:gerbiltooltip1, modnames[i]) 
-		end
-
-        g.addshape(p,opts)
-        i -= 1
-     end
+        end
+
+        # 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)
+
+            opts = {:id => "item#{i}" }
+            if parent.get_global_option(:auto_tooltips,false)
+                opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
+                opts.store(:gerbiltooltip1, modnames[i]) 
+            end
+
+            g.addshape(p,opts)
+            i -= 1
+        end
       
     end
 
-end
-
-end
+end  # class 
+end  # module 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gerbilcharts
 version: !ruby/object:Gem::Version
-  version: 0.10.16
+  version: 0.10.25
 platform: ruby
 authors:
 - vivek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -89,6 +89,7 @@ files:
 - lib/gerbilcharts/charts/line_chart.rb
 - lib/gerbilcharts/charts/line_chart_table.rb
 - lib/gerbilcharts/charts/matrix_chart.rb
+- lib/gerbilcharts/charts/mrtg_chart_table.rb
 - lib/gerbilcharts/charts/pie_chart.rb
 - lib/gerbilcharts/charts/square_line_chart.rb
 - lib/gerbilcharts/charts/stacked_area_chart.rb
@@ -127,6 +128,7 @@ files:
 - lib/gerbilcharts/surfaces/link_pivots.rb
 - lib/gerbilcharts/surfaces/mark_band.rb
 - lib/gerbilcharts/surfaces/matrix_surface.rb
+- lib/gerbilcharts/surfaces/mrtg_surface.rb
 - lib/gerbilcharts/surfaces/panel.rb
 - lib/gerbilcharts/surfaces/pie_surface.rb
 - lib/gerbilcharts/surfaces/rect.rb
@@ -161,7 +163,7 @@ homepage: http://github.com/vivekrajan/gerbilcharts
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,9 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: SVG timeseries charting
 test_files: []