gerbilcharts 0.10.3 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03e128d97f7c5611d9bd5d7fb784190fc7e810ad
-  data.tar.gz: 2d11b79dd2442346e44f8533b1f85ac735b094ae
+  metadata.gz: 9a1ce510c0c862f122e62a8f8344e327fc945b99
+  data.tar.gz: 90277699683b3ea5e065d749c44c66ebd257a571
 SHA512:
-  metadata.gz: 4c5bfaead62efc5602454b1b3e33d879b4e07c6b5e43e95508b1f4933519d8cfeb1e496e98be4f039732e0ce032e2c3f8599c30dfa721325c08aa75059fed28e
-  data.tar.gz: e46aefc7c92c8785b0b2c4d9d39a30f0d424f438bf87312694510316b6e0822fefe44c012a2880c41f032e917c0c1733d93eb89e40d8c33a60669535fb160a3a
+  metadata.gz: a5c8044f04f71eb6b4631fe24481903896d14e80f2b73934b7aa9be7fc56573e88c7393427a153759a81db30f5031deff573ba2ec41b685abfa9330718bd8ad6
+  data.tar.gz: a508675d306932b4c8c57a03ebc9eb1902609b59b697a9d5c064a79abb0482fee90b74b12e986a2189eb0792316c6ae444d6744df377d7f94134c5de788c46fc

data/lib/gerbilcharts/charts/area_chart.rb

@@ -23,17 +23,24 @@ 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::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30))
     @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
+
+	# link pivots
+	if @feature_linkpivots
+        @thechart.add_child(GerbilCharts::Surfaces::LinkPivots.new(:orient => ORIENT_OVERLAY ))
+	end
+
+    @thechart.add_child(GerbilCharts::Surfaces::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30))
     @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))  
     @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 ))
     @thechart.add_child(GerbilCharts::Surfaces::HorizontalTimeAxis.new(:orient => ORIENT_SOUTH, :dim => 25 ))
     
-    # optional features
-    if @feature_timetracker
-        @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY ))
-    end
   end
   
 end

data/lib/gerbilcharts/charts/chart_base.rb

@@ -29,6 +29,7 @@ module GerbilCharts::Charts
 # [+:scaling_y+]   Allowed values are :auto, :auto_0, and an array [min,max] (default = :auto)
 # [+:circle_data_points+] Draws a tiny circle around datapoints for tooltips
 # [+:enabletimetracker+] Time tracker  javascript selector  (default = false)
+# [+:enablelinkpivots+] Link Pivot box javascript selector  (default = false)
 #
 class ChartBase
 
@@ -50,6 +51,7 @@ class ChartBase
   attr_reader     :thechart
   attr_reader     :renderopts
   attr_reader     :feature_timetracker
+  attr_reader     :feature_linkpivots
   attr_reader	  :legend_width
   
   def initialize(opt={})
@@ -60,6 +62,13 @@ class ChartBase
         @feature_timetracker=opt[:enabletimetracker]
         opt.delete :enabletimetracker
     end
+
+    @enabletimetracker=false
+    if opt[:enablelinkpivots]
+        @feature_linkpivots=opt[:enablelinkpivots]
+        opt.delete :enablelinkpivots
+    end
+    
     
     # pass on options to chart object
     @thechart = GerbilCharts::Surfaces::Chart.new(opt)

data/lib/gerbilcharts/charts/line_chart.rb

@@ -26,8 +26,18 @@ class LineChart < ChartBase
     # 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::LineSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
+
+    # optional features
+    if @feature_timetracker
+        @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY ))
+    end
+
+	# link pivots
+	if @feature_linkpivots
+        @thechart.add_child(GerbilCharts::Surfaces::LinkPivots.new(:orient => ORIENT_OVERLAY ))
+	end
+    @thechart.add_child(GerbilCharts::Surfaces::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30))
     @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))
     @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 ))

data/lib/gerbilcharts/charts/square_line_chart.rb

@@ -28,17 +28,25 @@ 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::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30))
     @thechart.add_child(GerbilCharts::Surfaces::SquareLineSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
-    @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))
-    @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 ))
-    @thechart.add_child(GerbilCharts::Surfaces::HorizontalTimeAxis.new(:orient => ORIENT_SOUTH, :dim => 25 ))
 
     # optional features
     if @feature_timetracker
         @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_OVERLAY ))
     end
+
+	# link pivots
+	if @feature_linkpivots
+        @thechart.add_child(GerbilCharts::Surfaces::LinkPivots.new(:orient => ORIENT_OVERLAY ))
+	end
+
+    @thechart.add_child(GerbilCharts::Surfaces::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30))
+    @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))
+    @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
 

data/lib/gerbilcharts/charts/stacked_area_chart.rb

@@ -16,6 +16,16 @@ class StackedAreaChart < ChartBase
     @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 ))
+    end
+
+	# 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))  
     @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 , :cumulative => true ))

data/lib/gerbilcharts/models/graph_model.rb

@@ -15,6 +15,7 @@ class GraphModel
   attr_reader   :userlabel1       # map to tooltip 1 
   attr_reader   :userlabel2       # map to tooltip 2
   attr_reader   :transformer      # value transformer (a lambda function)
+  attr_accessor :href_pivot		  # href for pivot box (used w/ time selector)
   
   def initialize(n="Untitled")
     @name=n
@@ -42,11 +43,22 @@ class GraphModel
     h1=h.gsub("{","%7B")
     @href=h1.gsub("}","%7D")
   end
+
+  # clean up the href (todo: improve this)
+  def setHrefPivot(h)
+    h1=h.gsub("{","%7B")
+    @href_pivot=h1.gsub("}","%7D")
+  end
+  
   
   def hasHref?
     return @href != nil
   end
   
+  def hasHrefPivot?
+    return @href_pivot != nil
+  end
+  
   def setUserData(d)
     @userdata=d
   end

data/lib/gerbilcharts/models/monotonous_graph_model.rb

@@ -168,22 +168,22 @@ class MonotonousGraphModel < GraphModel
   #  todo : support :ninety_fifth
   #
   def get_statistical_analysis()
-  	return [0,0,0,0,0] if @yarr.size==0
+    return [0,0,0,0,0] if @yarr.size==0
 
-  	a = []
-	a[0]= @yrange.rmin
-	a[1]= @yrange.rmax
-	a[3]=0
+    a = []
+    a[0]= @yrange.rmin
+    a[1]= @yrange.rmax
+    a[3]=0
 
-	@yarr.each do |v|
-		a[3] = a[3] + v
-	end
-	a[3] = a[3] * @aggregation_factor 
-	a[2] = a[3]/@yarr.size
-	a[4] = latest_val
-	return a
+    @yarr.each do |v|
+      a[3] = a[3] + v
+    end
+    a[2] = a[3]/@yarr.size
+    a[3] = a[3] * @aggregation_factor
+    a[4] = latest_val
+    return a
   end
-  
+ 
 private
   # recompute ranges
   def recompute_ranges

data/lib/gerbilcharts/models/presets.rb

@@ -16,19 +16,22 @@ public
               [500000,100000],      [800000,200000],
               [1000000,200000],     [2000000,500000], [3000000,500000], [4000000,1000000],
               [5000000,1000000],    [6000000, 1000000], 
-              [8000000,2000000],    [10000000,2000000], [20000000,5000000], [50000000, 10000000],
-              [100000000,25000000], [200000000,50000000], [500000000,100000000], 
-              [1_000_000_000,    250_000_000] , [3_000_000_000, 1_000_000_000] , [5_000_000_000, 1_000_000_000] ,
-              [10_000_000_000,   2_000_000_000] ,
-              [100_000_000_000,  20_000_000_000] ,
-              [1_000_000_000_000,200_000_000_000] ,
+              [8000000,2000000],    [10000000,2000000], [20000000,5000000], [50_000_000, 10_000_000],
+              [100_000_000,25_000_000], [200_000_000,50_000_000], [300_000_000,100_000_000],  [500_000_000,100_000_000], 
+              [1_000_000_000,     250_000_000] , [3_000_000_000, 1_000_000_000] , [5_000_000_000, 1_000_000_000] ,
+              [10_000_000_000,    2_000_000_000] , 
+              [20_000_000_000,    5_000_000_000] , 
+			  [50_000_000_000,   10_000_000_000] ,
+              [100_000_000_000,   20_000_000_000] ,
+              [1_000_000_000_000, 200_000_000_000] ,
+              [10_000_000_000_000,2_000_000_000_000] ,
             ]
             
     TIMEPRESETS = [ 
               [0,0],  [1,0.2], [5,1],  [10,1],[20,5],
               [30,10],[60,10],[120,15], [300,60], [600,120], 
               [900,300], [1800,300], 
-              [3600,900], [7200,1800],[10800,3600], [14400,3600], [21600,3600],
+              [3600,300], [7200,900],[10800,1800], [14400,3600], [21600,3600],
               [43200, 7200],   [86400,7200],
               [172800, 43200],  [259200,86400],
               [604800,  86400], [1209600,172800], 

data/lib/gerbilcharts/surfaces.rb

@@ -35,3 +35,4 @@ require 'gerbilcharts/surfaces/square_line_surface'
 require 'gerbilcharts/surfaces/matrix_surface'
 require 'gerbilcharts/surfaces/conversation_ring'
 require 'gerbilcharts/surfaces/bubble_surface'
+require 'gerbilcharts/surfaces/link_pivots'

data/lib/gerbilcharts/surfaces/detailed_legend.rb

@@ -45,12 +45,12 @@ class DetailedLegend < GraphElement
 
 	  # toggle detail/mini legend 
 	  g.rectangle(@bounds.left-5,@bounds.top,5,5, {:href => "javascript:void(0);", 
-	  											   :onclick => "showMiniLegend();",
+	  											   :onclick => "showMiniLegend(event);",
 												   :fill => "white",
 												   :stroke => "none", 
 												   :gerbiltooltip1 => "Click to show compact legend" }) 
-	  g.textout(@bounds.left-4,@bounds.top+5,'>', {'font-size' => '9', :href => "javascript:void(0);", 
-	  											   :onclick => "showMiniLegend();", :stroke => '#DDDDDD',
+	  g.textout(@bounds.left-4,@bounds.top+5,'>', {:class=>'legend-tool', 
+	  											   :onclick => "showMiniLegend(event);", 
 												   :gerbiltooltip1 => "Click to show compact legend" }) 
 
       

data/lib/gerbilcharts/surfaces/graph_element.rb

@@ -80,7 +80,7 @@ class GraphElement
 
   # setup SVG group element and call int_render
   def render(sdc)
-      sdc.newwin(@group) do |sdc|
+      sdc.newwin(@group, { :class => @class } ) do |sdc|
 			  int_render(sdc)
 	  end
   end

data/lib/gerbilcharts/surfaces/legend.rb

@@ -25,13 +25,13 @@ class Legend < GraphElement
 
 	  # toggle detail/mini legend 
 	  g.rectangle(@bounds.left-5,@bounds.top,5,5, {:href => "javascript:void(0);", 
-	  											   :onclick => "showDetailedLegend();",
+	  											   :onclick => "showDetailedLegend(event);",
 												   :fill => "white",
 												   :stroke => "none",
 												   :gerbiltooltip1 => "Click to show a detailed legend" })
 
-	  g.textout(@bounds.left-7,@bounds.top+5,'+', {'font-size' => '9', :href => "javascript:void(0);", 
-	  											   :onclick => "showDetailedLegend();", :stroke => '#DDDDDD' ,
+	  g.textout(@bounds.left-7,@bounds.top+5,'+', {:class=> 'legend-tool', 
+	  											   :onclick => "showDetailedLegend(event);", 
 												   :gerbiltooltip1 => "Click to show a detailed legend" }) 
 
 	  # shift 
@@ -40,8 +40,8 @@ class Legend < GraphElement
 												   :fill => "white",
 												   :stroke => "none",
 												   :gerbiltooltip1 => "Click to move legend to left side" })
-	  g.textout(@bounds.left-7,@bounds.top+15,'<', {'font-size' => '9', :href => "javascript:void(0);", 
-	  											   :onclick => "shiftLegend(#{-@bounds.left+50});", :stroke => '#DDDDDD', 
+	  g.textout(@bounds.left-7,@bounds.top+15,'<', {:class=>'legend-tool',
+	  											   :onclick => "shiftLegend(#{-@bounds.left+50});", 
 												   :gerbiltooltip1 => "Click to move legend to left side" })
 
 
@@ -51,8 +51,8 @@ class Legend < GraphElement
 												   :fill => "white",
 												   :stroke => "none" ,
 												   :gerbiltooltip1 => "Click to move legend to right side"})
-	  g.textout(@bounds.left-7,@bounds.top+25,'>', {'font-size' => '9', :href => "javascript:void(0);", 
-	  											   :onclick => "shiftLegend(0);", :stroke => '#DDDDDD', 
+	  g.textout(@bounds.left-7,@bounds.top+25,'>', {:class => 'legend-tool',
+	  											   :onclick => "shiftLegend(0);", 
 												   :gerbiltooltip1 => "Click to move legend to right side"})
       rbox = Rect.new
       rbox.initfrom(@bounds)

data/lib/gerbilcharts/surfaces/link_pivots.rb

@@ -0,0 +1,56 @@
+module GerbilCharts::Surfaces
+
+# == Link Pivots
+#   When time is selected, we show custom links to Jump to other places 
+# 
+class LinkPivots  < GraphElement
+
+    attr_accessor   :just
+    
+    def initialize(opts={})
+      @class = "linkpivots"
+      super(opts)
+    end
+    
+    def int_render(g)
+      opts = {:class => "linkpivots", 'text-anchor' => 'middle' }
+
+	  win = g.newwin( "linkpivots", {:class => 'linkpivots' , :visibility => 'hidden' })
+	  g.setactivewindow(win)
+      
+      # count determines the bounds
+      @bounds.top = @bounds.bottom - 20 * parent.modelgroup.count
+	  if @bounds.top < 0  
+	  	@bounds.top =0
+	  end 
+
+      g.rectangle_r(@bounds)
+
+	  # start
+	  x = @bounds.left + @bounds.width/2 
+	  y = @bounds.top + 20
+
+      parent.modelgroup.each_model_with_index do | mod, i|
+
+		if mod.hasHrefPivot? 
+			opts.store(:href, mod.href_pivot)
+			opts.store(:base_href, mod.href_pivot)
+		end
+
+		opts.merge!( :id => "item#{i}")
+		g.textout(x,y, "Drill down into #{mod.name}",opts)
+
+		y += 20;
+      
+	  end
+	end
+
+    def align_to_anchor(anc)
+      super
+      @bounds.deflate_h(40,40)
+      @bounds.top = @bounds.bottom - 40
+    end
+
+
+end
+end

data/lib/gerbilcharts/surfaces/surface.rb

@@ -6,8 +6,7 @@ module GerbilCharts::Surfaces
 class Surface < GraphElement
 
     def initialize(opts={})
-      @class = "surfacepanel"
-      super(opts)
+      super(opts.merge(:class => 'surfacepanel' ))
     end
     
     def int_render(g)

data/lib/gerbilcharts/surfaces/tracker.rb

@@ -48,7 +48,7 @@ class Tracker < GraphElement
             xfrag.tspan( :id => 'trackertextinterval', :x=>0, :y=>ty) {
                 "15 Minutes"
             }
-            xfrag.tspan( :class => 'trackertextfromts', :id => 'trackertextfromts', :x=>0, :dy=>15) {
+            xfrag.tspan( :class => 'trackertextfromts', :id => 'trackertextfromts', :x=>0, :dy=>25) {
                 "Starting: Apr 2 1973, 05:00:00 PM"
             }
         }
@@ -59,8 +59,8 @@ class Tracker < GraphElement
               :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_tzoffset => Time.new.utc_offset,
-	      :gerb_tzname => Time.new.zone,
+	          :gerb_tzoffset => Time.new.utc_offset,
+	          :gerb_tzname => Time.new.zone,
               :gerb_selts=>1,
               :gerb_selsecs=>1)
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gerbilcharts
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.10
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,6 +124,7 @@ files:
 - lib/gerbilcharts/surfaces/impulse_surface.rb
 - lib/gerbilcharts/surfaces/legend.rb
 - lib/gerbilcharts/surfaces/line_surface.rb
+- lib/gerbilcharts/surfaces/link_pivots.rb
 - lib/gerbilcharts/surfaces/mark_band.rb
 - lib/gerbilcharts/surfaces/matrix_surface.rb
 - lib/gerbilcharts/surfaces/panel.rb
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SVG timeseries charting