svg-graph 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6eaa56f94856a998ecd2f0befef3a38c5529da886266cd15150cf4e9758168f
-  data.tar.gz: f9eb26d8c758153505d95d450e57c3fa0dfbfcdd9018d89bb6bcee3b656cebff
+  metadata.gz: 9d2a4756bdc712df308bb715f9076bac952fbf64dd8d8b2900d9c424b30026b7
+  data.tar.gz: 5c3b12638b3eb65936f32a84e50f222113b2c7c4c0e6f69bbbd9c594c99bd6eb
 SHA512:
-  metadata.gz: 5c77c61810a9d855bc469ac4672d9917f0bbb345b5464235c0a06e9d901aa796c8cba67c12e181200ca3865ea2ce9629d8ae39065aec831b77c707fdc46720d4
-  data.tar.gz: d270039fc1ea0340a515f554c4ff1f6437d0138c62ff09daafb5c1599df819d096ab04ffa23fe8862cac16b4bd6fcc71efea973e001fa97cfd1e5058e7444a82
+  metadata.gz: fd35db671d05e9f8c2559508a4ab7bf7bfd7d4582f6433fe4b93c2cd4f182c0692100f806cf3d72704ff4ec74a267ec2b319100df7704972c2ad46530ddc1978
+  data.tar.gz: 5216c72900a99522c7f49ac48166f85167bfecaf087c2d2e3891abfeaad44adbe378e1230cc87569d7e99ce9f1f4bd318de708eeff615218c23449c48f345dfd

data/History.txt

@@ -2,6 +2,13 @@ TODO / Backlog
 * refactor various hardcoded constant pixel offsets in Graph class to use named constants or variables
 * Fix bug in Plot where min/max_x/y_value are not respected, TODO
 
+=== 2.2.3 /
+
+=== 2.2.2 / 2023-04-30
+* fix line9 color typo in Line.rb [thanks, akostadinov #42]
+* anchor right y labels [thanks, akostadinov #44]
+* start line from first point, not 0 0 [thanks, akostadinov #43]
+
 === 2.2.1 / 2020-12-25
 * Remove inline styling for data point labels and popups [thanks marnen, PR #23]
 * fix #29 text background not aligned close to axis due to missing anchors

data/lib/SVG/Graph/Graph.rb

@@ -908,7 +908,10 @@ module SVG
           if show_y_labels
             # x = 0, y = 0 is top left right next to graph area
             y = y_offset - (label_height * count)
-            x = -label_width/2.0 + y_label_font_size/2.0
+            # instead of calculating the middle anchor position, simply use
+            # static offset and anchor end to right-align the labels. See line :936 below.
+            #x = -label_width/2.0 + y_label_font_size/2.0
+            x = 3
 
             if stagger_y_labels and count % 2 == 1
               x -= stagger
@@ -929,7 +932,8 @@ module SVG
             end
             text.text = textStr
             # note text-anchor is at bottom of textfield
-            text.attributes["style"] = "text-anchor: middle"
+            #text.attributes["style"] = "text-anchor: middle"
+            text.attributes["style"] = "text-anchor: end"
             degrees = rotate_y_labels
             text.attributes["transform"] = "translate( -#{font_size} 0 ) " +
                 "rotate( #{degrees} #{x} #{y} ) "

data/lib/SVG/Graph/Line.rb

@@ -42,7 +42,7 @@ module SVG
     #
     # = Examples
     #
-    # http://www.germane-software/repositories/public/SVG/test/single.rb
+    # https://github.com/lumean/svg-graph2/blob/master/examples/line.rb
     #
     # = Notes
     # Only number of fileds datapoints will be drawn, additional data values
@@ -238,8 +238,9 @@ module SVG
             })
           end
 
+          matcher = /^(\S+ \S+) (.*)/.match lpath
           @graph.add_element("path", {
-            "d" => "M0 #@graph_height L" + lpath,
+            "d" => "M#{matcher[1]} L#{matcher[2]}",
             "class" => "line#{line}"
           })
 
@@ -319,7 +320,7 @@ module SVG
 }
 .line9{
 	fill: none;
-	stroke: #ccc6666;
+	stroke: #cc6666;
 	stroke-width: 1px;
 }
 .line10{

data/lib/SVG/Graph/Pie.rb

@@ -36,7 +36,7 @@ module SVG
     #
     # = Examples
     #
-    # http://www.germane-software/repositories/public/SVG/test/single.rb
+    # https://github.com/lumean/svg-graph2/blob/master/examples/pie.rb
     #
     # == See also
     #

data/lib/SVG/Graph/Plot.rb

@@ -55,7 +55,7 @@ module SVG
     #
     # = Examples
     #
-    # http://www.germane-software/repositories/public/SVG/test/plot.rb
+    # https://github.com/lumean/svg-graph2/blob/master/examples/plot.rb
     #
     # = Notes
     #
@@ -180,6 +180,9 @@ module SVG
           "The data provided contained an odd set of "+
           "data points" unless conf[:data].length % 2 == 0
 
+        # clear the min/max x/y range caches
+        clear_cache
+
         # remove nil values
         conf[:data] = conf[:data].compact
 
@@ -223,24 +226,37 @@ module SVG
       X = 0
       Y = 1
 
+      # procedure to clear all the cached variables used in working out the
+      # max and min ranges for the chart
+      def clear_cache
+        @max_x_cache = @min_x_cache = @max_y_cache = @min_y_cache = nil
+      end
+
       def max_x_range
+        return @max_x_cache unless @max_x_cache.nil?
+
         # needs to be computed fresh when called, to cover the use-case:
         # add_data -> burn -> add_data -> burn
         # when values would be cached, the graph is not updated for second burning
         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
-        return max_value
+        @max_x_cache = max_value
+        @max_x_cache
       end
 
       def min_x_range
+        return @min_x_cache unless @min_x_cache.nil?
+
         # needs to be computed fresh when called, to cover the use-case:
         # add_data -> burn -> add_data -> burn
         # when values would be cached, the graph is not updated for second burning
         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
-        return min_value
+        @min_x_cache = min_value
+        @min_x_cache
       end
 
+      # calculate the min and max x value as well as the scale division used for the x-axis
       def x_label_range
         max_value = max_x_range
         min_value = min_x_range
@@ -253,6 +269,7 @@ module SVG
         end
         scale_range = max_value - min_value
 
+        # either use the given step size or by default do 9 divisions.
         scale_division = scale_x_divisions || (scale_range / 9.0)
         @x_offset = 0
 
@@ -265,10 +282,13 @@ module SVG
         [min_value, max_value, scale_division]
       end
 
+      # get array of values for the x axis divisions, assuming left-most value starts
+      # exactly where the graph starts.
       def get_x_values
         min_value, max_value, @x_scale_division = x_label_range
+        x_times = ((max_value-min_value)/@x_scale_division).round + 1
         rv = []
-        min_value.step( max_value + @x_scale_division , @x_scale_division ) {|v| rv << v}
+        x_times.times{|v| rv << (min_value + (v * @x_scale_division))}
         return rv
       end
       alias :get_x_labels :get_x_values
@@ -281,18 +301,24 @@ module SVG
       end
 
       def max_y_range
+        return @max_y_cache unless @max_y_cache.nil?
+
         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
-        return max_value
+        @max_y_cache = max_value
+        @max_y_cache
       end
 
       def min_y_range
+        return @min_y_cache unless @min_y_cache.nil?
+
         # needs to be computed fresh when called, to cover the use-case:
         # add_data -> burn -> add_data -> burn
         # when values would be cached, the graph is not updated for second burning
         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
-        return min_value
+        @min_y_cache = min_value
+        @min_y_cache
       end
 
       def y_label_range
@@ -345,6 +371,7 @@ module SVG
         @graph_height.to_f / (values.length - 1)
       end
 
+      # calculates the x,y coordinates of a datapoint in the plot area
       def calc_coords(x, y)
         coords = {:x => 0, :y => 0}
         # scale the coordinates, use float division / multiplication

data/lib/SVG/Graph/Schedule.rb

@@ -47,7 +47,7 @@ module SVG
     # 
     # = Examples
     #
-    # http://www.germane-software/repositories/public/SVG/test/schedule.rb
+    # https://github.com/lumean/svg-graph2/blob/master/examples/schedule.rb
     # 
     # = Notes
     # 

data/lib/SVG/Graph/TimeSeries.rb

@@ -60,7 +60,7 @@ module SVG
     #
     # = Examples
     #
-    # http://www.germane-software/repositories/public/SVG/test/timeseries.rb
+    # https://github.com/lumean/svg-graph2/blob/master/examples/timeseries.rb
     #
     # = Notes
     #
@@ -249,12 +249,12 @@ module SVG
               step = amount
             end
             # only do this if division_units is not year or month. Those are done already above in the cases.
-            min.step( max, step ) {|v| rv << v} if step
+            min.step( max + (step/10), step ) {|v| rv << v} if step
             @x_scale_division = step if step
             return rv
           end
         end
-        min.step( max , @x_scale_division ) {|v| rv << v}
+        min.step( max + (@x_scale_division/10), @x_scale_division ) {|v| rv << v}
         return rv
       end # get_x_values
 

data/lib/svggraph.rb

@@ -1,6 +1,6 @@
 module SVG
   module Graph
-    VERSION = '2.2.1'
+    VERSION = '2.2.2'
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svg-graph
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Sean Russell
@@ -9,10 +9,10 @@ authors:
 - Liehann Loots
 - Piergiuliano Bossi
 - Manuel Widmer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2023-04-30 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.
@@ -57,7 +57,7 @@ homepage: https://github.com/lumean/svg-graph2
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -72,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: SVG:::Graph is a pure Ruby library for generating charts, which are a type
   of graph where the values of one axis are not scalar.