From 99119d189a16339755feff6942116c51fadf513c Mon Sep 17 00:00:00 2001 From: Zsolt Foldvari Date: Mon, 1 Oct 2007 09:05:40 +0000 Subject: [PATCH] Adjust available paper height in DescendChart.py and AncestorChart.py when report is forced onto one page, so that it won't draw on the bottom margin. svn: r9052 --- ChangeLog | 6 ++++++ src/plugins/AncestorChart.py | 10 +++++++--- src/plugins/DescendChart.py | 10 +++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0888efade..5c6d7b58b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-01 Zsolt Foldvari + * src/plugins/DescendChart.py: + * src/plugins/AncestorChart.py: + Adjust available paper height when report is forced onto one page, + so that it won't draw on the bottom margin. + 2007-10-01 Benny Malengier * src/GrampsDb/_DbUtils.py: do deep copy of bookmarks from old to new db * src/GrampsDb/_GrampsXMLDB.py: in load_from: load correct bookmarks diff --git a/src/plugins/AncestorChart.py b/src/plugins/AncestorChart.py index 73be3e347..1a69bfc6e 100644 --- a/src/plugins/AncestorChart.py +++ b/src/plugins/AncestorChart.py @@ -285,11 +285,15 @@ class AncestorChart(Report): if self.title and self.force_fit: pstyle = style_sheet.get_paragraph_style("AC2-Title") tfont = pstyle.get_font() - self.offset = pt2cm(1.25* tfont.get_size()) + self.offset = pt2cm(1.25 * tfont.get_size()) + + gstyle = style_sheet.get_draw_style("AC2-box") + shadow_height = gstyle.get_shadow_space() else: self.offset = 0 - self.uh = self.doc.get_usable_height() - self.offset - uw = self.doc.get_usable_width()-pt2cm(self.box_pad_pts) + shadow_height = 0 + self.uh = self.doc.get_usable_height() - self.offset - shadow_height + uw = self.doc.get_usable_width() - pt2cm(self.box_pad_pts) calc_width = pt2cm(self.box_width + self.box_pad_pts) + 0.2 self.box_width = pt2cm(self.box_width) diff --git a/src/plugins/DescendChart.py b/src/plugins/DescendChart.py index b41904223..896194dcb 100644 --- a/src/plugins/DescendChart.py +++ b/src/plugins/DescendChart.py @@ -262,11 +262,15 @@ class DescendChart(Report): if self.title and self.force_fit: pstyle = style_sheet.get_paragraph_style("DC2-Title") tfont = pstyle.get_font() - self.offset = pt2cm(1.25* tfont.get_size()) + self.offset = pt2cm(1.25 * tfont.get_size()) + + gstyle = style_sheet.get_draw_style("DC2-box") + shadow_height = gstyle.get_shadow_space() else: self.offset = 0 - self.uh = self.doc.get_usable_height() - self.offset - uw = self.doc.get_usable_width()-pt2cm(self.box_pad_pts) + shadow_height = 0 + self.uh = self.doc.get_usable_height() - self.offset - shadow_height + uw = self.doc.get_usable_width() - pt2cm(self.box_pad_pts) calc_width = pt2cm(self.box_width + self.box_pad_pts) + self.box_gap self.box_width = pt2cm(self.box_width)