Fix Fan Chart Print centering and scaling on Windows

Fixes #8460
gramps-project · Jan 4, 2018 · 1777cd4 · 1777cd4
1 parent 3971fec
commit 1777cd4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/gramps/gui/widgets/fanchart.py b/gramps/gui/widgets/fanchart.py
@@ -1221,7 +1221,9 @@ def on_draw(self, widget, cr, scale=1.):
         cr.scale(scale, scale)
         if widget:
             self.center_xy = self.center_xy_from_delta()
-        cr.translate(*self.center_xy)
+            cr.translate(*self.center_xy)
+        else:
+            cr.translate(halfdist, halfdist)
 
         cr.save()
         cr.rotate(math.radians(self.rotate_value))

diff --git a/gramps/gui/widgets/fanchart2way.py b/gramps/gui/widgets/fanchart2way.py
@@ -374,7 +374,9 @@ def on_draw(self, widget, cr, scale=1.):
         cr.scale(scale, scale)
         if widget:
             self.center_xy = self.center_xy_from_delta()
-        cr.translate(*self.center_xy)
+            cr.translate(*self.center_xy)
+        else:
+            cr.translate(halfdist, halfdist)
 
         cr.save()
         # Draw background

diff --git a/gramps/plugins/view/fanchart2wayview.py b/gramps/plugins/view/fanchart2wayview.py
@@ -528,8 +528,6 @@ def on_draw_page(self, operation, context, page_nr):
         pxwidth = round(context.get_width())
         pxheight = round(context.get_height())
         scale = min(pxwidth/self.widthpx, pxheight/self.heightpx)
-        if scale > 1:
-            scale = 1
         self.drawfunc(None, cr, scale=scale)
 
     def on_paginate(self, operation, context):

diff --git a/gramps/plugins/view/fanchartdescview.py b/gramps/plugins/view/fanchartdescview.py
@@ -516,8 +516,6 @@ def on_draw_page(self, operation, context, page_nr):
         pxwidth = round(context.get_width())
         pxheight = round(context.get_height())
         scale = min(pxwidth/self.widthpx, pxheight/self.heightpx)
-        if scale > 1:
-            scale = 1
         self.drawfunc(None, cr, scale=scale)
 
     def on_paginate(self, operation, context):

diff --git a/gramps/plugins/view/fanchartview.py b/gramps/plugins/view/fanchartview.py
@@ -523,8 +523,6 @@ def on_draw_page(self, operation, context, page_nr):
         pxwidth = round(context.get_width())
         pxheight = round(context.get_height())
         scale = min(pxwidth/self.widthpx, pxheight/self.heightpx)
-        if scale > 1:
-            scale = 1
         self.drawfunc(None, cr, scale=scale)
 
     def on_paginate(self, operation, context):