further cleanup, get the tick marks pixel perfect

Original commit message from CVS:
further cleanup, get the tick marks pixel perfect
This commit is contained in:
Thomas Vander Stichele 2005-09-24 12:17:59 +00:00
parent ea0f5ff24b
commit 5f3ff797a5
2 changed files with 32 additions and 20 deletions

View file

@ -172,6 +172,7 @@ class FVUMeter(gtk.DrawingArea):
vumeter_width, vumeter_width,
vumeter_height) vumeter_height)
# draw peak level # draw peak level
# 0 maps to width of 0, full scale maps to total width
peaklevelpct = self.iec_scale(self.peaklevel) peaklevelpct = self.iec_scale(self.peaklevel)
peakwidth = int(vumeter_width * (peaklevelpct / 100)) peakwidth = int(vumeter_width * (peaklevelpct / 100))
draw_gc = self.green_gc draw_gc = self.green_gc
@ -179,6 +180,7 @@ class FVUMeter(gtk.DrawingArea):
draw_gc = self.orange_gc draw_gc = self.orange_gc
if self.peaklevel >= self.red_threshold: if self.peaklevel >= self.red_threshold:
draw_gc = self.red_gc draw_gc = self.red_gc
if peakwidth > 0:
self.window.draw_rectangle(draw_gc, True, self.window.draw_rectangle(draw_gc, True,
self.leftborder, self.topborder, self.leftborder, self.topborder,
peakwidth, vumeter_height) peakwidth, vumeter_height)
@ -186,12 +188,16 @@ class FVUMeter(gtk.DrawingArea):
# draw yellow decay level # draw yellow decay level
if self.decaylevel > -90.0: if self.decaylevel > -90.0:
decaylevelpct = self.iec_scale(self.decaylevel) decaylevelpct = self.iec_scale(self.decaylevel)
decaywidth = int(vumeter_width * (decaylevelpct/100)) decaywidth = int(vumeter_width) * (decaylevelpct / 100)
# cheat the geometry by drawing 0% level at pixel 0,
# which is same position as just above 0%
if decaywidth == 0:
decaywidth = 1
self.window.draw_line(self.yellow_gc, self.window.draw_line(self.yellow_gc,
self.leftborder + decaywidth, self.leftborder + decaywidth - 1,
self.topborder, self.topborder,
self.leftborder + decaywidth, self.leftborder + decaywidth - 1,
self.topborder + vumeter_height) self.topborder + vumeter_height - 1)
# draw tick marks # draw tick marks
scalers = [ scalers = [
@ -204,18 +210,19 @@ class FVUMeter(gtk.DrawingArea):
( '0', 1.0), ( '0', 1.0),
] ]
for level, scale in scalers: for level, scale in scalers:
# tick mark, 6 pixels high
# we cheat again here by putting the 0 at the first pixel
self.window.draw_line(self.style.black_gc, self.window.draw_line(self.style.black_gc,
self.leftborder + int (scale * vumeter_width), self.leftborder + int(scale * (vumeter_width - 1)),
h - self.bottomborder, h - self.bottomborder,
self.leftborder + int(scale * vumeter_width), self.leftborder + int(scale * (vumeter_width - 1)),
h - self.bottomborder + 5) h - self.bottomborder + 5)
self.window.draw_line(self.style.black_gc, # tick label
self.leftborder, h - self.bottomborder,
self.leftborder, h - self.bottomborder + 5)
layout = self.create_pango_layout(level) layout = self.create_pango_layout(level)
layout_width, layout_height = layout.get_pixel_size() layout_width, layout_height = layout.get_pixel_size()
self.window.draw_layout(self.style.black_gc, self.window.draw_layout(self.style.black_gc,
self.leftborder + int(scale * vumeter_width) - int(layout_width / 2), self.leftborder + int(scale * vumeter_width)
- int(layout_width / 2),
h - self.bottomborder + 7, layout) h - self.bottomborder + 7, layout)
# draw the peak level to the right # draw the peak level to the right

View file

@ -73,10 +73,15 @@ class Window(gtk.Dialog):
if message.structure.get_name() == 'level': if message.structure.get_name() == 'level':
s = message.structure s = message.structure
for i in range(0, len(s['peak'])): for i in range(0, len(s['peak'])):
self.vus[i].set_property('peak', self.vus[i].freeze_notify()
clamp(s['peak'][i], -90.0, 0.0)) decay = clamp(s['decay'][i], -90.0, 0.0)
self.vus[i].set_property('decay', peak = clamp(s['peak'][i], -90.0, 0.0)
clamp(s['decay'][i], -90.0, 0.0)) print "decay/peak", decay, peak
if peak > decay:
print "ERROR: peak bigger than decay!"
self.vus[i].set_property('decay', decay)
self.vus[i].set_property('peak', peak)
return True return True
def run(self): def run(self):