From 218c3feed81ee4e01bea27801531487a0be429fb Mon Sep 17 00:00:00 2001 From: Eugene Gagarin Date: Wed, 6 May 2009 10:47:31 +0400 Subject: [PATCH] Slightly corrected sizes in files/out_diaold --- src/files/out_diaold.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/files/out_diaold.py b/src/files/out_diaold.py index 2356bbd..0bb2129 100755 --- a/src/files/out_diaold.py +++ b/src/files/out_diaold.py @@ -4,7 +4,7 @@ from random import random from math import pi, cos, sin, sqrt -import os.path +from os.path import basename #============================================================================== @@ -54,7 +54,7 @@ class Gtk_Presentation(object): cr.rectangle(0, 0, w, h) cr.stroke() - cr.translate(w/2-w/6, h/2) # moving coordinates + cr.translate(R+10, h/2) # moving coordinates # drawing pie chart for i, (start_angle, end_angle, color) in enumerate(sectors): @@ -68,18 +68,18 @@ class Gtk_Presentation(object): delta_angle = end_angle - start_angle x = R/1.7 * cos(start_angle+delta_angle/2) y = R/1.7 * sin(start_angle+delta_angle/2) - area = 0.5*(delta_angle*R**2) # sector area + area = 0.5*(delta_angle*R**2) # sector area # drawing text - cr.set_font_size(sqrt(area)/2) # text size - text = str(i+1) # text string - xbearing, ybearing, textw, texth = cr.text_extents(text)[:4] - cr.move_to(x-(xbearing+textw/2), y-(ybearing+texth/2)) # text center - cr.set_source_rgb(.3, .3, .3) # text color + cr.set_font_size(sqrt(area)/2.5) # text size + text = str(i+1) # text string + xbear, ybear, textw, texth = cr.text_extents(text)[:4] + cr.move_to(x-(xbear+textw/2), y-(ybear+texth/2)) # text center + cr.set_source_rgb(.3, .3, .3) # text color cr.show_text(text) cr.set_font_size(14) - cr.translate(R+40, -h/2+40) # moving coordinates + cr.translate(R+30, -R+10) # moving coordinates cr.move_to(0, 0) # drawing files list @@ -89,7 +89,7 @@ class Gtk_Presentation(object): cr.rectangle(-20, 20*i+3, 14, -14) cr.fill() - text = str(i+1) + '. ' + os.path.basename(name) + ' (' + str(size) + ')' + text = str(i+1) + '. ' + basename(name) + ' (' + str(size) + ')' cr.move_to(0, 20*i) cr.set_source_rgb(0, 0, 0) cr.show_text(text) -- 1.7.9.5