Added width and color options to error bar plot and improved tests

alishdipani · alishdipani · commit 667668fd78ee · 2020-03-14T19:51:18.000+05:30
diff --git a/lib/rubyplot/artist/plot/error_bar.rb b/lib/rubyplot/artist/plot/error_bar.rb
@@ -2,17 +2,21 @@ module Rubyplot
   module Artist
     module Plot
       class ErrorBar < Artist::Plot::Base
-        attr_accessor :xerr
-        attr_accessor :yerr, :xuplims, :xlolims, :yuplims, :ylolims
-        
+        attr_accessor :xerr, :yerr, :xuplims, :xlolims, :yuplims, :ylolims, :line_width, :xerr_width, :yerr_width, :xerr_color, :yerr_color
+
         def initialize(*)
           super
+          @line_width = 1.0
+          @xerr_width = 1.0
+          @yerr_width = 1.0
+          @xerr_color = nil
+          @yerr_color = nil
         end
 
         def process_data
           super
           preprocess_err_values!
-          
+
           check_lims_sizes
           check_err_sizes
 
@@ -21,7 +25,8 @@ def process_data
             self,
             x: @data[:x_values],
             y: @data[:y_values],
-            color: @data[:color]
+            color: @data[:color],
+            width: @line_width
           )
           generate_yerr if @yerr
           generate_xerr if @xerr
@@ -40,7 +45,7 @@ def adjust_axes_ranges!
             @axes.x_axis.max_val = @data[:x_values].max + @xerr.max
             @axes.x_axis.min_val = @data[:x_values].min - @xerr.min
           end
-          
+
           if @yerr
             @axes.y_axis.max_val = @data[:y_values].max + @yerr.max
             @axes.y_axis.min_val = @data[:y_values].min - @yerr.min
@@ -71,7 +76,8 @@ def generate_xerr
                 self,
                 x: [xcoord - xe, xcoord + xe],
                 y: [ycoord, ycoord],
-                color: @data[:color]
+                color: @xerr_color.nil? ? @data[:color] : @xerr_color,
+                width: @xerr_width
               )
             else
               arrows = []
@@ -89,7 +95,7 @@ def generate_xerr
                   x1: xcoord,
                   y1: ycoord,
                   x2: xcoord - xe,
-                  y2: ycoord                  
+                  y2: ycoord
                 )
               end
               arrows
@@ -108,7 +114,8 @@ def generate_yerr
                 self,
                 x: [xcoord, xcoord],
                 y: [ycoord - ye, ycoord + ye],
-                color: @data[:color]
+                color: @yerr_color.nil? ? @data[:color] : @yerr_color,
+                width: @yerr_width
               )
             else
               arrows = []
@@ -126,7 +133,7 @@ def generate_yerr
                   x1: xcoord,
                   y1: ycoord,
                   x2: xcoord,
-                  y2: ycoord - ye               
+                  y2: ycoord - ye
                 )
               end
               arrows
@@ -136,7 +143,7 @@ def generate_yerr
         end
 
         def check_lims_sizes
-          
+
         end
 
         def check_err_sizes
diff --git a/spec/axes_spec.rb b/spec/axes_spec.rb
@@ -780,7 +780,7 @@
       @x = [1,2,3,4,5,6]
       @y = [3,4,5,6,7,8]
     end
-    
+
     it "adds a simple xerr to error bar plot" do
       @figure = Rubyplot::Figure.new
       axes = @figure.add_subplot! 0,0
@@ -798,7 +798,8 @@
       axes.error_bar! do |p|
         p.data @x, @y
         p.xerr = [0.1,0.3,0.5,0.1,0.2,0.4]
-      end      
+        p.color = :red
+      end
     end
 
     it "adds a simple yerr to the error bar plot" do
@@ -818,7 +819,8 @@
       axes.error_bar! do |p|
         p.data @x, @y
         p.yerr = [0.6,0.5,0.1,0.8,0.3,0.1]
-      end      
+        p.color = :green
+      end
     end
 
     it "adds an asymmetric collection of yerr to the error bar plot" do
@@ -850,7 +852,24 @@
       end
     end
 
-    it "adds error bar with upper limit and lower limit with collection xerr & yerr" do 
+    it "adds both xerr and yerr to the error bar plot with colour and width" do
+      @figure = Rubyplot::Figure.new
+      axes = @figure.add_subplot! 0,0
+      axes.title = "Simple error bar plot with collection xerr and yerr."
+      axes.error_bar! do |p|
+        p.data [1,2,3,4], [1,4,9,16]
+        p.xerr = [0.5,1.0,1.5,0.3]
+        p.yerr = [0.6,0.2,0.8,0.1]
+        p.line_width = 5
+        p.xerr_width = 2
+        p.yerr_width = 2
+        p.xerr_color = :blue
+        p.yerr_color = :red
+        p.color = :yellow
+      end
+    end
+
+    it "adds error bar with upper limit and lower limit with collection xerr & yerr" do
       @figure = Rubyplot::Figure.new
       axes = @figure.add_subplot! 0,0
       axes.title = "Error bar plot with lots of options"
