Skip to content

Commit 307096e

Browse files
finish up marketcolors kwarg for make_addplot()
1 parent 1d978d4 commit 307096e

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

examples/scratch_pad/iss466_pr471.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import pandas as pd
2+
import mplfinance as mpf
3+
4+
aapldf = pd.read_csv('../data/yahoofinance-AAPL-20040819-20180120.csv',index_col=0,parse_dates=True).iloc[-61:-1]
5+
googdf = pd.read_csv('../data/yahoofinance-GOOG-20040819-20180120.csv',index_col=0,parse_dates=True).iloc[-61:-1]
6+
7+
mcblue = mpf.make_marketcolors(base_mpf_style='default',up='b',down='b',ohlc='b')
8+
mcgreen = mpf.make_marketcolors(base_mpf_style='default',up='limegreen',down='limegreen',ohlc='limegreen')
9+
10+
sblue = mpf.make_mpf_style(base_mpf_style='default',marketcolors=mcblue)
11+
12+
ap = mpf.make_addplot(googdf,type='candle',marketcolors=mcgreen)
13+
mpf.plot(aapldf,type='candle',style=sblue,returnfig=True,addplot=ap)
14+
mpf.show()

src/mplfinance/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
version_info = (0, 12, 8, 'beta', 5)
2+
version_info = (0, 12, 8, 'beta', 6)
33

44
_specifier_ = {'alpha': 'a','beta': 'b','candidate': 'rc','final': ''}
55

src/mplfinance/plotting.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from mplfinance._arg_validators import _alines_validator, _tlines_validator
4040
from mplfinance._arg_validators import _scale_padding_validator, _yscale_validator
4141
from mplfinance._arg_validators import _valid_panel_id, _check_for_external_axes
42-
from mplfinance._arg_validators import _xlim_validator, _mco_validator
42+
from mplfinance._arg_validators import _xlim_validator, _mco_validator, _is_marketcolor_object
4343

4444
from mplfinance._panels import _build_panels
4545
from mplfinance._panels import _set_ticks_on_bottom_panel_only
@@ -867,7 +867,7 @@ def _addplot_collections(panid,panels,apdict,xdates,config):
867867
d,o,h,l,c,v = _check_and_prepare_data(apdata,config)
868868

869869
mc = apdict['marketcolors']
870-
if isinstance(mc,dict):
870+
if _is_marketcolor_object(mc):
871871
apstyle = config['style'].copy()
872872
apstyle['marketcolors'] = mc
873873
else:
@@ -1115,7 +1115,7 @@ def _valid_addplot_kwargs():
11151115
'Validator' : lambda value : value in valid_stepwheres },
11161116

11171117
'marketcolors' : { 'Default' : None, # use 'style' for default, instead.
1118-
'Validator' : lambda value: isinstance(value,dict) },
1118+
'Validator' : lambda value: _is_marketcolor_object(value) },
11191119
}
11201120

11211121
_validate_vkwargs_dict(vkwargs)

0 commit comments

Comments
 (0)