revert some rubocopping and antialias text

Author: v0dro

.rubocop.yml

@@ -11,6 +11,7 @@ AllCops:
     - 'benchmarks/*'
     - 'profile/*'
     - 'tmp/*'
+    - '*.so'
   DisplayCopNames: true
   TargetRubyVersion: 2.2
 

lib/rubyplot/artist/axes.rb

@@ -246,9 +246,10 @@ def with_backend(plot_type, *args)
 
       # Figure out the co-ordinates of the title text w.r.t Axes.
       def configure_title
-        @title = Rubyplot::Artist::Text.new(
-          @title, self, abs_x: abs_x + width / 2, abs_y: abs_y + @title_margin, font: @font, color: @font_color,
-                        pointsize: @title_font_size, internal_label: 'axes title.'
+        @texts << Rubyplot::Artist::Text.new(
+          @title, self, abs_x: abs_x + width / 2, abs_y: abs_y + @title_margin,
+          font: @font, color: @font_color,
+          pointsize: @title_font_size, internal_label: 'axes title.'
         )
       end
 
@@ -277,7 +278,7 @@ def actually_draw
         @x_axis.draw
         @x_ticks.each(&:draw)
         @y_axis.draw
-        @title.draw
+        @texts.each(&:draw)
         @legend_box.draw
         @plots.each(&:draw)
       end

lib/rubyplot/artist/axis/base.rb

@@ -19,6 +19,14 @@ def initialize axes
           @backend = @axes.backend
           @major_ticks_count = 5
           @x_ticks = nil
+          @texts = []
+          @lines = []
+        end
+
+        def draw
+          configure_title
+          @lines.each(&:draw)
+          @texts.each(&:draw)
         end
       end
       # class Base

lib/rubyplot/artist/axis/x_axis.rb

@@ -11,24 +11,18 @@ def initialize axes
         @length = (@abs_x2 - @abs_x1).abs
         configure_axis_line
       end
-
-      def draw
-        configure_title
-        @line.draw
-        @title.draw
-      end
-
+      
       private
 
       def configure_axis_line
-        @line = Rubyplot::Artist::Line2D.new(
+        @lines << Rubyplot::Artist::Line2D.new(
           self, abs_x1: @abs_x1, abs_y1: @axes.origin[1], abs_x2: @abs_x2, abs_y2: @axes.origin[1],
                 stroke_width: @stroke_width
         )
       end
 
       def configure_title
-        @title = Rubyplot::Artist::Text.new(
+        @texts << Rubyplot::Artist::Text.new(
           @title,
           self,
           pointsize: @axes.marker_font_size,

lib/rubyplot/artist/axis/y_axis.rb

@@ -10,18 +10,12 @@ def initialize(*)
         @y_ticks = []
         @length = (@abs_y1 - @abs_y2).abs
         configure_axis_line
-        configure_title
-      end
-
-      def draw
-        @title.draw
-        @line.draw
       end
 
       private
 
       def configure_axis_line
-        @line = Rubyplot::Artist::Line2D.new(
+        @lines << Rubyplot::Artist::Line2D.new(
           self,
           abs_x1: @abs_x1,
           abs_y1: @abs_y1,
@@ -32,7 +26,7 @@ def configure_axis_line
       end
 
       def configure_title
-        @title = Rubyplot::Artist::Text.new(
+        @texts << Rubyplot::Artist::Text.new(
           @title,
           self,
           rotation: -90.0,

lib/rubyplot/artist/figure.rb

@@ -33,18 +33,17 @@ class Figure < Artist::Base
       # @param height [Integer] nil Height in pixels of the complete Figure.
       # @param width [Integer] nil Width in pixels of the complete Figure.
       def initialize(height: nil, width: nil)
+        super(Rubyplot::Backend::MagickWrapper.new, 0, 0)
         @title = ''
         @nrows = 1
         @ncols = 1
-        @backend = Rubyplot::Backend::MagickWrapper.new
         @width = width || DEFAULT_TARGET_WIDTH
         @height = height || @width * 0.75
-        @abs_x = 0
-        @abs_y = 0
         @top_spacing = 0.05
         @bottom_spacing = 0.05
         @left_spacing = 0.05
         @right_spacing = 0.05
+        @subplots = nil
         setup_default_theme
         add_subplots @nrows, @ncols
       end

lib/rubyplot/artist/text.rb

@@ -7,18 +7,18 @@ class Text < Artist::Base
 
       # rubocop:disable Metrics/ParameterLists
       def initialize(text, owner, abs_x:, abs_y:,font: nil,
-        color: '#000000',pointsize:,stroke: 'transparent', internal_label: '', rotation: nil)
-        # weight: nil, gravity: nil is removed as they are unused method argument.
+                     color: '#000000',pointsize:,stroke: 'transparent',
+                     internal_label: '', rotation: nil,
+                     weight: nil, gravity: nil
+                    )
+        super(owner.backend, abs_x, abs_y)
         @text = text
         @owner = owner
-        @abs_x = abs_x
-        @abs_y = abs_y
         @font = font
         @color = color
         @pointsize = pointsize
         @stroke = stroke
         @internal_label = internal_label
-        @backend = @owner.backend
         @rotation = rotation
       end
       # rubocop:enable Metrics/ParameterLists

lib/rubyplot/backend/magick_wrapper.rb

@@ -16,28 +16,6 @@ def initialize
         @draw = Magick::Draw.new
       end
 
-      # Returns the height of the capital letter 'X' for the current font and
-      # size.
-      #
-      # Not scaled since it deals with dimensions that the regular scaling will
-      # handle.
-      def caps_height(font, font_size)
-        @draw.pointsize = font_size
-        @draw.font = font if font
-        @draw.get_type_metrics(@base_image, 'X').height
-      end
-
-      # Returns the width of a string at this pointsize.
-      #
-      # Not scaled since it deals with dimensions that the regular
-      # scaling will handle.
-      # FIXME: duplicate with get_text_width_height
-      def string_width(font, font_size, text)
-        @draw.pointsize = font_size
-        @draw.font = font if font
-        @draw.get_type_metrics(@base_image, text.to_s).height
-      end
-
       # Height in pixels of particular text.
       # @param text [String] Text to be measured.
       def text_height(text, font, font_size)
@@ -73,41 +51,43 @@ def get_text_width_height(text)
       # Unused method argument - stroke
       def draw_text(text,font_color:,font: nil,pointsize:,
         font_weight: Magick::NormalWeight, gravity: nil,
-        x_pos:,y_pos:,rotation: nil)
+        x:,y:,rotation: nil, stroke: 'transparent')
         @draw.fill = font_color
         @draw.font = font if font
         @draw.pointsize = pointsize
         @draw.font_weight = font_weight
         @draw.gravity = GRAVITY_MEASURE[gravity] || Magick::ForgetGravity
+        @draw.stroke stroke
+        @draw.stroke_antialias true
         @draw.rotation = rotation if rotation
-        @draw.annotate(@base_image, 0,0,x_pos.to_i,y_pos.to_i, text.gsub('%', '%%'))
+        @draw.annotate(@base_image, 0,0,x.to_i,y.to_i, text.gsub('%', '%%'))
         @draw.rotation = 90.0 if rotation
       end
 
       # Draw a rectangle.
-      def draw_rectangle(x01:,y01:,x02:,y02:,border_color: '#000000',stroke: 'transparent',
+      def draw_rectangle(x1:,y1:,x2:,y2:,border_color: '#000000',stroke: 'transparent',
         fill_color: nil, stroke_width: 1.0)
         if fill_color # solid rectangle
           @draw.stroke stroke
           @draw.fill fill_color
           @draw.stroke_width stroke_width
-          @draw.rectangle x01, y01, x02, y02
+          @draw.rectangle x1, y1, x2, y2
         else # just edges
           @draw.stroke_width stroke_width
           @draw.fill border_color
-          @draw.line x01, y01, x01 + (x02-x01), y01 # top line
-          @draw.line x01 + (x02-x01), y01, x02, y02 # right line
-          @draw.line x02, y02, x01, y01 + (y02-y01) # bottom line
-          @draw.line x01, y01, x01, y01 + (y02-y01) # left line
+          @draw.line x1, y1, x1 + (x2-x1), y1 # top line
+          @draw.line x1 + (x2-x1), y1, x2, y2 # right line
+          @draw.line x2, y2, x1, y1 + (y2-y1) # bottom line
+          @draw.line x1, y1, x1, y1 + (y2-y1) # left line
         end
       end
 
-      def draw_line(x01:,y01:,x02:,y02:,color: '#000000', stroke: 'transparent',
+      def draw_line(x1:,y1:,x2:,y2:,color: '#000000', stroke: 'transparent',
         stroke_opacity: 0.0, stroke_width: 2.0)
         @draw.stroke_opacity stroke_opacity
         @draw.stroke_width stroke_width
         @draw.fill color
-        @draw.line x01, y01, x02, y02
+        @draw.line x1, y1, x2, y2
       end
 
       def draw_circle(x_pos:,y_pos:,radius:,stroke_opacity:,stroke_width:,color:)

rubyplot.gemspec

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

spec/figure_spec.rb

@@ -9,4 +9,15 @@
       expect(axes).to be_a(Rubyplot::Axes)
     end
   end
+
+  context "#reset!" do
+    it "resets all values to defaults" do
+      fig = Rubyplot::Figure.new
+      axes = fig.add_subplot 0,0
+      axes.title = "reset test"
+      fig.reset!
+
+      expect(axes.title).to eq("")
+    end
+  end
 end