4096 for default fft_size, tune various lower_freq

diff --git a/tests/test_graphing.py b/tests/test_graphing.py
index 88676bae5292f2c3db24183556f475bc77edb326..cd5da61379dc5ed3e41f2b3508b94b391f1f8864 100755 (executable)
--- a/tests/test_graphing.py
+++ b/tests/test_graphing.py
@@ -19,28 +19,28 @@ class TestGraphing(TestCase):
         from timeside.grapher.waveform_simple import Waveform
         self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")
         self.image = "/tmp/test_waveform_sweep_wav.png"
-        self.grapher = Waveform(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
+        self.grapher = Waveform(width=1024, height=256, bg_color=(255,255,255), color_scheme='default')
 
     def testFlac2Waveform(self):
         "Test FLAC to Waveform"
         from timeside.grapher.waveform_simple import Waveform
         self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.flac")
         self.image = "/tmp/test_waveform_sweep_flac.png"
-        self.grapher = Waveform(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
+        self.grapher = Waveform(width=1024, height=256, bg_color=(255,255,255), color_scheme='default')
 
     def testMp32Waveform(self):
         "Test MP3 to Waveform"
         from timeside.grapher.waveform_simple import Waveform
         self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.mp3")
         self.image = "/tmp/test_waveform_sweep_mp3.png"
-        self.grapher = Waveform(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
+        self.grapher = Waveform(width=1024, height=256, bg_color=(255,255,255), color_scheme='default')
 
     def testOgg2Waveform(self):
         "Test OGG to Waveform"
         from timeside.grapher.waveform_simple import Waveform
         self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.ogg")
         self.image = "/tmp/test_waveform_sweep_ogg.png"
-        self.grapher = Waveform(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
+        self.grapher = Waveform(width=1024, height=256, bg_color=(255,255,255), color_scheme='default')
 
     # WAVEFORM CENTROID
     def testWav2WaveformCentroid(self):

diff --git a/timeside/grapher/core.py b/timeside/grapher/core.py
index 24a4b7c681a804430df36551c834eaf2134bbc38..ddc3099a98bf4246b1da6dec1e195d1adcdca8d7 100644 (file)
--- a/timeside/grapher/core.py
+++ b/timeside/grapher/core.py
@@ -100,11 +100,10 @@ class Grapher(Processor):
     Generic abstract class for the graphers
     '''
 
-    fft_size = 0x800
+    fft_size = 0x1000
     frame_cursor = 0
     pixel_cursor = 0
-    lower_freq = 200
-    higher_freq = 22050
+    lower_freq = 20
 
     def __init__(self, width=1024, height=256, bg_color=None, color_scheme='default'):
         self.bg_color = bg_color
@@ -131,6 +130,7 @@ class Grapher(Processor):
     def setup(self, channels=None, samplerate=None, blocksize=None, totalframes=None):
         super(Grapher, self).setup(channels, samplerate, blocksize, totalframes)
         self.samplerate = samplerate
+        self.higher_freq = self.samplerate/2
         self.blocksize = blocksize
         self.totalframes = totalframes
         self.image = Image.new("RGBA", (self.image_width, self.image_height), self.bg_color)

diff --git a/timeside/grapher/spectrogram_log.py b/timeside/grapher/spectrogram_log.py
index 3f5349bd6bfbbd13e1f87ffba9a2e84e78cb6d7c..ba5c9db175f29dec77ca396875387b91c8d2ce40 100644 (file)
--- a/timeside/grapher/spectrogram_log.py
+++ b/timeside/grapher/spectrogram_log.py
@@ -33,6 +33,7 @@ class SpectrogramLog(Grapher):
     @interfacedoc
     def __init__(self, width=1024, height=256, bg_color=(0,0,0), color_scheme='default'):
         super(SpectrogramLog, self).__init__(width, height, bg_color, color_scheme)
+        self.lower_freq = 100
         self.colors = default_color_schemes[color_scheme]['spectrogram']
         self.pixels = []
         self.y_to_bin = []

diff --git a/timeside/grapher/waveform_centroid.py b/timeside/grapher/waveform_centroid.py
index aaabde4978bcf6ad6c7bc951ad4346cd044bddf4..5f2d145f71f5d22f6dfec17ffca1e3bd6b66ac20 100644 (file)
--- a/timeside/grapher/waveform_centroid.py
+++ b/timeside/grapher/waveform_centroid.py
@@ -34,6 +34,7 @@ class WaveformCentroid(Waveform):
     @interfacedoc
     def __init__(self, width=1024, height=256, bg_color=(0,0,0), color_scheme='default'):
         super(WaveformCentroid, self).__init__(width, height, bg_color, color_scheme)
+        self.lower_freq = 200
         colors = default_color_schemes[color_scheme]['waveform']
         self.color_lookup = interpolate_colors(colors)