From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 6 Dec 2013 10:13:15 +0000 (+0100)
Subject: fix graph watermark, change linear spectrogram id
X-Git-Tag: 0.5.2~8^2~3^2^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6d599c31bf556d41930c5a1043f4bcb37dad050a;p=timeside.git

fix graph watermark, change linear spectrogram id
---

diff --git a/timeside/grapher/core.py b/timeside/grapher/core.py
index 17da285..550a513 100644
--- a/timeside/grapher/core.py
+++ b/timeside/grapher/core.py
@@ -163,7 +163,7 @@ class Grapher(Processor):
         return self.image
 
     def watermark(self, text, font=None, color=(255, 255, 255), opacity=.6, margin=(5,5)):
-        self.image = im_watermark(text, text, color=color, opacity=opacity, margin=margin)
+        self.image = im_watermark(self.image, text, color=color, opacity=opacity, margin=margin)
 
     def draw_peaks(self, x, peaks, line_color):
         """Draw 2 peaks at x"""
diff --git a/timeside/grapher/spectrogram_lin.py b/timeside/grapher/spectrogram_lin.py
index 04df721..5ae98fd 100644
--- a/timeside/grapher/spectrogram_lin.py
+++ b/timeside/grapher/spectrogram_lin.py
@@ -38,7 +38,7 @@ class SpectrogramLinear(SpectrogramLog):
     @staticmethod
     @interfacedoc
     def id():
-        return "spectrogram_linear"
+        return "spectrogram_lin"
 
     @staticmethod
     @interfacedoc