[gnue] r7038 - trunk/gnue-reports/src/adapters/filters/Char/universal

[btami]

Author: btami
Date: 2005-02-18 03:04:23 -0600 (Fri, 18 Feb 2005)
New Revision: 7038

Modified:
   trunk/gnue-reports/src/adapters/filters/Char/universal/Writer.py
Log:
fixed horizontal positioning

Modified: trunk/gnue-reports/src/adapters/filters/Char/universal/Writer.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/universal/Writer.py    
2005-02-18 08:34:45 UTC (rev 7037)
+++ trunk/gnue-reports/src/adapters/filters/Char/universal/Writer.py    
2005-02-18 09:04:23 UTC (rev 7038)
@@ -55,7 +55,7 @@
     self.output.write(self.printdef['job_end'])
 
   def renderBand(self, band): 
-    self.output.write("[[ Begin Band %s ]]" % band._type)
+#    self.output.write("[[ Begin Band %s ]]" % band._type)
     for line in band.buffer: 
       line.sort()
       self.output.write(self.printdef['line_begin'])
@@ -69,20 +69,22 @@
         # Move us to correct X position
         if cx < x: 
           self.output.write(self.printdef.escape(' '*(x-cx)))
-          cx = x + len(line)
+          cx = x
+
         self.output.write(prefix + \
-                          self.printdef.escape(text) + \
+                          
self.printdef.escape(text).encode(_encoding,'replace') + \
                           postfix)
+        cx = cx + len(text)
 
       self.output.write(self.printdef['line_end'])
     
-    self.output.write("[[ End Band %s ]]" % band._type)
+ #   self.output.write("[[ End Band %s ]]" % band._type)
 
     
   def render(self, object, x, y, width, band,
                   align='none', condensed=False, bold=False,
                   italic=False, underline=False):
-
+
     # Make sure buffer is big enough
     for i in xrange(y-len(band.buffer)+1): 
       band.buffer.append([])
@@ -117,7 +119,7 @@
       postfix += self.printdef['condensed_end']
 
     
-    curline.append((x, _alignFunc[align](object, width), prefix, postfix))
+    curline.append((x, _alignFunc[align](object[:width], width), prefix, 
postfix))
     # go to correct position in current band if needed...
 #     if width > len(object):
 #       self.output.write(self.printdef.escape((width-len(object))*' '))
@@ -152,24 +154,11 @@
                          self.printdef['line_end'] )
       self.currLine += 1
 
-  def newLine(self, n=1):
-    if self.PageFooter and (not self.pageFooterDone):
-      if self.currLine + 1 > self.reportHeight - self.PageFooter.height:
-        self.PageFooter.process(self)
-
-    if self.currLine + 1 > self.reportHeight:
-      self.newPage()
-
-    if self.PageHeader and (not self.pageHeaderDone):
-      self.PageHeader.process(self)
-
-    for i in range(n):
-      self.output.write(self.printdef['line_begin'] + 
self.printdef['line_end'])
-      self.currLine += 1
-
   
 _alignFunc = {'left'   : lambda obj, width: string.ljust(obj, width),
               'right'  : lambda obj, width: string.rjust(obj, width),
               'center' : lambda obj, width: string.center(obj, width),
               'none'   : lambda obj, width: string.ljust(obj, width),
              }
+
+_encoding = gConfig('textEncoding')
\ No newline at end of file