support hide_labels separate from hide_line_markers for bar graphs on…

…ly (#446) * support hide_labels separate from hide_line_markers for bar graphs * add expected_java PNG32 bar no line markers and labels images
topfunky · Sep 13, 2020 · f743cc0 · f743cc0
1 parent 747a09b
commit f743cc0
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 4 deletions.
diff --git a/lib/gruff/bar.rb b/lib/gruff/bar.rb
@@ -33,12 +33,16 @@ class Gruff::Bar < Gruff::Base
   # Default is +false+.
   attr_writer :show_labels_for_bar_values
 
+  # Prevent drawing of column labels below a bar graph.  Default is +false+.
+  attr_writer :hide_labels
+
   def initialize_ivars
     super
     @spacing_factor = 0.9
     @group_spacing = 10
     @label_formatting = nil
     @show_labels_for_bar_values = false
+    @hide_labels = false
   end
   private :initialize_ivars
 
@@ -68,6 +72,10 @@ def spacing_factor=(space_percent)
 
 protected
 
+  def hide_labels?
+    @hide_labels
+  end
+
   def draw_bars
     # Setup spacing.
     #

diff --git a/lib/gruff/base.rb b/lib/gruff/base.rb
@@ -199,7 +199,7 @@ def initialize_store
     end
     protected :initialize_store
 
-    # Initialize instance variable of attribures
+    # Initialize instance variable of attributes
     #
     # Subclasses can override this, call super, then set values separately.
     #
@@ -500,6 +500,10 @@ def hide_title?
       @hide_title || @title.nil? || @title.empty?
     end
 
+    def hide_labels?
+      @hide_line_markers
+    end
+
     ##
     # Calculates size of drawable area, general font dimensions, etc.
 
@@ -661,7 +665,7 @@ def draw_label(x_offset, index, gravity = Magick::NorthGravity)
     end
 
     def draw_unique_label(index)
-      return if @hide_line_markers
+      return if hide_labels?
 
       @labels_seen ||= {}
       if !@labels[index].nil? && @labels_seen[index].nil?
@@ -746,7 +750,7 @@ def sort_norm_data
   private
 
     def setup_marker_caps_height
-      @hide_line_markers ? 0 : calculate_caps_height(@marker_font_size)
+      hide_labels? ? 0 : calculate_caps_height(@marker_font_size)
     end
 
     def setup_title_caps_height
@@ -795,7 +799,7 @@ def setup_top_margin
     end
 
     def setup_bottom_margin
-      graph_bottom_margin = @hide_line_markers ? @bottom_margin : @bottom_margin + @marker_caps_height + LABEL_MARGIN
+      graph_bottom_margin = hide_labels? ? @bottom_margin : @bottom_margin + @marker_caps_height + LABEL_MARGIN
 
       x_axis_label_height = @x_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN
       # FIXME: Consider chart types other than bar

diff --git a/test/expected/bar_no_labels.png b/test/expected/bar_no_labels.png
diff --git a/test/expected/bar_no_line_markers.png b/test/expected/bar_no_line_markers.png
diff --git a/test/expected/bar_no_line_markers_or_labels.png b/test/expected/bar_no_line_markers_or_labels.png
diff --git a/test/expected_java/bar_no_labels.png b/test/expected_java/bar_no_labels.png
diff --git a/test/expected_java/bar_no_line_markers.png b/test/expected_java/bar_no_line_markers.png
diff --git a/test/expected_java/bar_no_line_markers_or_labels.png b/test/expected_java/bar_no_line_markers_or_labels.png
diff --git a/test/test_bar.rb b/test/test_bar.rb
@@ -95,6 +95,23 @@ def test_bar_graph_small
   #   g.write "test/output/bar_nil_font.png"
   # end
 
+  def test_no_labels
+    g = setup_basic_graph(400)
+    g.title = 'No Labels'
+    g.hide_labels = true
+    g.write('test/output/bar_no_labels.png')
+    assert_same_image('test/expected/bar_no_labels.png', 'test/output/bar_no_labels.png')
+  end
+
+  def test_no_line_markers_or_labels
+    g = setup_basic_graph(400)
+    g.title = 'No Line Markers or Labels'
+    g.hide_labels = true
+    g.hide_line_markers = true
+    g.write('test/output/bar_no_line_markers_or_labels.png')
+    assert_same_image('test/expected/bar_no_line_markers_or_labels.png', 'test/output/bar_no_line_markers_or_labels.png')
+  end
+
   def test_no_line_markers
     g = setup_basic_graph(400)
     g.title = 'No Line Markers'