diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 13:42:42 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 13:42:42 -0700 |
commit | b092142302bcf8c771ec68e61da7781eb406c86f (patch) | |
tree | 535b32403668d08323026939957187d30bda64a3 /gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py | |
parent | 676d5cbe64f0b1293797025e5c4460f1e79896dc (diff) | |
parent | 0ab6607ffb0d45816a69c7069a1da90cc94bf047 (diff) |
Merge branch 'ctrlport'
Diffstat (limited to 'gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py')
-rw-r--r-- | gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py index 661705d613..c5bfd0a8cb 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py @@ -23,7 +23,7 @@ from gnuradio import gr from gnuradio import blocks from gnuradio import filter -from gnuradio.ctrlport import GNURadio +from gnuradio.ctrlport.GNURadio import ControlPort import sys, time, struct try: @@ -442,7 +442,7 @@ class GrDataPlotterValueTable: units = str(knobprops[itemKey].units) descr = str(knobprops[itemKey].description) - if(type(v) == GNURadio.complex): + if(type(v) == ControlPort.complex): v = v.re + v.im*1j # If it's a byte stream, Python thinks it's a string. # Unpack and convert to floats for plotting. @@ -468,7 +468,7 @@ class GrDataPlotterValueTable: for k in knobs.keys(): if k not in foundKeys: v = knobs[k].value - if(type(v) == GNURadio.complex): + if(type(v) == ControlPort.complex): v = v.re + v.im*1j # If it's a byte stream, Python thinks it's a string. # Unpack and convert to floats for plotting. |