working error bars

Author: v0dro

ext/grruby/grruby.c

@@ -1817,8 +1817,8 @@ static VALUE setarrowstyle(VALUE self,VALUE style){
  * The default arrow size is 1.
  */
 static VALUE setarrowsize(VALUE self,VALUE size) {
-  int sizec = NUM2INT(size);
-  gr_setarrowsize(size);
+  gr_setarrowsize(NUM2DBL(size));
+  
   return Qtrue;
 }
 
@@ -1839,7 +1839,7 @@ static VALUE drawarrow (VALUE self,VALUE x1,VALUE y1,VALUE x2,VALUE y2) {
   double x2c = NUM2DBL(x2);
   double y1c = NUM2DBL(y1);
   double y2c = NUM2DBL(y2);
-  gr_drawarrow(x1c, x2c, y1c, y2c);
+  gr_drawarrow(x1c, y1c, x2c, y2c);
 
   return Qtrue;
 }

lib/rubyplot/artist/arrow.rb

@@ -1,7 +1,7 @@
 module Rubyplot
   module Artist
     class Arrow < Artist::Base
-      def initialize x1:, y1:, x2:, y2:, size: 1.0, style: :simple_single_ended
+      def initialize x1:, y1:, x2:, y2:, size: 0.5, style: :simple_single_ended
         @x1 = x1
         @y1 = y1
         @x2 = x2

lib/rubyplot/artist/plot/error_bar.rb

@@ -3,20 +3,20 @@ module Artist
     module Plot
       class ErrorBar < Artist::Plot::Base
         attr_accessor :xerr
-        attr_accessor :yerr, :xuplims, :xlolims, :yuplims, :xlolims
+        attr_accessor :yerr, :xuplims, :xlolims, :yuplims, :ylolims
 
         def initialize(*)
           super
         end
 
         def process_data
           super
-          
           preprocess_err_values!
 
           check_lims_sizes
           check_err_sizes
 
+          adjust_axes_ranges!
           @line = Rubyplot::Artist::Line2D.new(
             self,
             x: @data[:x_values],
@@ -29,12 +29,25 @@ def process_data
 
         def draw
           @line.draw
-          @yerr_lines.each(&:draw) if @yerr
-          @xerr_lines.each(&:draw) if @xerr
+          @yerr_lines.each(&:draw) if @yerr_lines
+          @xerr_lines.each(&:draw) if @xerr_lines
         end
 
         private
 
+        def adjust_axes_ranges!
+          if @xerr
+            @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
+          end
+
+        end
+
         def preprocess_err_values!
           if @yerr
             if @yerr.is_a?(Float)
@@ -74,12 +87,13 @@ def generate_xerr
 
               if @xlolims && @xlolims[idx]
                 arrows << Rubyplot::Artist::Arrow.new(
-                  x1: xcoord - xe,
+                  x1: xcoord,
                   y1: ycoord,
-                  x2: xcoord,
+                  x2: xcoord - xe,
                   y2: ycoord                  
                 )
               end
+              arrows
             end
           end
           @xerr_lines.flatten!
@@ -97,8 +111,29 @@ def generate_yerr
                 y: [ycoord - ye, ycoord + ye],
                 color: @data[:color]
               )
+            else
+              arrows = []
+              if @yuplims && @yuplims[idx]
+                arrows << Rubyplot::Artist::Arrow.new(
+                  x1: xcoord,
+                  y1: ycoord,
+                  x2: xcoord,
+                  y2: ycoord + ye
+                )
+              end
+
+              if @ylolims && @ylolims[idx]
+                arrows << Rubyplot::Artist::Arrow.new(
+                  x1: xcoord,
+                  y1: ycoord,
+                  x2: xcoord,
+                  y2: ycoord - ye               
+                )
+              end
+              arrows
             end
           end
+          @yerr_lines.flatten!
         end
 
         def check_lims_sizes

lib/rubyplot/backend/gr_wrapper.rb

@@ -321,9 +321,11 @@ def draw_circle(x:, y:, radius:, border_width:, border_color:, border_type:,
       end
 
       def draw_arrow(x1:, y1:, x2:, y2:, size:, style:)
-        GR.setarrowstyle(ARROW_STYLE_MAP[style])
-        GR.setarrowsize(size)
-        GR.drawarrow(x1, y1, x2, y2)
+        within_window do
+          GR.setarrowstyle(ARROW_STYLE_MAP[style])
+          GR.setarrowsize(size)
+          GR.drawarrow(x1, y1, x2, y2)
+        end
       end
 
       def draw

rubyplot.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'parallel_tests'
 
   spec.add_runtime_dependency 'rmagick',  '>= 2.13.4'
 end

spec/axes_spec.rb

@@ -496,7 +496,7 @@
     end
   end
 
-  context "#error_bar!", focus: true do
+  context "#error_bar!" do
     before do
       @x = [1,2,3,4,5,6]
       @y = [3,4,5,6,7,8]
@@ -571,14 +571,14 @@
       end
     end
 
-    it "adds error bar with upper limit and lower limit with collection xerr & yerr" do 
+    it "adds error bar with upper limit and lower limit with collection xerr & yerr", focus: true do 
       @figure = Rubyplot::Figure.new
       axes = @figure.add_subplot! 0,0
       axes.title = "Error bar plot with lots of options"
       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.yerr = [0.6,1.0,0.8,0.5]
         p.xuplims = [true, false, true, false]
         p.xlolims = [false, true, false, true]
         p.yuplims = [true, false, true, false]