From 977e53e4604ef6133f790a937de228c8bec20ed0 Mon Sep 17 00:00:00 2001 From: Bernhard Stampfer Date: Thu, 7 Jul 2016 18:23:45 +0200 Subject: [PATCH] -change: minor stuff --- app/plot.py | 6 +++--- app/views.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/plot.py b/app/plot.py index a2b437b..2fb634f 100644 --- a/app/plot.py +++ b/app/plot.py @@ -116,7 +116,7 @@ def plot_log(days, logfiles): data = None for logfile in logfiles: try: - d = pd.read_csv("app/static/testdata.csv", parse_dates=[0]) + d = pd.read_csv(logfile, parse_dates=[0]) if data: data = pd.concat((data, d)) else: @@ -139,7 +139,7 @@ def plot_log(days, logfiles): plt.plot(data.index.to_pydatetime(), frame, "b") ax = plt.gca() #ax.grid(True, linewidth=1.0) - plt.xlim(begin, today) + plt.xlim(begin, datetime.datetime.now()) ax.spines['right'].set_visible(False) ax.spines['top'].set_visible(False) ax.yaxis.set_ticks_position('none')#('left') @@ -253,4 +253,4 @@ def plot_list(duration): #1024x768 #fig.set_size_inches(10.24, 7.68) #plt.savefig('app/static/bierliste.png', dpi=100) - logging.info("end plot_list " + str(datetime.datetime.now())) \ No newline at end of file + logging.info("end plot_list " + str(datetime.datetime.now())) diff --git a/app/views.py b/app/views.py index f39ac0e..9724155 100644 --- a/app/views.py +++ b/app/views.py @@ -67,7 +67,7 @@ def logout(): @app.route('/fridges') def fridges(): - plot_log(30, ("static/testdata.csv",)) + plot_log(30, ("/tmp/baroness_logdata_fast.csv",)) return render_template('fridges.html', fridges=settings.fridges, user=get_user_by_name(session.get('name')))