fix spec default

diff --git a/timeside/grapher/core.py b/timeside/grapher/core.py
index 4eb518bf916abfa1e163298bbeae70d07fe24cc9..a06c6a1e80a08e7e4b83f6cd0beb988798c9dea2 100644 (file)
--- a/timeside/grapher/core.py
+++ b/timeside/grapher/core.py
@@ -266,8 +266,12 @@ class SpectrogramImage(object):
         self.filename = filename
         self.color_scheme = color_scheme
 
+        if isinstance(color_scheme, dict):
+            colors = color_scheme['spectrogram']
+        else:
+            colors = default_color_schemes[color_scheme]['spectrogram']
+
         self.image = Image.new("P", (self.image_height, self.image_width))
-        colors = color_schemes[self.color_scheme]['spectrogram']
         self.image.putpalette(interpolate_colors(colors, True))
 
         self.samples_per_pixel = self.nframes / float(self.image_width)

diff --git a/timeside/grapher/spectrogram.py b/timeside/grapher/spectrogram.py
index 09628420e40111b486d18685e95b3d8f26cc0f55..de898b890cc1859125ec7683bd2d6278632b223f 100644 (file)
--- a/timeside/grapher/spectrogram.py
+++ b/timeside/grapher/spectrogram.py
@@ -21,7 +21,7 @@
 
 from timeside.core import Processor, implements, interfacedoc, FixedSizeInputAdapter
 from timeside.api import IGrapher
-from timeside.grapher import *
+from timeside.grapher.core import *
 
 
 class Spectrogram(Processor):
@@ -30,15 +30,9 @@ class Spectrogram(Processor):
     FFT_SIZE = 0x400
 
     @interfacedoc
-    def __init__(self, width=None, height=None, output=None, bg_color=None, color_scheme=None):
-        if width:
-            self.width = width
-        else:
-            self.width = 1500
-        if height:
-            self.height = height
-        else:
-            self.height = 200
+    def __init__(self, width=1024, height=256, output=None, bg_color=(0,0,0), color_scheme='default'):
+        self.width = width
+        self.height = height
         self.bg_color = bg_color
         self.color_scheme = color_scheme
         self.filename = output