X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/423e36d347a8b2d68d8ae4f26499719d11d1476f..4d7bc1b66f5503555723900af14730aa1a9102c5:/gw-tests/genhtml/genhtml.py

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 6218004..1990302 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -23,6 +23,8 @@ class DimValue(object):
 	return "DimValue(%s, %s)" % (repr(self.dim), repr(self.value))
     def htmlTableHeading(self):
 	return self.dim.htmlTableHeading(self.value)
+    def index(self):
+        return self.dim.sortedKeys.index(self.value)
 
 class DimValues(list):
     def replace(self, val):
@@ -152,8 +154,11 @@ class Test(object):
             print >>file, "<a href='%s/results.html'><img src='%s/%s'></a>" % \
                   (urllib.quote(self.path), urllib.quote(self.path), img)
     def fullImgLink(self, pngName):
-        return "<div><a href='%s'><img src='%s' /></a></div>" % \
-               (pngName[:-4]+".pdf", pngName)
+        if os.environ['NO_PDF']:
+            return "<div><img src='%s' /></div>" % pngName
+        else:
+            return "<div><a href='%s'><img src='%s' /></a></div>" % \
+                   (pngName[:-4]+".pdf", pngName)
         
     def htmlPrintStats(self, html):
         cwd = os.getcwd()
@@ -164,12 +169,14 @@ class Test(object):
         stats.sort()
         for i in stats:
             lines = open(i).readlines()
-            def stripComment(l):
+            def fixupLine(l):
                 comment = l.find("#")
                 if comment >= 0:
                     l = l[:comment-1]
+                if l.find("cmdline=") == 0:
+                    l = "<abbr title=%s>cmdline=...</abbr>" % str(l[8:])
                 return l
-            lines = [stripComment(l) for l in lines if l.find("cmdline=") != 0]
+            lines = [fixupLine(l) for l in lines]
             print >>html, "<td><h4>%s</h4>%s</td>" % (i, "<br />".join(lines))
         print >>html, "</tr></table>"
         os.chdir(cwd)
@@ -213,6 +220,7 @@ class Test(object):
         additionalImgs = glob.glob("graph?*.png")
         if additionalImgs: print >>html, "<h3>Additional graphs</h3>"
         for i in additionalImgs:
+            print >>html, "<h4>%s</h4>" % i[5:-4]
             print >>html, self.fullImgLink(i)
         os.chdir(cwd)
         
@@ -332,7 +340,7 @@ class Page(object):
 	self.tests = tests
     def getName(self):
 	return "%s-vs-%s-for-%s.html"%(self.dimy.type, self.dimx.type,
-                                       "-".join([v.value for v in self.valsOther]))
+                                       "-".join(["%02d"%v.index() for v in self.valsOther]))
     def generate(self):
 	html = open(self.getName(), "w")
 	title = "CAN gateway timing analysis"