diff options
| author | Tom Rondeau <tom@trondeau.com> | 2013-09-13 16:17:47 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2013-09-13 16:17:47 -0400 |
| commit | 7516b6dd96e6936ac275a94fa66ecb1307588098 (patch) | |
| tree | b33cf4d53f317c449a81f68ca4ee05e308fc716d | |
| parent | 860f762ee62aad55241e1467b522f46c68e844ba (diff) | |
| parent | 8fd3be0a5e4a7a24af2143fb238535e3832e79af (diff) | |
Merge branch 'maint'
| -rwxr-xr-x | gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor | 5 | ||||
| -rw-r--r-- | gr-qtgui/examples/CMakeLists.txt | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor index b087ad5c71..56cb2f3696 100755 --- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor +++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor @@ -644,7 +644,10 @@ class MForm(QtGui.QWidget): tableitems = knobs.keys() #UPDATE TABLE: - self.table.updateItems(knobs, self.knobprops) + try: + self.table.updateItems(knobs, self.knobprops) + except: + self.knobprops = self.radio.properties([]) #UPDATE PLOTS self.parent.update(knobs, self.uid) diff --git a/gr-qtgui/examples/CMakeLists.txt b/gr-qtgui/examples/CMakeLists.txt index 998d17bd91..fafa4d77ad 100644 --- a/gr-qtgui/examples/CMakeLists.txt +++ b/gr-qtgui/examples/CMakeLists.txt @@ -20,10 +20,24 @@ include(GrPython) GR_PYTHON_INSTALL(PROGRAMS + pyqt_const_c.py pyqt_example_c.py pyqt_example_f.py + pyqt_freq_c.py + pyqt_freq_f.py pyqt_time_c.py pyqt_time_f.py + pyqt_time_raster_b.py + pyqt_time_raster_f.py + pyqt_waterfall_c.py + pyqt_waterfall_f.py DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR} COMPONENT "qtgui_python" ) + +install( + FILES + dark.qss + DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR} + COMPONENT "qtgui_python" +) |