Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add additional y-axis lines to diagrams #164

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 35 additions & 24 deletions lib/gruff/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class Base

# Same as font but for the title.
attr_accessor :title_font

# Specifies whether to draw the title bolded or not.
attr_accessor :bold_title

Expand Down Expand Up @@ -187,6 +187,8 @@ class Base

# Experimental
attr_accessor :additional_line_values
attr_accessor :additional_line_labels
attr_accessor :additional_line_colors

# Experimental
attr_accessor :stacked
Expand Down Expand Up @@ -282,6 +284,7 @@ def initialize_ivars
@label_truncation_style = :absolute

@additional_line_values = []
@additional_line_labels = []
@additional_line_colors = []
@theme_options = {}

Expand Down Expand Up @@ -653,7 +656,6 @@ def draw_line_markers
# Draw horizontal line markers and annotate with numbers
(0..@marker_count).each do |index|
y = @graph_top + @graph_height - index.to_f * @increment_scaled

@d = @d.fill(@marker_color)

# FIXME(uwe): Workaround for Issue #66
Expand Down Expand Up @@ -688,28 +690,37 @@ def draw_line_markers
end
end

# # Submitted by a contibutor...the utility escapes me
# i = 0
# @additional_line_values.each do |value|
# @increment_scaled = @graph_height.to_f / (@maximum_value.to_f / value)
#
# y = @graph_top + @graph_height - @increment_scaled
#
# @d = @d.stroke(@additional_line_colors[i])
# @d = @d.line(@graph_left, y, @graph_right, y)
#
#
# @d.fill = @additional_line_colors[i]
# @d.font = @font if @font
# @d.stroke('transparent')
# @d.pointsize = scale_fontsize(@marker_font_size)
# @d.gravity = EastGravity
# @d = @d.annotate_scaled( @base_image,
# 100, 20,
# -10, y - (@marker_font_size/2.0),
# "", @scale)
# i += 1
# end
# draw additional lines for e.g. scatterplot percentiles
i = 0
@additional_line_values.each do |value|
# draw lines only if they are in the visible spectrum of the diagram
if @maximum_value > value && value > @minimum_value
coord = value - @minimum_value

if @increment > 1
position = @graph_height.to_f / (@maximum_value.to_f / coord)
y = @graph_top + @graph_height - position
else
y = @graph_top + @graph_height - coord.to_f * @increment_scaled
end

@d = @d.stroke(@additional_line_colors[i])
@d = @d.line(@graph_left, y, @graph_right, y)


@d.fill = @additional_line_colors[i]
@d.font = @font if @font
@d.stroke('transparent')
@d.pointsize = scale_fontsize(@marker_font_size)
@d.gravity = EastGravity
@d = @d.annotate_scaled( @base_image,
100, 20,
-10, y - (@marker_font_size/2.0),
@additional_line_labels[i], @scale)
i += 1
end
end
# end draw additional lines

@d = @d.stroke_antialias true
end
Expand Down
Binary file modified test/output/TestLabelsForNullData.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/accum_bar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/area_keynote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/area_keynote_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/area_many.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/area_many_areas_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/area_tiny.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/area_wide.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar2_wrapped_legend_16_400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar2_wrapped_legend_16_800.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar2_wrapped_legend_30_400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar2_wrapped_legend_30_800.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar2_wrapped_legend_4_400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar2_wrapped_legend_4_800.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar2_wrapped_legend__400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar2_wrapped_legend__800.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_background_gradient_bottom_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_background_gradient_left_right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_background_gradient_right_left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_background_gradient_top_bottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_background_gradient_topleft_bottomright.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_background_gradient_topright_bottomleft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_formatted_numbers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_keynote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_keynote_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/output/bar_long_legend_text.png
Binary file modified test/output/bar_manual_colors.png
Binary file modified test/output/bar_marker_shadow.png
Binary file modified test/output/bar_nearly_zero_max_10.png
Binary file modified test/output/bar_no_legend.png
Binary file modified test/output/bar_no_line_markers.png
Binary file modified test/output/bar_no_title.png
Binary file modified test/output/bar_no_title_or_legend.png
Binary file modified test/output/bar_object_labels.png
Binary file modified test/output/bar_odeo.png
Binary file modified test/output/bar_one_value.png
Binary file modified test/output/bar_pos_neg.png
Binary file modified test/output/bar_rails_keynote.png
Binary file modified test/output/bar_set_absolute_trunc.png
Binary file modified test/output/bar_set_label_stagger_height.png
Binary file modified test/output/bar_set_legend_box_size_lg.png
Binary file modified test/output/bar_set_legend_box_size_sm.png
Binary file modified test/output/bar_set_marker.png
Binary file modified test/output/bar_set_trailing_dots_trunc.png
Binary file modified test/output/bar_spacing_full.png
Binary file modified test/output/bar_spacing_half.png
Binary file modified test/output/bar_spacing_none.png
Binary file modified test/output/bar_tall_graph.png
Binary file modified test/output/bar_tall_graph_small.png
Binary file modified test/output/bar_themed.png
Binary file modified test/output/bar_title_margin.png
Binary file modified test/output/bar_value_labels.png
Binary file modified test/output/bar_wide_graph.png
Binary file modified test/output/bar_wide_graph_small.png
Binary file modified test/output/bar_wrapped_legend_16_400.png
Binary file modified test/output/bar_wrapped_legend_16_800.png
Binary file modified test/output/bar_wrapped_legend_30_400.png
Binary file modified test/output/bar_wrapped_legend_30_800.png
Binary file modified test/output/bar_wrapped_legend_4_400.png
Binary file modified test/output/bar_wrapped_legend_4_800.png
Binary file modified test/output/bar_wrapped_legend__400.png
Binary file modified test/output/bar_wrapped_legend__800.png
Binary file modified test/output/bar_x_y_labels.png
Binary file modified test/output/bar_y_increment_1.png
Binary file modified test/output/bar_y_increment_2.0.png
Binary file modified test/output/bar_y_increment_20.png
Binary file modified test/output/bar_y_increment_5.png
Binary file modified test/output/bar_zero_marker_count.png
Binary file modified test/output/bar_zero_spacing.png
Binary file modified test/output/bezier.png
Binary file modified test/output/bezier_2.png
Binary file modified test/output/bezier_3.png
Binary file modified test/output/bullet_greyscale.png
Binary file modified test/output/bullet_no_options.png
Binary file modified test/output/dot.png
Binary file modified test/output/dot_manual_colors.png
Binary file modified test/output/dot_nearly_zero_max_10.png
Binary file modified test/output/dot_no_legend.png
Binary file modified test/output/dot_no_line_markers.png
Binary file modified test/output/dot_no_title.png
Binary file modified test/output/dot_no_title_or_legend.png
Binary file modified test/output/dot_one_value.png
Binary file modified test/output/dot_pos_neg.png
Binary file modified test/output/dot_set_legend_box_size_lg.png
Binary file modified test/output/dot_set_legend_box_size_sm.png
Binary file modified test/output/dot_set_marker.png
Binary file modified test/output/dot_small.png
Binary file modified test/output/dot_tall_graph.png
Binary file modified test/output/dot_tall_graph_small.png
Binary file modified test/output/dot_themed.png
Binary file modified test/output/dot_wide_graph.png
Binary file modified test/output/dot_wide_graph_small.png
Binary file modified test/output/dot_x_y_labels.png
Binary file modified test/output/dot_y_increment_1.png
Binary file modified test/output/dot_y_increment_2.0.png
Binary file modified test/output/dot_y_increment_20.png
Binary file modified test/output/dot_y_increment_5.png
Binary file modified test/output/enhancements.png
Binary file modified test/output/enhancements_dot.png
Binary file modified test/output/line_all_neg.png
Binary file modified test/output/line_all_neg_400.png
Binary file modified test/output/line_all_neg_no_max.png
Binary file modified test/output/line_baseline.png
Binary file modified test/output/line_dot_style_square.png
Binary file modified test/output/line_hang_value.png
Binary file modified test/output/line_hide_dots.png
Binary file modified test/output/line_hide_lines.png
Binary file modified test/output/line_jruby_error.png
Binary file modified test/output/line_large.png
Binary file modified test/output/line_large_baseline.png
Binary file modified test/output/line_legend_at_bottom.png
Binary file modified test/output/line_many.png
Binary file modified test/output/line_many_lines_small.png
Binary file modified test/output/line_many_numbers.png
Binary file modified test/output/line_marker_label_accuracy.png
Binary file modified test/output/line_more_sets_than_colors.png
Binary file modified test/output/line_no_data.png
Binary file modified test/output/line_no_data_msg.png
Binary file modified test/output/line_no_data_other.png
Binary file modified test/output/line_no_hide.png
Binary file modified test/output/line_no_legend.png
Binary file modified test/output/line_no_line_markers.png
Binary file modified test/output/line_no_title.png
Binary file modified test/output/line_nothing_but_the_graph.png
Binary file modified test/output/line_one_value.png
Binary file modified test/output/line_one_value_array.png
Binary file modified test/output/line_pos_neg.png
Binary file modified test/output/line_pos_neg_400.png
Binary file modified test/output/line_reference_lines.png
Binary file modified test/output/line_similar_high_end_values.png
Binary file modified test/output/line_similar_high_end_values_with_floor.png
Binary file modified test/output/line_small_small_zero.png
Binary file modified test/output/line_small_values.png
Binary file modified test/output/line_small_values_small.png
Binary file modified test/output/line_small_zero.png
Binary file modified test/output/line_some_nil_points.png
Binary file modified test/output/line_theme_37signals_.png
Binary file modified test/output/line_theme_37signals_400.png
Binary file modified test/output/line_theme_keynote_.png
Binary file modified test/output/line_theme_keynote_400.png
Binary file modified test/output/line_theme_odeo_.png
Binary file modified test/output/line_theme_odeo_400.png
Binary file modified test/output/line_theme_rails_keynote_.png
Binary file modified test/output/line_theme_rails_keynote_400.png
Binary file modified test/output/line_tiny.png
Binary file modified test/output/line_transparent.png
Binary file modified test/output/line_very_small.png
Binary file removed test/output/line_webp.webp
Binary file not shown.
Binary file modified test/output/line_wide_graph.png
Binary file modified test/output/line_wide_graph_small.png
Binary file modified test/output/line_xy.png
Binary file modified test/output/line_xy_pairs.png
Binary file modified test/output/line_y_axis_increment.png
Binary file modified test/output/mini_bar.png
Binary file modified test/output/mini_pie.png
Binary file modified test/output/mini_pie_right_legend.png
Binary file modified test/output/mini_side_bar.png
Binary file modified test/output/mini_side_bar_multi_color.png
Binary file modified test/output/net_dots_tiny.png
Binary file modified test/output/net_large.png
Binary file modified test/output/net_many.png
Binary file modified test/output/net_many_nets_small.png
Binary file modified test/output/net_no_data.png
Binary file modified test/output/net_no_data_msg.png
Binary file modified test/output/net_no_data_other.png
Binary file modified test/output/net_no_legend.png
Binary file modified test/output/net_no_net_markers.png
Binary file modified test/output/net_no_title.png
Binary file modified test/output/net_nothing_but_the_graph.png
Binary file modified test/output/net_similar_high_end_values.png
Binary file modified test/output/net_small.png
Binary file modified test/output/net_small_small.png
Binary file modified test/output/net_small_small_zero.png
Binary file modified test/output/net_small_zero.png
Binary file modified test/output/net_wide_graph.png
Binary file modified test/output/net_wide_graph_small.png
Binary file modified test/output/pie_adjusted_text_offset_percentage.png
Binary file modified test/output/pie_equal.png
Binary file modified test/output/pie_grey.png
Binary file modified test/output/pie_keynote.png
Binary file modified test/output/pie_keynote_small.png
Binary file modified test/output/pie_legend.png
Binary file modified test/output/pie_legend_small.png
Binary file modified test/output/pie_nearly_equal.png
Binary file modified test/output/pie_one_val.png
Binary file modified test/output/pie_pastel.png
Binary file modified test/output/pie_simple.png
Binary file modified test/output/pie_subclass_custom_labels.png
Binary file modified test/output/pie_wide.png
Binary file modified test/output/pie_wrapped_legend_16_400.png
Binary file modified test/output/pie_wrapped_legend_16_800.png
Binary file modified test/output/pie_wrapped_legend_30_400.png
Binary file modified test/output/pie_wrapped_legend_30_800.png
Binary file modified test/output/pie_wrapped_legend_4_400.png
Binary file modified test/output/pie_wrapped_legend_4_800.png
Binary file modified test/output/pie_wrapped_legend__400.png
Binary file modified test/output/pie_wrapped_legend__800.png
Binary file modified test/output/pie_zero.png
Binary file modified test/output/scatter_all_neg.png
Binary file modified test/output/scatter_all_neg_400.png
Binary file modified test/output/scatter_basic.png
Binary file modified test/output/scatter_custom_label_format.png
Binary file modified test/output/scatter_many.png
Binary file modified test/output/scatter_no_data.png
Binary file modified test/output/scatter_no_data_msg.png
Binary file modified test/output/scatter_no_data_other.png
Binary file modified test/output/scatter_no_hide.png
Binary file modified test/output/scatter_no_labels.png
Binary file modified test/output/scatter_no_legend.png
Binary file modified test/output/scatter_no_line_markers.png
Binary file modified test/output/scatter_no_title.png
Binary file modified test/output/scatter_nothing_but_the_graph.png
Binary file modified test/output/scatter_pos_neg.png
Binary file modified test/output/scatter_pos_neg_400.png
Binary file modified test/output/scatter_wide_graph.png
Binary file modified test/output/scatter_wide_graph_small.png
Binary file modified test/output/scene_hazy_night.png
Binary file modified test/output/scene_not_hazy_day.png
Binary file modified test/output/scene_partly_cloudy_day.png
Binary file modified test/output/scene_stormy_day.png
Binary file modified test/output/scene_stormy_night.png
Binary file modified test/output/side_bar.png
Binary file modified test/output/side_bar_data_range.png
Binary file modified test/output/side_bar_labels.png
Binary file modified test/output/side_bar_spacing_full.png
Binary file modified test/output/side_bar_spacing_half.png
Binary file modified test/output/side_bar_spacing_none.png
Binary file modified test/output/side_stacked_bar_keynote.png
Binary file modified test/output/side_stacked_bar_keynote_small.png
Binary file modified test/output/side_stacked_bar_labels.png
Binary file modified test/output/side_stacked_bar_long_label.png
Binary file modified test/output/side_stacked_bar_wide.png
Binary file modified test/output/spider_37signals.png
Binary file modified test/output/spider_equal.png
Binary file modified test/output/spider_keynote.png
Binary file modified test/output/spider_legend.png
Binary file modified test/output/spider_legend_small.png
Binary file modified test/output/spider_lots_of_data.png
Binary file modified test/output/spider_lots_of_data_normal_names.png
Binary file modified test/output/spider_nearly_equal.png
Binary file modified test/output/spider_no_axes.png
Binary file modified test/output/spider_no_background.png
Binary file modified test/output/spider_no_print.png
Binary file modified test/output/spider_overlay_1.png
Binary file modified test/output/spider_overlay_2.png
Binary file modified test/output/spider_rotation.png
Binary file modified test/output/spider_small.png
Binary file modified test/output/spider_wide.png
Binary file modified test/output/spider_zero.png
Binary file modified test/output/stacked_area_keynote.png
Binary file modified test/output/stacked_area_keynote_small.png
Binary file modified test/output/stacked_bar_keynote.png
Binary file modified test/output/stacked_bar_keynote_no_space.png
Binary file modified test/output/stacked_bar_keynote_small.png
4 changes: 3 additions & 1 deletion test/test_scatter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ def test_custom_label_format
DateTime.strptime(value.to_i.to_s,'%s').strftime('%d.%m.%Y')
end
g.y_axis_increment = 1

g.additional_line_values = Array[7, 14, 14.5]
g.additional_line_labels = Array['50%', '85%', '95%']
g.additional_line_colors = Array['#ff6600', '#f66230', '#ff0000']
# Fake data (100 days, random times of day between 5 and 16)
r = Random.new(269155)
y_values = (0..100).map { 5 + r.rand(12) }
Expand Down