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

0001228: Descendent Chart doesn't respect the margin

Browse Source 
svn: r9757
This commit is contained in:
Brian Matherly
2008-01-09 05:13:27 +00:00
parent 3784011060
commit 21f8c08ace
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,4 +1,9 @@
2008-01-00 Brian Matherly <brian@gramps-project.org> 2008-01-08 Brian Matherly <brian@gramps-project.org>
* src/plugins/AncestorChart.py:
* src/plugins/DescendChart.py:
Fix 0001228: Descendent Chart doesn't respect the margin
2008-01-08 Brian Matherly <brian@gramps-project.org>
* src/DisplayModels/_BaseModel.py: Fix 0001554: Select Place search * src/DisplayModels/_BaseModel.py: Fix 0001554: Select Place search
2008-01-08 Jim Sack <jgsack@san.rr.com> 2008-01-08 Jim Sack <jgsack@san.rr.com>

14
src/plugins/AncestorChart.py
View File

@@ -293,7 +293,15 @@ class AncestorChart(Report):
gstyle = style_sheet.get_draw_style("AC2-box") gstyle = style_sheet.get_draw_style("AC2-box")
shadow_height = gstyle.get_shadow_space() shadow_height = gstyle.get_shadow_space()
else: else:
self.offset = 0 # Make space for the page number labels at the bottom.
p = style_sheet.get_paragraph_style("AC2-Normal")
font = p.get_font()
lheight = pt2cm(1.2*font.get_size())
lwidth = pt2cm(1.1*self.doc.string_width(font,"(00,00)"))
self.page_label_x_offset = self.doc.get_usable_width() - lwidth
self.page_label_y_offset = self.doc.get_usable_height() - lheight
self.offset = pt2cm(1.25 * font.get_size())
shadow_height = 0 shadow_height = 0
self.uh = self.doc.get_usable_height() - self.offset - shadow_height self.uh = self.doc.get_usable_height() - self.offset - shadow_height
uw = self.doc.get_usable_width() - pt2cm(self.box_pad_pts) uw = self.doc.get_usable_width() - pt2cm(self.box_pad_pts)
@@ -410,8 +418,8 @@ class AncestorChart(Report):
if not self.force_fit: if not self.force_fit:
self.doc.draw_text('AC2-box', self.doc.draw_text('AC2-box',
'(%d,%d)' % (colx+1,coly+1), '(%d,%d)' % (colx+1,coly+1),
self.doc.get_usable_width()+0.5, self.page_label_x_offset,
self.doc.get_usable_height()+0.75) self.page_label_y_offset)
self.doc.end_page() self.doc.end_page()
def add_lines(self): def add_lines(self):

14
src/plugins/DescendChart.py
View File

@@ -269,7 +269,15 @@ class DescendChart(Report):
gstyle = style_sheet.get_draw_style("DC2-box") gstyle = style_sheet.get_draw_style("DC2-box")
shadow_height = gstyle.get_shadow_space() shadow_height = gstyle.get_shadow_space()
else: else:
self.offset = 0 # Make space for the page number labels at the bottom.
p = style_sheet.get_paragraph_style("DC2-Normal")
font = p.get_font()
lheight = pt2cm(1.2*font.get_size())
lwidth = pt2cm(1.1*self.doc.string_width(font,"(00,00)"))
self.page_label_x_offset = self.doc.get_usable_width() - lwidth
self.page_label_y_offset = self.doc.get_usable_height() - lheight
self.offset = pt2cm(1.25 * font.get_size())
shadow_height = 0 shadow_height = 0
self.uh = self.doc.get_usable_height() - self.offset - shadow_height self.uh = self.doc.get_usable_height() - self.offset - shadow_height
uw = self.doc.get_usable_width() - pt2cm(self.box_pad_pts) uw = self.doc.get_usable_width() - pt2cm(self.box_pad_pts)
@@ -385,8 +393,8 @@ class DescendChart(Report):
if not self.force_fit: if not self.force_fit:
self.doc.draw_text('DC2-box', self.doc.draw_text('DC2-box',
'(%d,%d)' % (colx+1,coly+1), '(%d,%d)' % (colx+1,coly+1),
self.doc.get_usable_width()+0.5, self.page_label_x_offset,
self.doc.get_usable_height()+0.75) self.page_label_y_offset)
self.doc.end_page() self.doc.end_page()
#------------------------------------------------------------------------ #------------------------------------------------------------------------