svg-graph 1.0.1 → 1.0.3

data/lib/SVG/Graph/Graph.rb

@@ -140,6 +140,7 @@ module SVG
           :title_font_size      =>16,
           :subtitle_font_size   =>14,
           :x_label_font_size    =>12,
+          :y_label_font_size    =>12,
           :x_title_font_size    =>14,
           :y_label_font_size    =>12,
           :y_title_font_size    =>14,
@@ -365,14 +366,14 @@ module SVG
       def calculate_left_margin
         @border_left = 7
         # Check for Y labels
-        max_y_label_height_px = rotate_y_labels ? 
-          y_label_font_size :
+        max_y_label_height_px = @rotate_y_labels ? 
+          @y_label_font_size :
           get_y_labels.max{|a,b| 
             a.to_s.length<=>b.to_s.length
-          }.to_s.length * y_label_font_size * 0.6
-        @border_left += max_y_label_height_px if show_y_labels
-        @border_left += max_y_label_height_px + 10 if stagger_y_labels
-        @border_left += y_title_font_size + 5 if show_y_title
+          }.to_s.length * @y_label_font_size * 0.6
+        @border_left += max_y_label_height_px if @show_y_labels
+        @border_left += max_y_label_height_px + 10 if @stagger_y_labels
+        @border_left += y_title_font_size + 5 if @show_y_title
       end
 
 
@@ -533,7 +534,7 @@ module SVG
 
               x = count * label_width + x_label_offset( label_width )
               y = @graph_height + x_label_font_size + 3
-              t = 0 - (font_size / 2)
+              #t = 0 - (font_size / 2)
 
               if stagger_x_labels and count % 2 == 1
                 y += stagger
@@ -700,7 +701,8 @@ module SVG
       end
 
       def keys 
-        return @data.collect{ |d| d[:title] }
+        i = 0
+        return @data.collect{ |d| i+=1; d[:title] || "Serie #{i}" }
       end
 
       # Draws the legend on the graph
@@ -792,7 +794,7 @@ module SVG
         css = get_style
         rv = {}
         while css =~ /^(\.(\w+)(?:\s*,\s*\.\w+)*)\s*\{/m
-          names_orig = names = $1
+          names = $1
           css = $'
           css =~ /([^}]+)\}/m
           content = $1

data/lib/SVG/Graph/Line.rb

@@ -102,6 +102,7 @@ module SVG
         :area_fill          => false
         )
         
+
         self.top_align = self.top_font = self.right_align = self.right_font = 1
         end
 

data/lib/SVG/Graph/Pie.rb

@@ -170,11 +170,11 @@ module SVG
 
       def keys
         total = 0
-        max_value = 0
+        #max_value = 0
         @data.each {|x| total += x }
         percent_scale = 100.0 / total
         count = -1
-        a = @config[:fields].collect{ |x|
+        @config[:fields].collect{ |x|
           count += 1
           v = @data[count]
           perc = show_key_percent ? " "+(v * percent_scale).round.to_s+"%" : ""
@@ -275,7 +275,7 @@ module SVG
             msr = Math.sin(radians)
             mcr = Math.cos(radians)
             tx = radius + (msr * radius)
-            ty = radius -(mcr * radius)
+            ty = radius - (mcr * radius)
 
             if expanded or (expand_greatest && value == max_value)
               tx += (msr * expand_gap)

data/lib/SVG/Graph/Plot.rb

@@ -97,7 +97,9 @@ module SVG
                   :show_data_values  => true,
                   :show_data_points  => true,
                   :area_fill         => false,
-                  :stacked           => false
+                  :stacked           => false,
+                  :show_lines        => true,
+                  :round_popups      => true
                  )
                  self.top_align = self.right_align = self.top_font = self.right_font = 1
       end
@@ -127,14 +129,22 @@ module SVG
       attr_accessor :show_data_points
       # Set the minimum value of the X axis
       attr_accessor :min_x_value 
+      # Set the maximum value of the X axis
+      attr_accessor :max_x_value 
       # Set the minimum value of the Y axis
       attr_accessor :min_y_value
+      # Set the maximum value of the Y axis
+      attr_accessor :max_y_value
+      # Show lines connecting data points
+      attr_accessor :show_lines
+      # Round value of data points in popups to integer
+      attr_accessor :round_popups
 
 
       # Adds data to the plot.  The data must be in X,Y pairs; EG
       #   [ 1, 2 ]    # A data set with 1 point: (1,2)
       #   [ 1,2, 5,6] # A data set with 2 points: (1,2) and (5,6)  
-      def add_data data
+      def add_data(data)
 	      
         @data = [] unless @data
 
@@ -145,17 +155,21 @@ module SVG
           "data points" unless data[:data].length % 2 == 0
         return if data[:data].length == 0
 
+        data[:description] ||= Array.new(data[:data].size/2)
+        if data[:description].size != data[:data].size/2
+          raise "Description for popups does not have same size as provided data: #{data[:description].size} vs #{data[:data].size/2}"
+        end
+
         x = []
         y = []
         data[:data].each_index {|i|
           (i%2 == 0 ? x : y) << data[:data][i]
         }
-        sort( x, y )
+        sort( x, y, data[:description] )
         data[:data] = [x,y]
         @data << data
       end
 
-
       protected
 
       def keys
@@ -177,10 +191,22 @@ module SVG
 
       X = 0
       Y = 1
-      def x_range
+
+      def max_x_range
         max_value = @data.collect{|x| x[:data][X][-1] }.max
+        max_value = max_value > max_x_value ? max_value : max_x_value if max_x_value
+        max_value
+      end
+
+      def min_x_range
         min_value = @data.collect{|x| x[:data][X][0] }.min
-        min_value = min_value<min_x_value ? min_value : min_x_value if min_x_value
+        min_value = min_value < min_x_value ? min_value : min_x_value if min_x_value
+        min_value
+      end
+
+      def x_range
+        max_value = max_x_range
+        min_value = min_x_range
 
         range = max_value - min_value
         right_pad = range == 0 ? 10 : range / 20.0
@@ -205,17 +231,28 @@ module SVG
 
       def field_width
         values = get_x_values
-        max = @data.collect{|x| x[:data][X][-1]}.max
+        max = max_x_range
         dx = (max - values[-1]).to_f / (values[-1] - values[-2])
         (@graph_width.to_f - font_size*2*right_font) /
           (values.length + dx - right_align)
       end
 
 
-      def y_range
+      def max_y_range
         max_value = @data.collect{|x| x[:data][Y].max }.max
+        max_value = max_value > max_y_value ? max_value : max_y_value if max_y_value
+        max_value
+      end
+
+      def min_y_range
         min_value = @data.collect{|x| x[:data][Y].min }.min
-        min_value = min_value<min_y_value ? min_value : min_y_value if min_y_value
+        min_value = min_value < min_y_value ? min_value : min_y_value if min_y_value
+        min_value
+      end
+
+      def y_range
+        max_value = max_y_range
+        min_value = min_y_range
 
         range = max_value - min_value
         top_pad = range == 0 ? 10 : range / 20.0
@@ -232,15 +269,21 @@ module SVG
 
       def get_y_values
         min_value, max_value, scale_division = y_range
+        if max_value != min_value
+          while (max_value - min_value) < scale_division
+            scale_division /= 10.0
+          end
+        end
         rv = []
         min_value.step( max_value, scale_division ) {|v| rv << v}
+        rv << rv[0] + 1 if rv.length == 1
         return rv
       end
       alias :get_y_labels :get_y_values
 
       def field_height
         values = get_y_values
-        max = @data.collect{|x| x[:data][Y].max }.max
+        max = max_y_range
         if values.length == 1
           dx = values[-1]
         else
@@ -252,9 +295,9 @@ module SVG
 
       def draw_data
         line = 1
-
-        x_min, x_max, x_div = x_range
-        y_min, y_max, y_div = y_range
+        
+        x_min, x_max = x_range
+        y_min, y_max = y_range
         x_step = (@graph_width.to_f - font_size*2) / (x_max-x_min)
         y_step = (@graph_height.to_f -  font_size*2) / (y_max-y_min)
 
@@ -279,10 +322,12 @@ module SVG
             })
           end
 
-          @graph.add_element( "path", {
-            "d" => "M#{x_start} #{y_start} #{lpath}",
-            "class" => "line#{line}"
-          })
+          if show_lines
+            @graph.add_element( "path", {
+              "d" => "M#{x_start} #{y_start} #{lpath}",
+              "class" => "line#{line}"
+            })
+          end
 
           if show_data_points || show_data_values
             x_points.each_index { |idx|
@@ -295,7 +340,7 @@ module SVG
                   "r" => "2.5",
                   "class" => "dataPoint#{line}"
                 })
-                add_popup(x, y, format( x_points[idx], y_points[idx] )) if add_popups
+                add_popup(x, y, format( x_points[idx], y_points[idx], data[:description][idx])) if add_popups
               end
               make_datapoint_text( x, y-6, y_points[idx] ) if show_data_values
             }
@@ -304,8 +349,12 @@ module SVG
         end
       end
 
-      def format x, y
-        "(#{(x * 100).to_i / 100}, #{(y * 100).to_i / 100})"
+      def format x, y, desc
+        info = []
+        info << (round_popups ? (x * 100).to_i / 100 : x)
+        info << (round_popups ? (y * 100).to_i / 100 : y)
+        info << desc
+        "(#{info.compact.join(', ')})"
       end
       
       def get_css

data/lib/SVG/Graph/Schedule.rb

@@ -1,5 +1,8 @@
 require 'SVG/Graph/Plot'
-require 'parsedate'
+TIME_PARSE_AVAIL = (RUBY_VERSION =~ /1\.9\./) ? true : false
+if not TIME_PARSE_AVAIL then
+  require 'parsedate'
+end
 
 module SVG
   module Graph
@@ -159,8 +162,13 @@ module SVG
           if im3 == 0
             y << data[:data][i]
           else
-            arr = ParseDate.parsedate( data[:data][i] )
-            t = Time.local( *arr[0,6].compact )
+            if TIME_PARSE_AVAIL then
+              arr = DateTime.parse(data[:data][i])
+              t = arr.to_time
+            else
+              arr = ParseDate.parsedate( data[:data][i] )
+              t = Time.local( *arr[0,6].compact )
+            end
             (im3 == 1 ? x_start : x_end) << t.to_i
           end
         }
@@ -172,8 +180,14 @@ module SVG
       protected
 
       def min_x_value=(value)
-        arr = ParseDate.parsedate( value )
-        @min_x_value = Time.local( *arr[0,6].compact ).to_i
+        if TIME_PARSE_AVAIL then
+          arr = Time.parse(value)
+          t = arr.to_time
+        else
+          arr = ParseDate.parsedate( value )
+          t = Time.local( *arr[0,6].compact )
+        end
+        @min_x_value = t.to_i
       end
 
 

data/lib/SVG/Graph/TimeSeries.rb

@@ -1,5 +1,8 @@
 require 'SVG/Graph/Plot'
-require 'parsedate'
+TIME_PARSE_AVAIL = (RUBY_VERSION =~ /1\.9\./) ? true : false
+if not TIME_PARSE_AVAIL then
+  require 'parsedate'
+end
 
 module SVG
   module Graph
@@ -7,15 +10,17 @@ module SVG
     # 
     # = Synopsis
     # 
-    #   require 'SVG/Graph/TimeSeriess'
-    # 
+    #   require 'SVG/Graph/TimeSeries'
+    #   
     #   # Data sets are x,y pairs
-    #   data1 = ["6/17/72", 11,    "1/11/72", 7,    "4/13/04 17:31", 11, 
-    #           "9/11/01", 9,    "9/1/85", 2,    "9/1/88", 1,    "1/15/95", 13]
-    #   data2 = ["8/1/73", 18,    "3/1/77", 15,    "10/1/98", 4, 
-    #           "5/1/02", 14,    "3/1/95", 6,    "8/1/91", 12,    "12/1/87", 6, 
-    #           "5/1/84", 17,    "10/1/80", 12]
-    #
+    #   projection = ["6/17/72", 11,    "1/11/72", 7,    "4/13/04 17:31", 11,
+    #                "9/11/01", 9,    "9/1/85", 2,    "9/1/88", 1,    "1/15/95", 13]
+    #   actual = ["8/1/73", 18,    "3/1/77", 15,    "10/1/98", 4,
+    #             "5/1/02", 14,    "3/1/95", 6,    "8/1/91", 12,    "12/1/87", 6,
+    #             "5/1/84", 17,    "10/1/80", 12]
+    #   
+    #   title = "Ice Cream Cone Consumption"
+    #   
     #   graph = SVG::Graph::TimeSeries.new( {
     #     :width => 640,
     #     :height => 480,
@@ -27,7 +32,7 @@ module SVG
     #     :scale_y_integers => true,
     #     :min_x_value => 0,
     #     :min_y_value => 0,
-    #     :show_data_labels => true,
+    #     :show_data_values => true,
     #     :show_x_guidelines => true,
     #     :show_x_title => true,
     #     :x_title => "Time",
@@ -39,13 +44,13 @@ module SVG
     #   })
     #   
     #   graph.add_data({
-    #   	:data => projection
-    # 	  :title => 'Projected',
+    #           :data => projection,
+    #     :title => 'Projected',
     #   })
-    # 
+    #   
     #   graph.add_data({
-    #   	:data => actual,
-    # 	  :title => 'Actual',
+    #           :data => actual,
+    #     :title => 'Actual',
     #   })
     #   
     #   print graph.burn()
@@ -140,46 +145,35 @@ module SVG
       #     :title => 'Two'
       #   )
       #
-      # Note that the data must be in time,value pairs, and that the date format
-      # may be any date that is parseable by ParseDate.
+      # Note that the data must be in time,value pairs. The time may be any date in
+      # a format that is parseable by ParseDate, a Time object, or a number of seconds
+      # after the unix epoch.
       def add_data data
-        @data = [] unless @data
-       
-        raise "No data provided by #{@data.inspect}" unless data[:data] and
-                                                    data[:data].kind_of? Array
-        raise "Data supplied must be x,y pairs!  "+
-          "The data provided contained an odd set of "+
-          "data points" unless data[:data].length % 2 == 0
-        return if data[:data].length == 0
-
-
-        x = []
-        y = []
-        data[:data].each_index {|i|
-          if i%2 == 0
-            arr = ParseDate.parsedate( data[:data][i] )
-            t = Time.local( *arr[0,6].compact )
-            x << t.to_i
-          else
-            y << data[:data][i]
-          end
-        }
-        sort( x, y )
-        data[:data] = [x,y]
-        @data << data
+        data[:data].each_index do |i|
+          data[:data][i] = parse_time(data[:data][i]).to_i if i % 2 == 0
+        end
+        super(data)
       end
 
 
       protected
 
       def min_x_value=(value)
-        arr = ParseDate.parsedate( value )
-        @min_x_value = Time.local( *arr[0,6].compact ).to_i
+        t = parse_time(value)
+        @min_x_value = t.to_i
       end
 
+      def max_x_value=(value)
+        t = parse_time(value)
+        @max_x_value = t.to_i
+      end
 
-      def format x, y
-        Time.at( x ).strftime( popup_format )
+      def format x, y, description
+        info = [
+          Time.at(x).strftime(popup_format),
+          round_popups ? (y * 100).to_i / 100 : y,
+          description
+        ].compact.join(', ')
       end
 
       def get_x_labels
@@ -187,6 +181,29 @@ module SVG
       end
       
       private
+
+      # Accepts date time as a string, number of seconds since the epoch, or Time 
+      # object and returns a Time object. Raises an error if not a valid date time
+      # representation.
+      def parse_time(time)
+        case time
+        when Time
+          return time
+        when String
+          if TIME_PARSE_AVAIL then
+            arr = DateTime.parse(time)
+            return arr.to_time
+          else
+            arr = ParseDate.parsedate(time)
+            return Time.local( *arr[0,6].compact )
+          end
+        when Integer
+          return Time.at(time)
+        else
+          raise "Can not parse time #{time.inspect}"
+        end
+      end
+
       def get_x_values
         rv = []
         min, max, scale_division = x_range