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.

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

Jump to bottom

Update nvd3_tags.py #70

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Update nvd3_tags.py #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
548a23f
Update nvd3_tags.py
smorokin Nov 30, 2015
2f52c5b
Update nvd3_tags.py
smorokin Jan 11, 2016
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
17 changes: 15 additions & 2 deletions django_nvd3/templatetags/nvd3_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,26 @@ def load_chart(chart_type, series, container, kw_extra={}, *args, **kwargs):
# Build chart
chart = eval(chart_type)(**kw_extra)

xdata = series['x']

x_axis_list = [k for k in series.keys() if k.startswith('x')]
y_axis_list = [k for k in series.keys() if k.startswith('y')]
if len(x_axis_list) > 1 and len(x_axis_list) != len(y_axis_list):
raise RuntimeError("Number of x-series must be one or equal to the number of y-series")

if len(x_axis_list) > 1:
# Ensure numeric sorting
x_axis_list = sorted(x_axis_list, key=lambda x: int(x[1:]))
if len(y_axis_list) > 1:
# Ensure numeric sorting
y_axis_list = sorted(y_axis_list, key=lambda x: int(x[1:]))

for key in y_axis_list:
for i, key in enumerate(y_axis_list):

if len(x_axis_list) > 1:
key_x = x_axis_list[i]
else:
key_x = x_axis_list[0]
xdata = series[key_x]
ydata = series[key]
axis_no = key.split('y')[1]

Expand Down