]> git.parisson.com Git - timeside.git/commitdiff
Fix issue in spectrogram and waveform analyzer (mixedCase attribute stil alive) ...
authorThomas Fillon <thomas@parisson.com>
Fri, 11 Oct 2013 19:39:28 +0000 (21:39 +0200)
committerThomas Fillon <thomas@parisson.com>
Fri, 11 Oct 2013 19:39:28 +0000 (21:39 +0200)
tests/api/exempleCMMR_vamp.py
timeside/analyzer/spectrogram.py
timeside/analyzer/waveform.py

index 0f0746a18b4d5ec3284aae6f18732d580d72fb2f..2cb8c548af930123981d47b7584d21820c9d790f 100644 (file)
@@ -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))
 
 
index c5488b2819fb308aa175bbfe68c6656987c4eeab..48c7275eb7c4b98276e56614357e57ee203287f8 100644 (file)
@@ -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)
index 8f64bfb65c22512a0c17bab721b94f2ed007777d..a3da8f42fee426e9dc7cd10d8dcb40db436942df 100644 (file)
@@ -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)