Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/docgen/LPRDoc.py: Fix colliding name.

Browse Source 
svn: r3044
This commit is contained in:
Alex Roitman 2004-03-22 16:29:38 +00:00
parent bf49b58457
commit ffce4f06d5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@ -1,3 +1,6 @@
2004-03-22 Alex Roitman <shura@alex.neuro.umn.edu>
* src/docgen/LPRDoc.py: Fix colliding name.
2004-03-21 Don Allingham <dallingham@users.sourceforge.net> 2004-03-21 Don Allingham <dallingham@users.sourceforge.net>
* src/AddMedia.py: GenericTreeModel changes * src/AddMedia.py: GenericTreeModel changes
* src/AddSpouse.py: GenericTreeModel changes * src/AddSpouse.py: GenericTreeModel changes

10
gramps2/src/docgen/LPRDoc.py
View File

@ -627,7 +627,7 @@ class LPRDoc(BaseDoc.BaseDoc):
self.table_width = (self.right_margin - self.left_margin) * \ self.table_width = (self.right_margin - self.left_margin) * \
self.tbl_style.get_width() / 100.0 self.tbl_style.get_width() / 100.0
self.cell_widths = [] self.cell_widths = []
self.cell_styles = [] self.gp_cell_styles = []
self.brand_new_page = 0 self.brand_new_page = 0
def end_table(self): def end_table(self):
@ -646,7 +646,7 @@ class LPRDoc(BaseDoc.BaseDoc):
self.cellnum = -1 self.cellnum = -1
self.span = 1 self.span = 1
self.cell_widths.append([0] * self.ncols) self.cell_widths.append([0] * self.ncols)
self.cell_styles.append([None] * self.ncols) self.gp_cell_styles.append([None] * self.ncols)
for cell in range(self.ncols): for cell in range(self.ncols):
self.cell_widths[self.rownum][cell] = self.table_width * \ self.cell_widths[self.rownum][cell] = self.table_width * \
self.tbl_style.get_column_width(cell) / 100.0 self.tbl_style.get_column_width(cell) / 100.0
@ -666,7 +666,7 @@ class LPRDoc(BaseDoc.BaseDoc):
self.cell_data = [] self.cell_data = []
self.cellnum = self.cellnum + self.span self.cellnum = self.cellnum + self.span
self.span = span self.span = span
self.cell_styles[self.rownum][self.cellnum] = \ self.gp_cell_styles[self.rownum][self.cellnum] = \
self.cell_styles[style_name] self.cell_styles[style_name]
for extra_cell in range(1,span): for extra_cell in range(1,span):
self.cell_widths[self.rownum][self.cellnum] += \ self.cell_widths[self.rownum][self.cellnum] += \
@ -907,7 +907,7 @@ class LPRDoc(BaseDoc.BaseDoc):
if not self.cell_widths[row_num][col]: if not self.cell_widths[row_num][col]:
continue continue
padding = cm2u(self.cell_styles[row_num][col].get_padding()) padding = cm2u(self.gp_cell_styles[row_num][col].get_padding())
the_max = 0 the_max = 0
for paragraph in row[col]: for paragraph in row[col]:
the_min = paragraph.get_min_width() the_min = paragraph.get_min_width()
@ -943,7 +943,7 @@ class LPRDoc(BaseDoc.BaseDoc):
if not self.cell_widths[row_num][col]: if not self.cell_widths[row_num][col]:
continue continue
self.y = col_y self.y = col_y
padding = cm2u(self.cell_styles [row_num][col].get_padding()) padding = cm2u(self.gp_cell_styles [row_num][col].get_padding())
for paragraph in row[col]: for paragraph in row[col]:
if paragraph.__class__.__name__ == 'GnomePrintPhoto': if paragraph.__class__.__name__ == 'GnomePrintPhoto':
write_item = self.write_photo write_item = self.write_photo