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

revert to former create_plotconfig behaviour

Browse Source
This commit is contained in:
Christof 2020-12-19 14:14:20 +01:00
parent 4531c924da
commit cc39cf97dd
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
freqtrade/plot/plotting.py
View File

@ -226,7 +226,6 @@ def plot_trades(fig, trades: pd.DataFrame) -> make_subplots:
logger.warning("No trades found.") logger.warning("No trades found.")
return fig return fig
def create_plotconfig(indicators1: List[str], indicators2: List[str], def create_plotconfig(indicators1: List[str], indicators2: List[str],
plot_config: Dict[str, Dict]) -> Dict[str, Dict]: plot_config: Dict[str, Dict]) -> Dict[str, Dict]:
""" """
@ -236,25 +235,12 @@ def create_plotconfig(indicators1: List[str], indicators2: List[str],
:param plot_config: Dict of Dicts containing advanced plot configuration :param plot_config: Dict of Dicts containing advanced plot configuration
:return: plot_config - eventually with indicators 1 and 2 :return: plot_config - eventually with indicators 1 and 2
""" """
if plot_config:
# maybe main or sub is given, not both.
if 'main_plot' not in plot_config.keys():
plot_config['main_plot'] = {}
if 'subplots' not in plot_config.keys(): if plot_config:
plot_config['subplots'] = {}
if indicators1: if indicators1:
for ind in indicators1: plot_config['main_plot'] = {ind: {} for ind in indicators1}
# add indicators with NO advanced plot_config, only! to be sure
# indicator colors given in advanced plot_config will not be
# overwritten.
if ind not in plot_config['main_plot'].keys():
plot_config['main_plot'][ind] = {}
if indicators2: if indicators2:
# add other indicators given on cmd line to advanced plot_config. plot_config['subplots'] = {'Other': {ind: {} for ind in indicators2}}
plot_config['subplots'].update(
{'Other': {ind: {} for ind in indicators2}}
)
if not plot_config: if not plot_config:
# If no indicators and no plot-config given, use defaults. # If no indicators and no plot-config given, use defaults.
@ -268,10 +254,13 @@ def create_plotconfig(indicators1: List[str], indicators2: List[str],
'main_plot': {ind: {} for ind in indicators1}, 'main_plot': {ind: {} for ind in indicators1},
'subplots': {'Other': {ind: {} for ind in indicators2}}, 'subplots': {'Other': {ind: {} for ind in indicators2}},
} }
if 'main_plot' not in plot_config:
plot_config['main_plot'] = {}
if 'subplots' not in plot_config:
plot_config['subplots'] = {}
return plot_config return plot_config
def generate_candlestick_graph(pair: str, data: pd.DataFrame, trades: pd.DataFrame = None, *, def generate_candlestick_graph(pair: str, data: pd.DataFrame, trades: pd.DataFrame = None, *,
indicators1: List[str] = [], indicators1: List[str] = [],
indicators2: List[str] = [], indicators2: List[str] = [],