Changeset 5e491b3b for python/aubio/gnuplot.py

Timestamp:

Aug 28, 2005, 7:58:31 PM (19 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

3c86eb1

Parents:

4cc9fe5

Message:

massive changes from cam

File:

• python/aubio/gnuplot.py (modified) (7 diffs)

python/aubio/gnuplot.py

@@ -151 +151 @@
         from aubio.onsetcompare import onset_roc
 
-        if len(onsets) == 0: onsets = [0.];
-
-        # onset detection function 
-        downtime = (hopsize/samplerate)*numarray.arange(len(ofunc))
-        d = Gnuplot.Data(downtime,ofunc,with='lines') 
-
-        # detected onsets
-        x1 = (hopsize/samplerate)*numarray.array(onsets)
-        y1 = max(ofunc)*numarray.ones(len(onsets))
-        e = Gnuplot.Data(x1,-y1,with='impulses') 
-        e2= Gnuplot.Data(x1,y1,with='impulses') 
+        d,d2 = [],[]
+        maxofunc = 0
+        for i in range(len(onsets)):
+                if len(onsets[i]) == 0: onsets[i] = [0.];
+
+                # onset detection function 
+                downtime = (hopsize/samplerate)*numarray.arange(len(ofunc[i]))
+                d.append(Gnuplot.Data(downtime,ofunc[i],with='lines'))
+                maxofunc = max(max(ofunc[i]), maxofunc)
+
+        for i in range(len(onsets)):
+                # detected onsets
+                x1 = (hopsize/samplerate)*numarray.array(onsets[i])
+                y1 = maxofunc*numarray.ones(len(onsets[i]))
+                d.append(Gnuplot.Data(x1,y1,with='impulses'))
+                d2.append(Gnuplot.Data(x1,-y1,with='impulses'))
 
         # check if datafile exists truth
@@ -170 +175 @@
         else:
                 t_onsets = aubio.txtfile.read_datafile(datafile)
-                y2 = max(ofunc)*numarray.ones(len(t_onsets))
+                y2 = maxofunc*numarray.ones(len(t_onsets))
                 x2 = numarray.array(t_onsets).resize(len(t_onsets))
-                t = Gnuplot.Data(x2,y2,with='impulses') 
+                d2.append(Gnuplot.Data(x2,y2,with='impulses'))
                 
                 tol = 0.050 
@@ -189 +194 @@
         # audio data
         time,data = audio_to_array(filename)
-        f = make_audio_plot(time,data)
+        d2.append(make_audio_plot(time,data))
 
         # prepare the plot
@@ -212 +217 @@
         g('set yrange [-1:1]') 
         g.ylabel('amplitude')
-        g.plot(f,e,t)
+        g.plot(*d2)
         
         g('unset title')
@@ -219 +224 @@
         g('set size 1,0.7')
         g('set origin 0,0')
-        g('set xrange [0:%f]' % (hopsize/samplerate*len(ofunc)))
-        g('set yrange [0:%f]' % (max(ofunc)*1.01))
+        g('set xrange [0:%f]' % (hopsize/samplerate*len(ofunc[0])))
+        g('set yrange [0:%f]' % (maxofunc*1.01))
         g.xlabel('time')
         g.ylabel('onset detection value')
-        g.plot(d,e2)
+        g.plot(*d)
 
         g('unset multiplot')
@@ -233 +238 @@
         import numarray
 
-        # onset detection function 
-        downtime = (hopsize/samplerate)*numarray.arange(len(pitch))
-        d = Gnuplot.Data(downtime,pitch,with='lines') 
+        d = []
+        maxpitch = 100
+        for i in range(len(pitch)):
+                downtime = (hopsize/samplerate)*numarray.arange(len(pitch[i]))
+                d.append(Gnuplot.Data(downtime,pitch[i],with='lines'))
+                maxpitch = max(maxpitch,max(pitch[i][:])*1.1)
 
         # check if datafile exists truth
@@ -291 +299 @@
         g('set size 1,0.7')
         g('set origin 0,0')
-        g('set xrange [0:%f]' % (hopsize/samplerate*len(pitch)))
-        g('set yrange [0:%f]' % (max(pitch)*1.01))
+        g('set xrange [0:%f]' % max(time))
+        g('set yrange [40:%f]' % maxpitch) 
         g.xlabel('time')
         g.ylabel('frequency (Hz)')
-        g.plot(d,t)
+        g.plot(*d)
 
         g('unset multiplot')