# HG changeset patch # User Matt Johnston # Date 1391093777 -28800 # Node ID 15ebb9de50492c7bd7f6fe1f5e088044882ad1bd # Parent 77c2a9caca3d541454befd3d32f8dcbc6208598c# Parent 30390852cb5d7110069351125a6bb24fc271d914 merge diff -r 77c2a9caca3d -r 15ebb9de5049 web/log.py --- a/web/log.py Thu Jan 30 22:55:27 2014 +0800 +++ b/web/log.py Thu Jan 30 22:56:17 2014 +0800 @@ -78,6 +78,9 @@ volts_mult = 1.0/volts_div + # (title, sensorline) pairs. + sensor_lines = [] + for n, (rrdfile, sensor) in enumerate(rrds): unit = None if 'avrtemp' in sensor: @@ -112,7 +115,11 @@ print_legend = '%s (%s)' % (legend, format_last_value) else: print_legend = legend - graph_args.append('LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals()) + sensor_lines.append( (legend, 'LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals()) ) + + sensor_lines.sort(key = lambda (legend, line): "Wort" in legend) + + graph_args += (line for (legend, line) in sensor_lines) end = int(start+length) start = int(start)