fix some bugs in scatter with negative values

Author: v0dro

lib/rubyplot/artist/axes.rb

@@ -99,12 +99,6 @@ def legend_box_iy
       end
 
       # Write an image to a file by communicating with the backend.
-      # FIXME: (refactor) Currently draw first assigns default colors and then
-      # performs consolidation etc of the data and then assigns the default X ticks.
-      # The reason for this is that default labels are needed by the consolidated
-      # plots when they create the required rectangles etc. However assigning
-      # default ticks should be a part of the 'assign defaults' step and should
-      # therefore should be clubbed with the assign labels step.
       def draw
         set_axes_ranges
         normalize_plotting_data
@@ -207,8 +201,12 @@ def assign_default_label_colors
       def assign_x_ticks
         @inter_x_ticks_distance = @x_axis.length / (@num_x_ticks.to_f-1)
         unless @x_ticks
-          @x_ticks = (@x_range[0]..@x_range[1]).step(@inter_x_ticks_distance).map { |i| i }
+          value_distance = (@x_range[1] - @x_range[0]) / (@num_x_ticks.to_f - 1)
+          @x_ticks = @num_x_ticks.times.map do |i|
+            @x_range[0] + i * value_distance
+          end
         end
+
         unless @x_ticks.all? { |t| t.is_a?(Rubyplot::Artist::XTick) }
           @x_ticks.map!.with_index do |tick_label, i|
             Rubyplot::Artist::XTick.new(

lib/rubyplot/artist/plot/scatter.rb

@@ -17,8 +17,9 @@ def draw
             abs_x = ix * @axes.x_axis.length + @axes.abs_x + @axes.y_axis_margin
             abs_y = (@axes.y_axis.length - iy * @axes.y_axis.length) + @axes.abs_y
             Rubyplot::Artist::Circle.new(
-              self, abs_x: abs_x, abs_y: abs_y, radius: @circle_radius, stroke_opacity: @stroke_opacity,
-                    stroke_width: @stroke_width
+              self, abs_x: abs_x, abs_y: abs_y, radius: @circle_radius,
+              stroke_opacity: @stroke_opacity,
+              stroke_width: @stroke_width
             ).draw
           end
         end

lib/rubyplot/utils.rb

@@ -3,7 +3,7 @@ module Utils
     THOUSAND_SEPARATOR = ','.freeze
     class << self
       def format_label label
-        if label.is_a? Float
+        if label.is_a? Numeric
           '%0.2f' % label
         elsif label.is_a? String
           label

spec/axes_spec.rb

@@ -270,7 +270,7 @@
         axes.title = "Random bar numbers"
       end
 
-      it "adds bar plot with title margin", focus: true do
+      it "adds bar plot with title margin" do
         @figure = Rubyplot::Figure.new
         axes = @figure.add_subplot 0,0
         axes.bar! do |p|axes = 
@@ -281,7 +281,7 @@
         axes.title = "Bar with title margin = 100"
       end
 
-      it "checks if Geometry adjusts for large numbers" do
+      it "plots large numbers" do
         @figure = Rubyplot::Figure.new
         axes = @figure.add_subplot 0,0
         axes.bar! do |p|
@@ -315,7 +315,7 @@
         end
       end
 
-      it "plots both positive and negative values" do
+      it "plots both positive and negative values", focus: true do
         @figure = Rubyplot::Figure.new
         axes = @figure.add_subplot 0,0
         axes.bar! do |p|
@@ -382,6 +382,11 @@
     end
 
     context "#scatter!" do
+      before do
+        @x1 = [1, 2, 3, 4, 5]
+        @y1 = [11, 2, 33, 4, 65]
+      end
+      
       it "adds a simple scatter plot." do
         @figure = Rubyplot::Figure.new
         axes = @figure.add_subplot 0,0
@@ -404,6 +409,16 @@
         end
         axes.title = "all negative scatter graph test."
       end
+
+      it "adds scatter with positive and negative values" do
+        @figure = Rubyplot::Figure.new
+        axes = @figure.add_subplot 0,0
+        axes.scatter! do |p|
+          p.data [-2,0,2,4,6], [-3,-1, 1, 4, 8]
+          p.label = "values"
+        end
+        axes.title = "positive + negative test."
+      end
     end
 
     context "#top_margin=" do