From cae218546087552ba890cb39425e6f6820058ad7 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 31 May 2019 06:41:55 +0200 Subject: [PATCH] Move generate_plot to plotting.py --- freqtrade/plot/plotting.py | 20 ++++++++++++++++++++ scripts/plot_dataframe.py | 22 ++-------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/freqtrade/plot/plotting.py b/freqtrade/plot/plotting.py index a8bd032ab..037516a27 100644 --- a/freqtrade/plot/plotting.py +++ b/freqtrade/plot/plotting.py @@ -3,6 +3,7 @@ from typing import List import arrow import pandas as pd +from pathlib import Path logger = logging.getLogger(__name__) @@ -200,3 +201,22 @@ def generate_graph( fig = generate_row(fig=fig, row=3, indicators=indicators2, data=data) return fig + + +def generate_plot_file(fig, pair, ticker_interval) -> None: + """ + Generate a plot html file from pre populated fig plotly object + :param fig: Plotly Figure to plot + :param pair: Pair to plot (used as filename and Plot title) + :param ticker_interval: Used as part of the filename + :return: None + """ + logger.info('Generate plot file for %s', pair) + + pair_name = pair.replace("/", "_") + file_name = 'freqtrade-plot-' + pair_name + '-' + ticker_interval + '.html' + + Path("user_data/plots").mkdir(parents=True, exist_ok=True) + + plot(fig, filename=str(Path('user_data/plots').joinpath(file_name)), + auto_open=False) diff --git a/scripts/plot_dataframe.py b/scripts/plot_dataframe.py index a20d8abae..bccf98261 100755 --- a/scripts/plot_dataframe.py +++ b/scripts/plot_dataframe.py @@ -38,7 +38,7 @@ from freqtrade import persistence from freqtrade.arguments import Arguments, TimeRange from freqtrade.data import history from freqtrade.data.btanalysis import BT_DATA_COLUMNS, load_backtest_data -from freqtrade.plot.plotting import generate_graph +from freqtrade.plot.plotting import generate_graph, generate_plot_file from freqtrade.exchange import Exchange from freqtrade.optimize import setup_configuration from freqtrade.persistence import Trade @@ -87,23 +87,6 @@ def load_trades(db_url: str = None, exportfilename: str = None) -> pd.DataFrame: return trades -def generate_plot_file(fig, pair, ticker_interval, is_last) -> None: - """ - Generate a plot html file from pre populated fig plotly object - :return: None - """ - logger.info('Generate plot file for %s', pair) - - pair_name = pair.replace("/", "_") - file_name = 'freqtrade-plot-' + pair_name + '-' + ticker_interval + '.html' - - Path("user_data/plots").mkdir(parents=True, exist_ok=True) - - plot(fig, filename=str(Path('user_data/plots').joinpath(file_name)), - auto_open=False) - if is_last: - plot(fig, filename=str(Path('user_data').joinpath('freqtrade-plot.html')), auto_open=False) - def get_trading_env(args: Namespace): """ @@ -228,8 +211,7 @@ def analyse_and_plot_pairs(args: Namespace): indicators2=args.indicators2.split(",") ) - is_last = (False, True)[pair_counter == len(tickers)] - generate_plot_file(fig, pair, ticker_interval, is_last) + generate_plot_file(fig, pair, ticker_interval) logger.info('End of ploting process %s plots generated', pair_counter)