[PythonReports-checkins] PythonReports/PythonReports builder.py, 1.5, 1.6

[alexander s. <a1...@us...>]

Update of /cvsroot/pythonreports/PythonReports/PythonReports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27841

Modified Files:
	builder.py 
Log Message:
group header an footer renamed to title and summary

Index: builder.py
===================================================================
RCS file: /cvsroot/pythonreports/PythonReports/PythonReports/builder.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** builder.py	7 Dec 2006 13:11:06 -0000	1.5
--- builder.py	15 Dec 2006 08:32:44 -0000	1.6
***************
*** 2,5 ****
--- 2,6 ----
  # FIXME: column-based variables are not intelligible
  """History (most recent first):
+ 15-dec-2006 [als]   group header an footer renamed to title and summary
  07-dec-2006 [als]   support rectangle opacity
  05-dec-2006 [als]   fix errors and some warnings reported by pylint
***************
*** 1191,1203 ****
          # process all groups
          for _group in self.groups:
!             # group header and footer use containing frame, columns are inside
!             # group header and footer are *not* frame header and footer
!             # (not printed on each page; don't reserve space)
!             _header = _group.find("header")
!             if _header is not None:
!                 self.section_frames[_header] = _frame
!             _footer = _group.find("footer")
!             if _footer is not None:
!                 self.section_frames[_footer] = _frame
              _frame = self.make_column_frames(_group, _frame)
          # detail section uses innermost frame
--- 1192,1202 ----
          # process all groups
          for _group in self.groups:
!             # group title and summary use containing frame, columns are inside
!             _title = _group.find("title")
!             if _title is not None:
!                 self.section_frames[_title] = _frame
!             _summary = _group.find("summary")
!             if _summary is not None:
!                 self.section_frames[_summary] = _frame
              _frame = self.make_column_frames(_group, _frame)
          # detail section uses innermost frame
***************
*** 1278,1282 ****
              self.fill_detail()
          # fill_summary will close all report groups.
!         # since group footers are always evaluated in old_context
          # (assuming that current context started a new group)
          # we now need old_context to be current context.
--- 1277,1281 ----
              self.fill_detail()
          # fill_summary will close all report groups.
!         # since group summaries are always evaluated in old_context
          # (assuming that current context started a new group)
          # we now need old_context to be current context.
***************
*** 1533,1540 ****
              if (_var.iter == "group") and (_var.itergrp == _group_name):
                  _var.iterate(self.context)
!         _header = group.find("header")
!         if _header:
!             self.check_eject(_header)
!             self.add_section(self.build_section(_header))
          _columns = group.find("columns")
          if _columns:
--- 1532,1539 ----
              if (_var.iter == "group") and (_var.itergrp == _group_name):
                  _var.iterate(self.context)
!         _title = group.find("title")
!         if _title:
!             self.check_eject(_title)
!             self.add_section(self.build_section(_title))
          _columns = group.find("columns")
          if _columns:
***************
*** 1554,1561 ****
              if _max_y > self.cur_y:
                  self.cur_y = _max_y
!         _footer = group.find("footer")
!         if _footer:
!             self.check_eject(_footer)
!             self.add_section(self.build_section(_footer,
                  context=self.old_context))
          self.resolve_eval(("group", group.get("name")))
--- 1553,1560 ----
              if _max_y > self.cur_y:
                  self.cur_y = _max_y
!         _summary = group.find("summary")
!         if _summary:
!             self.check_eject(_summary)
!             self.add_section(self.build_section(_summary,
                  context=self.old_context))
          self.resolve_eval(("group", group.get("name")))
***************
*** 1616,1620 ****
          self.page.append(section)
          self.cur_y = section.box.y + section.box.height + 1
!         if section.template.tag == "header":
              # adjust top margin of all contained frames
              # (new columns will start at this position)
--- 1615,1619 ----
          self.page.append(section)
          self.cur_y = section.box.y + section.box.height + 1
!         if section.template.tag in ("header", "title"):
              # adjust top margin of all contained frames
              # (new columns will start at this position)