From 8c81374c57a81ccab4210951e6374102f4a04d26 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 7 Dec 2010 19:14:36 +0100 Subject: [PATCH] Update genhtml etc. --- gw-tests/genhtml/genhtml.py | 21 ++++++++++++++------- gw-tests/lib.sh | 14 ++++++++++---- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py index 70e918f..83995bc 100755 --- a/gw-tests/genhtml/genhtml.py +++ b/gw-tests/genhtml/genhtml.py @@ -34,6 +34,10 @@ class Dimension(dict): self[value] = DimValue(self, value) def htmlLabel(self, v): return v + def __str__(self): + return self.name + def __repr__(self): + return self.type class DimensionKern(Dimension): def __init__(self): @@ -83,11 +87,12 @@ class DimensionTraffic(Dimension): class Test: @classmethod def isOnPath(cls, path): - f = os.path.join(path, 'plot.gp') + f = os.path.join(path, '.results') return os.path.isfile(f) def __init__(self, path): self.path = path def printThumbLink(self, file): + print self.path for img in dircache.listdir(self.path+'/thumb'): print >>file, "" % \ (urllib.quote(self.path), img, urllib.quote(self.path), img) @@ -151,16 +156,17 @@ class Tests(dict): yield d def generateHtml(self): for pair in self.iterDimensionPairs(): - remdims = [d for d in self.iterRemainingDimensions(pair)] - for vals in iterDimValues(remdims): - page = Page(pair, remdims, vals, self) + remDims = [d for d in self.iterRemainingDimensions(pair)] + print pair, remDims + for vals in iterDimValues(remDims): + page = Page(pair, remDims, vals, self) page.generate() try: os.remove("index.html") except OSError: pass os.symlink(page.getName(), "index.html") - os.system("source-highlight -d --output-dir=. ../*.sh") + #os.system("source-highlight -d --output-dir=. ../*.sh") class Page: def __init__(self, dimPair, dimOther, valsOther, tests): @@ -173,8 +179,9 @@ class Page: def generate(self): html = open(self.getName(), "w") title = "CAN gateway timing analysis" + ", ".join([v.dim.name+" "+v.value for v in self.valsOther]) - print >> html, """ - + print >> html, """ + + %s