Skip to content

Finance fixes #270

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

Merged
merged 9 commits into from
Jul 29, 2015
Merged

Finance fixes #270

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2f2361a
pep8 :lipstick:
chriddyp Jul 28, 2015
c3c8672
nicer default reds and greens
chriddyp Jul 29, 2015
609b033
reformatted examples that focus on pandas
chriddyp Jul 29, 2015
f880a5e
whoops, one more colors update
chriddyp Jul 29, 2015
f08b712
more explicit dates argument check
chriddyp Jul 29, 2015
e3e10d2
another missed colors commit
chriddyp Jul 29, 2015
6829986
Merge branch 'financecharts' into finance-fixes
chriddyp Jul 29, 2015
da022e2
1.8.0 - OHLC and Candlestick Charts
chriddyp Jul 29, 2015
aa13dc2
missing datetime imports
chriddyp Jul 29, 2015
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
Prev Previous commit
Next Next commit
more explicit dates argument check 
so that you can pass in `dates=df.index` and nothing will fail with the
`datetimeindex isn’t a bool`
  • Loading branch information
@chriddyp
chriddyp committed Jul 29, 2015
commit f08b7120c748376629911974077e80ad74c87f0c
14 changes: 6 additions & 8 deletions plotly/tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2355,7 +2355,7 @@ def create_ohlc(open, high, low, close,
py.iplot(fig, filename='finance/simple-ohlc', validate=False)
```
"""
if dates:
if dates is not None:
TraceFactory.validate_equal_length(open, high, low, close, dates)
else:
TraceFactory.validate_equal_length(open, high, low, close)
Expand Down Expand Up @@ -2628,7 +2628,7 @@ def create_candlestick(open, high, low, close,
"""
FigureFactory.validate_ohlc(open, high, low, close, direction,
**kwargs)
if dates:
if dates is not None:
TraceFactory.validate_equal_length(open, high, low, close, dates)
else:
TraceFactory.validate_equal_length(open, high, low, close)
Expand Down Expand Up @@ -2683,10 +2683,8 @@ def __init__(self, open, high, low, close, dates, **kwargs):
self.low = low
self.close = close
self.empty = [None] * len(open)
if dates:
self.dates = dates
else:
self.dates = None
self.dates = dates

self.all_x = []
self.all_y = []
self.increase_x = []
Expand All @@ -2709,7 +2707,7 @@ def get_all_xy(self):
"""
self.all_y = list(zip(self.open, self.open, self.high,
self.low, self.close, self.close, self.empty))
if self.dates:
if self.dates is not None:
date_dif = []
for i in range(len(self.dates) - 1):
date_dif.append(self.dates[i + 1] - self.dates[i])
Expand Down Expand Up @@ -2780,7 +2778,7 @@ def __init__(self, open, high, low, close, dates, **kwargs):
self.high = high
self.low = low
self.close = close
if dates:
if dates is not None:
self.x = dates
else:
self.x = [x for x in range(len(self.open))]
Expand Down