fix graph watermark, change linear spectrogram id

diff --git a/timeside/grapher/core.py b/timeside/grapher/core.py
index 17da285de2cf2e78207b9e8e5efdd3e320ccacf4..550a51389bcfad512abbff45b32f9369d610fe43 100644 (file)
--- 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 04df721a7d58b8dcb05153caa74264732c42cf3a..5ae98fdc8e597f4d84024a8cf6494b090cc38438 100644 (file)
--- 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