Changeset 294

Timestamp:

12/07/05 08:47:36 (19 years ago)

Author:

jerome

Message:

Fixed detection of duplex mode

Files:

• pkpgcounter/trunk/pkpgpdls/pcl345.py (modified) (5 diffs)

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -92 +92 @@
     def setPageDict(self, pages, number, attribute, value) :
         """Initializes a page dictionnary."""
-        dic = pages.setdefault(number, { "copies" : 1, "mediasource" : "Main", "mediasize" : "Default", "mediatype" : "Plain", "orientation" : "Portrait", "escaped" : ""})
+        dic = pages.setdefault(number, { "copies" : 1, "mediasource" : "Main", "mediasize" : "Default", "mediatype" : "Plain", "orientation" : "Portrait", "escaped" : "", "duplex": 0})
         dic[attribute] = value
         
@@ -239 +239 @@
                                 escstart += 1
                             elif (tag == "&a") and (size == 2) :
+                                # We are on the backside, so mark current page as duplex
+                                self.setPageDict(pages, pagecount, "duplex", 1)
                                 backsides += 1      # Back side in duplex mode
                             else :    
@@ -378 +380 @@
         for pnum in range(pagecount) :
             # if no number of copies defined, take the preceding one else the one set before any page else 1.
-            page = pages.get(pnum, pages.get(pnum - 1, pages.get(0, { "copies" : 1, "mediasource" : "Main", "mediasize" : "Default", "mediatype" : "Plain", "orientation" : "Portrait", "escaped" : ""})))
+            page = pages.get(pnum, pages.get(pnum - 1, pages.get(0, { "copies" : 1, "mediasource" : "Main", "mediasize" : "Default", "mediatype" : "Plain", "orientation" : "Portrait", "escaped" : "", "duplex": 0})))
             pjlstuff = page["escaped"]
             if pjlstuff :
@@ -399 +401 @@
                     else :    
                         pjlcopies = oldpjlcopies    
-                defaultdm = pjlparser.default_variables.get("DUPLEX", "")
-                if defaultdm :
-                    if defaultdm.upper() == "ON" :
-                        defaultduplexmode = "Duplex"
-                    else :    
-                        defaultduplexmode = "Simplex"
-                envdm = pjlparser.environment_variables.get("DUPLEX", "")
-                if envdm :
-                    if envdm.upper() == "ON" :
-                        duplexmode = "Duplex"
-                    else :    
-                        duplexmode = "Simplex"
-                else :        
-                    if not oldduplexmode :
-                        duplexmode = defaultduplexmode
-                    else :    
-                        duplexmode = oldduplexmode
+                if page["duplex"] :        
+                    duplexmode = "Duplex"
+                else :    
+                    defaultdm = pjlparser.default_variables.get("DUPLEX", "")
+                    if defaultdm :
+                        if defaultdm.upper() == "ON" :
+                            defaultduplexmode = "Duplex"
+                        else :    
+                            defaultduplexmode = "Simplex"
+                    envdm = pjlparser.environment_variables.get("DUPLEX", "")
+                    if envdm :
+                        if envdm.upper() == "ON" :
+                            duplexmode = "Duplex"
+                        else :    
+                            duplexmode = "Simplex"
+                    else :        
+                        duplexmode = oldduplexmode or defaultduplexmode
                 defaultps = pjlparser.default_variables.get("PAPER", "")
                 if defaultps :
@@ -432 +434 @@
                 else :    
                     pjlcopies = oldpjlcopies
-                if not oldduplexmode :
-                    duplexmode = defaultduplexmode
-                else :    
-                    duplexmode = oldduplexmode
+                
+                duplexmode = (page["duplex"] and "Duplex") or oldduplexmode or defaultduplexmode
                 if not oldpapersize :    
                     papersize = defaultpapersize
                 else :    
                     papersize = oldpapersize
-                duplexmode = oldduplexmode
                 papersize = oldpapersize or page["mediasize"]
             if page["mediasize"] != "Default" :