From 7eb65214f77699ca519bd3d5784f034577887c60 Mon Sep 17 00:00:00 2001 From: Frederic Back Date: Tue, 26 Sep 2006 15:04:39 +0000 Subject: * Improved percentage display git-svn-id: file:///home/lennart/svn/public/fring/trunk@32 d0d2c35f-0a1e-0410-abeb-dabff30a67ee --- src/fringlib/fringrenderer.py | 10 ++++++---- src/fringlib/fringui.py | 4 ---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/fringlib/fringrenderer.py b/src/fringlib/fringrenderer.py index 51f5850..1f27de0 100644 --- a/src/fringlib/fringrenderer.py +++ b/src/fringlib/fringrenderer.py @@ -147,12 +147,14 @@ class FringRenderer: self.__register_side_link(isinstance(d, sum_list),p,value,end-start,x,y+(height/2),x+(width),y-(height/2)) - if ring <= self.LABEL_UNTIL_RING: + # write disk usage on segments + if self.RING_RADIUS >= ctx.text_extents("55%")[3]: ctx.move_to(*middle) ctx.set_source_rgb(0, 0, 0) - - # write relative and absolute disk usage - self._draw_centered_text2(ctx, "%.0f%%" % ((end-start)*100), pretty_size(value)) + percent = (end-start)*100 + if percent >= 8: + #self._draw_centered_text2(ctx, "%.0f%%" % ((end-start)*100), pretty_size(value)) + self._draw_centered_text(ctx, "%.0f%%" %percent) last = end i += 1 diff --git a/src/fringlib/fringui.py b/src/fringlib/fringui.py index febce89..ca634d1 100644 --- a/src/fringlib/fringui.py +++ b/src/fringlib/fringui.py @@ -202,10 +202,6 @@ class UI( gtk.Window ): #self.renderer.INNER_RADIUS *= self.zoomfactor self.renderer.RING_RADIUS *= self.zoomfactor self.renderer.RINGS_MAX = 3 - - self.renderer.LABEL_UNTIL_RING = int(self.zoomfactor - 0.4) - if self.zoomfactor < 0.8: self.renderer.LABEL_UNTIL_RING = -1 - self.renderer.draw_segment(self.ctx, 0, 0, 1, 0, 1, self.data, self.path) self.image.queue_draw() self.__show_busy_cursor(-1) -- cgit