dabo Commit
Revision 5248
Date: 2009-06-16 17:09:09 -0700 (Tue, 16 Jun 2009)
Author: Paul
Trac: http://trac.dabodev.com/changeset/5248
Changed:
U trunk/dabo/lib/reportWriter.py
Log:
Fixes SpanningLine to work in the pageHeader, as well as group headers, as
advertised.
Diff:
Modified: trunk/dabo/lib/reportWriter.py
===================================================================
--- trunk/dabo/lib/reportWriter.py 2009-06-16 23:57:01 UTC (rev 5247)
+++ trunk/dabo/lib/reportWriter.py 2009-06-17 00:09:09 UTC (rev 5248)
@@ -859,6 +859,8 @@
"""
obj["xFrom"] = origin[0]
obj["yFrom"] = origin[1]
+ if group is not None:
+ group = group["expr"]
spanList = self._spanningObjects.setdefault(group, [])
if obj not in spanList:
spanList.append(obj)
@@ -872,13 +874,15 @@
for l in self._spanningObjects[g]:
spanList.append(l)
else:
- spanList = self._spanningObjects.setdefault(group, [])
+ spanList =
self._spanningObjects.setdefault(group["expr"], [])
for obj in spanList:
y1 = self.getPt(obj.getProp("yFooter")) + y
x1 = self.getPt(obj.getProp("xFooter")) + x
self.draw(obj, (x1, y1))
def clearSpanningObjects(self, group=None):
+ if group is not None:
+ group = group["expr"]
try:
del self._spanningObjects[group]
except KeyError:
@@ -1688,8 +1692,7 @@
y1 = y + y1
if obj.__class__.__name__ == "SpanningLine":
- print y, y1, obj_deferred
- self.storeSpanningObject(obj, (x1, y1),
group["expr"])
+ self.storeSpanningObject(obj, (x1, y1),
group)
continue
availableHeight = y - (pageFooterOrigin[1] +
pfHeight)
@@ -1725,8 +1728,8 @@
del_deferred_idxs.append(idx)
if band == "groupFooter":
- self.drawSpanningObjects((x,y), group["expr"])
- self.clearSpanningObjects(group["expr"])
+ self.drawSpanningObjects((x,y), group)
+ self.clearSpanningObjects(group)
del_deferred_idxs.sort(reverse=True)
for idx in del_deferred_idxs:
_______________________________________________
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]
