Changeset 377 for pkpgcounter/trunk

Timestamp:

08/27/06 22:57:22 (18 years ago)

Author:

jerome

Message:

Don't output the number of pages anymore in ink coverage mode, the
number of pages is equal to the number of lines in the result anyway.

Files:

• pkpgcounter/trunk/pkpgpdls/analyzer.py (modified) (3 diffs)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -235 +235 @@
             arguments.append("-")
         totalsize = 0    
+        lines = []
         try :
             for arg in arguments :
@@ -243 +244 @@
                     else :
                         (cspace, pages) = parser.getInkCoverage()
-                        totalsize += len(pages)
                         for page in pages :
-                            for k in cspace :
+                            lineparts = []
+                            for k in cspace : # NB : this way we preserve the order of the planes
                                 try :
-                                    print "%s : %f      " % (k, page[k]),
+                                    lineparts.append("%s : %f%%" % (k, page[k]))
                                 except KeyError :
                                     pass
-                            print        
+                            lines.append("      ".join(lineparts))     
                 except (IOError, pdlparser.PDLParserError), msg :    
                     sys.stderr.write("ERROR: %s\n" % msg)
@@ -257 +258 @@
             sys.stderr.write("WARN: Aborted at user's request.\n")
             sys.stderr.flush()
-        print "%s" % totalsize
+        if not options.colorspace :    
+            print "%s" % totalsize
+        else :    
+            print "\n".join(lines)
     
 if __name__ == "__main__" :