Changeset 55ed67a


Ignore:
Timestamp:
Sep 26, 2009, 1:40:44 AM (15 years ago)
Author:
Paul Brossier <piem@piem.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:
5f23f66
Parents:
707c30e
Message:

python/aubio/gnuplot.py: use numpy, not numarray (debian #478438)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • python/aubio/gnuplot.py

    r707c30e r55ed67a  
    2424def audio_to_array(filename):
    2525        import aubio.aubioclass
    26         import numarray
     26        from numpy import arange
    2727        hopsize  = 2048
    2828        filei    = aubio.aubioclass.sndfile(filename)
     
    4040                        data.append(myvec.get(curpos,i))
    4141                        curpos+=1
    42         time = numarray.arange(len(data))*framestep
     42        time = arange(len(data))*framestep
    4343        return time,data
    4444
     
    144144def downsample_audio(time,data,maxpoints=10000):
    145145  """ resample audio data to last only maxpoints """
    146   import numarray
     146  from numpy import array, resize
    147147  length = len(time)
    148148  downsample = length/maxpoints
    149149  if downsample == 0: downsample = 1
    150   x = numarray.array(time).resize(length)[0:-1:downsample]
    151   y = numarray.array(data).resize(length)[0:-1:downsample]
     150  x = resize(array(time),length)[0:-1:downsample]
     151  y = resize(array(data),length)[0:-1:downsample]
    152152  return x,y
    153153
     
    156156  import Gnuplot, Gnuplot.funcutils
    157157  x,y = downsample_audio(time,data,maxpoints=maxpoints)
    158   return Gnuplot.Data(x,y,with='lines')
     158  return Gnuplot.Data(x,y,with_='lines')
    159159
    160160def make_audio_envelope(time,data,maxpoints=10000):
    161161  """ create gnuplot plot from an audio file """
    162   import numarray
     162  from numpy import array
    163163  import Gnuplot, Gnuplot.funcutils
    164164  bufsize = 500
    165   x = [i.mean() for i in numarray.array(time).resize(len(time)/bufsize,bufsize)]
    166   y = [i.mean() for i in numarray.array(data).resize(len(time)/bufsize,bufsize)]
     165  x = [i.mean() for i in resize(array(time), (len(time)/bufsize,bufsize))]
     166  y = [i.mean() for i in resize(array(data), (len(time)/bufsize,bufsize))]
    167167  x,y = downsample_audio(x,y,maxpoints=maxpoints)
    168   return Gnuplot.Data(x,y,with='lines')
     168  return Gnuplot.Data(x,y,with_='lines')
    169169
    170170def gnuplot_addargs(parser):
Note: See TracChangeset for help on using the changeset viewer.