Changeset dbd19ea for python

Timestamp:

Aug 10, 2006, 4:34:17 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:

e81c045

Parents:

33cf541

Message:

update demo-tempo to new gnuplot functions, fix audio yrange for -acf
update demo-tempo to new gnuplot functions, fix audio yrange for -acf

Location:

python/test/bench/tempo

Files:

• demo-tempo (modified) (3 diffs)
• demo-tempo-acf (modified) (6 diffs)

python/test/bench/tempo/demo-tempo

@@ -8 +8 @@
 from aubio.task import taskbeat,taskparams
 from aubio.aubioclass import fvec, aubio_autocorr
-from aubio.gnuplot import gnuplot_create
+from aubio.gnuplot import gnuplot_create, gnuplot_addargs
 from aubio.aubiowrapper import *
 from math import exp,log
@@ -23 +23 @@
                           action="store", dest="printframe", default=-1, 
                           help="make a plot of the n_th frame")
-        parser.add_option("-x","--xsize",
-                          action="store", dest="xsize", default=1., 
-                          type='float', help="define xsize for plot")
-        parser.add_option("-y","--ysize",
-                          action="store", dest="ysize", default=1., 
-                          type='float', help="define ysize for plot")
-        parser.add_option("-O","--outplot",
-                          action="store", dest="outplot", default=None, 
-                          help="save plot to output.{ps,png}")
+        gnuplot_addargs(parser)
         (options, args) = parser.parse_args()
         if not options.filename: 
@@ -55 +47 @@
   extension = ''
   outplot = None
-f = gnuplot_create(outplot=outplot,extension=extension)
+f = gnuplot_create(outplot=outplot,extension=extension,options=options)
 
 params = taskparams()

python/test/bench/tempo/demo-tempo-acf

@@ -8 +8 @@
 from aubio.task import taskbeat,taskparams
 from aubio.aubioclass import fvec, aubio_autocorr
-from aubio.gnuplot import gnuplot_create
+from aubio.gnuplot import gnuplot_create, gnuplot_addargs
 from aubio.aubiowrapper import *
 from math import exp,log
@@ -23 +23 @@
                           action="store", dest="printframe", default=-1, 
                           help="make a plot of the n_th frame")
-        parser.add_option("-x","--xsize",
-                          action="store", dest="xsize", default=1., 
-                          type='float', help="define xsize for plot")
-        parser.add_option("-y","--ysize",
-                          action="store", dest="ysize", default=1., 
-                          type='float', help="define ysize for plot")
-        parser.add_option("-O","--outplot",
-                          action="store", dest="outplot", default=None, 
-                          help="save plot to output.{ps,png}")
+        gnuplot_addargs(parser)
         (options, args) = parser.parse_args()
         if not options.filename: 
@@ -55 +47 @@
   extension = ''
   outplot = None
-f = gnuplot_create(outplot=outplot,extension=extension)
+f = gnuplot_create(outplot,extension,options)
 
 params = taskparams()
@@ -108 +100 @@
 acf = fvec(winlen,1)
 
-if options.outplot and printframe > 0: 
-  extension = options.outplot.split('.')[-1] 
-  outplot = '.'.join(options.outplot.split('.')[:-1])
-else: 
-  extension = ''
-  outplot = None
-f = gnuplot_create(outplot=outplot,extension=extension)
 nrframe = 0
 while (task.readsize == params.hopsize):
@@ -150 +135 @@
       f('set orig %f,%f' % (0.0*xsize,0.66*ysize) )
       f('set xrange [%f:%f]' % (0,btstep*hopsize) )
+      f('set yrange [%f:%f]' % (-1.2*max(sig),1.2*max(sig)) )
       f.title('Input signal')
       f.xlabel('time (samples)')
@@ -156 +142 @@
       f('set orig %f,%f' % (0.0*xsize,0.33*ysize) )
       f('set xrange [%f:%f]' % (-winlen,0) )
+      f('set autoscale y')
       f.title('Onset detection function')
       f.xlabel('time (df samples)')