[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Maposmatic-dev] [PATCH 2/2] In layoutlib/multi_page_renderer.py, use sh
From: |
David MENTRE |
Subject: |
[Maposmatic-dev] [PATCH 2/2] In layoutlib/multi_page_renderer.py, use shared draw_utils.render_page_number() |
Date: |
Sat, 31 Mar 2012 18:45:08 +0200 |
Signed-off-by: David MENTRE <address@hidden>
---
ocitysmap2/layoutlib/multi_page_renderer.py | 43 +++++++++-----------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/ocitysmap2/layoutlib/multi_page_renderer.py
b/ocitysmap2/layoutlib/multi_page_renderer.py
index 8919b5d..0bf5fc8 100644
--- a/ocitysmap2/layoutlib/multi_page_renderer.py
+++ b/ocitysmap2/layoutlib/multi_page_renderer.py
@@ -567,35 +567,14 @@ class MultiPageRenderer(Renderer):
ctx.set_source_rgb(.6,.6,.6)
Renderer._draw_centered_text(ctx, _('This page is intentionally left '\
'blank.'), w/2.0, 0.95*h)
- self._render_page_number(ctx, 2)
+ draw_utils.render_page_number(ctx, 2,
+ self._usable_area_width_pt,
+ self._usable_area_height_pt,
+ self.grayed_margin_pt,
+ transparent_background = True)
cairo_surface.show_page()
ctx.restore()
- def _render_page_number(self, ctx, page_number):
- """
- Render page number
- """
- ctx.save()
- x_offset = 0
- if page_number % 2:
- x_offset += commons.convert_pt_to_dots(self._usable_area_width_pt)\
- - commons.convert_pt_to_dots(self.grayed_margin_pt)
- y_offset = commons.convert_pt_to_dots(self._usable_area_height_pt)\
- - commons.convert_pt_to_dots(self.grayed_margin_pt)
- ctx.translate(x_offset, y_offset)
-
- ctx.set_source_rgba(1, 1, 1, 0.6)
- ctx.rectangle(0, 0, commons.convert_pt_to_dots(self.grayed_margin_pt),
- commons.convert_pt_to_dots(self.grayed_margin_pt))
- ctx.fill()
-
- ctx.set_source_rgba(0, 0, 0, 1)
- x_offset = commons.convert_pt_to_dots(self.grayed_margin_pt)/2
- y_offset = commons.convert_pt_to_dots(self.grayed_margin_pt)/2
- ctx.translate(x_offset, y_offset)
- Renderer._draw_centered_text(ctx, unicode(page_number), 0, 0)
- ctx.restore()
-
def _render_overview_page(self, ctx, cairo_surface, dpi):
rendered_map = self.overview_canvas.get_rendered_map()
mapnik.render(rendered_map, ctx)
@@ -605,7 +584,11 @@ class MultiPageRenderer(Renderer):
commons.convert_pt_to_dots(self._usable_area_width_pt),
commons.convert_pt_to_dots(self._usable_area_height_pt))
# Render the page number
- self._render_page_number(ctx, 3)
+ draw_utils.render_page_number(ctx, 3,
+ self._usable_area_width_pt,
+ self._usable_area_height_pt,
+ self.grayed_margin_pt,
+ transparent_background = True)
cairo_surface.show_page()
@@ -646,7 +629,11 @@ class MultiPageRenderer(Renderer):
ctx.restore()
# Render the page number
- self._render_page_number(ctx, i+4)
+ draw_utils.render_page_number(ctx, i+4,
+ self._usable_area_width_pt,
+ self._usable_area_height_pt,
+ self.grayed_margin_pt,
+ transparent_background = True)
#self._render_neighbour_arrows()
page_number = i+4
--
1.7.5.4