adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement first working version of plot_config

Browse Source
This commit is contained in:
Matthias 2020-01-03 20:10:22 +01:00
parent 84ef588163
commit 5d5074ac9c
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
freqtrade/plot/plotting.py
View File

@ -96,11 +96,15 @@ def _add_indicators_dict(fig, row, indicators: Dict[str, Dict],
for indicator, conf in indicators.items(): for indicator, conf in indicators.items():
print(conf) print(conf)
if indicator in data: if indicator in data:
kwargs = {'x': data['date'],
'y': data[indicator].values,
'mode': 'lines',
'name': indicator
}
if 'color' in conf:
kwargs.update({'line': {'color': conf['color']}})
scatter = go.Scatter( scatter = go.Scatter(
x=data['date'], **kwargs
y=data[indicator].values,
mode='lines',
name=indicator
) )
fig.add_trace(scatter, row, 1) fig.add_trace(scatter, row, 1)
else: else:
@ -123,9 +127,9 @@ def add_indicators(fig, row, indicators: IndicatorType, data: pd.DataFrame) -> m
:param data: candlestick DataFrame :param data: candlestick DataFrame
""" """
if isinstance(indicators, list): if isinstance(indicators, list):
_add_indicators_list(fig, row, indicators, data) return _add_indicators_list(fig, row, indicators, data)
else: else:
_add_indicators_dict(fig, row, indicators, data) return _add_indicators_dict(fig, row, indicators, data)
def add_profit(fig, row, data: pd.DataFrame, column: str, name: str) -> make_subplots: def add_profit(fig, row, data: pd.DataFrame, column: str, name: str) -> make_subplots:
@ -376,6 +380,17 @@ def store_plot_file(fig, filename: str, directory: Path, auto_open: bool = False
logger.info(f"Stored plot as {_filename}") logger.info(f"Stored plot as {_filename}")
def _get_plot_indicators(config, strategy):
if hasattr(strategy, 'plot_config'):
indicators1 = strategy.plot_config['main_plot']
indicators2 = strategy.plot_config['subplots']
else:
indicators1 = config.get("indicators1")
indicators2 = config.get("indicators2")
return indicators1, indicators2
def load_and_plot_trades(config: Dict[str, Any]): def load_and_plot_trades(config: Dict[str, Any]):
""" """
From configuration provided From configuration provided
@ -402,8 +417,7 @@ def load_and_plot_trades(config: Dict[str, Any]):
trades_pair = trades.loc[trades['pair'] == pair] trades_pair = trades.loc[trades['pair'] == pair]
trades_pair = extract_trades_of_period(dataframe, trades_pair) trades_pair = extract_trades_of_period(dataframe, trades_pair)
indicators1 = config["indicators1"] indicators1, indicators2 = _get_plot_indicators(config, strategy)
indicators2 = config["indicators2"]
fig = generate_candlestick_graph( fig = generate_candlestick_graph(
pair=pair, pair=pair,