svg-graph 2.0.1 → 2.0.2.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0a6c4dcff26a2412d42bb11f392ca6292afde8d
-  data.tar.gz: b91765dbbf54900ffeba3f665af1b17429e72d05
+  metadata.gz: d856850b800bff5e1688e0ad450ccbcc21bdd21d
+  data.tar.gz: 095e8398439866cc6cd52439d60d036ef960ac8a
 SHA512:
-  metadata.gz: d63ea323203f76843f1ba2b07b1db9522b7619a871467064b7f06e87e9e4d55f94404a263d513c1d295e38f2377cec4beaba53549c30f4d8142a91cc6ef26550
-  data.tar.gz: e682a1ee1c37dfdad7f95a52942334ba3f0eee7a001779cf0fd696745f3a7cdb5a54f265312351365992a7602d984e1b003297e1987d4cae170b8c0c096f8032
+  metadata.gz: 69d1f607ba2edec2452d14e39fdb18079bc59a76c52898e101d7adff4c383d8ae40c589e45a001eb3b50912bd2d46af6ac89e4d1b9a9a68f87968a8cf2382877
+  data.tar.gz: 2cb188581fe18553a4c1a2527168f4d4988cf2b47dd6577dadf248b4d93fe09d26608f164bdca8fddb9d97ee9feece347b1287ee8fef12e325245a11d63b05d6

data/History.txt

@@ -1,7 +1,18 @@
 TODO
-* fix axis titles positioning for timeseries and schedule graphs
+* fix axis titles positioning for staggered axis (prevent overlap)
+* fix scale_integer
+* fix sorting and connected lines for Plot
 
-=== 2.0.0 / 2016-08-09
+
+=== 2.0.2 work in progress
+* fix axis-title positioning
+* fix/add support for popups of values line, plot, bar graph
+* Line,Plot,Pie graph support nil values (or pairs of nil for plot) for non-present datapoints
+* changed text anchor of first datapoint label to avoid overlap with axis
+* fix pie graph key overlapping the graph
+*
+
+=== 2.0.1 / 2016-08-09
 * dropped support for ruby 1.8.7 [lumean]
 * Merge ErrBar graph from https://github.com/mondhs/svg-graph
 * Merge number formatting to have more readable floats from https://github.com/mondhs/svg-graph

data/README.markdown

@@ -74,10 +74,14 @@ File.open('bar.svg', 'w') {|f| f.write(g.burn_svg_only)}
 
 ### BarHorizontal
 
+![example bar_horizontal graph](https://cdn.rawgit.com/lumean/svg-graph2/master/examples/bar_horizontal.svg)
+
 ### ErrBar
 
 ### Line
 
+![example line graph](https://cdn.rawgit.com/lumean/svg-graph2/master/examples/line.svg)
+
 ### Pie
 
 ### Plot

data/lib/SVG/Graph/Bar.rb

@@ -61,7 +61,7 @@ module SVG
       # See Graph::initialize and BarBase::set_defaults
       def set_defaults 
         super
-        self.top_align = self.top_font = 1
+        # self.top_align = self.top_font = 1
       end
 
       protected
@@ -78,16 +78,17 @@ module SVG
         top_pad = range == 0 ? 10 : range / 20.0
         scale_range = (maxvalue + top_pad) - minvalue
 
-        scale_division = scale_divisions || (scale_range / 10.0)
+        @y_scale_division = scale_divisions || (scale_range / 10.0)
 
         if scale_integers
-          scale_division = scale_division < 1 ? 1 : scale_division.round
+          @y_scale_division = @y_scale_division < 1 ? 1 : @y_scale_division.round
         end
 
         rv = []
-        maxvalue = maxvalue%scale_division == 0 ? 
-          maxvalue : maxvalue + scale_division
-        minvalue.step( maxvalue, scale_division ) {|v| rv << v}
+        if maxvalue%@y_scale_division != 0
+          maxvalue = maxvalue + @y_scale_division
+        end
+        minvalue.step( maxvalue, @y_scale_division ) {|v| rv << v}
         return rv
       end
 
@@ -99,8 +100,9 @@ module SVG
         minvalue = min_value
         fieldwidth = field_width
 
-        unit_size =  (@graph_height.to_f - font_size*2*top_font) / 
-                          (get_y_labels.max - get_y_labels.min)
+        # unit_size =  (@graph_height.to_f - font_size*2*top_font) / 
+        #                   (get_y_labels.max - get_y_labels.min)
+        unit_size = field_height
         bargap = bar_gap ? (fieldwidth < 10 ? fieldwidth / 2 : 10) : 0
 
         bar_width = fieldwidth - bargap
@@ -120,7 +122,7 @@ module SVG
             #    +ve   -ve  value - 0
             #    -ve   -ve  value.abs - 0
           
-            value = dataset[:data][i]
+            value = dataset[:data][i]/@y_scale_division
             
             left = (fieldwidth * field_count)
             
@@ -137,7 +139,8 @@ module SVG
               "class" => "fill#{dataset_count+1}"
             })
 
-            make_datapoint_text(left + bar_width/2.0, top - 6, value.to_s)
+            make_datapoint_text(left + bar_width/2.0, top - font_size/2, dataset[:data][i].to_s)
+            add_popup(left + bar_width/2.0, top , dataset[:data][i].to_s)
             dataset_count += 1
           end
           field_count += 1

data/lib/SVG/Graph/BarHorizontal.rb

@@ -67,7 +67,7 @@ module SVG
           :show_x_guidelines  => true,
           :show_y_guidelines  => false
         )
-        self.right_align = self.right_font = 1
+        # self.right_align = self.right_font = 1
       end
   
       protected
@@ -79,16 +79,17 @@ module SVG
         top_pad = range == 0 ? 10 : range / 20.0
         scale_range = (maxvalue + top_pad) - minvalue
 
-        scale_division = scale_divisions || (scale_range / 10.0)
+        @x_scale_division = scale_divisions || (scale_range / 10.0)
 
         if scale_integers
-          scale_division = scale_division < 1 ? 1 : scale_division.round
+          @x_scale_division = @x_scale_division < 1 ? 1 : @x_scale_division.round
         end
 
         rv = []
-        maxvalue = maxvalue%scale_division == 0 ? 
-          maxvalue : maxvalue + scale_division
-        minvalue.step( maxvalue, scale_division ) {|v| rv << v}
+        if maxvalue%@x_scale_division != 0
+          maxvalue = maxvalue + @x_scale_division
+        end
+        minvalue.step( maxvalue, @x_scale_division ) {|v| rv << v}
         return rv
       end
 
@@ -103,9 +104,10 @@ module SVG
       def draw_data
         minvalue = min_value
         fieldheight = field_height
-
-        unit_size = (@graph_width.to_f - font_size*2*right_font ) /
-                        (get_x_labels.max - get_x_labels.min )
+        # number of steps in px between x-labels
+        # unit_size = (@graph_width.to_f - font_size*2*right_font ) /
+        #                 (get_x_labels.max - get_x_labels.min )
+        unit_size = field_width
         bargap = bar_gap ? (fieldheight < 10 ? fieldheight / 2 : 10) : 0
 
         bar_height = fieldheight - bargap
@@ -116,7 +118,7 @@ module SVG
         @config[:fields].each_index { |i|
           dataset_count = 0
           for dataset in @data
-            value = dataset[:data][i]
+            value = dataset[:data][i]/@x_scale_division
             
             top = @graph_height - (fieldheight * field_count)
             top += (bar_height * dataset_count) if stack == :side
@@ -137,8 +139,9 @@ module SVG
             })
 
             make_datapoint_text( 
-              left+length+5, top+y_mod, value, "text-anchor: start; "
+              left+length+5, top+y_mod, dataset[:data][i].to_s, "text-anchor: start; "
               )
+            add_popup(left+length, top+y_mod , dataset[:data][i].to_s)
             dataset_count += 1
           end
           field_count += 1

data/lib/SVG/Graph/ErrBar.rb

@@ -69,7 +69,7 @@ module SVG
       # See Graph::initialize and BarBase::set_defaults
       def set_defaults 
         super
-        self.top_align = self.top_font = 1
+        # self.top_align = self.top_font = 1
       end
 
       protected

data/lib/SVG/Graph/Graph.rb

@@ -102,7 +102,8 @@ module SVG
       def initialize( config )
         @config = config
         @data = []
-        self.top_align = self.top_font = self.right_align = self.right_font = 0
+        #self.top_align = self.top_font = 0
+        #self.right_align = self.right_font = 0
 
         init_with({
           :width                => 500,
@@ -192,12 +193,15 @@ module SVG
       #
       # This method will croak unless at least one data set has
       # been added to the graph object.
-      #
+      # 
       #   print graph.burn
+      # 
       def burn
         raise "No data available" unless @data.size > 0
         
-        calculations if methods.include? 'calculations'
+        # undocumented and not used in any sublass
+        # to be removed
+        #calculations if methods.include? 'calculations'
 
         start_svg
         calculate_graph_dimensions
@@ -205,7 +209,7 @@ module SVG
         draw_graph
         draw_titles
         draw_legend
-        draw_data
+        draw_data  # this method needs to be implemented by child classes
         @graph.add_element( @foreground )
         style
 
@@ -278,7 +282,7 @@ module SVG
       #   Default it false, to turn on set to true.
       attr_accessor :rotate_x_labels
       #   This turns the Y axis labels by 90 degrees.
-      #   Default it false, to turn on set to true.
+      #   Default it true, to turn on set to false.
       attr_accessor :rotate_y_labels
       #   How many "steps" to use between displayed X axis labels,
       #   a step of one means display every label, a step of two results
@@ -382,7 +386,9 @@ module SVG
 
 
       protected
-
+      
+      # implementation of quicksort
+      # used for Schedule and Plot
       def sort( *arrys )
         sort_multiple( arrys )
       end
@@ -396,35 +402,45 @@ module SVG
         @popup_radius ||= 10
       end
 
-      attr_accessor :top_align, :top_font, :right_align, :right_font
+      # unknown why needed
+      # attr_accessor :top_align, :top_font, :right_align, :right_font
 
+      # size of the square box in the legend which indicates the colors
       KEY_BOX_SIZE = 12
 
       # Override this (and call super) to change the margin to the left
       # of the plot area.  Results in @border_left being set.
+      #
+      # By default it is 7 + max label height(font size or string length, depending on rotate) + title height
       def calculate_left_margin
         @border_left = 7
         # Check size of Y labels
-        max_y_label_height_px = y_label_font_size
-        if !rotate_y_labels
-          max_y_label_height_px = get_longest_label(get_y_labels).to_s.length * y_label_font_size * 0.6
+        @border_left += max_y_label_width_px
+        if (show_y_title && (y_title_location ==:middle))
+          @border_left += y_title_font_size + 5 
         end
-
-        @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 && (y_title_location ==:middle))
       end
 
-
       # Calculates the width of the widest Y label.  This will be the
-      # character height if the Y labels are rotated
+      # character height if the Y labels are rotated. Returns 0 if labels
+      # are not shown
       def max_y_label_width_px
-        return font_size if rotate_y_labels
+        return 0 if !show_y_labels
+        if !rotate_y_labels
+          max_width = get_longest_label(get_y_labels).to_s.length * y_label_font_size * 0.6
+        else
+          max_width = y_label_font_size + 3
+        end
+        max_width += 10 if stagger_y_labels
+        return max_width
       end
 
 
       # Override this (and call super) to change the margin to the right
       # of the plot area.  Results in @border_right being set.
+      #
+      # By default it is 7 + width of the key if it is placed on the right
+      #   or the maximum of this value or the tilte length (if title is placed at :end)
       def calculate_right_margin
         @border_right = 7
         if key and key_position == :right
@@ -441,6 +457,8 @@ module SVG
 
       # Override this (and call super) to change the margin to the top
       # of the plot area.  Results in @border_top being set.
+      #
+      # This is 5 + the Title size + 5 + subTitle size
       def calculate_top_margin
         @border_top = 5
         @border_top += [title_font_size, y_title_font_size].max if (show_graph_title || (y_title_location ==:end))
@@ -448,32 +466,42 @@ module SVG
         @border_top += subtitle_font_size if show_graph_subtitle
       end
 
+      def add_datapoint_text_and_popup( x, y, label )
+        add_popup( x, y, label )
+        make_datapoint_text( x, y, label )
+      end
 
-      # Adds pop-up point information to a graph.
-      def add_popup( x, y, label )
-        txt_width = label.length * font_size * 0.6 + 10
-        tx = (x+txt_width > width ? x-5 : x+5)
-        t = @foreground.add_element( "text", {
-          "x" => tx.to_s,
-          "y" => (y - font_size).to_s,
-          "visibility" => "hidden",
-        })
-        t.attributes["style"] = "fill: #000; "+
-          (x+txt_width > width ? "text-anchor: end;" : "text-anchor: start;")
-        t.text = label.to_s
-        t.attributes["id"] = t.object_id.to_s
-
-        @foreground.add_element( "circle", {
-          "cx" => x.to_s,
-          "cy" => y.to_s,
-          "r" => "#{@popup_radius}",
-          "style" => "opacity: 0",
-          "onmouseover" => 
-            "document.getElementById(#{t.object_id}).setAttribute('visibility', 'visible' )",
-          "onmouseout" => 
-            "document.getElementById(#{t.object_id}).setAttribute('visibility', 'hidden' )",
-        })
-
+      # Adds pop-up point information to a graph only if the config option is set.
+      def add_popup( x, y, label, style="" )
+        if add_popups
+          if( numeric?(label) )
+            label = @number_format % label
+          end
+          txt_width = label.length * font_size * 0.6 + 10
+          tx = (x+txt_width > width ? x-5 : x+5)
+          t = @foreground.add_element( "text", {
+            "x" => tx.to_s,
+            "y" => (y - font_size).to_s,
+            "class" => "dataPointLabel",
+            "visibility" => "hidden",
+          })
+          t.attributes["style"] = "stroke-width: 2; fill: #000; #{style}"+
+            (x+txt_width > width ? "text-anchor: end;" : "text-anchor: start;")
+          t.text = label.to_s
+          t.attributes["id"] = t.object_id.to_s
+          
+          # add a circle to catch the mouseover
+          @foreground.add_element( "circle", {
+            "cx" => x.to_s,
+            "cy" => y.to_s,
+            "r" => "#{popup_radius}",
+            "style" => "opacity: 0",
+            "onmouseover" => 
+              "document.getElementById(#{t.object_id}).setAttribute('visibility', 'visible' )",
+            "onmouseout" => 
+              "document.getElementById(#{t.object_id}).setAttribute('visibility', 'hidden' )",
+          })
+        end # add_popups
       end
 
       # returns the longest label from an array of labels as string
@@ -491,22 +519,32 @@ module SVG
       
       # Override this (and call super) to change the margin to the bottom
       # of the plot area.  Results in @border_bottom being set.
+      #
+      # 7 + max label height(font size or string length, depending on rotate) + title height
       def calculate_bottom_margin
         @border_bottom = 7
         if key and key_position == :bottom
           @border_bottom += @data.size * (font_size + 5)
           @border_bottom += 10
         end
-        if show_x_labels
-          max_x_label_height_px = x_label_font_size
-          if rotate_x_labels     
-            max_x_label_height_px = get_longest_label(get_x_labels).to_s.length * x_label_font_size * 0.6
-          end
-
-          @border_bottom += max_x_label_height_px
-          @border_bottom += max_x_label_height_px + 10 if stagger_x_labels
+        @border_bottom += max_x_label_height_px
+        if (show_x_title && (x_title_location ==:middle))
+          @border_bottom += x_title_font_size + 5
+        end
+      end
+      
+      # returns the maximum height of the labels respect the rotation or 0 if
+      # the labels are not shown
+      def max_x_label_height_px
+        return 0 if !show_x_labels
+        
+        if rotate_x_labels     
+          max_height = get_longest_label(get_x_labels).to_s.length * x_label_font_size * 0.6
+        else
+          max_height = x_label_font_size + 3
         end
-        @border_bottom += x_title_font_size + 5 if (show_x_title && (x_title_location ==:middle))
+        max_height += 10 if stagger_x_labels
+        return max_height
       end
 
 
@@ -553,18 +591,25 @@ module SVG
         true if Float(object) rescue false
       end
 
+      # adds the datapoint text to the graph only if the config option is set
       def make_datapoint_text( x, y, value, style="" )
         if show_data_values
           textStr = value
           if( numeric?(value) )
             textStr = @number_format % value
           end
+          # change anchor is label overlaps axis
+          if x < textStr.length/2 * font_size * 0.6
+            style << "text-anchor: start;"
+          end
+          # white background for better readability
           @foreground.add_element( "text", {
             "x" => x.to_s,
             "y" => y.to_s,
             "class" => "dataPointLabel",
             "style" => "#{style} stroke: #fff; stroke-width: 2;"
           }).text = textStr 
+          # actual label
           text = @foreground.add_element( "text", {
             "x" => x.to_s,
             "y" => y.to_s,
@@ -574,7 +619,7 @@ module SVG
           text.attributes["style"] = style if style.length > 0
         end
       end
-
+      
 
       # Draws the X axis labels
       def draw_x_labels
@@ -591,6 +636,10 @@ module SVG
             end
 
             if step == 0 then
+              label = label.to_s
+              if( numeric?(label) )
+                label = @number_format % label
+              end
               text = @graph.add_element( "text" )
               text.attributes["class"] = "xAxisLabels"
               text.text = label.to_s
@@ -632,20 +681,39 @@ module SVG
         0
       end
 
-
+      # override this method in child class
+      # must return the array of labels for the x-axis
+      def get_x_labels
+      end
+      
+      # override this method in child class
+      # must return the array of labels for the y-axis
+      # this method defines @y_scale_division
+      def get_y_labels
+      end
+      
+      # space in px between x-labels
       def field_width
-        (@graph_width.to_f - font_size*2*right_font) /
-           (get_x_labels.length - right_align)
+        #(@graph_width.to_f - font_size*2*right_font) /
+        #   (get_x_labels.length - right_align)
+        @graph_width.to_f / get_x_labels.length
       end
 
-
+      # space in px between the y-labels
       def field_height
-        (@graph_height.to_f - font_size*2*top_font) /
-           (get_y_labels.length - top_align)
+        #(@graph_height.to_f - font_size*2*top_font) /
+        #   (get_y_labels.length - top_align)
+        @graph_height.to_f / get_y_labels.length
       end
 
 
-      # Draws the Y axis labels
+      # Draws the Y axis labels, the Y-Axis (@graph_height) is divided equally into #get_y_labels.lenght sections
+      # So the y coordinate for an arbitrary value is calculated as follows: 
+      #   y = @graph_height equals the min_value
+      #   #normalize value of a single scale_division: 
+      #   count = value /(@y_scale_division) 
+      #   y = @graph_height - count * field_height  
+      # 
       def draw_y_labels
         stagger = y_label_font_size + 5
         if show_y_labels
@@ -735,16 +803,12 @@ module SVG
         end
 
         if show_x_title
-          y = @graph_height + @border_top + x_title_font_size
           if (x_title_location == :end)
-            y = y - x_title_font_size/2.0
-            x = width - x_title.length * x_title_font_size * 0.6/2.0
+            y = @graph_height + @border_top + x_title_font_size/2.0
+            x = @border_left + @graph_width + x_title.length * x_title_font_size * 0.6/2.0
           else
-            x = width / 2
-            if show_x_labels
-              y += x_label_font_size + 5 if stagger_x_labels
-              y += x_label_font_size + 5
-            end
+            y = @graph_height + @border_top + x_title_font_size + max_x_label_height_px
+            x = @border_left + @graph_width / 2
           end
 
           @root.add_element("text", {
@@ -755,12 +819,12 @@ module SVG
         end
 
         if show_y_title
-          x = y_title_font_size + (y_title_text_direction==:bt ? 3 : -3)
           if (y_title_location == :end)
             x = y_title.length * y_title_font_size * 0.6/2.0 # positioning is not optimal but ok for now
             y = @border_top - y_title_font_size/2.0
           else
-            y = height / 2
+            x = y_title_font_size + (y_title_text_direction==:bt ? 3 : -3)
+            y = @border_top + @graph_height / 2
           end
           text = @root.add_element("text", {
             "x" => x.to_s,
@@ -816,12 +880,12 @@ module SVG
             x_offset = @border_left + 20
             y_offset = @border_top + @graph_height + 5
             if show_x_labels
-              max_x_label_height_px = (not rotate_x_labels) ? 
-              x_label_font_size :
-              get_x_labels.max{|a,b| 
-                a.to_s.length<=>b.to_s.length
-              }.to_s.length * x_label_font_size * 0.6
-                x_label_font_size
+              # max_x_label_height_px = (not rotate_x_labels) ? 
+              # x_label_font_size :
+              # get_x_labels.max{|a,b| 
+              #   a.to_s.length<=>b.to_s.length
+              # }.to_s.length * x_label_font_size * 0.6
+              #   x_label_font_size
               y_offset += max_x_label_height_px
               y_offset += max_x_label_height_px + 5 if stagger_x_labels
             end
@@ -898,10 +962,17 @@ module SVG
 
 
       # Override and place code to add defs here
+      # @param defs [REXML::Element]
       def add_defs defs
       end
 
-
+      # Creates the XML document and adds the root svg element with 
+      # the width, height and viewBox attributes already set.
+      # The element is stored as @root. 
+      #
+      # In addition a rectangle background of the same size as the 
+      # svg is added.
+      #
       def start_svg
         # Base document
         @doc = Document.new
@@ -946,7 +1017,7 @@ module SVG
         })
       end
 
-
+      #
       def calculate_graph_dimensions
         calculate_left_margin
         calculate_right_margin

data/lib/SVG/Graph/Line.rb

@@ -45,7 +45,10 @@ module SVG
     # http://www.germane-software/repositories/public/SVG/test/single.rb
     # 
     # = Notes
-    # 
+    # Only number of fileds datapoints will be drawn, additional data values
+    # are ignored. Nil values in data are  skipped and
+    # interpolated as straight line to the next datapoint.
+    #
     # The default stylesheet handles upto 10 data sets, if you
     # use more you must create your own stylesheet and add the
     # additional settings for the extra data sets. You will know
@@ -78,65 +81,64 @@ module SVG
       # Fill in the area under the plot if true
       attr_accessor :area_fill
 
-        # The constructor takes a hash reference, fields (the names for each
-        # field on the X axis) MUST be set, all other values are defaulted to 
-        # those shown above - with the exception of style_sheet which defaults
-        # to using the internal style sheet.
-        def initialize config
-            raise "fields was not supplied or is empty" unless config[:fields] &&
-            config[:fields].kind_of?(Array) &&
-            config[:fields].length > 0
-            super
-        end
+      # The constructor takes a hash reference, :fields (the names for each
+      # field on the X axis) MUST be set, all other values are defaulted to 
+      # those shown above - with the exception of style_sheet which defaults
+      # to using the internal style sheet.
+      def initialize config
+          raise "fields was not supplied or is empty" unless config[:fields] &&
+          config[:fields].kind_of?(Array) &&
+          config[:fields].length > 0
+          super
+      end
 
       # In addition to the defaults set in Graph::initialize, sets
       # [show_data_points] true
       # [show_data_values] true
       # [stacked] false
       # [area_fill] false
-        def set_defaults
+      def set_defaults
         init_with(
-        :show_data_points   => true,
-        :show_data_values   => true,
-        :stacked            => false,
-        :area_fill          => false
+          :show_data_points   => true,
+          :show_data_values   => true,
+          :stacked            => false,
+          :area_fill          => false
         )
-        
-
-        self.top_align = self.top_font = self.right_align = self.right_font = 1
-        end
+      # self.top_align = self.top_font = self.right_align = self.right_font = 1
+      end
 
       protected
 
-        def max_value
-            max = 0
-            
-            if (stacked == true) then
-              sums = Array.new(@config[:fields].length).fill(0)
-            
-              @data.each do |data|
-                sums.each_index do |i|
-                  sums[i] += data[:data][i].to_f
-                end
-              end
-              
-              max = sums.max
-            else
-              max = @data.collect{|x| x[:data].max}.max
+      def max_value
+        max = 0
+        if stacked
+          sums = Array.new(@config[:fields].length).fill(0)
+        
+          @data.each do |data|
+            sums.each_index do |i|
+              sums[i] += data[:data][i].to_f
             end
-            
-            return max
+          end
+          max = sums.max
+        else
+          # compact removes nil values when computing the max
+          max = @data.collect{ |x|
+            x[:data].compact.max
+          }.max
         end
+        
+        return max
+      end
 
       def min_value
         min = 0
-        
-        if (min_scale_value.nil? == false) then
+        # compact removes nil values
+        if (!min_scale_value.nil?) then
           min = min_scale_value
         elsif (stacked == true) then
-          min = @data[-1][:data].min
+          min = @data[-1][:data].compact.min
         else
-          min = @data.collect{|x| x[:data].min}.min
+          min = @data.collect{|x| x[:data].compact.min}.min
         end
 
         return min
@@ -155,58 +157,75 @@ module SVG
       def get_y_labels
         maxvalue = max_value
         minvalue = min_value
+        #
         range = maxvalue - minvalue
-        top_pad = range == 0 ? 10 : range / 20.0
+        if range == 0
+          top_pad = 10
+        else
+          top_pad = range / 20.0
+        end
         scale_range = (maxvalue + top_pad) - minvalue
 
-        scale_division = scale_divisions || (scale_range / 10.0)
+        @y_scale_division = scale_divisions || (scale_range / 10.0)
 
         if scale_integers
-          scale_division = scale_division < 1 ? 1 : scale_division.round
+          # only use integers if there will be at least 3 labels and division is > 0.5
+          if maxvalue/@y_scale_division >= 3 && @y_scale_division > 0.5
+            @y_scale_division = @y_scale_division.round
+          end
         end
 
         rv = []
-        maxvalue = maxvalue%scale_division == 0 ? 
-          maxvalue : maxvalue + scale_division
-        minvalue.step( maxvalue, scale_division ) {|v| rv << v}
+        # make sure we have at least one label higher than the max_value
+        if maxvalue%@y_scale_division != 0
+          maxvalue = maxvalue + @y_scale_division
+        end 
+        minvalue.step( maxvalue, @y_scale_division ) {|v| rv << v}
         return rv
       end
 
       def calc_coords(field, value, width = field_width, height = field_height)
         coords = {:x => 0, :y => 0}
         coords[:x] = width * field
-        coords[:y] = @graph_height - value * height
+        coords[:y] = @graph_height - value/@y_scale_division * height
       
         return coords
       end
 
       def draw_data
         minvalue = min_value
-        fieldheight = (@graph_height.to_f - font_size*2*top_font) / 
-                         (get_y_labels.max - get_y_labels.min)
+        #fieldheight = (@graph_height.to_f - font_size*2*top_font) / 
+        #                 (get_y_labels.max - get_y_labels.min)
+        fieldheight = field_height
         fieldwidth = field_width
         line = @data.length
 
         prev_sum = Array.new(@config[:fields].length).fill(0)
-        cum_sum = Array.new(@config[:fields].length).fill(-minvalue)
+        cum_sum = Array.new(@config[:fields].length).fill(nil)
 
         for data in @data.reverse
           lpath = ""
           apath = ""
-
-          if not stacked then cum_sum.fill(-minvalue) end
           
-          data[:data].each_index do |i|
-            cum_sum[i] += data[:data][i]
-            
+          # reset cum_sum if we are not in a stacked graph
+          if not stacked then cum_sum.fill(nil) end
+          
+          # only consider as many datapoints as we have fields
+          @config[:fields].each_index do |i|
+            next if data[:data][i].nil?
+            if cum_sum[i].nil? #first time init
+              cum_sum[i] = data[:data][i] - minvalue
+            else # in case of stacked
+              cum_sum[i] += data[:data][i]
+            end
             c = calc_coords(i, cum_sum[i], fieldwidth, fieldheight)
-            
             lpath << "#{c[:x]} #{c[:y]} "
           end
         
           if area_fill
             if stacked then
               (prev_sum.length - 1).downto 0 do |i|
+                next if prev_sum[i].nil?
                 c = calc_coords(i, prev_sum[i], fieldwidth, fieldheight)
                 
                 apath << "#{c[:x]} #{c[:y]} "
@@ -229,21 +248,27 @@ module SVG
             "class" => "line#{line}"
           })
           
-          if show_data_points || show_data_values
+          if show_data_points || show_data_values || add_popups
             cum_sum.each_index do |i|
+              # skip datapoint if nil
+              next if cum_sum[i].nil?
+              c = calc_coords(i, cum_sum[i], fieldwidth, fieldheight)
               if show_data_points
                 @graph.add_element( "circle", {
-                  "cx" => (fieldwidth * i).to_s,
-                  "cy" => (@graph_height - cum_sum[i] * fieldheight).to_s,
+                  # "cx" => (fieldwidth * i).to_s,
+                  # "cy" => (@graph_height - cum_sum[i] * fieldheight).to_s,
+                  "cx" => c[:x].to_s,
+                  "cy" => c[:y].to_s,
                   "r" => "2.5",
                   "class" => "dataPoint#{line}"
                 })
               end
-              make_datapoint_text( 
-                fieldwidth * i, 
-                @graph_height - cum_sum[i] * fieldheight - 6,
-                cum_sum[i] + minvalue
-              )
+              #x = fieldwidth * i
+              #y = @graph_height - cum_sum[i] * fieldheight
+              #make_datapoint_text( x, y - font_size/2, cum_sum[i] + minvalue)
+              #add_popup(x, y, cum_sum[i] + minvalue)
+              make_datapoint_text( c[:x], c[:y] - font_size/2, cum_sum[i] + minvalue)
+              add_popup(c[:x], c[:y], cum_sum[i] + minvalue)
             end
           end
 

data/lib/SVG/Graph/Pie.rb

@@ -108,10 +108,17 @@ module SVG
       # is the same as:
       #
       #   graph.add_data( { :data => [3,5,8,13] } )
+      #
+      # nil values in the array will be replaced by 0
+      #   
+      #   graph.add_data( { :data => [3,nil,nil,2] } ) is equivalent to graph.add_data( { :data => [3,0,0,2] } )
+      #
       def add_data arg
         arg[:data].each_index {|idx|
           @data[idx] = 0 unless @data[idx]
-          @data[idx] += arg[:data][idx]
+          if !arg[:data][idx].nil?
+            @data[idx] += arg[:data][idx]
+          end
         }
       end
 
@@ -160,10 +167,12 @@ module SVG
       def draw_graph
       end
 
+      # We don't have axis labels
       def get_y_labels
         [""]
       end
 
+      # We don't have axis labels
       def get_x_labels
         [""]
       end
@@ -195,7 +204,8 @@ module SVG
         diameter -= 10 if show_shadow
         radius = diameter / 2.0
 
-        xoff = (width - diameter) / 2
+        #xoff = (width - diameter) / 2
+        xoff = (@graph_width - diameter) / 2
         yoff = (height - @border_bottom - diameter)
         yoff -= 10 if show_shadow
         @graph.attributes['transform'] = "translate( #{xoff} #{yoff} )"

data/lib/SVG/Graph/Plot.rb

@@ -102,7 +102,7 @@ module SVG
                   :show_lines        => true,
                   :round_popups      => true
                  )
-                 self.top_align = self.right_align = self.top_font = self.right_font = 1
+                 # self.top_align = self.right_align = self.top_font = self.right_font = 1
       end
 
       # Determines the scaling for the X axis divisions.
@@ -143,32 +143,41 @@ module SVG
 
 
       # 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)
-	      
-        @data = [] unless @data
-
-        raise "No data provided by #{conf.inspect}" unless data[:data] and
-        data[:data].kind_of? Array
+      #   data_set1 = [ 1, 2 ]    # A data set with 1 point: (1,2)
+      #   data_set2 = [ 1,2, 5,6] # A data set with 2 points: (1,2) and (5,6) 
+      #   
+      #   graph.add_data({
+      #     :data => data_set1,
+      #     :title => 'single point'
+      #   })   
+      #   graph.add_data({
+      #     :data => data_set2,
+      #     :title => 'two points'
+      #   })         
+      def add_data(conf)
+	      @data ||= []
+        # remove nil values
+        conf[:data] = conf[:data].compact
+        raise "No data provided by #{conf.inspect}" unless conf[:data] and
+          conf[: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
+          "data points" unless conf[:data].length % 2 == 0
+        return if conf[: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}"
+        conf[:description] ||= Array.new(conf[:data].size/2)
+        if conf[:description].size != conf[:data].size/2
+          raise "Description for popups does not have same size as provided data: #{conf[:description].size} vs #{conf[:data].size/2}"
         end
 
         x = []
         y = []
-        data[:data].each_index {|i|
-          (i%2 == 0 ? x : y) << data[:data][i]
+        conf[:data].each_index {|i|
+          (i%2 == 0 ? x : y) << conf[:data][i]
         }
-        sort( x, y, data[:description] )
-        data[:data] = [x,y]
-        @data << data
+        sort( x, y, conf[:description] )
+        conf[:data] = [x,y]
+        @data << conf
       end
 
       protected
@@ -231,11 +240,13 @@ module SVG
       alias :get_x_labels :get_x_values
 
       def field_width
+        # exclude values which are outside max_x_range
         values = get_x_values
         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)
+        #(@graph_width.to_f - font_size*2*right_font) /
+        #  (values.length + dx - right_align)
+        @graph_width.to_f / values.length
       end
 
 
@@ -283,6 +294,7 @@ module SVG
       alias :get_y_labels :get_y_values
 
       def field_height
+        # exclude values which are outside max_x_range
         values = get_y_values
         max = max_y_range
         if values.length == 1
@@ -290,8 +302,9 @@ module SVG
         else
           dx = (max - values[-1]).to_f / (values[-1] - values[-2])
         end
-        (@graph_height.to_f - font_size*2*top_font) /
-          (values.length + dx - top_align)
+        #(@graph_height.to_f - font_size*2*top_font) /
+        #  (values.length + dx - top_align)
+        @graph_height.to_f / values.length
       end
 
       def draw_data
@@ -330,7 +343,7 @@ module SVG
             })
           end
 
-          if show_data_points || show_data_values
+          if show_data_points || show_data_values || add_popups
             x_points.each_index { |idx|
               x = (x_points[idx] -  x_min) * x_step
               y = @graph_height - (y_points[idx] -  y_min) * y_step
@@ -338,9 +351,9 @@ module SVG
                 DataPoint.new(x, y, line).shape(data[:description][idx]).each{|s|
                   @graph.add_element( *s )
                 }
-                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
+              make_datapoint_text( x, y-6, y_points[idx] )
+              add_popup(x, y, format( x_points[idx], y_points[idx], data[:description][idx]))
             }
           end
           line += 1

data/lib/svggraph.rb

@@ -1,6 +1,6 @@
 module SVG
   module Graph
-    VERSION = '2.0.1'
+    VERSION = '2.0.2.beta'
   end
 end
 require_relative 'SVG/Graph/DataPoint'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svg-graph
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2.beta
 platform: ruby
 authors:
 - Sean Russell
@@ -54,7 +54,7 @@ files:
 - test/test_svg_graph.rb
 homepage: http://www.germane-software.com/software/SVG/SVG::Graph/
 licenses:
-- GPL
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -67,12 +67,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: SVG:::Graph is a pure Ruby library for generating charts, which are a type