gerbilcharts 0.2.13 → 0.5.9

data/lib/gerbilcharts/models/presets.rb

@@ -6,8 +6,8 @@ module GerbilCharts::Models
 # and the label values are neat and clean
 #
 class Presets
-  
-protected
+
+public
     PRESETS = [ 
               [0,0],  [1,0.2], [5,1],  [10,1],[20,5],
               [50,10],[100,25],[200,50], [500,100], [1000,200], 
@@ -16,9 +16,10 @@ protected
               [500000,100000],[800000,200000],
               [1000000,200000],[2000000,500000], [3000000,500000], [4000000,1000000],
               [5000000,1000000],[6000000, 1000000], 
-			  [8000000,2000000], [10000000,2000000], [20000000,4000000], [50000000, 10000000],
-              [100000000,25000000], [500000000,100000000], 
-              [1000000000,250000000] 
+	          [8000000,2000000], [10000000,2000000], [20000000,5000000], [50000000, 10000000],
+              [100000000,25000000], [200000000,50000000], [500000000,100000000], 
+			  [1000000000, 250000000] , [3000000000, 1000000000] , [5000000000, 1000000000] ,
+              [10000000000,2000000000] ,
             ]
             
     TIMEPRESETS = [ 
@@ -26,10 +27,11 @@ protected
               [30,10],[60,10],[120,15], [300,60], [600,120], 
               [900,300], [1800,300], 
               [3600,900], [7200,1800],[10800,3600], [14400,3600], [21600,7200],
-              [43200, 10800], [86400,21600],
-              [172800, 43200], [259200,86400],
+              [43200, 10800],   [86400,21600],
+              [172800, 43200],  [259200,86400],
               [604800,  86400], [1209600,172800], 
               [2419200, 604800],
+              [4848400, 604800],
               [7257600, 2419200],
               [14515200,7257600],
               [29030400,7257600],
@@ -58,8 +60,8 @@ protected
     UNITPRESETS.each do |unit|
           if raw_value.abs  >= unit[0]
             retval = raw_value  / unit[0]
-            sout=format("%.2f %s", retval, unit[1])
-            sout.gsub! ".00",""
+            sout=format("%.1f%s", retval, unit[1])
+            sout.gsub! "\.0",""
             return sout
           end
     end
@@ -71,6 +73,11 @@ protected
   #    interval = desired window in seconds
   def format_timeval ( tvsec, interval)   
     t = Time.at(tvsec).getlocal
+
+    if t.hour + t.min == 0 
+	return t.strftime("%b-%d") 
+    end
+
     if interval < 60 
       return t.strftime("%M:%S")
     elsif interval < 300
@@ -80,9 +87,9 @@ protected
     elsif interval < 86400
       return t.strftime("%H:%M")
     elsif interval < 259200
-      return t.strftime("%a-%H:%M")
+      return t.strftime("%H:%M")
     elsif interval < 604800
-      return t.strtime("%b-%d")
+      return t.strftime("%b-%d")
     elsif interval < 2419200
       return t.strftime("%b-%d")
     else

data/lib/gerbilcharts/models/raw_range.rb

@@ -12,7 +12,7 @@ class RawRange  < Presets
   end
 
   def invalid?
-  	@rmin.nil?
+  	@rmin.nil? || @rmax.nil?
   end
   
   # update - updates the range

data/lib/gerbilcharts/models/round_range.rb

@@ -45,11 +45,13 @@ class RoundRange < RawRange
   # provide ticks (per label interval)
   def each_tick(tpl)
     
-      raise "Range not aligned with presets (call round range first)" if not @lmax  
+      return  "Range not aligned with presets (call round range first)" if not @lmax  
 
       return if @lmax==0
+	  return if tpl==0
       
       lint = @lmax/tpl
+	  return if lint==0
       if @rmin % lint != 0
         v = (@rmin+lint) - (@rmin%lint)
       else

data/lib/gerbilcharts/models/round_time_range.rb

@@ -19,8 +19,10 @@ class RoundTimeRange < RawRange
     super()
     @rdelta,@ldelta=round_delta(raw_range.delta)
     @rmin=raw_range.rmin
-    @rmax=round_max(raw_range.rmax,@rdelta)
-    @gmhalfhour = Time.now.gmt_offset%3600 
+
+	# this can be rdelta or ldelta for wider or tighter
+    #@rmax=round_max(raw_range.rmax,@rdelta)
+    @rmax=round_max(raw_range.rmax,@ldelta)
   end
  
    # provide labels
@@ -30,19 +32,8 @@ class RoundTimeRange < RawRange
     raise "Range not aligned with presets (call round range first)" if not @ldelta
     
     return if @ldelta == 0
-      
-	if (@rmin.tv_sec % @ldelta) != @gmhalfhour
-      ni_sec = (@rmin.tv_sec+@ldelta)/@ldelta
 
-	  # if labeling hours, make sure you account tz weirdness like india GMT +5:30
-	  if @ldelta >= 3600
-		 v = Time.at(@ldelta * ni_sec.to_i  - @gmhalfhour)
-	  else
-	  	 v = Time.at(@ldelta * ni_sec.to_i)
-	  end
-    else
-      v = @rmin
-    end
+	v = get_label_start_time
 
     while (v<=@rmax) do
       yield v, format_timeval(v,@rdelta)    
@@ -59,18 +50,7 @@ class RoundTimeRange < RawRange
 
 	subtick_delta = ideal_subtick_interval(@ldelta)
       
-	if (@rmin.tv_sec % @ldelta) != @gmhalfhour
-      ni_sec = (@rmin.tv_sec+subtick_delta)/subtick_delta
-
-	  # if labeling hours, make sure you account tz weirdness like india GMT +5:30
-	  if @ldelta >= 3600
-		 v = Time.at(subtick_delta* ni_sec.to_i  - @gmhalfhour)
-	  else
-	  	 v = Time.at(subtick_delta * ni_sec.to_i)
-	  end
-    else
-      v = @rmin
-    end
+	v = get_label_start_time
 
     while (v<=@rmax) do
       yield v    
@@ -121,7 +101,7 @@ private
   #  Eg. 10x of 2 hours will be 12 min ticks = FAIL
   def ideal_subtick_interval(label_interval)
 
-	case ldelta
+	case label_interval
 		when (0..1*MINUTE); return 10
 		when (1*MINUTE..5*MINUTE); return 1*MINUTE
 		when (5*MINUTE..15*MINUTE); return 3*MINUTE
@@ -134,8 +114,18 @@ private
 	end
   end
 
-
-  
+  def get_label_start_time
+	# if labeling hours, make sure you account tz weirdness like india GMT +5:30
+	if @ldelta >= 86400
+	  	 v = Time.mktime(@rmin.year, @rmin.month, @rmin.day,
+		                 0,0,0,0) + 86400
+	elsif 
+		 tbase = Time.mktime(@rmin.year, @rmin.month, @rmin.day,0,0,0,0)
+		 sec_inc = @rmin.tv_sec - tbase.tv_sec
+		 v = Time.at( tbase.tv_sec + @ldelta*(sec_inc/@ldelta).ceil)
+	end
+	return v
+  end
 end
 
 end

data/lib/gerbilcharts/models/sampled_timeseries_graph_model.rb

@@ -47,7 +47,7 @@ class SampledTimeSeriesGraphModel < TimeSeriesGraphModel
   
   # sweep this bucket
   def sweep(tval)
-  
+
     return 0 if @xarr.length == 0
     return 0 if @last_sweep_pos >= @xarr.length
     

data/lib/gerbilcharts/public/brushmetal.css

@@ -1,139 +1,153 @@
 .surfacepanel
 {
-	fill: none;
-        stroke-width: 1;
-        stroke: black;
+    fill: none;
+    stroke-width: 1;
+    stroke: black;
 }
 .gridlineh
 {
-        stroke-width: 1;
-        stroke: lightgray;
+    stroke-width: 0.7;
+    stroke: #ccc;
 }
 .gridlinev
 {
-        stroke-width: 1;
-        stroke: lightgray;
+    stroke-width: 0.7;
+    stroke: #ccc;
 }
 .gridlinesub
 {
-        stroke-width: 0.4;
-        stroke: lightgray;
+    stroke-width: 0.5;
+    stroke: #eee;
 }
 .surfaceback
 {
-        fill: white;
+    fill: white;
+    stroke: none;
 }
 .axispanel
 {
-        fill: lightgray;
+    fill: #EEEEEE;
+    stroke: none;
 }
 .axistickmajor
 {
-        stroke-width: 2;
-        stroke: black;
+    stroke-width: 2;
+    stroke: black;
 }
 .axistickminor
 {
-        stroke-width: 1;
-        stroke: black;
+    stroke-width: 1;
+    stroke: black;
 }
 .panel
 {
-        fill: white;
+    fill: white;
 }
 
 .legend
 {
-        fill: red;
+    fill: red;
+}
+.x_mk
+{
+    fill: yellow;
+    fill-opacity: 0.10;
+    stroke: gray;
+}
+#ref_mod
+{
+    fill: gray;
+    fill-opacity: 0.20;
+	stroke: none;
 }
 #item0
 {
         stroke: none;
-        fill: #1F75FE;
+        fill: #2166AC;
 }
 #item1
 {
         stroke: none;
-        fill: #B87333;
+        fill: #4393C3;
 }
 #item2
 {
         stroke: none;
-        fill: gold;
+        fill: #92C5DE;
 }
 #item3
 {
         stroke: none;
-        fill: magenta;
+        fill:#D1E5F0;
 }
 #item4
 {
         stroke: none;
-        fill: olive;
+        fill:#D6604D; /*FDDBC7*/
 }
 #item5
 {
         stroke: none;
-        fill: green;
+        fill:#FDDBC7;
 }
 #item6
 {
         stroke: none;
-        fill: red;
+        fill: #2166AC;
 }
 #item7
 {
         stroke: none;
-        fill: #F88017;
+        fill: #4393C3;
 }
 #item8
 {
     stroke: none;
-    fill: #640E29;
+    fill: #92C5DE;
 }
 #item9
 {
     stroke: none;
-    fill: aqua;
+    fill: #92C5DE;
 }
 #item10
 {
     stroke: none;
-    fill: black;
+    fill: #D1E5F0;
 }
 #lineitem0
 {
-    stroke: #1F75FE;
+    stroke: #2166AC;
     stroke-width: 2;
 }
 #lineitem1
 {
-    stroke: #B87333;
+    stroke: #4393C3;
     stroke-width: 2;
 }
 #lineitem2
 {
-    stroke: gold;
+    stroke:#92C5DE;
     stroke-width: 2;
 }
 #lineitem3
 {
-    stroke: magenta;
+    stroke:#D1E5F0;
     stroke-width: 2;
 }
 #lineitem4
 {
-    stroke: olive;
+    stroke:#FDDBC7;
     stroke-width: 2;
 }
 #lineitem5
 {
-    stroke: green;
-    stroke-width: 2;
+    stroke: #F4A582;
+    stroke-width:2;
 }
 #lineitem6
 {
-    stroke: red;
+    stroke: #D6604D;
     stroke-width: 2;
 }
 #lineitem7
@@ -148,71 +162,106 @@
 }
 .axislabel
 {
-        font-family: sans;
-        font-size: 10px;
-        fill: black;
-        stroke: none;
+    font-family: monospace;
+    font-size: 11px;
+    fill: black;
+    stroke: none;
 }
 
 .axislabelt0
 {
-        font-family: sans;
-        font-size: 8px;
-        fill: black;
-        stroke: none;
+    font-family: monospace;
+    font-size: 9px;
+    fill: black;
+    stroke: none;
 }
 .titletext
 {
-        fill: gray;
-        stroke: none;
-        font-family: Arial, Helvetica, sans-serif;;
-        font-size: 24px;
-        font-weight: bold;
+    fill: #999;
+    stroke:none;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 22px;
 }
 .titlepanel
 {
-        fill: white;
-        fill-opacity: 0.5;
+    fill: none;
+    fill-opacity: 0.5;
+}
+.titletool
+{
+    fill: #AAA;
+    stroke:none;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 10px;
 }
 .legendpanel
 {
-        fill: white;
-        fill-opacity: 0.5;
+    fill: white;
+    fill-opacity: 0.6;
+    stroke: #ddd;
 }
 
 .legendtext
 {
-        font-family: sans;
-        font-size: 10px;
-        fill: black;
-        stroke: none;
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 10px;
+    fill: black;
+    stroke: none;
 }
 .legendstats
 {
-        font-family: sans;
-		font-size: 9px;
-		fill: black;
-		stroke: none;
+    font-family: monospace;
+    font-size: 10px;
+    fill: black;
+    stroke: none;
 }
 
 .elementlabel
 {
-        font-family: sans;
-        font-size: 10px;
-        fill: black;
-        stroke: none;
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 10px;
+    fill: black;
+    stroke: none;
+}
+.elementlabel_large
+{
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 10px;
+    fill: black;
+    stroke: none;
+}
+.elementlabel_huge
+{
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    fill: black;
+    stroke: none;
 }
 .elementvalue
 {
-        font-family: sans;
-        font-size: 8px;
-        fill: black;
-        stroke: none;
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 10px;
+    fill: black;
+    stroke: none;
+}
+.elementvalue_large
+{
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 10px;
+    fill: black;
+    stroke: none;
+}
+.elementvalue_huge
+{
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    fill: black;
+    stroke: none;
 }
 .trackerpanel
 {
     fill: white;
-    fill-opacity: 0.01;
+    fill-opacity: 0.0;
 }
 .trackerrect
 {
@@ -223,13 +272,13 @@
 {
     font-family: courier;
     font-size: 11px;
-	fill: black;
-	stroke: none;
+    fill: black;
+    stroke: none;
 }
 .trackertextfromts
 {
     font-family: courier;
     font-size: 9px;
-	fill: black;
-	stroke: none;
+    fill: black;
+    stroke: none;
 }