gerbilcharts 0.6.8 → 0.7.0

data/lib/gerbilcharts/charts.rb

@@ -9,6 +9,7 @@ module GerbilCharts::Charts;end;
 
 require 'gerbilcharts/charts/chart_base'
 require 'gerbilcharts/charts/area_chart'
+require 'gerbilcharts/charts/area_chart_table'
 require 'gerbilcharts/charts/bar_chart_compact'
 require 'gerbilcharts/charts/bar_chart'
 require 'gerbilcharts/charts/impulse_chart'

data/lib/gerbilcharts/charts/area_chart_table.rb

@@ -0,0 +1,38 @@
+module GerbilCharts::Charts
+
+
+# =Area Chart Table 
+#  Same with detailed legend at bottom 
+#
+class AreaChartTable  < 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(224,224,224)"))
+    
+    # additional filter by name
+    @thechart.create_filter(GerbilCharts::SVGDC::LikeButton.new('LikeButton')) if @gerbilfilter == 'LikeButton'
+
+    # 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::AreaSurface.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::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
+   
+end

data/lib/gerbilcharts/surfaces/detailed_legend.rb

@@ -21,7 +21,7 @@ class DetailedLegend < GraphElement
     
     def int_render(g)
 
-	  return unless parent.get_global_option(:enable_detailed_legend,true) 
+
 
 	  if @always_visible
 	     w=g.newwin("legendpanel_detail")
@@ -62,9 +62,8 @@ class DetailedLegend < GraphElement
       rbox.bottom = rbox.top+10
        
 
-
 	  stat_label_pos = rbox.right + STAT_TABLE_OFFSET
-	  lab = %w(Max Min Avg Latest).inject("") { |m,ai| m += ai.rjust(9)}  
+	  lab = %w(Max Min Avg Latest Total).inject("") { |m,ai| m += ai.rjust(9)}  
 	  if @show_stats
       	g.textout(stat_label_pos, rbox.bottom-2, lab, {'xml:space' => 'preserve', :class => "legendstats"} )
 	  end
@@ -72,6 +71,7 @@ class DetailedLegend < GraphElement
       rbox.top += 16
       rbox.bottom = rbox.top+10
 
+
       parent.modelgroup.each_model_with_index do | mod, i|
 
 		# Adding tool tips
@@ -86,12 +86,14 @@ class DetailedLegend < GraphElement
         g.textout(rbox.right+5, rbox.bottom-2, mod.name,opts)
 
 		stat_ana = mod.get_statistical_analysis
+		bucketsize = mod.respond_to?(:bucket_size_secs)? mod.bucket_size_secs: 1
 
 	  	stat_label_pos = rbox.right + STAT_TABLE_OFFSET
 		outs = mod.formatted_val(stat_ana[1]).to_s.rjust(9) +
 			   mod.formatted_val(stat_ana[0]).to_s.rjust(9) +
 			   mod.formatted_val(stat_ana[2]).to_s.rjust(9) +
-			   mod.formatted_val(stat_ana[4]).to_s.rjust(9) 
+			   mod.formatted_val(stat_ana[4]).to_s.rjust(9) +
+			   fmt_prefix_2(stat_ana[3]*bucketsize/8).to_s.rjust(9) 
 		if @show_stats
         	g.textout(stat_label_pos, rbox.bottom-2, outs, {'xml:space' => 'preserve', :class => 'legendstats'} )
 		end
@@ -114,6 +116,32 @@ class DetailedLegend < GraphElement
         @bounds.left = @bounds.right - @width
       end
     end
+
+  # format for volumes 
+  def fmt_prefix_2 raw_value
+  units_str = [
+                    [1099511627776.0,"T","%.2f%s"],
+                    [1073741824.0,   "G","%.2f%s"],
+                    [1048576.0,      "M","%.2f%s"],
+                    [1024.0,         "K","%.2f%s"],
+                    [1,     "", "%d %s"],
+                    [1e-03, "m","%.3f %s"],
+                    [1e-06, "u","%.3f %s"],
+                    [1e-09, "n","%.3f %s"],
+                    [1e-12, "p","%.3f %s"],
+              ]
+
+    return "0" if raw_value == 0
+
+    units_str.each do |unit|
+      if raw_value >= unit[0]
+        retval = raw_value  / unit[0]
+        return format(unit[2], retval, unit[1])
+      end
+    end
+    return raw_value.to_s
+  end
+
 end
 end
 

metadata

@@ -1,91 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gerbilcharts
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 8
-  version: 0.6.8
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-30 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gerbilcharts is a server side charting library that outputs SVG text
 email: vivek_rajagopal@yahoo.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - lib/gerbilcharts.rb
 - lib/gerbilcharts/charts.rb
 - lib/gerbilcharts/charts/area_chart.rb
+- lib/gerbilcharts/charts/area_chart_table.rb
 - lib/gerbilcharts/charts/bar_chart.rb
 - lib/gerbilcharts/charts/bar_chart_compact.rb
 - lib/gerbilcharts/charts/bubble_chart.rb
@@ -164,38 +165,32 @@ files:
 - lib/gerbilcharts/version.rb
 - LICENSE.txt
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/vivekrajan/gerbilcharts
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 117781501
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1136062034129104066
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: SVG timeseries charting
 test_files: []
-