From 76e1edbd82e231ccf591ebb167032ed3943c18b3 Mon Sep 17 00:00:00 2001 From: "Craig J. Anderson" Date: Tue, 17 Jul 2012 01:30:10 +0000 Subject: [PATCH] Backed out a change I made in parameters in commit 19862 svn: r20017 --- 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 2a5e0a19e..c1aa2f98d 100644 --- a/src/plugins/drawreport/FanChart.py +++ b/src/plugins/drawreport/FanChart.py @@ -339,8 +339,7 @@ class FanChart(Report): if self.map[index]: if (generation == 0) and self.circle == FULL_CIRCLE: yc = y - 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) text_angle += delta @@ -369,12 +368,11 @@ class FanChart(Report): start_angle, end_angle, rad1) text_angle += delta if self.map[index]: - 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) else: - self.doc.rotate_text(text_style, txt, + self.doc.rotate_text(text_style, self.text[index], xc, yc, text_angle) #------------------------------------------------------------------------ diff --git a/src/plugins/lib/libcairodoc.py b/src/plugins/lib/libcairodoc.py index 2d65693fd..7baab9a4f 100644 --- a/src/plugins/lib/libcairodoc.py +++ b/src/plugins/lib/libcairodoc.py @@ -1614,7 +1614,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) + self.__markup('\n'.join(text)), x, y, angle) self._active_element.add_child(new_text) # paginating and drawing interface