Mercurial > templog
changeset 380:180dc60140a4
merge
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 03 Jul 2012 21:55:50 +0800 |
| parents | 16f96019a9e0 (current diff) fed6738be1ab (diff) |
| children | 83c83014e5e3 |
| files | |
| diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/web/config.py Sat Jun 30 22:00:46 2012 +0800 +++ b/web/config.py Tue Jul 03 21:55:50 2012 +0800 @@ -25,4 +25,4 @@ #GRAPH_FONT = "URW Gothic L" # determine by zooming in an image viewer -GRAPH_LEFT_MARGIN = 95 +GRAPH_LEFT_MARGIN = 63
--- a/web/log.py Sat Jun 30 22:00:46 2012 +0800 +++ b/web/log.py Tue Jul 03 21:55:50 2012 +0800 @@ -90,7 +90,7 @@ '-h', str(config.GRAPH_HEIGHT), '--slope-mode', '--border', '0', - '--vertical-label', 'Voltage', +# '--vertical-label', 'Voltage', '--y-grid', '0.1:1', '--dynamic-labels', '--grid-dash', '1:0', @@ -105,8 +105,9 @@ args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT] if have_volts: args += ['--right-axis', '10:-20', # matches the scalevolts CDEF above - '--right-axis-format', '%.2lf', - '--right-axis-label', 'Temperature'] + '--right-axis-format', '%.0lf', +# '--right-axis-label', 'Temperature' + ] rrdtool.graph(*args) return tempf.read()
--- a/web/views/top.tpl Sat Jun 30 22:00:46 2012 +0800 +++ b/web/views/top.tpl Tue Jul 03 21:55:50 2012 +0800 @@ -1,8 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> - <head> - <style type="text/css"><!-- span.no_selection { -webkit-user-select: none; // webkit (safari, chrome) browsers @@ -11,12 +9,13 @@ } //--> </style> - - +<title></title> </head> +<!-- Click on the graph to zoom in, click on the Y axis labels to zoom out --> + <body> -<form action="" method=GET> +<form action="" method="get"> <span class="no_selection"><input type="image" src="graph.png?{{urlparams}}"/></span> <input type="hidden" name="length" value="{{length}}"/> <input type="hidden" name="end" value="{{end}}"/>