svg-graph 2.0.2 → 2.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7101e9e0d576c758450907b8f9d30bf2b8c787ee
-  data.tar.gz: c370f0c3b179587d0e4bf34d4862f4c1a0366dce
+  metadata.gz: 0cd53b929ddc82314e5a2f5905ee19e6945f4a7c
+  data.tar.gz: 95968148c4ec92b65c88f8dc1b0796fa95a645b7
 SHA512:
-  metadata.gz: da39453fcbd961e3b8758da1b7a5ed49f9fa6142f598151de6625e7294ca3ffc2689aca19110841a6f598bf23305ab85daaf2f5b2d59a03f29b3204d96c2ecc2
-  data.tar.gz: 58a9de11f45ce90ffbf7600b4d82a0b26b27f4b6598e016221bc838fa074cd7aaaecad537aa7cd69fbcae33d03f4c6da432883b890775dfd9db24900c1c39f3e
+  metadata.gz: d08b2f7ec8271044779fb858cb79262a1d8e69a86b76181c7dc4fa0b8c02aec6c5a2e248ab2b90d07774456dbc9e77754a50a62e944d313426678fc216af9dc2
+  data.tar.gz: c4ec0861d565c824cc5aed3ce3d4eef79ce85093a730e630fd4255b8797559825f6fb1dfd2e68ff47a267704bffc28eba45579e81089dd997ea695e3f4686500

data/History.txt

@@ -2,6 +2,12 @@ TODO / Backlog
 * add unit tests for all types of graphs
 * refactor various hardcoded constant pixel offsets in Graph class to use named constants or variables
 
+=== 2.1.0 / 2017-02-12 [lumean]
+* change behavior for number format, Strings axis labels will never be formatted
+  previously, when containing numbers they were formatted with the number_format template
+* added options to change x-axis and y-axis position :x_axis_position and :y_axis_position
+* x_guidelines and y_guidelines can now be drawn independently of show_x_labels and show_y_labels,
+  before they were only drawn if show_x_labels resp show_y_labels was true
 
 === 2.0.2 / 2016-10-24 [lumean]
 * fix axis-title positioning
@@ -24,7 +30,7 @@ TODO / Backlog
 * all ruby files in the test directory now run on ruby >2.0 and write output to files [lumean]
 * changed from autoload to static loading due to issues with unit-testing when the gem is not installed [lumean]
 * begin transition to minitest for tests [lumean]
-* merged fix for 100% pie graphs from https://github.com/endersstocker/svg-graph 
+* merged fix for 100% pie graphs from https://github.com/endersstocker/svg-graph
 * fix wrong margins for labels after merge of number formatting [lumean]
 * Add new option for locations for the axis titles (at the end of the axis instead of below / left from it) [lumean]
 * improved x-axis label location when x-axis marks are vertical and long [lumean]
@@ -46,5 +52,3 @@ TODO / Backlog
 * Max values and improved Time data handling.
 * Merge pull request #1 from thinkingbox/master
 * Adding scattered plot support with :show_lines =>false Rounding values to integers in popups can be disabled with :round_popups => false Optional description gets shown in popup
-
-

data/lib/SVG/Graph/Bar.rb

@@ -103,29 +103,29 @@ module SVG
 
         bar_width = fieldwidth - bargap
         bar_width /= @data.length if stack == :side
- 
+
         bottom = @graph_height
 
         field_count = 0
         @config[:fields].each_index { |i|
           dataset_count = 0
           for dataset in @data
-          
+
             # cases (assume 0 = +ve):
             #   value  min  length
             #    +ve   +ve  value - min
             #    +ve   -ve  value - 0
             #    -ve   -ve  value.abs - 0
-          
+
             value = dataset[:data][i]/@y_scale_division
-            
+
             left = (fieldwidth * field_count)
-            
+
             length = (value.abs - (minvalue > 0 ? minvalue : 0)) * unit_size
             # top is 0 if value is negative
             top = bottom - (((value < 0 ? 0 : value) - minvalue) * unit_size)
             left += bar_width * dataset_count if stack == :side
- 
+
             @graph.add_element( "rect", {
               "x" => left.to_s,
               "y" => top.to_s,
@@ -134,7 +134,8 @@ module SVG
               "class" => "fill#{dataset_count+1}"
             })
 
-            make_datapoint_text(left + bar_width/2.0, top - font_size/2, dataset[:data][i].to_s)
+            make_datapoint_text(left + bar_width/2.0, top - font_size/2, dataset[:data][i])
+            # number format shall not apply to popup (use .to_s conversion)
             add_popup(left + bar_width/2.0, top , dataset[:data][i].to_s)
             dataset_count += 1
           end

data/lib/SVG/Graph/BarHorizontal.rb

@@ -4,43 +4,43 @@ require_relative 'BarBase'
 module SVG
   module Graph
     # === Create presentation quality SVG horitonzal bar graphs easily
-    # 
+    #
     # = Synopsis
-    # 
+    #
     #   require 'SVG/Graph/BarHorizontal'
-    #   
+    #
     #   fields = %w(Jan Feb Mar)
     #   data_sales_02 = [12, 45, 21]
-    #   
+    #
     #   graph = SVG::Graph::BarHorizontal.new({
     #     :height => 500,
     #     :width => 300,
     #     :fields => fields,
     #   })
-    #   
+    #
     #   graph.add_data({
     #     :data => data_sales_02,
     #     :title => 'Sales 2002',
     #   })
-    #   
+    #
     #   print "Content-type: image/svg+xml\r\n\r\n"
     #   print graph.burn
-    # 
+    #
     # = Description
-    # 
+    #
     # This object aims to allow you to easily create high quality
     # SVG horitonzal bar graphs. You can either use the default style sheet
     # or supply your own. Either way there are many options which can
     # be configured to give you control over how the graph is
     # generated - with or without a key, data elements at each point,
     # title, subtitle etc.
-    # 
+    #
     # = Examples
-    # 
+    #
     # * http://germane-software.com/repositories/public/SVG/test/test.rb
-    # 
+    #
     # = See also
-    # 
+    #
     # * SVG::Graph::Graph
     # * SVG::Graph::Bar
     # * SVG::Graph::Line
@@ -62,14 +62,14 @@ module SVG
       # [show_y_guidelines] false
       def set_defaults
         super
-        init_with( 
+        init_with(
           :rotate_y_labels    => true,
           :show_x_guidelines  => true,
           :show_y_guidelines  => false
         )
         # self.right_align = self.right_font = 1
       end
-  
+
       protected
 
       def get_x_labels
@@ -110,14 +110,14 @@ module SVG
         bar_height = fieldheight - bargap
         bar_height /= @data.length if stack == :side
         y_mod = (bar_height / 2) + (font_size / 2)
-        
+
         field_count = 1
         @config[:fields].each_index { |i|
           dataset_count = 0
           for dataset in @data
             value = dataset[:data][i]
-            
-            top = @graph_height - (fieldheight * field_count)
+
+            top = @graph_height - (fieldheight * field_count) + bargap
             top += (bar_height * dataset_count) if stack == :side
             # cases (assume 0 = +ve):
             #   value  min  length          left
@@ -135,9 +135,8 @@ module SVG
               "class" => "fill#{dataset_count+1}"
             })
 
-            make_datapoint_text( 
-              left+length+5, top+y_mod, dataset[:data][i].to_s, "text-anchor: start; "
-              )
+            make_datapoint_text(left+length+5, top+y_mod, dataset[:data][i], "text-anchor: start; ")
+            # number format shall not apply to popup (use .to_s conversion)
             add_popup(left+length, top+y_mod , dataset[:data][i].to_s)
             dataset_count += 1
           end

data/lib/SVG/Graph/ErrBar.rb

@@ -13,14 +13,14 @@ module SVG
     #   fields = %w(Jan Feb);
     #   myarr1_mean = 10
     #   myarr1_confidence = 1
-    #   
+    #
     #   myarr2_mean = 20
     #   myarr2_confidence = 2
-    #   
+    #
     #   data= [myarr1_mean, myarr2_mean]
-    #   
+    #
     #   err_mesure = [myarr1_confidence, myarr2_confidence]
-    #   
+    #
     #   graph = SVG::Graph::ErrBar.new(
     #     :height => 500,
     #     :width => 600,
@@ -28,7 +28,7 @@ module SVG
     #     :errorBars => err_mesure,
     #     :scale_integers => true,
     #   )
-    #   
+    #
     #   graph.add_data(
     #     :data => data,
     #     :title => 'Sales 2002'
@@ -71,10 +71,10 @@ module SVG
       def initialize config
           raise "fields was not supplied or is empty" unless config[:errorBars] &&
           config[:errorBars].kind_of?(Array) &&
-          config[:errorBars].length > 0 
+          config[:errorBars].length > 0
           super
-      end 
-      # Array of confidence values for each item in :fields. A range from 
+      end
+      # Array of confidence values for each item in :fields. A range from
       # value[i]-errorBars[i] to value[i]+errorBars[i] is drawn into the graph.
       attr_accessor :errorBars
 
@@ -103,7 +103,7 @@ module SVG
         end
 
         rv = []
-        maxvalue = maxvalue%@y_scale_division == 0 ? 
+        maxvalue = maxvalue%@y_scale_division == 0 ?
           maxvalue : maxvalue + @y_scale_division
         minvalue.step( maxvalue, @y_scale_division ) {|v| rv << v}
         return rv
@@ -122,31 +122,31 @@ module SVG
 
         bar_width = fieldwidth - (bargap *2)
         bar_width /= @data.length if stack == :side
- 
+
         bottom = @graph_height
 
         field_count = 0
         @config[:fields].each_index { |i|
           dataset_count = 0
           for dataset in @data
-          
+
             # cases (assume 0 = +ve):
             #   value  min  length
             #    +ve   +ve  value - min
             #    +ve   -ve  value - 0
             #    -ve   -ve  value.abs - 0
-          
+
             value = dataset[:data][i].to_f/@y_scale_division
-            
+
             left = (fieldwidth * field_count)
             left += bargap
-         
-            
+
+
             length = (value.abs - (minvalue > 0 ? minvalue : 0)) * unit_size
             # top is 0 if value is negative
             top = bottom - (((value < 0 ? 0 : value) - minvalue) * unit_size)
             left += bar_width * dataset_count if stack == :side
- 
+
             @graph.add_element( "rect", {
               "x" => left.to_s,
               "y" => top.to_s,
@@ -160,7 +160,7 @@ module SVG
             upperErr = top+threshold
             bottomErr = top-threshold
             withthErr = bar_width/4
-			
+
             @graph.add_element( "line", {
               "x1" => middlePointErr.to_s,
               "y1" => upperErr.to_s,
@@ -168,7 +168,7 @@ module SVG
               "y2" => bottomErr.to_s,
               "style" => "stroke:rgb(0,0,0);stroke-width:1"
             })
-            
+
             @graph.add_element( "line", {
               "x1" => (middlePointErr-withthErr).to_s,
               "y1" => upperErr.to_s,
@@ -183,15 +183,16 @@ module SVG
               "y2" => bottomErr.to_s,
               "style" => "stroke:rgb(0,0,0);stroke-width:1"
             })
-            
-            make_datapoint_text(left + bar_width/2.0, top - 6, dataset[:data][i].to_s)
+
+            make_datapoint_text(left + bar_width/2.0, top - 6, dataset[:data][i])
+            # number format shall not apply to popup (use .to_s conversion)
             add_popup(left + bar_width/2.0, top , dataset[:data][i].to_s)
             dataset_count += 1
           end
           field_count += 1
         } # config[:fields].each_index
       end # draw_data
-      
+
     end # ErrBar
   end
 end

data/lib/SVG/Graph/Graph.rb

@@ -10,7 +10,7 @@ module SVG
   module Graph
 
     # === Base object for generating SVG Graphs
-    # 
+    #
     # == Synopsis
     #
     # This class is only used as a superclass of specialized charts.  Do not
@@ -28,9 +28,9 @@ module SVG
     # * file:test/single.rb
     # * file:test/test.rb
     # * file:test/timeseries.rb
-    # 
+    #
     # == Description
-    # 
+    #
     # This package should be used as a base for creating SVG graphs.
     #
     # == Acknowledgements
@@ -39,7 +39,7 @@ module SVG
     # port is based on.
     #
     # Stephen Morgan for creating the TT template and SVG.
-    # 
+    #
     # == See
     #
     # * SVG::Graph::BarHorizontal
@@ -63,6 +63,8 @@ module SVG
       # instantiate this class directly; see the subclass for options.
       # [width] 500
       # [height] 300
+      # [x_axis_position] nil
+      # [y_axis_position] nil
       # [show_x_guidelines] false
       # [show_y_guidelines] true
       # [show_data_values] true
@@ -98,7 +100,7 @@ module SVG
       # [key_font_size] 10
       # [no_css] false
       # [add_popups] false
-      # [number_format] '%.2f' 
+      # [number_format] '%.2f'
       def initialize( config )
         @config = config
         @data = []
@@ -112,6 +114,9 @@ module SVG
           :show_y_guidelines    => true,
           :show_data_values     => true,
 
+          :x_axis_position      => nil,
+          :y_axis_position      => nil,
+
           :min_scale_value      => nil,
 
           :show_x_labels        => true,
@@ -138,7 +143,7 @@ module SVG
           :graph_title          => 'Graph Title',
           :show_graph_subtitle  => false,
           :graph_subtitle        => 'Graph Sub Title',
-          :key                  => true, 
+          :key                  => true,
           :key_position          => :right, # bottom or right
 
           :font_size            =>12,
@@ -149,27 +154,27 @@ module SVG
           :x_title_font_size    =>14,
           :y_title_font_size    =>14,
           :key_font_size        =>10,
-          
+
           :no_css               =>false,
           :add_popups           =>false,
-          :number_format        => '%.2f' 
+          :number_format        => '%.2f'
         })
         set_defaults if self.respond_to? :set_defaults
         init_with config
       end
 
-      
+
       # This method allows you do add data to the graph object.
       # It can be called several times to add more data sets in.
       #
       #   data_sales_02 = [12, 45, 21];
-      #   
+      #
       #   graph.add_data({
       #     :data => data_sales_02,
       #     :title => 'Sales 2002'
       #   })
       def add_data conf
-        @data = [] unless (defined? @data and !@data.nil?) 
+        @data = [] unless (defined? @data and !@data.nil?)
 
         if conf[:data] and conf[:data].kind_of? Array
           @data << conf
@@ -183,7 +188,7 @@ module SVG
       # reuse it to create a new graph but with the same config options.
       #
       #   graph.clear_data
-      def clear_data 
+      def clear_data
         @data = []
       end
 
@@ -193,12 +198,12 @@ 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
-       
+
         start_svg
         calculate_graph_dimensions
         @foreground = Element.new( "g" )
@@ -223,14 +228,14 @@ module SVG
             data << "<!-- Ruby Zlib not available for SVGZ -->";
           end
         end
-        
+
         return data
       end
-      
-      # Burns the graph but returns only the <svg> node as String without the 
+
+      # Burns the graph but returns only the <svg> node as String without the
       # Doctype and XML Declaration. This allows easy integration into
       # existing xml documents.
-      # 
+      #
       # @return [String] the SVG node which represents the Graph
       def burn_svg_only
         # initialize all instance variables by burning the graph
@@ -260,6 +265,19 @@ module SVG
       attr_accessor :style_sheet
       #   (Bool) Show the value of each element of data on the graph
       attr_accessor :show_data_values
+      #   By default (nil/undefined) the x-axis is at the bottom of the graph.
+      #   With this property a custom position for the x-axis can be defined.
+      #   Valid values are between :min_scale_value and maximum value of the
+      #   data.
+      #   Default: nil
+      attr_accessor :x_axis_position
+      #   By default (nil/undefined) the y-axis is the left border of the graph.
+      #   With this property a custom position for the y-axis can be defined.
+      #   Valid values are any values in the range of x-values (in case of a
+      #   Plot) or any of the :fields values (in case of Line/Bar Graphs, note
+      #   the '==' operator is used to find at which value to draw the axis).
+      #   Default: nil
+      attr_accessor :y_axis_position
       #   The point at which the Y axis starts, defaults to nil,
       #   if set to nil it will default to the minimum data value.
       attr_accessor :min_scale_value
@@ -268,17 +286,17 @@ module SVG
       attr_accessor :show_x_labels
       #   This puts the X labels at alternative levels so if they
       #   are long field names they will not overlap so easily.
-      #   Default it false, to turn on set to true.
+      #   Default is false, to turn on set to true.
       attr_accessor :stagger_x_labels
       #   This puts the Y labels at alternative levels so if they
       #   are long field names they will not overlap so easily.
-      #   Default it false, to turn on set to true.
+      #   Default is false, to turn on set to true.
       attr_accessor :stagger_y_labels
       #   This turns the X axis labels by 90 degrees.
-      #   Default it false, to turn on set to true.
+      #   Default is false, to turn on set to true.
       attr_accessor :rotate_x_labels
       #   This turns the Y axis labels by 90 degrees.
-      #   Default it true, to turn on set to false.
+      #   Default is 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
@@ -286,7 +304,7 @@ module SVG
       #   a step of three results in every third label being displayed
       #   (label <gap> <gap> label <gap> <gap> label) and so on.
       attr_accessor :step_x_labels
-      #   Whether to (when taking "steps" between X axis labels) step from 
+      #   Whether to (when taking "steps" between X axis labels) step from
       #   the first label (i.e. always include the first label) or step from
       #   the X axis origin (i.e. start with a gap if step_x_labels is greater
       #   than one).
@@ -295,7 +313,7 @@ module SVG
       #   to true, set to false if you want to turn them off.
       attr_accessor :show_y_labels
       #   Ensures only whole numbers are used as the scale divisions.
-      #   Default it false, to turn on set to true. This has no effect if 
+      #   Default is false, to turn on set to true. This has no effect if
       #   scale divisions are less than 1.
       attr_accessor :scale_integers
       #   This defines the gap between markers on the Y axis,
@@ -315,7 +333,7 @@ module SVG
       #   Whether to show the title under the Y axis labels,
       #   default is false, set to true to show.
       attr_accessor :show_y_title
-      #   Aligns writing mode for Y axis label. 
+      #   Aligns writing mode for Y axis label.
       #   Defaults to :bt (Bottom to Top).
       #   Change to :tb (Top to Bottom) to reverse.
       attr_accessor :y_title_text_direction
@@ -383,7 +401,7 @@ module SVG
 
 
       protected
-      
+
       # implementation of quicksort
       # used for Schedule and Plot
       def sort( *arrys )
@@ -411,7 +429,7 @@ module SVG
         # Check size of Y labels
         @border_left += max_y_label_width_px
         if (show_y_title && (y_title_location ==:middle))
-          @border_left += y_title_font_size + 5 
+          @border_left += y_title_font_size + 5
         end
       end
 
@@ -439,12 +457,12 @@ module SVG
         @border_right = 7
         if key and key_position == :right
           val = keys.max { |a,b| a.length <=> b.length }
-          @border_right += val.length * key_font_size * 0.6 
+          @border_right += val.length * key_font_size * 0.6
           @border_right += KEY_BOX_SIZE
           @border_right += 10    # Some padding around the box
         end
         if (x_title_location == :end)
-          @border_right = [@border_right, x_title.length * x_title_font_size * 0.6].max 
+          @border_right = [@border_right, x_title.length * x_title_font_size * 0.6].max
         end
       end
 
@@ -483,16 +501,16 @@ module SVG
             (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" => 
+            "onmouseover" =>
               "document.getElementById(#{t.object_id}).setAttribute('visibility', 'visible' )",
-            "onmouseout" => 
+            "onmouseout" =>
               "document.getElementById(#{t.object_id}).setAttribute('visibility', 'hidden' )",
           })
         end # if add_popups
@@ -501,16 +519,16 @@ module SVG
       # returns the longest label from an array of labels as string
       # each object in the array must support .to_s
       def get_longest_label(arry)
-        longest_label = arry.max{|a,b| 
+        longest_label = arry.max{|a,b|
               # respect number_format
-              a = @number_format % a if numeric?(a) 
+              a = @number_format % a if numeric?(a)
               b = @number_format % b if numeric?(b)
               a.to_s.length <=> b.to_s.length
             }
         longest_label = @number_format % longest_label if numeric?(longest_label)
         return longest_label
       end
-      
+
       # Override this (and call super) to change the margin to the bottom
       # of the plot area.  Results in @border_bottom being set.
       #
@@ -526,13 +544,13 @@ module SVG
           @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     
+
+        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
@@ -557,32 +575,92 @@ module SVG
           "class" => "graphBackground"
         })
 
-        # Axis
+        draw_x_axis
+        draw_y_axis
+
+        draw_x_labels
+        draw_y_labels
+      end
+
+      # draws the x-axis; can be overridden by child classes
+      def draw_x_axis
+        # relative position on y-axis (hence @graph_height is our axis length)
+        relative_position = calculate_rel_position(get_y_labels, field_height, @x_axis_position, @graph_height)
+        # X-Axis
+        y_offset = (1 - relative_position) * @graph_height
         @graph.add_element( "path", {
-          "d" => "M 0 0 v#@graph_height",
+          "d" => "M 0 #{y_offset} h#@graph_width",
           "class" => "axis",
-          "id" => "xAxis"
+          "id" => "yAxis"
         })
+      end
+
+      # draws the y-axis; can be overridden by child classes
+      def draw_y_axis
+        # relative position on x-axis (hence @graph_width is our axis length)
+        relative_position = calculate_rel_position(get_x_labels, field_width, @y_axis_position, @graph_width)
+        # Y-Axis
+        x_offset = relative_position * @graph_width
         @graph.add_element( "path", {
-          "d" => "M 0 #@graph_height h#@graph_width",
+          "d" => "M #{x_offset} 0 v#@graph_height",
           "class" => "axis",
-          "id" => "yAxis"
+          "id" => "xAxis"
         })
-
-        draw_x_labels
-        draw_y_labels
       end
 
+      # calculates the relative position betewen 0 and 1 of a value on the axis
+      # can be multiplied with either @graph_height or @graph_width to get the
+      # absolute position in pixels.
+      # If labels are strings, checks if one of label matches with the value
+      # and returns this position.
+      # If labels are numeric, compute relative position between first and last value
+      # If nothing else applies or the value is nil, the relative position is 0
+      # @param labels [Array] the array of x or y labels, see {#get_x_labels} or {#get_y_labels}
+      # @param segment_px [Float] number of pixels per label, see {#field_width} or {#field_height}
+      # @param value [Numeric, String] the value for which the relative position is computed
+      # @param axis_length [Numeric] either @graph_width or @graph_height
+      # @return [Float] relative position between 0 and 1, returns 0
+      def calculate_rel_position(labels, segment_px, value, axis_length)
+        # default value, y-axis on the left side, or x-axis at bottom
+        # puts "calculate_rel_position:"
+        # p labels
+        # p segment_px
+        # p value
+        # p axis_length
+        relative_position = 0
+        if !value.nil? # only
+          if (labels[0].is_a? Numeric) && (labels[-1].is_a? Numeric) && (value.is_a? Numeric)
+            # labels are numeric, compute relative position between first and last value
+            range = labels[-1] - labels[0]
+            position = value - labels[0]
+            # compute how many segments long the offset is
+            relative_to_segemts = position/range * (labels.size - 1)
+            # convert from segments to relative position on the axis axis,
+            # the number of segments (i.e. relative_to_segemts >= 1)
+            relative_position = relative_to_segemts * segment_px / axis_length
+          elsif labels[0].is_a? String
+            # labels are strings, see if one of label matches with the position
+            # and place the axis there
+            index = labels.index(value)
+            if !index.nil? # index would be nil if label is not found
+              offset_px = segment_px * index
+              relative_position = offset_px/axis_length   # between 0 and 1
+            end
+          end
+        end # value.nil?
+        return relative_position
+      end
 
       # Where in the X area the label is drawn
       # Centered in the field, should be width/2.  Start, 0.
       def x_label_offset( width )
         0
       end
-      
+
       # check if an object can be converted to float
       def numeric?(object)
-        true if Float(object) rescue false
+        # true if Float(object) rescue false
+        object.is_a? Numeric
       end
 
       # adds the datapoint text to the graph only if the config option is set
@@ -604,7 +682,7 @@ module SVG
             "y" => y.to_s,
             "class" => "dataPointLabel",
             "style" => "#{style} stroke: #fff; stroke-width: 2;"
-          }).text = textStr 
+          }).text = textStr
           # actual label
           text = @foreground.add_element( "text", {
             "x" => x.to_s,
@@ -615,60 +693,60 @@ module SVG
           text.attributes["style"] = style if style.length > 0
         end
       end
-      
 
-      # Draws the X axis labels
+
+      # Draws the X axis labels. The x-axis (@graph_width) is diveded into
+      # {#get_x_labels.length} equal sections. The (center) x-coordinate for a
+      # label hence is label_index * width_of_section
       def draw_x_labels
         stagger = x_label_font_size + 5
-        if show_x_labels
-          label_width = field_width
+        label_width = field_width
+        count = 0
+        x_axis_already_drawn = false
+        for label in get_x_labels
+          if step_include_first_x_label == true then
+            step = count % step_x_labels
+          else
+            step = (count + 1) % step_x_labels
+          end
+          # only draw every n-th label as defined by step_x_labels
+          if step == 0 && show_x_labels then
+            textStr = label.to_s
+            if( numeric?(label) )
+              textStr = @number_format % label
+            end
+            text = @graph.add_element( "text" )
+            text.attributes["class"] = "xAxisLabels"
+            text.text = textStr
 
-          count = 0
-          for label in get_x_labels
-            if step_include_first_x_label == true then
-              step = count % step_x_labels
-            else
-              step = (count + 1) % step_x_labels
+            x = count * label_width + x_label_offset( label_width )
+            y = @graph_height + x_label_font_size + 3
+            #t = 0 - (font_size / 2)
+
+            if stagger_x_labels and count % 2 == 1
+              y += stagger
+              @graph.add_element( "path", {
+                "d" => "M#{x} #@graph_height v#{stagger}",
+                "class" => "staggerGuideLine"
+              })
             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
-
-              x = count * label_width + x_label_offset( label_width )
-              y = @graph_height + x_label_font_size + 3
-              #t = 0 - (font_size / 2)
-
-              if stagger_x_labels and count % 2 == 1
-                y += stagger
-                @graph.add_element( "path", {
-                  "d" => "M#{x} #@graph_height v#{stagger}",
-                  "class" => "staggerGuideLine"
-                })
-              end
-
-              text.attributes["x"] = x.to_s
-              text.attributes["y"] = y.to_s
-              if rotate_x_labels
-                text.attributes["transform"] = 
-                  "rotate( 90 #{x} #{y-x_label_font_size} )"+
-                  " translate( 0 -#{x_label_font_size/4} )"
-                text.attributes["style"] = "text-anchor: start"
-              else
-                text.attributes["style"] = "text-anchor: middle"
-              end
+            text.attributes["x"] = x.to_s
+            text.attributes["y"] = y.to_s
+            if rotate_x_labels
+              text.attributes["transform"] =
+                "rotate( 90 #{x} #{y-x_label_font_size} )"+
+                " translate( 0 -#{x_label_font_size/4} )"
+              text.attributes["style"] = "text-anchor: start"
+            else
+              text.attributes["style"] = "text-anchor: middle"
             end
+          end # if step == 0 && show_x_labels
 
-            draw_x_guidelines( label_width, count ) if show_x_guidelines
-            count += 1
-          end
-        end
-      end
+          draw_x_guidelines( label_width, count ) if show_x_guidelines
+          count += 1
+        end # for label in get_x_labels
+      end # draw_x_labels
 
 
       # Where in the Y area the label is drawn
@@ -681,17 +759,17 @@ module SVG
       # 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
         # -1 is to use entire x-axis
-        # otherwise there is always 1 division unused        
+        # otherwise there is always 1 division unused
         @graph_width.to_f / ( get_x_labels.length - 1 )
       end
 
@@ -704,21 +782,20 @@ module SVG
 
 
       # 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: 
+      # 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  
-      # 
+      #   #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
-          label_height = field_height
-
-          count = 0
-          y_offset = @graph_height + y_label_offset( label_height )
-          y_offset += font_size/1.2 unless rotate_y_labels
-          for label in get_y_labels
+        label_height = field_height
+        count = 0
+        y_offset = @graph_height + y_label_offset( label_height )
+        y_offset += font_size/1.2 unless rotate_y_labels
+        for label in get_y_labels
+          if show_y_labels
             y = y_offset - (label_height * count)
             x = rotate_y_labels ? 0 : -3
 
@@ -748,14 +825,14 @@ module SVG
               text.attributes["y"] = (y - (y_label_font_size/2)).to_s
               text.attributes["style"] = "text-anchor: end"
             end
-            draw_y_guidelines( label_height, count ) if show_y_guidelines
-            count += 1
-          end
-        end
-      end
+          end # if show_y_labels
+          draw_y_guidelines( label_height, count ) if show_y_guidelines
+          count += 1
+        end # for label in get_y_labels
+      end # draw_y_labels
 
 
-      # Draws the X axis guidelines
+      # Draws the X axis guidelines, parallel to the y-axis
       def draw_x_guidelines( label_height, count )
         if count != 0
           @graph.add_element( "path", {
@@ -766,7 +843,7 @@ module SVG
       end
 
 
-      # Draws the Y axis guidelines
+      # Draws the Y axis guidelines, parallel to the x-axis
       def draw_y_guidelines( label_height, count )
         if count != 0
           @graph.add_element( "path", {
@@ -788,7 +865,7 @@ module SVG
         end
 
         if show_graph_subtitle
-          y_subtitle = show_graph_title ? 
+          y_subtitle = show_graph_title ?
             title_font_size + subtitle_font_size + 5 :
             subtitle_font_size
           @root.add_element("text", {
@@ -840,7 +917,7 @@ module SVG
         end
       end # draw_titles
 
-      def keys 
+      def keys
         i = 0
         return @data.collect{ |d| i+=1; d[:title] || "Serie #{i}" }
       end
@@ -893,7 +970,7 @@ module SVG
           sort_multiple(arrys, lo, p-1)
           sort_multiple(arrys, p+1, hi)
         end
-        arrys 
+        arrys
       end
 
       def partition( arrys, lo, hi )
@@ -955,11 +1032,11 @@ module SVG
       def add_defs defs
       end
 
-      # Creates the XML document and adds the root svg element with 
+      # 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. 
+      # The element is stored as @root.
       #
-      # In addition a rectangle background of the same size as the 
+      # In addition a rectangle background of the same size as the
       # svg is added.
       #
       def start_svg
@@ -1096,7 +1173,7 @@ module SVG
 .staggerGuideLine{
   fill: none;
   stroke: #000000;
-  stroke-width: 0.5px;  
+  stroke-width: 0.5px;
 }
 
 #{get_css}

data/lib/SVG/Graph/Line.rb

@@ -3,47 +3,47 @@ require_relative 'Graph'
 module SVG
   module Graph
     # === Create presentation quality SVG line graphs easily
-    # 
+    #
     # = Synopsis
-    # 
+    #
     #   require 'SVG/Graph/Line'
-    # 
+    #
     #   fields = %w(Jan Feb Mar);
     #   data_sales_02 = [12, 45, 21]
     #   data_sales_03 = [15, 30, 40]
-    #   
+    #
     #   graph = SVG::Graph::Line.new({
     #   	:height => 500,
     #    	:width => 300,
     # 	  :fields => fields,
     #   })
-    #   
+    #
     #   graph.add_data({
     #   	:data => data_sales_02,
     # 	  :title => 'Sales 2002',
     #   })
-    # 
+    #
     #   graph.add_data({
     #   	:data => data_sales_03,
     # 	  :title => 'Sales 2003',
     #   })
-    #   
+    #
     #   print "Content-type: image/svg+xml\r\n\r\n";
     #   print graph.burn();
-    # 
+    #
     # = Description
-    # 
+    #
     # This object aims to allow you to easily create high quality
     # SVG line graphs. You can either use the default style sheet
     # or supply your own. Either way there are many options which can
     # be configured to give you control over how the graph is
     # generated - with or without a key, data elements at each point,
     # title, subtitle etc.
-    # 
+    #
     # = Examples
-    # 
+    #
     # 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
@@ -54,9 +54,9 @@ module SVG
     # additional settings for the extra data sets. You will know
     # if you go over 10 data sets as they will have no style and
     # be in black.
-    # 
+    #
     # = See also
-    # 
+    #
     # * SVG::Graph::Graph
     # * SVG::Graph::BarHorizontal
     # * SVG::Graph::Bar
@@ -75,14 +75,14 @@ module SVG
       #    Show a small circle on the graph where the line
       #    goes from one point to the next.
       attr_accessor :show_data_points
-      #    Accumulates each data set. (i.e. Each point increased by sum of 
+      #    Accumulates each data set. (i.e. Each point increased by sum of
       #   all previous series at same point). Default is 0, set to '1' to show.
       attr_accessor :stacked
       # 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 
+      # 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
@@ -112,7 +112,7 @@ module SVG
         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
@@ -125,7 +125,7 @@ module SVG
             x[:data].compact.max
           }.max
         end
-        
+
         return max
       end
 
@@ -167,7 +167,7 @@ module SVG
 
         @y_scale_division = scale_divisions || (scale_range / 10.0)
         @y_offset = 0
-        
+
         if scale_integers
           @y_scale_division = @y_scale_division < 1 ? 1 : @y_scale_division.round
           @y_offset = (minvalue.to_f - minvalue.floor).to_f
@@ -201,10 +201,10 @@ module SVG
         for data in @data.reverse
           lpath = ""
           apath = ""
-          
+
           # 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?
@@ -216,33 +216,33 @@ module SVG
             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]} "
               end
-          
+
               c = calc_coords(0, prev_sum[0], fieldwidth, fieldheight)
             else
               apath = "V#@graph_height"
               c = calc_coords(0, -@y_offset, fieldwidth, fieldheight)
             end
-              
+
             @graph.add_element("path", {
               "d" => "M#{c[:x]} #{c[:y]} L" + lpath + apath + "Z",
               "class" => "fill#{line}"
             })
           end
-        
+
           @graph.add_element("path", {
             "d" => "M0 #@graph_height L" + lpath,
             "class" => "line#{line}"
           })
-          
+
           if show_data_points || show_data_values || add_popups
             cum_sum.each_index do |i|
               # skip datapoint if nil
@@ -258,7 +258,8 @@ module SVG
               end
 
               make_datapoint_text( c[:x], c[:y] - font_size/2, cum_sum[i] + minvalue)
-              add_popup(c[:x], c[:y], cum_sum[i] + minvalue)
+              # number format shall not apply to popup (use .to_s conversion)
+              add_popup(c[:x], c[:y], (cum_sum[i] + minvalue).to_s)
             end
           end
 
@@ -274,62 +275,62 @@ module SVG
 .line1{
 	fill: none;
 	stroke: #ff0000;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line2{
 	fill: none;
 	stroke: #0000ff;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line3{
 	fill: none;
 	stroke: #00ff00;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line4{
 	fill: none;
 	stroke: #ffcc00;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line5{
 	fill: none;
 	stroke: #00ccff;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line6{
 	fill: none;
 	stroke: #ff00ff;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line7{
 	fill: none;
 	stroke: #00ffff;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line8{
 	fill: none;
 	stroke: #ffff00;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line9{
 	fill: none;
 	stroke: #ccc6666;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line10{
 	fill: none;
 	stroke: #663399;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line11{
 	fill: none;
 	stroke: #339900;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .line12{
 	fill: none;
 	stroke: #9966FF;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 /* default fill styles */
 .fill1{
@@ -396,62 +397,62 @@ module SVG
 .key1,.dataPoint1{
 	fill: #ff0000;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key2,.dataPoint2{
 	fill: #0000ff;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key3,.dataPoint3{
 	fill: #00ff00;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key4,.dataPoint4{
 	fill: #ffcc00;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key5,.dataPoint5{
 	fill: #00ccff;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key6,.dataPoint6{
 	fill: #ff00ff;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key7,.dataPoint7{
 	fill: #00ffff;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key8,.dataPoint8{
 	fill: #ffff00;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key9,.dataPoint9{
 	fill: #cc6666;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key10,.dataPoint10{
 	fill: #663399;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key11,.dataPoint11{
 	fill: #339900;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key12,.dataPoint12{
 	fill: #9966FF;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 EOL
       end

data/lib/svggraph.rb

@@ -1,6 +1,6 @@
 module SVG
   module Graph
-    VERSION = '2.0.2'
+    VERSION = '2.1.0.beta1'
   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.2
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - Sean Russell
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies: []
 description: "Gem version of SVG:::Graph. SVG:::Graph is a pure Ruby library for generating
   charts, \nwhich are a type of graph where the values of one axis are not scalar.
@@ -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.6.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: SVG:::Graph is a pure Ruby library for generating charts, which are a type