Changeset fb8bde7

Timestamp:

May 4, 2006, 5:02:01 PM (18 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:

45fcbb8

Parents:

fe4f78a

Message:

update pitch plot
update pitch plot

File:

• python/aubio/task/pitch.py (modified) (6 diffs)

python/aubio/task/pitch.py

@@ -152 +152 @@
                 return osil, esil, opit, epit, echr
 
-        def plot(self,pitch,wplot,oplots,outplot=None):
+        def plot(self,pitch,wplot,oplots,titles,outplot=None):
                 import Gnuplot
 
@@ -159 +159 @@
                 oplots.append(Gnuplot.Data(time,pitch,with='lines',
                         title=self.params.pitchmode))
+                titles.append(self.params.pitchmode)
 
                         
-        def plotplot(self,wplot,oplots,outplot=None,multiplot = 1, midi = 1):
+        def plotplot(self,wplot,oplots,titles,outplot=None,multiplot = 1, midi = 1, truth = 1):
                 from aubio.gnuplot import gnuplot_init, audio_to_array, make_audio_plot
                 import re
@@ -170 +171 @@
 
                 # check if ground truth exists
-                timet,pitcht = self.gettruth()
-                if timet and pitcht:
-                        oplots = [Gnuplot.Data(timet,pitcht,with='lines',
-                                title='ground truth')] + oplots
+                if truth:
+                        timet,pitcht = self.gettruth()
+                        if timet and pitcht:
+                                oplots = [Gnuplot.Data(timet,pitcht,with='lines',
+                                        title='ground truth')] + oplots
 
                 t = Gnuplot.Data(0,0,with='impulses') 
@@ -181 +183 @@
                 g('set multiplot')
                 # hack to align left axis
-                g('set lmargin 15')
+                g('set lmargin 4')
+                g('set rmargin 4')
                 # plot waveform and onsets
                 g('set size 1,0.3')
@@ -188 +191 @@
                 g('set xrange [0:%f]' % max(time)) 
                 g('set yrange [-1:1]') 
+                g('set noytics')
+                g('set y2tics -1,1')
+                g.xlabel('time (s)',offset=(0,0.8))
                 g.ylabel('amplitude')
                 g.plot(f)
@@ -205 +211 @@
                         g.ylabel('midi')
                         g('set yrange [%f:%f]' % (aubio_freqtomidi(self.params.pitchmin), aubio_freqtomidi(self.params.pitchmax)))
+                        g('set y2tics %f,%f' % (round(aubio_freqtomidi(self.params.pitchmin)+.5),12))
                 g('set key right top')
                 g('set noclip one') 
                 g('set format x ""')
                 if multiplot:
+                        g('set tmargin 0')
                         for i in range(len(oplots)):
                                 # plot onset detection functions
                                 g('set size 1,%f' % (0.7/(len(oplots))))
-                                g('set origin 0,%f' % (float(i)*0.7/(len(oplots))))
+                                g('set origin 0,%f' % ((len(oplots)-float(i)-1)*0.7/(len(oplots))))
                                 g('set xrange [0:%f]' % max(time))
+                                g('set nokey')
+                                g.ylabel(titles[i])
+                                g.xlabel('')
                                 g.plot(oplots[i])
                 else: