Changeset 3122

Timestamp:

12/10/06 19:23:44 (17 years ago)

Author:

jerome

Message:

Added support for pkpgcounter v2.13's GC pseudo-colorspace.

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (4 diffs)
• NEWS (modified) (1 diff)
• pykota/accounters/ink.py (modified) (2 diffs)

pykota/trunk/conf/pykota.conf.sample

@@ -608 +608 @@
 #       cmy     ===> Cyan, Magenta, Yellow
 #       rgb     ===> Red, Green, Blue
+#       gc      ===> Grayscale, Colored : this is a pseudo colorspace useful
+#                    if all you need is differentiating grayscale from
+#                    colored pages.
 #
 # Supported resolutions for ink accounting are any number of dots
@@ -643 +646 @@
 # accounter : ink(bw)
 # accounter : ink(cmy, 72)
+# accounter : ink(gc, 72)
 #         
 # This directive can be set either globally or per printer or both.
@@ -689 +693 @@
 #       cmy     ===> Cyan, Magenta, Yellow
 #       rgb     ===> Red, Green, Blue
+#       gc      ===> Grayscale, Colored : this is a pseudo colorspace useful
+#                    if all you need is differentiating grayscale from
+#                    colored pages.
 #
 # Supported resolutions for ink accounting are any number of dots
@@ -1244 +1251 @@
 #               coefficient_black
 #
+#       gc :
+#               coefficient_grayscale
+#               coefficient_colored
+#
 # Any coefficient which is not set is considered to be equal to 1.0
 #

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.26alpha1 (2006-12-10) :
+    
+        - Added support for pkpgcounter v2.13's GC pseudo colorspace if you
+          only want to differentiate grayscale pages from colored pages.
+          
+        - Fixed a compatibility problem dumpykota's "--format cups" command line
+          option.
+          
     - 1.25 (2006-12-03) :
        

pykota/trunk/pykota/accounters/ink.py

@@ -33 +33 @@
                         "RGB" : { "R" : "red", "G" : "green", "B" : "blue" } ,
                         "BW" : { "B" : "black", "W" : "white" } ,
+                        "GC" : { "G" : "grayscale", "C" : "colored" } ,
                      }
     def computeJobSize(self) :    
@@ -50 +51 @@
         (colorspace, resolution) = parameters
         colorspace = colorspace.lower()
-        if colorspace not in ("cmyk", "bw", "cmy", "rgb") :
+        if colorspace not in ("cmyk", "bw", "cmy", "rgb", "gc") :
             raise PyKotaAccounterError, "Invalid parameters for ink accounter : [%s]" % self.arguments