r6778 - trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects

[btami]

Author: btami
Date: 2004-12-01 09:16:58 -0600 (Wed, 01 Dec 2004)
New Revision: 6778

Modified:
   trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHDetail.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHGroupFooter.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHGroupHeader.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHObject.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHPageFooter.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHPageHeader.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHSummaryPage.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHTitlePage.py
Log:
reordered labels in bands by position before processing them

Modified: 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHDetail.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHDetail.py     
2004-12-01 15:14:59 UTC (rev 6777)
+++ trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHDetail.py     
2004-12-01 15:16:58 UTC (rev 6778)
@@ -38,6 +38,8 @@
     CHBand.__init__(self)
 
   def process(self, writer):
+    self.reorderByPosition()
+
     for child in self._children:
       child.process(writer, self)
 

Modified: 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHGroupFooter.py
===================================================================
--- 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHGroupFooter.py    
    2004-12-01 15:14:59 UTC (rev 6777)
+++ 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHGroupFooter.py    
    2004-12-01 15:16:58 UTC (rev 6778)
@@ -38,6 +38,8 @@
     CHBand.__init__(self)
 
   def process(self, writer):
+    self.reorderByPosition()
+
     for child in self._children:
       child.process(writer, self)
 

Modified: 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHGroupHeader.py
===================================================================
--- 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHGroupHeader.py    
    2004-12-01 15:14:59 UTC (rev 6777)
+++ 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHGroupHeader.py    
    2004-12-01 15:16:58 UTC (rev 6778)
@@ -38,6 +38,8 @@
     CHBand.__init__(self)
 
   def process(self, writer):
+    self.reorderByPosition()
+
     for child in self._children:
       child.process(writer, self)
 

Modified: 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHObject.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHObject.py     
2004-12-01 15:14:59 UTC (rev 6777)
+++ trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHObject.py     
2004-12-01 15:16:58 UTC (rev 6778)
@@ -46,3 +46,17 @@
     self.x = 0
     self.y = -1
 
+  def reorderByPosition(self):
+    self._children.sort(self.__comparePositions)
+    
+  def __comparePositions(self, a, b):
+    if a.y < b.y:
+      return -1
+    elif a.y > b.y:
+      return 1
+    elif a.x < b.x:
+      return -1
+    elif a.x > b.x:
+      return 1
+    else:
+      return 0

Modified: 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHPageFooter.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHPageFooter.py 
2004-12-01 15:14:59 UTC (rev 6777)
+++ trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHPageFooter.py 
2004-12-01 15:16:58 UTC (rev 6778)
@@ -39,6 +39,8 @@
     CHBand.__init__(self)
 
   def process(self, writer):
+    self.reorderByPosition()
+
     writer.pageFooterDone = True
     if writer.currLine < writer.reportHeight - self.height:
       writer.newLine(writer.reportHeight - self.height - writer.currLine)

Modified: 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHPageHeader.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHPageHeader.py 
2004-12-01 15:14:59 UTC (rev 6777)
+++ trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHPageHeader.py 
2004-12-01 15:16:58 UTC (rev 6778)
@@ -39,6 +39,8 @@
     CHBand.__init__(self)
 
   def process(self, writer):
+    self.reorderByPosition()
+
     writer.pageHeaderDone = True
     for child in self._children:
       child.process(writer, self)

Modified: 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHSummaryPage.py
===================================================================
--- 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHSummaryPage.py    
    2004-12-01 15:14:59 UTC (rev 6777)
+++ 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHSummaryPage.py    
    2004-12-01 15:16:58 UTC (rev 6778)
@@ -39,6 +39,8 @@
 
 
   def process(self, writer):
+    self.reorderByPosition()
+
     if writer.PageFooter and (not writer.pageFooterDone):
       writer.PageFooter.process(writer)
     elif writer.currLine < writer.reportHeight:

Modified: 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHTitlePage.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHTitlePage.py  
2004-12-01 15:14:59 UTC (rev 6777)
+++ trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHTitlePage.py  
2004-12-01 15:16:58 UTC (rev 6778)
@@ -40,6 +40,8 @@
 
 
   def process(self, writer):
+    self.reorderByPosition()
+
     writer.pageHeaderDone = True
     writer.pageFooterDone = True