From 6d39969056935d9602f961d0a213746dc3c4f585 Mon Sep 17 00:00:00 2001 From: "Craig J. Anderson" Date: Tue, 17 Jul 2012 01:34:54 +0000 Subject: [PATCH] backed out a parameter passing change I made in commit 19862 svn: r20018 --- src/plugins/drawreport/fanchart.py | 8 +++----- src/plugins/lib/libcairodoc.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/drawreport/fanchart.py b/src/plugins/drawreport/fanchart.py index a8847f30f..050b31e3e 100644 --- a/src/plugins/drawreport/fanchart.py +++ b/src/plugins/drawreport/fanchart.py @@ -345,8 +345,7 @@ class FanChart(Report): yc = y person = self.database.get_person_from_handle(self.map[index]) mark = ReportUtils.get_person_mark(self.database, person) - txt = '\n'.join(self.text[index]) - self.doc.rotate_text(text_style, txt, + self.doc.rotate_text(text_style, self.text[index], xc, yc, text_angle, mark) text_angle += delta @@ -377,12 +376,11 @@ class FanChart(Report): if self.map[index]: person = self.database.get_person_from_handle(self.map[index]) mark = ReportUtils.get_person_mark(self.database, person) - txt = '\n'.join(self.text[index]) if self.radial == RADIAL_UPRIGHT and (start_angle >= 90) and (start_angle < 270): - self.doc.rotate_text(text_style, txt, + self.doc.rotate_text(text_style, self.text[index], xc, yc, text_angle + 180, mark) else: - self.doc.rotate_text(text_style, txt, + self.doc.rotate_text(text_style, self.text[index], xc, yc, text_angle, mark) #------------------------------------------------------------------------ diff --git a/src/plugins/lib/libcairodoc.py b/src/plugins/lib/libcairodoc.py index 423909d8c..101fdc068 100644 --- a/src/plugins/lib/libcairodoc.py +++ b/src/plugins/lib/libcairodoc.py @@ -1628,7 +1628,7 @@ links (like ODF) and write PDF from that format. paragraph_style.set_alignment(PARA_ALIGN_CENTER) new_text = GtkDocText(paragraph_style, 'center', - self.__markup(text), x, y, angle, mark) + self.__markup('\n'.join(text)), x, y, angle, mark) self._active_element.add_child(new_text) # paginating and drawing interface