Skip to content

Commit a7db26b

Browse files
author
Robert van der Tuuk
committed
edited a few patterns
1 parent cf22545 commit a7db26b

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

Ledart/Patterns/Fft.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def __init__(self, **kwargs):
3434

3535
# self.window = numpy.bartlett(self.width)
3636
# self.window = numpy.blackman(self.width)
37-
self.window = numpy.hamming(self.width)
38-
# self.window = numpy.hanning(self.width)
37+
# self.window = numpy.hamming(self.width)
38+
self.window = numpy.hanning(self.width)
3939
# self.window = numpy.kaiser(self.width, 0)
4040
# self.window = [1, ] * self.width
4141

Ledart/Patterns/VUmeter.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from Ledart.Tools.Graphics import Graphics, BLUE, WHITE, BLACK
33

44
import alsaaudio
5+
import colorsys
56
import audioop
67
import struct
78
import time
@@ -30,27 +31,31 @@ def mean(self, a):
3031
def average_lists(self, lists):
3132
return map(self.mean, zip(*lists))
3233

34+
def draw_pixel(self, x, y, color):
35+
color = [int(c * 0xff) for c in colorsys.hsv_to_rgb(y / float(self.height), 1, 1)]
36+
Graphics.draw_pixel(self, x, y, color)
37+
3338
def generate(self):
3439
self.fill(BLACK)
3540
l, data = self.stream.read()
3641
h = 0
3742
if l:
3843
data = struct.unpack("%dh" % (len(data) / 2), data)
3944
self.chunks.append(data)
40-
if len(self.chunks) > 10:
45+
if len(self.chunks) > 100:
4146
del self.chunks[0]
4247
data = self.average_lists(self.chunks)
4348
# scale values to the window.
4449
data = [translate(val, min(data), max(data), 1, self.height * 0.8) for val in data]
4550

4651
for x in xrange(len(data)):
47-
if self.mode == 1:
52+
if self.mode == 0:
4853
self.draw_line(x, self.height - data[x], x, self.height, BLUE)
49-
elif self.mode == 2:
54+
elif self.mode == 1:
5055
self.draw_pixel(x, self.height - data[x], BLUE)
51-
elif self.mode == 3:
56+
elif self.mode == 2:
5257
self.draw_line(x, (self.height / 2) - data[x] / 2, x, (self.height / 2) + data[x] / 2, BLUE)
53-
elif self.mode == 4:
58+
elif self.mode == 3:
5459
if x >= (self.width - 1):
5560
self.draw_pixel(x, self.height - data[x], BLUE)
5661
else:
@@ -61,4 +66,4 @@ def generate(self):
6166
# if not (len(data) & 1):
6267
# h = audioop.max(data, 2) / 100
6368
# color = [min(h, 0xff), max(0xff - h, 0), 0]
64-
# self.draw_line(x, self.height, x, self.height - h, color)
69+
# self.draw_line(x, self.height, x, self.height - h, color)

Ledart/configs/pattern_conf.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,15 @@
8686
# dest: SpiroGraph(dims=dims, mode=2),
8787
# dest: MetaBalls(dims=dims),
8888

89-
# dest: VUmeter(dims=dims),
89+
# dest: VUmeter(dims=dims, mode=0),
90+
# dest: VUmeter(dims=dims, mode=1),
91+
# dest: VUmeter(dims=dims, mode=2),
92+
dest: VUmeter(dims=dims, mode=3),
93+
9094
# dest: RandomWalker(dims=dims),
9195
# dest: PerlinTest(dims=dims),
9296

93-
dest: Fft(dims=dims, mode=1),
97+
# dest: Fft(dims=dims, mode=1),
9498
# dest: Fft(dims=dims, mode=2),
9599
# dest: Fft(dims=dims, mode=3),
96100
# dest: Fft(dims=dims, mode=4),

0 commit comments

Comments
 (0)