Changeset 376

Timestamp:

08/27/06 00:41:23 (18 years ago)

Author:

jerome

Message:

Output is now easier to read.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• analyzer.py (modified) (1 diff)
• inkcoverage.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -242 +242 @@
                         totalsize += parser.getJobSize()
                     else :
-                        result = parser.getInkCoverage()
-                        totalsize += len(result)
-                        print result
+                        (cspace, pages) = parser.getInkCoverage()
+                        totalsize += len(pages)
+                        for page in pages :
+                            for k in cspace :
+                                try :
+                                    print "%s : %f      " % (k, page[k]),
+                                except KeyError :
+                                    pass
+                            print        
                 except (IOError, pdlparser.PDLParserError), msg :    
                     sys.stderr.write("ERROR: %s\n" % msg)

pkpgcounter/trunk/pkpgpdls/inkcoverage.py

@@ -103 +103 @@
         while 1 :
             nbpixels = image.size[0] * image.size[1]
-            result.append({ colorspace : computation(image, nbpixels) })
+            result.append(computation(image, nbpixels))
             index += 1              
             image.seek(index)
     except EOFError :        
         pass
-    return result
+    return (colorspace, result)
 
 if __name__ == "__main__" :