class DimValue(object):
def __new__(cls, dim, value):
if value in dim:
- print "OLD", value
return dim[value]
else:
- print "NEW", value
return super(DimValue, cls).__new__(cls, dim, value)
def __init__(self, dim, value):
self.dim = dim
<h1>%s</h1>""" % (title, cdup, title)
params = ["%s %s" % (v.dim, v) for v in self.values]
print >>html, "Results for:", ", ".join(params)
- print >>html, "<div class='box'><h4>Other results</h4>"
+ print >>html, "<div class='otherview'><h4>Other results</h4><table>"
for d in self.tests.space:
links = []
for v in d:
if v in self.values:
- links.append(str(v))
+ links.append("<span class='value current'>%s</span>"%str(v))
else:
vv = DimValues(self.values)
vv.replace(v)
- href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html")
- links.append("<a href='%s'>%s</a>"%(href, str(v)))
- print >>html, "%s: " % d, " | ".join(links), "<br>"
+ try:
+ href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html")
+ links.append("<span class='value other'><a href='%s'>%s</a></span>"%(href, str(v)))
+ except KeyError:
+ links.append("<span class='value missing'>%s</span>"%str(v))
+ print >>html, "<tr><th>%s</th><td>" % d, " ".join(links), "</td></tr>"
- print >>html, "</div>"
+ print >>html, "</table></div>"
print >>html, "<div><img src='%s' /></div>" % (self.name+".png")
print >>html, "<a href='./'>Raw data</a><br />"
print >>html, "<a href='%s'>Script source</a><br />" % (cdup+self.name+".sh.html")
table { border-collapse: collapse; }
th, td { border: 1px solid lightgray; padding: 4px;}
h4 { margin: 0; }
-.box { border: 1px solid black; padding: 1ex; margin: 1ex 0}
+.otherview { margin: 1ex 0}
+.otherview .value { color: black; padding: 0ex 1ex; -moz-border-radius: 1ex; border-radius: 1ex;}
+.otherview .value a { color: inherit; text-decoration: none; }
+.otherview .other:hover { background: #eee; }
+.otherview .missing { color: gray; }
+.otherview .current { background: #ccc; }
"""
css.close()
for test in self.values():
<h1>%s</h1>""" % (title, title)
params = ["%s %s" % (v.dim, v) for v in self.valsOther]
print >>html, "<h3>Results for ", ", ".join(params), "</h3>"
- print >>html, "<div class='box'><h4>Other views</h4>"
+ print >>html, "<div class='otherview'><h4>Other views</h4>"
+ print >>html, "<table><tr>"
for d in self.dimOther:
- print >>html, "%s: " % d
- print >>html, "<a href='%s'>X axis</a>, " % \
+ print >>html, "<th>%s</th>" % d
+ print >>html, "<td><a href='%s'>→</a> " % \
Page((self.dimy, d), self.valsOther - d + self.dimx.getValue(0), self.tests).getName()
- print >>html, "<a href='%s'>Y axis</a>; " % \
+ print >>html, "<a href='%s'>↓</a></td>" % \
Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
links = []
+ print >>html, "<td>"
for v in d:
if v in self.valsOther:
- links.append(str(v))
+ links.append("<span class='value current'>%s</span>"%str(v))
else:
vv = DimValues(self.valsOther)
vv.replace(v)
- links.append("<a href='%s'>%s</a>"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v)))
- print >>html, " | ".join(links)
- print >>html, "<br>"
- try:
- print >>html, d.htmlPreamble()
- except Exception:
- pass
- print >>html, "</div>"
+ links.append("<span class='value other'><a href='%s'>%s</a></span>"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v)))
+ print >>html, " ".join(links)
+ print >>html, "</td></tr>"
+ print >>html, "</table></div>"
print >>html, "<table><thead><tr><td>%s → <br />%s ↓</td>" % (self.dimx.name, self.dimy.name)
for x in self.dimx: