finished separated line plots

Author: v0dro

lib/rubyplot.rb

@@ -3,6 +3,7 @@
 require 'rmagick'
 
 require 'rubyplot/color'
+require 'rubyplot/utils'
 require 'rubyplot/version'
 require 'rubyplot/themes'
 require 'rubyplot/artist'

lib/rubyplot/artist/axis/base.rb

@@ -16,7 +16,7 @@ def initialize axes, title, min_val, max_val
 
         def draw
           Rubyplot::Artist::Line2D.new(
-            self, x1: @x1, y1: @y1, x2: @x2, y2: @y2, stroke_width: 2.0)
+            self, x1: @x1, y1: @y1, x2: @x2, y2: @y2, stroke_width: 2.0).draw
         end
       end # class Base
     end # class Axis

lib/rubyplot/artist/axis/x_axis.rb

@@ -31,7 +31,7 @@ def populate_major_x_ticks
             @axes,
             x: count * @major_ticks_distance + @x1,
             y: @y1,
-            label: (count * value_distance).to_s,
+            label: (count * value_distance),
             length: 6,
             label_distance: 10
           )

lib/rubyplot/artist/line2d.rb

@@ -9,11 +9,14 @@ def initialize(owner,x1:,y1:,x2:,y2:,color: '#000000',
         @x2 = x2
         @y2 = y2
         @color = color
+        @stroke_opacity = stroke_opacity
+        @stroke_width = stroke_width
         @backend = @owner.backend
       end
 
       def draw
-        @backend.draw_line(x1: @x1, y1: @y1, x2: @x2, y2: @y2, color: @color)
+        @backend.draw_line(x1: @x1, y1: @y1, x2: @x2, y2: @y2, color: @color,
+                           stroke_opacity: @stroke_opacity, stroke_width: @stroke_width)
       end
     end # class Line2D
   end # class Artist

lib/rubyplot/artist/plot/line.rb

@@ -7,8 +7,7 @@ class Line < Artist::Plot::Base
 
         def initialize(*)
           super
-          @hide_lines = false
-          
+          @hide_lines = false         
         end
 
         def data x_values, y_values=[]
@@ -33,13 +32,14 @@ def draw_single_point
         end
 
         def draw_lines
+          prev_x = prev_y = nil
           @normalized_data[:x_values].each_with_index do |ix, idx_ix|
-            prev_x = prev_y = nil
             iy = @normalized_data[:y_values][idx_ix]
             new_x = ix * @axes.graph_width + @axes.graph_left
             new_y = @axes.graph_top + (@axes.graph_height - iy * @axes.graph_height)
-            unless prev_x.nil? && prev_y.nil?
+            if !(prev_x.nil? && prev_y.nil?)
               Rubyplot::Artist::Line2D.new(
+                self,
                 x1: prev_x,
                 y1: prev_y,
                 x2: new_x,

lib/rubyplot/artist/tick/base.rb

@@ -17,12 +17,12 @@ class Base
         # @param label_distance [Integer] Distance between the label and tick.
         # @param tick_opacity [Float] Number describing the opacity of the tick drawn. 0-1.0.
         def initialize(owner,x:,y:,length:,label:,label_distance:,
-                       tick_opacity: 1.0,tick_width: 3.0)
+                       tick_opacity: 1.0,tick_width: 1.0)
           @owner = owner
           @x = x
           @y = y
           @length = length
-          @label_text = label
+          @label_text = Rubyplot::Utils.format_label label
           @label_distance = label_distance
           @tick_opacity = tick_opacity
           @tick_width = tick_width

lib/rubyplot/magick_wrapper/artist.rb

@@ -444,7 +444,7 @@ def draw_line_markers!
         (0..@geometry.marker_count).each do |index|
           y = @graph_top + @graph_height - index.to_f * @geometry.increment_scaled
           y_next = @graph_top + @graph_height - (index.to_f + 1) * @geometry.increment_scaled
-          @d = @d.fill(@marker_color)
+         @d = @d.fill(@marker_color)
           @d = @d.line(@graph_left, y, @graph_right, y) if
             !@geometry.hide_line_markers || (index == 0)
           # If the user specified a marker shadow color, draw a shadow just below it

lib/rubyplot/utils.rb

@@ -0,0 +1,12 @@
+module Rubyplot
+  module Utils
+    THOUSAND_SEPARATOR = ','
+    class << self
+      def format_label label
+        if label.is_a? Float
+          format('%0.2f', label)
+        end
+      end
+    end
+  end # module Utils
+end # module Rubyplot

spec/axes_spec.rb

@@ -275,11 +275,11 @@
 
       end
 
-      it "makes a simple line plot", focus: true do
+      it "makes a simple line plot" do
         fig = Rubyplot::Figure.new
         axes = fig.add_subplot 0,0
         axes.line! do |p|
-          p.data [20, 23, 19, 8]
+          p.data [5, 8, 13, 15]
           p.label = "Marco"
           p.color = :blue
         end
@@ -652,7 +652,7 @@
 #        FileUtils.rm_rf SPEC_ROOT + "temp/scatter"
       end
 
-      it "adds a simple scatter plot." do
+      it "adds a simple scatter plot.", focus: true do
         fig = Rubyplot::Figure.new
         axes = fig.add_subplot 0,0
         axes.scatter!(400) do |p|