diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-11-13 15:25:23 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-11-15 15:40:37 -0800 |
| commit | 273bbfb51d2db8f9b7481532d97bf6802596e6f2 (patch) | |
| tree | 0ff6f150834bbdaf1044f71c6fb44118538b3c4b /gr-uhd | |
| parent | d305018cbeb87e8a39ac67f6775e73914576fdfa (diff) | |
uhd: Fix Python issues
- Import order for uhd_fft
- Convert iterators to lists
Diffstat (limited to 'gr-uhd')
| -rwxr-xr-x | gr-uhd/apps/uhd_fft | 4 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_siggen_gui | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft index 02d49cd1b3..42d7efd341 100755 --- a/gr-uhd/apps/uhd_fft +++ b/gr-uhd/apps/uhd_fft @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # -# Copyright 2015-2016 Free Software Foundation, Inc. +# Copyright 2015-2016,2018 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -59,9 +59,9 @@ class uhd_fft(gr.top_block, Qt.QWidget, UHDApp): Simple UHD Spectrum Analyzer / Scope App. """ def __init__(self, args): + UHDApp.__init__(self, args=args, prefix="UHD FFT") gr.top_block.__init__(self, "UHD FFT") Qt.QWidget.__init__(self) - UHDApp.__init__(self, args=args, prefix="UHD FFT") ################################################## # Init QT App ################################################## diff --git a/gr-uhd/apps/uhd_siggen_gui b/gr-uhd/apps/uhd_siggen_gui index 20ce9b4ec5..d29ca20322 100755 --- a/gr-uhd/apps/uhd_siggen_gui +++ b/gr-uhd/apps/uhd_siggen_gui @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2015-2016 Free Software Foundation, Inc. +# Copyright 2015-2016,2018 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -91,8 +91,8 @@ class uhd_siggen_gui(Qt.QWidget): # Widgets + Controls ################################################## ### Waveform Selector - self._waveform_options = uhd_siggen.WAVEFORMS.keys() - self._waveform_labels = uhd_siggen.WAVEFORMS.values() + self._waveform_options = list(uhd_siggen.WAVEFORMS.keys()) + self._waveform_labels = list(uhd_siggen.WAVEFORMS.values()) self._waveform_group_box = Qt.QGroupBox("Waveform") self._waveform_box = Qt.QHBoxLayout() class variable_chooser_button_group(Qt.QButtonGroup): |