diff options
| author | jcorgan | 2007-05-28 17:04:09 +0000 |
|---|---|---|
| committer | jcorgan | 2007-05-28 17:04:09 +0000 |
| commit | 9880e7bb383054aa43681b52ebd33c8fd4cb8fcb (patch) | |
| tree | c9cd097baefda9ec392da2944fb799cbffabaa40 /gr-wxgui/src/python/waterfallsink2.py | |
| parent | f29776e2c39c06c958e7b4dfeae8883b47305969 (diff) | |
| download | gnuradio-9880e7bb383054aa43681b52ebd33c8fd4cb8fcb.tar.gz gnuradio-9880e7bb383054aa43681b52ebd33c8fd4cb8fcb.tar.bz2 gnuradio-9880e7bb383054aa43681b52ebd33c8fd4cb8fcb.zip | |
Merged r5547:5542 from jcorgan/num into trunk. Converts from using Python Numeric to numpy. Trunk passes distcheck. gr-radio-astronomy still needs conversion.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5553 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-wxgui/src/python/waterfallsink2.py')
| -rwxr-xr-x | gr-wxgui/src/python/waterfallsink2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-wxgui/src/python/waterfallsink2.py b/gr-wxgui/src/python/waterfallsink2.py index cd4cc75da..ea041d003 100755 --- a/gr-wxgui/src/python/waterfallsink2.py +++ b/gr-wxgui/src/python/waterfallsink2.py @@ -24,7 +24,7 @@ from gnuradio import gr, gru, window from gnuradio.wxgui import stdgui2 import wx import gnuradio.wxgui.plot as plot -import Numeric +import numpy import os import threading import math @@ -174,7 +174,7 @@ class input_watcher (threading.Thread): start = itemsize * (nitems - 1) s = s[start:start+itemsize] - complex_data = Numeric.fromstring (s, Numeric.Float32) + complex_data = numpy.fromstring (s, numpy.float32) de = DataEvent (complex_data) wx.PostEvent (self.event_receiver, de) del de |