diff options
| author | Tom Rondeau <tom@trondeau.com> | 2015-02-23 11:10:23 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2015-04-02 15:38:56 -0700 |
| commit | 8270b20580b43fd00d1f1c1df14dee1f2a2498ad (patch) | |
| tree | 47385ae9e4eeab9bfbea1d63594c5e6960196b68 /gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor | |
| parent | 490fe7fb527f629f6ba8fb804f33a51822e3b8ae (diff) | |
controlport: more cleanup of python code to help generalize the interface
Diffstat (limited to 'gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor index 5411b244b0..251b4bc03c 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor +++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor @@ -20,15 +20,12 @@ # Boston, MA 02110-1301, USA. # -# from gnuradio import gr, ctrlport - from PyQt4 import QtCore,Qt import PyQt4.QtGui as QtGui import os, sys, time, struct -# from gnuradio.ctrlport.IceRadioClient import * +from gnuradio import gr, ctrlport from gnuradio.ctrlport.GrDataPlotter import * -# from gnuradio.ctrlport import GNURadio class RateDialog(QtGui.QDialog): def __init__(self, delay, parent=None): @@ -79,7 +76,7 @@ class MAINWindow(QtGui.QMainWindow): self.setUnifiedTitleAndToolBarOnMac(True) self.newCon(radioclient) - icon = QtGui.QIcon(sys.argv[0] + "/icon.png" ) + icon = QtGui.QIcon(ctrlport.__path__[0] + "/icon.png" ) self.setWindowIcon(icon) # Locally turn off ControlPort export from GR. This prevents @@ -179,8 +176,10 @@ class MAINWindow(QtGui.QMainWindow): uid = tree.uid knobprop = self.knobprops[uid][tag] - r = str(tree.radio).split(" ") - title = "{0}:{1}".format(r[3], r[5]) + strr = str(tree.radioclient) + print(strr) +# r = strr.split(" ") + title = strr #title = "{0}:{1}".format(r[3], r[5]) pmin,pmax = get_minmax(knobprop) disp = knobprop.display @@ -301,13 +300,12 @@ class MAINWindow(QtGui.QMainWindow): def update(self, knobs, uid): #sys.stderr.write("KNOB KEYS: {0}\n".format(knobs.keys())) for plot in self.plots[uid]: - print("update plotuid:", uid) data = [] for n in plot.knobnames: - print("update plotuid:", uid, "name:", n) d = knobs[n].value - if(type(d) == GNURadio.complex): - d = [d.re, d.im] + # TODO: FIX COMPLEX! +# if(type(d) == GNURadio.complex): +# d = [d.re, d.im] # If it's a byte stream, Python thinks it's a string. # Unpack and convert to floats for plotting. @@ -735,10 +733,11 @@ def get_minmax(p): pmax = p.max.value # Find min/max or real or imag for GNURadio::complex - if(type(pmin) == GNURadio.complex): - pmin = min(pmin.re, pmin.im) - if(type(pmax) == GNURadio.complex): - pmax = max(pmax.re, pmax.im) + # TODO: fix complex +# if(type(pmin) == GNURadio.complex): +# pmin = min(pmin.re, pmin.im) +# if(type(pmax) == GNURadio.complex): +# pmax = max(pmax.re, pmax.im) # If it's a byte stream, Python thinks it's a string. if(type(pmin) == str): @@ -757,9 +756,15 @@ def get_minmax(p): return pmin, pmax +# class MyClient(IceRadioClient): +# def __init__(self): +# IceRadioClient.__init__(self, MAINWindow) +# +# sys.exit(MyClient().main(sys.argv)) + class MyApp(object): def __init__(self, args): - from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient + from GNURadioControlPortClient import GNURadioControlPortClient GNURadioControlPortClient(args, 'thrift', self.run, QtGui.QApplication(sys.argv).exec_) def run(self, client): |