dabo Commit
Revision 5298
Date: 2009-07-16 17:13:22 -0700 (Thu, 16 Jul 2009)
Author: Paul
Trac: http://trac.dabodev.com/changeset/5298
Changed:
U trunk/dabo/lib/reportWriter.py
Log:
Fixed SpanningLine to work correctly in pageHeader/pageFooter as well
as in group header/footer like it had been. Was not drawing yFooter
relative to the pageFooter origin before this commit.
Diff:
Modified: trunk/dabo/lib/reportWriter.py
===================================================================
--- trunk/dabo/lib/reportWriter.py 2009-07-15 21:36:08 UTC (rev 5297)
+++ trunk/dabo/lib/reportWriter.py 2009-07-17 00:13:22 UTC (rev 5298)
@@ -884,15 +884,24 @@
x,y = origin
if group is None:
spanList = []
+ spanList_page = []
for g in self._spanningObjects:
for l in self._spanningObjects[g]:
- spanList.append(l)
+ if g is None:
+ spanList_page.append(l)
+ else:
+ spanList.append(l)
else:
spanList =
self._spanningObjects.setdefault(group["expr"], [])
+ spanList_page = []
for obj in spanList:
y1 = self.getPt(obj.getProp("yFooter")) + y
x1 = self.getPt(obj.getProp("xFooter")) + x
self.draw(obj, (x1, y1))
+ for obj in spanList_page:
+ y1 = self.getPt(obj.getProp("yFooter")) +
self.getPt(self.ReportForm["page"].getProp("marginBottom"))
+ x1 = self.getPt(obj.getProp("xFooter")) + x
+ self.draw(obj, (x1, y1))
def clearSpanningObjects(self, group=None):
if group is not None:
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
