From 18527dd22cac9f31163171839b6985ab61b09a29 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 9 Dec 2010 15:29:20 +0100 Subject: [PATCH] genhtml: Hopefully completed --- gw-tests/genhtml/genhtml.py | 47 ++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py index 558ef4b..5425f5e 100755 --- a/gw-tests/genhtml/genhtml.py +++ b/gw-tests/genhtml/genhtml.py @@ -127,10 +127,11 @@ class Test: def isOnPath(cls, path): f = os.path.join(path, '.results') return os.path.isfile(f) - def __init__(self, path, values): + def __init__(self, path, values, tests=None): self.path = path self.name = os.path.basename(path) self.values = values + self.tests = tests def printThumbLink(self, file): thumb = self.path+'/thumb' try: @@ -141,39 +142,37 @@ class Test: print >>file, "

" % \ (urllib.quote(self.path), urllib.quote(self.path), img) def generateHtml(self): - html = open(os.path.join(path, 'results.html'), "w") + html = open(os.path.join(self.path, 'results.html'), "w") + title = "CAN gateway timing analysis" + cdup = "../"*len(self.values) print >> html, """ %s - + -

%s

""" % (title, title) - params = ["%s %s" % (v.dim, v) for v in self.vals] - print >>html, "Results for:", ", ".join(params), "

" - for d in self.dimOther: - print >>html, "%s: " % d - print >>html, "X axis, " % \ - Page((self.dimy, d), self.valsOther - d + self.dimx.getValue(0), self.tests).getName() - print >>html, "Y axis; " % \ - Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName() +

%s

""" % (title, cdup, title) + params = ["%s %s" % (v.dim, v) for v in self.values] + print >>html, "Results for:", ", ".join(params) + print >>html, "

Other views

" + for d in self.tests.space: links = [] for v in d.values(): - if v in self.valsOther: + if v in self.values: links.append(str(v)) else: - vv = DimValues(self.valsOther) + vv = DimValues(self.values) vv.replace(v) - links.append("%s"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v))) - print >>html, " | ".join(links) - print >>html, "
" - try: - print >>html, d.htmlPreamble() - except Exception: - pass + href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html") + links.append("%s"%(href, str(v))) + print >>html, "%s: " % d, " | ".join(links), "
" + print >>html, "

" + print >>html, "

" % (self.name+".png") + print >>html, "Raw data
" + print >>html, "Back to top" % cdup html.close() @@ -240,12 +239,13 @@ class Tests(dict): if len(coordinates) != len(self.space): raise KeyError("The number coordinates do not match the number of dimensions: " + str(coordinates)) dv = DimValues([DimValue(self.space[i], coordinates[i]) for i in xrange(len(coordinates))]) - self.addTest(Test(root, dv)) + self.addTest(Test(root, dv, self)) def generateHtml(self): for pair in self.space.iterDimensionPairs(): remDims = Space(*tuple([d for d in self.space.iterRemainingDimensions(pair)])) for vals in remDims.iterValues(): page = Page(pair, vals, self) + print page.getName() page.generate() try: os.remove("index.html") @@ -259,6 +259,9 @@ h4 { margin: 0; } .box { border: 1px solid black; padding: 1ex; margin: 1ex 0} """ css.close() + for test in self.values(): + print test.path + test.generateHtml() #os.system("source-highlight -d --output-dir=. ../*.sh") -- 2.39.2