bofh/baroness
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-change: minor stuff

Browse Source
This commit is contained in:
Bernhard Stampfer
2016-07-07 18:23:45 +02:00
parent 042d0c86fa
commit 977e53e460
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/plot.py
View File

@@ -116,7 +116,7 @@ def plot_log(days, logfiles):
data = None data = None
for logfile in logfiles: for logfile in logfiles:
try: try:
d = pd.read_csv("app/static/testdata.csv", parse_dates=[0]) d = pd.read_csv(logfile, parse_dates=[0])
if data: if data:
data = pd.concat((data, d)) data = pd.concat((data, d))
else: else:
@@ -139,7 +139,7 @@ def plot_log(days, logfiles):
plt.plot(data.index.to_pydatetime(), frame, "b") plt.plot(data.index.to_pydatetime(), frame, "b")
ax = plt.gca() ax = plt.gca()
#ax.grid(True, linewidth=1.0) #ax.grid(True, linewidth=1.0)
plt.xlim(begin, today) plt.xlim(begin, datetime.datetime.now())
ax.spines['right'].set_visible(False) ax.spines['right'].set_visible(False)
ax.spines['top'].set_visible(False) ax.spines['top'].set_visible(False)
ax.yaxis.set_ticks_position('none')#('left') ax.yaxis.set_ticks_position('none')#('left')
@@ -253,4 +253,4 @@ def plot_list(duration):
#1024x768 #1024x768
#fig.set_size_inches(10.24, 7.68) #fig.set_size_inches(10.24, 7.68)
#plt.savefig('app/static/bierliste.png', dpi=100) #plt.savefig('app/static/bierliste.png', dpi=100)
logging.info("end plot_list " + str(datetime.datetime.now())) logging.info("end plot_list " + str(datetime.datetime.now()))

2
app/views.py
View File

@@ -67,7 +67,7 @@ def logout():
@app.route('/fridges') @app.route('/fridges')
def 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'))) return render_template('fridges.html', fridges=settings.fridges, user=get_user_by_name(session.get('name')))