[gnue] r7377 - in trunk/gnue-reports/src/adapters: destinations/printer filters/Char/etc/printdef filters/Char/universal

[btami]

Author: btami
Date: 2005-04-15 09:28:48 -0500 (Fri, 15 Apr 2005)
New Revision: 7377

Modified:
   trunk/gnue-reports/src/adapters/destinations/printer/gdi.py
   trunk/gnue-reports/src/adapters/filters/Char/etc/printdef/xml.grp
   trunk/gnue-reports/src/adapters/filters/Char/universal/Writer.py
Log:
fixed first detail line printed on top of page with xml filter bug

Modified: trunk/gnue-reports/src/adapters/destinations/printer/gdi.py
===================================================================
--- trunk/gnue-reports/src/adapters/destinations/printer/gdi.py 2005-04-15 
13:57:20 UTC (rev 7376)
+++ trunk/gnue-reports/src/adapters/destinations/printer/gdi.py 2005-04-15 
14:28:48 UTC (rev 7377)
@@ -127,6 +127,9 @@
     elif name == "page":
       self.dc.StartPage()
 
+    elif name == "line":
+      self._y = int(attrs['y'])
+
     elif name == "label":
       self._attrs = attrs
       self.dc.SelectObject(FONTS['normal'])
@@ -155,7 +158,7 @@
       h = self.metrics['height']
       w = self.metrics['width']
       self.dc.TextOut(int(w * int(self._attrs['x'])),
-                      int( - h * 1.3 * int(self._attrs['y'])),
+                      int( - h * 1.3 * self._y),
                       self._text.encode(_encoding, 'replace'))
 
   def setup(self, printer):
@@ -167,7 +170,7 @@
     m = self.dc.GetTextMetrics()
     
     self.metrics = {}  
-    self.metrics['width']  = m['tmMaxCharWidth']
+    self.metrics['width']  = m['tmAveCharWidth']
     self.metrics['height'] = m['tmHeight']
 
 

Modified: trunk/gnue-reports/src/adapters/filters/Char/etc/printdef/xml.grp
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/etc/printdef/xml.grp   
2005-04-15 13:57:20 UTC (rev 7376)
+++ trunk/gnue-reports/src/adapters/filters/Char/etc/printdef/xml.grp   
2005-04-15 14:28:48 UTC (rev 7377)
@@ -19,9 +19,9 @@
 page_end=</page>
 graphics_begin=
 graphics_end=
-line_begin=
-line_end=
-label_begin=<label x="%s" y="%s">
+line_begin=<line y="%s">
+line_end=</line>
+label_begin=<label x="%s">
 label_end=</label>
 underline_begin=<u>
 underline_end=</u>

Modified: trunk/gnue-reports/src/adapters/filters/Char/universal/Writer.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/universal/Writer.py    
2005-04-15 13:57:20 UTC (rev 7376)
+++ trunk/gnue-reports/src/adapters/filters/Char/universal/Writer.py    
2005-04-15 14:28:48 UTC (rev 7377)
@@ -74,7 +74,7 @@
           cx = x
 
         if self.formatter == "xml" and prefix[:6] == '<label':
-          prefix = prefix % (cx, self.currLine)
+          prefix = prefix % cx
 
         outputLine += prefix + \
                       self.printdef.escape(text).encode(_encoding,'replace') + 
\
@@ -126,7 +126,7 @@
   def newPage(self):
     if self.pageNumber > 1: 
       self.output.write(self.printdef['page_end'])
-    self.pageNumber += 1
+    self.pageNumber += 1
     self.currLine = 0
     self.pageHeaderDone = False
     self.pageFooterDone = False
@@ -143,10 +143,13 @@
     if self.PageHeader and (not self.pageHeaderDone) and bandtype != 
'CHSummaryPage':
       self.PageHeader.process(self)
 
-#    print self.reportHeight, self.PageFooter.height, self.currLine
-    self.output.write( self.printdef['line_begin'] +  \
-                       line +  \
-                       self.printdef['line_end'] )
+    fullline = self.printdef['line_begin'] +  \
+                     line +  \
+                     self.printdef['line_end']
+    if self.formatter == "xml":
+      fullline = fullline % self.currLine
+
+    self.output.write(fullline)
     self.currLine += 1