Skip to content

fix zero and negative value for grouped barcharts #93

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.

Sign up for GitHub

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

Open
manuel-rubio wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix zero and negative value for grouped barcharts #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77f57e1
fix zero and negative value for grouped barcharts
manuel-rubio Jan 25, 2024
7a35a3d
remove unclear code and keep it simpler for setting zero and negative…
manuel-rubio Feb 4, 2024
3563ba5
zero axis (as @mindok suggested)
manuel-rubio Feb 6, 2024
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
11 changes: 11 additions & 0 deletions lib/chart/axis.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,17 @@ defmodule Contex.Axis do
]
end

@doc """
Draw the zero line for ensuring it's drawn even when zero
isn't aligned to the base of the graph.
"""
def get_zero_line_svg(%Axis{scale: scale} = axis) do
# Check that scale intersects zero by looking at domain
# If so...
domain_to_range_fn = Scale.domain_to_range_fn(scale)
get_svg_gridline(axis, domain_to_range_fn.(0.0))
end

defp get_svg_gridlines(%Axis{scale: scale} = axis) do
domain_ticks = Scale.ticks_domain(scale)
domain_to_range_fn = Scale.domain_to_range_fn(scale)
Expand Down
7 changes: 5 additions & 2 deletions lib/chart/barchart.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,12 @@ defmodule Contex.BarChart do

val_axis_svg = if plot_options.show_val_axis, do: Axis.to_svg(value_axis), else: ""

zero_line = Axis.get_zero_line_svg(category_axis)

[
cat_axis_svg,
val_axis_svg,
zero_line,
"<g>",
get_svg_bars(plot),
"</g>"
Expand Down Expand Up @@ -504,12 +507,12 @@ defmodule Contex.BarChart do
end

defp prepare_bar_values(series_values, scale, :grouped) do
{scale_min, _} = Scale.get_range(scale)
scale_zero = Scale.domain_to_range(scale, 0.0)

results =
Enum.reduce(series_values, [], fn data_val, points ->
range_val = Scale.domain_to_range(scale, data_val)
[{scale_min, range_val} | points]
[{scale_zero, range_val} | points]
end)

Enum.reverse(results)
Expand Down