# HG changeset patch # User Matt Johnston # Date 1432137610 -28800 # Node ID 2071d939e4ffdd2cdf6ecb08ae2c9471ac6c4431 # Parent c90190a380c6790a348c0bf0d09a786e561b22af use base64 data, faster diff -r c90190a380c6 -r 2071d939e4ff web/config.py --- a/web/config.py Tue May 19 23:56:56 2015 +0800 +++ b/web/config.py Thu May 21 00:00:10 2015 +0800 @@ -16,9 +16,11 @@ UPDATE_URL = 'http://evil.ucc.asn.au/~matt/templog/update' -GRAPH_WIDTH = 1200 -GRAPH_HEIGHT = 600 +GRAPH_WIDTH = 600 +GRAPH_HEIGHT = 700 ZOOM = 1 +# determine by viewing the image +GRAPH_LEFT_MARGIN = 65 LINE_WIDTH = 2 @@ -50,8 +52,6 @@ GRAPH_FONT = "Prociono" #GRAPH_FONT = "URW Gothic L" -# determine by zooming in an image viewer -GRAPH_LEFT_MARGIN = 63 # 1 hour CSRF_TIMEOUT = 3600 diff -r c90190a380c6 -r 2071d939e4ff web/templog.py --- a/web/templog.py Tue May 19 23:56:56 2015 +0800 +++ b/web/templog.py Thu May 21 00:00:10 2015 +0800 @@ -51,15 +51,22 @@ return "OK" +def make_graph(length, end): + length_minutes = int(length) + end = datetime.strptime(end, DATE_FORMAT) + start = end - timedelta(minutes=length_minutes) + + start_epoch = time.mktime(start.timetuple()) + return log.graph_png(start_epoch, length_minutes * 60) + +def encode_data(data, mimetype): + return 'data:%s;base64,%s' % (mimetype, binascii.b2a_base64(data).rstrip()) + + @route('/graph.png') def graph(): - length_minutes = int(request.query.length) - end = datetime.strptime(request.query.end, DATE_FORMAT) - start = end - timedelta(minutes=length_minutes) - response.set_header('Content-Type', 'image/png') - start_epoch = time.mktime(start.timetuple()) - return log.graph_png(start_epoch, length_minutes * 60) + return make_graph(request.query.length, request.query.end) @route('/set/update', method='post') def set_update(): @@ -121,9 +128,12 @@ request.query.replace('end', end.strftime(DATE_FORMAT)) urlparams = urllib.urlencode(request.query) + graphdata = encode_data(make_graph(request.query.length, request.query.end), 'image/png') return bottle.template('top', urlparams=urlparams, end = end.strftime(DATE_FORMAT), - length = minutes) + length = minutes, + graphwidth = config.GRAPH_WIDTH, + graphdata = graphdata) @route('/debug') def debuglog(): diff -r c90190a380c6 -r 2071d939e4ff web/views/top.tpl --- a/web/views/top.tpl Tue May 19 23:56:56 2015 +0800 +++ b/web/views/top.tpl Thu May 21 00:00:10 2015 +0800 @@ -2,6 +2,7 @@ Wort Temperature Log +