From 23d6c28abaeff19a2e88f4a13a156001c70062fa Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Fri, 11 Oct 2013 21:39:28 +0200 Subject: [PATCH] Fix issue in spectrogram and waveform analyzer (mixedCase attribute stil alive) + Modify plot for exempleCMMR_vamp --- tests/api/exempleCMMR_vamp.py | 2 +- timeside/analyzer/spectrogram.py | 4 ++-- timeside/analyzer/waveform.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/api/exempleCMMR_vamp.py b/tests/api/exempleCMMR_vamp.py index 0f0746a..2cb8c54 100644 --- a/tests/api/exempleCMMR_vamp.py +++ b/tests/api/exempleCMMR_vamp.py @@ -69,7 +69,7 @@ plt.imshow(20 * np.log10(spec_res.data.T), max_freq], aspect='auto') -data = res_vamp.data - res_vamp.data.mean() +data = (res_vamp.data - res_vamp.data.mean()).clip(0) plt.plot(res_vamp.time, abs(data / data.max() * max_freq)) diff --git a/timeside/analyzer/spectrogram.py b/timeside/analyzer/spectrogram.py index c5488b2..48c7275 100644 --- a/timeside/analyzer/spectrogram.py +++ b/timeside/analyzer/spectrogram.py @@ -66,12 +66,12 @@ class Spectrogram(Analyzer): def release(self): # set Result - spectrogram = self.new_result(dataMode='value', timeMode='framewise') + spectrogram = self.new_result(data_mode='value', time_mode='framewise') # parameters : spectrogram.parameters = {'FFT_SIZE': self.FFT_SIZE} # Set Data - spectrogram.dataObject.value = self.values + spectrogram.data_object.value = self.values self._results.add(spectrogram) diff --git a/timeside/analyzer/waveform.py b/timeside/analyzer/waveform.py index 8f64bfb..a3da8f4 100644 --- a/timeside/analyzer/waveform.py +++ b/timeside/analyzer/waveform.py @@ -65,9 +65,9 @@ class Waveform(Analyzer): def release(self): # set Result - waveform = self.new_result(dataMode='value', timeMode='framewise') + waveform = self.new_result(data_mode='value', time_mode='framewise') # Set Data - waveform.dataObject.value = np.asarray(self.values).flatten() + waveform.data_object.value = np.asarray(self.values).flatten() self._results.add(waveform) -- 2.39.5