diff options
| author |   Josh Morman <jmorman@gnuradio.org> | 2021-11-24 12:39:12 -0500 |
|---|---|---|
| committer |   mormj <34754695+mormj@users.noreply.github.com> | 2021-11-24 14:41:53 -0500 |
| commit | 29fd7c725d7e155e668351e0b4532145a6df3212 (patch) | |
| tree | 16c0c24543c720ba3f495328356ec0540c368ab5 /gr-qtgui | |
| parent | pdu: pep8 formatting (diff) | |
| download | gnuradio-29fd7c725d7e155e668351e0b4532145a6df3212.tar.xz gnuradio-29fd7c725d7e155e668351e0b4532145a6df3212.zip | |
qtgui: pep8 formatting
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
Diffstat (limited to 'gr-qtgui')
33 files changed, 654 insertions, 479 deletions
diff --git a/gr-qtgui/apps/uhd_display.py b/gr-qtgui/apps/uhd_display.py index 39e5cfbfc..be501a018 100644 --- a/gr-qtgui/apps/uhd_display.py +++ b/gr-qtgui/apps/uhd_display.py @@ -82,8 +82,8 @@ class main_window(QtGui.QMainWindow): self.fg.start() self.gui.pauseButton.setText("Pause") - # Functions to set the values in the GUI + def set_frequency(self, freq): self.freq = freq sfreq = eng_notation.num_to_str(self.freq) @@ -102,11 +102,12 @@ class main_window(QtGui.QMainWindow): self.amp = amp self.gui.amplifierEdit.setText(QtCore.QString("%1").arg(self.amp)) - # Functions called when signals are triggered in the GUI + def frequencyEditText(self): try: - freq = eng_notation.str_to_num(self.gui.frequencyEdit.text().toAscii()) + freq = eng_notation.str_to_num( + self.gui.frequencyEdit.text().toAscii()) self.fg.set_frequency(freq) self.freq = freq except RuntimeError: @@ -122,7 +123,8 @@ class main_window(QtGui.QMainWindow): def bandwidthEditText(self): try: - bw = eng_notation.str_to_num(self.gui.bandwidthEdit.text().toAscii()) + bw = eng_notation.str_to_num( + self.gui.bandwidthEdit.text().toAscii()) self.fg.set_bandwidth(bw) self.bw = bw except ValueError: @@ -137,7 +139,8 @@ class main_window(QtGui.QMainWindow): pass def saveData(self): - fileName = QtGui.QFileDialog.getSaveFileName(self, "Save data to file", "."); + fileName = QtGui.QFileDialog.getSaveFileName( + self, "Save data to file", ".") if(len(fileName)): self.fg.save_to_file(str(fileName)) @@ -150,7 +153,6 @@ class main_window(QtGui.QMainWindow): self.fg.cancel_dc(state) - class my_top_block(gr.top_block): def __init__(self, options): gr.top_block.__init__(self) @@ -160,7 +162,8 @@ class my_top_block(gr.top_block): self.qapp = QtGui.QApplication(sys.argv) - self.u = uhd.usrp_source(device_addr=options.address, stream_args=uhd.stream_args('fc32')) + self.u = uhd.usrp_source( + device_addr=options.address, stream_args=uhd.stream_args('fc32')) if(options.antenna): self.u.set_antenna(options.antenna, 0) @@ -170,13 +173,13 @@ class my_top_block(gr.top_block): if options.gain is None: # if no gain was specified, use the mid-point in dB g = self.u.get_gain_range() - options.gain = float(g.start()+g.stop()) / 2 + options.gain = float(g.start() + g.stop()) / 2 self.set_gain(options.gain) if options.freq is None: # if no freq was specified, use the mid-point r = self.u.get_freq_range() - options.freq = float(r.start()+r.stop()) / 2 + options.freq = float(r.start() + r.stop()) / 2 self.set_frequency(options.freq) self._fftsize = options.fft_size @@ -218,7 +221,6 @@ class my_top_block(gr.top_block): self.main_win.show() - def save_to_file(self, name): self.lock() @@ -262,19 +264,20 @@ class my_top_block(gr.top_block): if(state): self.disconnect(self.u, self.amp) - self.connect(self.u, (self.dc_sub,0)) - self.connect(self.u, self.dc, (self.dc_sub,1)) + self.connect(self.u, (self.dc_sub, 0)) + self.connect(self.u, self.dc, (self.dc_sub, 1)) self.connect(self.dc_sub, self.amp) else: self.disconnect(self.dc_sub, self.amp) - self.disconnect(self.dc, (self.dc_sub,1)) + self.disconnect(self.dc, (self.dc_sub, 1)) self.disconnect(self.u, self.dc) - self.disconnect(self.u, (self.dc_sub,0)) + self.disconnect(self.u, (self.dc_sub, 0)) self.connect(self.u, self.amp) self.unlock() -def main (): + +def main(): parser = OptionParser(option_class=eng_option) parser.add_option("-a", "--address", type="string", default="addr=192.168.10.2", help="Address of UHD device, [default=%default]") @@ -296,11 +299,11 @@ def main (): tb = my_top_block(options) tb.start() - tb.snk.exec_(); + tb.snk.exec_() + if __name__ == '__main__': try: - main () + main() except KeyboardInterrupt: pass - diff --git a/gr-qtgui/apps/usrp_display_qtgui.py b/gr-qtgui/apps/usrp_display_qtgui.py index d14c7535c..1a1522cf6 100644 --- a/gr-qtgui/apps/usrp_display_qtgui.py +++ b/gr-qtgui/apps/usrp_display_qtgui.py @@ -9,6 +9,7 @@ from PyQt5 import QtCore, QtGui + class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") @@ -20,10 +21,12 @@ class Ui_MainWindow(object): self.horizontalLayout_2 = QtGui.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.groupBox = QtGui.QGroupBox(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy( + QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.groupBox.sizePolicy().hasHeightForWidth()) self.groupBox.setSizePolicy(sizePolicy) self.groupBox.setMinimumSize(QtCore.QSize(240, 150)) self.groupBox.setMaximumSize(QtCore.QSize(240, 16777215)) @@ -35,52 +38,68 @@ class Ui_MainWindow(object): self.formLayout.setObjectName("formLayout") self.frequencyLabel = QtGui.QLabel(self.formLayoutWidget) self.frequencyLabel.setObjectName("frequencyLabel") - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.frequencyLabel) + self.formLayout.setWidget( + 0, QtGui.QFormLayout.LabelRole, self.frequencyLabel) self.gainLabel = QtGui.QLabel(self.formLayoutWidget) self.gainLabel.setObjectName("gainLabel") - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.gainLabel) + self.formLayout.setWidget( + 1, QtGui.QFormLayout.LabelRole, self.gainLabel) self.bandwidthLabel = QtGui.QLabel(self.formLayoutWidget) self.bandwidthLabel.setObjectName("bandwidthLabel") - self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.bandwidthLabel) + self.formLayout.setWidget( + 2, QtGui.QFormLayout.LabelRole, self.bandwidthLabel) self.frequencyEdit = QtGui.QLineEdit(self.formLayoutWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy( + QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.frequencyEdit.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.frequencyEdit.sizePolicy().hasHeightForWidth()) self.frequencyEdit.setSizePolicy(sizePolicy) self.frequencyEdit.setMinimumSize(QtCore.QSize(120, 26)) self.frequencyEdit.setObjectName("frequencyEdit") - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.frequencyEdit) + self.formLayout.setWidget( + 0, QtGui.QFormLayout.FieldRole, self.frequencyEdit) self.gainEdit = QtGui.QLineEdit(self.formLayoutWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy( + QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.gainEdit.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.gainEdit.sizePolicy().hasHeightForWidth()) self.gainEdit.setSizePolicy(sizePolicy) self.gainEdit.setMinimumSize(QtCore.QSize(120, 26)) self.gainEdit.setObjectName("gainEdit") - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.gainEdit) + self.formLayout.setWidget( + 1, QtGui.QFormLayout.FieldRole, self.gainEdit) self.bandwidthEdit = QtGui.QLineEdit(self.formLayoutWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy( + QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.bandwidthEdit.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.bandwidthEdit.sizePolicy().hasHeightForWidth()) self.bandwidthEdit.setSizePolicy(sizePolicy) self.bandwidthEdit.setMinimumSize(QtCore.QSize(120, 26)) self.bandwidthEdit.setObjectName("bandwidthEdit") - self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.bandwidthEdit) + self.formLayout.setWidget( + 2, QtGui.QFormLayout.FieldRole, self.bandwidthEdit) self.amplifierLabel = QtGui.QLabel(self.formLayoutWidget) self.amplifierLabel.setObjectName("amplifierLabel") - self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.amplifierLabel) + self.formLayout.setWidget( + 3, QtGui.QFormLayout.LabelRole, self.amplifierLabel) self.amplifierEdit = QtGui.QLineEdit(self.formLayoutWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy( + QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.amplifierEdit.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.amplifierEdit.sizePolicy().hasHeightForWidth()) self.amplifierEdit.setSizePolicy(sizePolicy) self.amplifierEdit.setMinimumSize(QtCore.QSize(120, 26)) self.amplifierEdit.setObjectName("amplifierEdit") - self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.amplifierEdit) + self.formLayout.setWidget( + 3, QtGui.QFormLayout.FieldRole, self.amplifierEdit) self.horizontalLayout_2.addWidget(self.groupBox) self.frame_2 = QtGui.QFrame(self.centralwidget) self.frame_2.setMinimumSize(QtCore.QSize(200, 0)) @@ -104,28 +123,35 @@ class Ui_MainWindow(object): self.dcGainEdit.setObjectName("dcGainEdit") self.horizontalLayout.addWidget(self.dcGainEdit) self.verticalLayout_3.addLayout(self.horizontalLayout) - spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + spacerItem = QtGui.QSpacerItem( + 20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.verticalLayout_3.addItem(spacerItem) self.horizontalLayout_2.addWidget(self.frame_2) - spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem1 = QtGui.QSpacerItem( + 40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem1) self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") - spacerItem2 = QtGui.QSpacerItem(20, 80, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + spacerItem2 = QtGui.QSpacerItem( + 20, 80, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) self.verticalLayout.addItem(spacerItem2) self.pauseButton = QtGui.QPushButton(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy( + QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pauseButton.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.pauseButton.sizePolicy().hasHeightForWidth()) self.pauseButton.setSizePolicy(sizePolicy) self.pauseButton.setObjectName("pauseButton") self.verticalLayout.addWidget(self.pauseButton) self.closeButton = QtGui.QPushButton(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtGui.QSizePolicy( + QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.closeButton.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.closeButton.sizePolicy().hasHeightForWidth()) self.closeButton.setSizePolicy(sizePolicy) self.closeButton.setMinimumSize(QtCore.QSize(75, 0)) self.closeButton.setObjectName("closeButton") @@ -135,10 +161,12 @@ class Ui_MainWindow(object): self.verticalLayout_2 = QtGui.QVBoxLayout() self.verticalLayout_2.setObjectName("verticalLayout_2") self.frame = QtGui.QFrame(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) + sizePolicy = QtGui.QSizePolicy( + QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(1) - sizePolicy.setHeightForWidth(self.frame.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.frame.sizePolicy().hasHeightForWidth()) self.frame.setSizePolicy(sizePolicy) self.frame.setMinimumSize(QtCore.QSize(800, 550)) self.frame.setFrameShape(QtGui.QFrame.StyledPanel) @@ -170,22 +198,36 @@ class Ui_MainWindow(object): self.menubar.addAction(self.menuFile.menuAction()) self.retranslateUi(MainWindow) - QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), MainWindow.close) - QtCore.QObject.connect(self.actionExit, QtCore.SIGNAL("triggered()"), MainWindow.close) + QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL( + "clicked()"), MainWindow.close) + QtCore.QObject.connect(self.actionExit, QtCore.SIGNAL( + "triggered()"), MainWindow.close) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "USRP Display", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox.setTitle(QtGui.QApplication.translate("MainWindow", "Receiver Parameters", None, QtGui.QApplication.UnicodeUTF8)) - self.frequencyLabel.setText(QtGui.QApplication.translate("MainWindow", "Frequency (Hz)", None, QtGui.QApplication.UnicodeUTF8)) - self.gainLabel.setText(QtGui.QApplication.translate("MainWindow", "RF Gain", None, QtGui.QApplication.UnicodeUTF8)) - self.bandwidthLabel.setText(QtGui.QApplication.translate("MainWindow", "Bandwidth", None, QtGui.QApplication.UnicodeUTF8)) - self.amplifierLabel.setText(QtGui.QApplication.translate("MainWindow", "Amplifier", None, QtGui.QApplication.UnicodeUTF8)) - self.dcCancelCheckBox.setText(QtGui.QApplication.translate("MainWindow", "Cancel DC", None, QtGui.QApplication.UnicodeUTF8)) - self.dcGainLabel.setText(QtGui.QApplication.translate("MainWindow", "DC Canceller Gain", None, QtGui.QApplication.UnicodeUTF8)) - self.pauseButton.setText(QtGui.QApplication.translate("MainWindow", "Pause", None, QtGui.QApplication.UnicodeUTF8)) - self.closeButton.setText(QtGui.QApplication.translate("MainWindow", "Close", None, QtGui.QApplication.UnicodeUTF8)) - self.menuFile.setTitle(QtGui.QApplication.translate("MainWindow", "&File", None, QtGui.QApplication.UnicodeUTF8)) - self.actionExit.setText(QtGui.QApplication.translate("MainWindow", "E&xit", None, QtGui.QApplication.UnicodeUTF8)) - self.actionSaveData.setText(QtGui.QApplication.translate("MainWindow", "&Save Data", None, QtGui.QApplication.UnicodeUTF8)) - + MainWindow.setWindowTitle(QtGui.QApplication.translate( + "MainWindow", "USRP Display", None, QtGui.QApplication.UnicodeUTF8)) + self.groupBox.setTitle(QtGui.QApplication.translate( + "MainWindow", "Receiver Parameters", None, QtGui.QApplication.UnicodeUTF8)) + self.frequencyLabel.setText(QtGui.QApplication.translate( + "MainWindow", "Frequency (Hz)", None, QtGui.QApplication.UnicodeUTF8)) + self.gainLabel.setText(QtGui.QApplication.translate( + "MainWindow", "RF Gain", None, QtGui.QApplication.UnicodeUTF8)) + self.bandwidthLabel.setText(QtGui.QApplication.translate( + "MainWindow", "Bandwidth", None, QtGui.QApplication.UnicodeUTF8)) + self.amplifierLabel.setText(QtGui.QApplication.translate( + "MainWindow", "Amplifier", None, QtGui.QApplication.UnicodeUTF8)) + self.dcCancelCheckBox.setText(QtGui.QApplication.translate( + "MainWindow", "Cancel DC", None, QtGui.QApplication.UnicodeUTF8)) + self.dcGainLabel.setText(QtGui.QApplication.translate( + "MainWindow", "DC Canceller Gain", None, QtGui.QApplication.UnicodeUTF8)) + self.pauseButton.setText(QtGui.QApplication.translate( + "MainWindow", "Pause", None, QtGui.QApplication.UnicodeUTF8)) + self.closeButton.setText(QtGui.QApplication.translate( + "MainWindow", "Close", None, QtGui.QApplication.UnicodeUTF8)) + self.menuFile.setTitle(QtGui.QApplication.translate( + "MainWindow", "&File", None, QtGui.QApplication.UnicodeUTF8)) + self.actionExit.setText(QtGui.QApplication.translate( + "MainWindow", "E&xit", None, QtGui.QApplication.UnicodeUTF8)) + self.actionSaveData.setText(QtGui.QApplication.translate( + "MainWindow", "&Save Data", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/gr-qtgui/examples/pyqt_const_c.py b/gr-qtgui/examples/pyqt_const_c.py index 0f3cf6060..9442feb54 100644 --- a/gr-qtgui/examples/pyqt_const_c.py +++ b/gr-qtgui/examples/pyqt_const_c.py @@ -32,17 +32,20 @@ except ImportError: sys.stderr.write("Error: Program requires gr-channels.\n") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display, control): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -64,14 +67,12 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Signal 1 Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.freq2Edit = QtWidgets.QLineEdit(self) self.freq2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Frequency:", self.freq2Edit) self.freq2Edit.editingFinished.connect(self.freq2EditText) - self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Amplitude:", self.amp2Edit) @@ -106,7 +107,6 @@ class control_box(QtWidgets.QWidget): except ValueError: print("Bad amplitude value entered") - def freq2EditText(self): try: newfreq = float(self.freq2Edit.text()) @@ -136,22 +136,22 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.5, 0) src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.5, 0) - src = blocks.add_cc() + src = blocks.add_cc() channel = channels.channel_model(0.001) - thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) + thr = blocks.throttle(gr.sizeof_gr_complex, 100 * npts) self.snk1 = qtgui.const_sink_c(npts, "Constellation Example", 1, None) self.snk1.disable_legend() - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) - self.connect(src, channel, thr, (self.snk1, 0)) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) + self.connect(src, channel, thr, (self.snk1, 0)) self.ctrl_win = control_box() self.ctrl_win.attach_signal1(src1) self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget @@ -160,8 +160,9 @@ class my_top_block(gr.top_block): self.main_box = dialog_box(pyWin, self.ctrl_win) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_example_c.py b/gr-qtgui/examples/pyqt_example_c.py index 9485c050a..7ccd42f77 100644 --- a/gr-qtgui/examples/pyqt_example_c.py +++ b/gr-qtgui/examples/pyqt_example_c.py @@ -33,17 +33,20 @@ except ImportError: sys.stderr.write("Error: Program requires gr-channels.\n") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display, control): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -65,14 +68,12 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Signal 1 Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.freq2Edit = QtWidgets.QLineEdit(self) self.freq2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Frequency:", self.freq2Edit) self.freq2Edit.editingFinished.connect(self.freq2EditText) - self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Amplitude:", self.amp2Edit) @@ -108,7 +109,6 @@ class control_box(QtWidgets.QWidget): except ValueError: print("Bad amplitude value entered") - def freq2EditText(self): try: newfreq = float(self.freq2Edit.text()) @@ -142,24 +142,24 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0) src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) - src = blocks.add_cc() + src = blocks.add_cc() channel = channels.channel_model(0.001) - thr = blocks.throttle(gr.sizeof_gr_complex, 100*fftsize) + thr = blocks.throttle(gr.sizeof_gr_complex, 100 * fftsize) self.snk1 = qtgui.sink_c(fftsize, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Complex Signal Example", True, True, True, False, None) - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) - self.connect(src, channel, thr, self.snk1) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) + self.connect(src, channel, thr, self.snk1) self.ctrl_win = control_box() self.ctrl_win.attach_signal1(src1) self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget @@ -169,8 +169,9 @@ class my_top_block(gr.top_block): self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_example_f.py b/gr-qtgui/examples/pyqt_example_f.py index c8e06b872..172e51c28 100644 --- a/gr-qtgui/examples/pyqt_example_f.py +++ b/gr-qtgui/examples/pyqt_example_f.py @@ -27,17 +27,20 @@ except ImportError: sys.stderr.write("Error: Program requires gr-analog.\n") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display, control): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -59,14 +62,12 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Signal 1 Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.freq2Edit = QtWidgets.QLineEdit(self) self.freq2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Frequency:", self.freq2Edit) self.freq2Edit.editingFinished.connect(self.freq2EditText) - self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Amplitude:", self.amp2Edit) @@ -102,7 +103,6 @@ class control_box(QtWidgets.QWidget): except ValueError: print("Bad amplitude value entered") - def freq2EditText(self): try: newfreq = float(self.freq2Edit.text()) @@ -132,8 +132,8 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0) src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) - src = blocks.add_ff() - thr = blocks.throttle(gr.sizeof_float, 100*fftsize) + src = blocks.add_ff() + thr = blocks.throttle(gr.sizeof_float, 100 * fftsize) noise = analog.noise_source_f(analog.GR_GAUSSIAN, 0.001) add = blocks.add_ff() self.snk1 = qtgui.sink_f(fftsize, window.WIN_BLACKMAN_hARRIS, @@ -141,10 +141,10 @@ class my_top_block(gr.top_block): "Float Signal Example", True, True, True, False, None) - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) - self.connect(src, thr, (add,0)) - self.connect(noise, (add,1)) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) + self.connect(src, thr, (add, 0)) + self.connect(noise, (add, 1)) self.connect(add, self.snk1) self.ctrl_win = control_box() @@ -152,7 +152,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget @@ -162,8 +162,9 @@ class my_top_block(gr.top_block): self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_freq_c.py b/gr-qtgui/examples/pyqt_freq_c.py index 8f3387bef..5ba641c86 100644 --- a/gr-qtgui/examples/pyqt_freq_c.py +++ b/gr-qtgui/examples/pyqt_freq_c.py @@ -33,17 +33,20 @@ except ImportError: sys.stderr.write("Error: Program requires gr-channels.\n") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display, control): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -65,14 +68,12 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Signal 1 Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.freq2Edit = QtWidgets.QLineEdit(self) self.freq2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Frequency:", self.freq2Edit) self.freq2Edit.editingFinished.connect(self.freq2EditText) - self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Amplitude:", self.amp2Edit) @@ -108,7 +109,6 @@ class control_box(QtWidgets.QWidget): except ValueError: print("Bad amplitude value entered") - def freq2EditText(self): try: newfreq = float(self.freq2Edit.text()) @@ -142,36 +142,37 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0) src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) - src = blocks.add_cc() + src = blocks.add_cc() channel = channels.channel_model(0.01) - thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) + thr = blocks.throttle(gr.sizeof_gr_complex, 100 * npts) self.snk1 = qtgui.freq_sink_c(npts, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Complex Freq Example", 3, None) - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) - self.connect(src, channel, thr, (self.snk1, 0)) - self.connect(src1, (self.snk1, 1)) - self.connect(src2, (self.snk1, 2)) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) + self.connect(src, channel, thr, (self.snk1, 0)) + self.connect(src1, (self.snk1, 1)) + self.connect(src2, (self.snk1, 2)) self.ctrl_win = control_box() self.ctrl_win.attach_signal1(src1) self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget pyWin = sip.wrapinstance(pyQt, QtWidgets.QWidget) - #pyWin.show() + # pyWin.show() self.main_box = dialog_box(pyWin, self.ctrl_win) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_freq_f.py b/gr-qtgui/examples/pyqt_freq_f.py index 15949495c..274e45de7 100644 --- a/gr-qtgui/examples/pyqt_freq_f.py +++ b/gr-qtgui/examples/pyqt_freq_f.py @@ -33,12 +33,14 @@ class dialog_box(QtWidgets.QWidget): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -60,14 +62,12 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Signal 1 Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.freq2Edit = QtWidgets.QLineEdit(self) self.freq2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Frequency:", self.freq2Edit) self.freq2Edit.editingFinished.connect(self.freq2EditText) - self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Amplitude:", self.amp2Edit) @@ -103,7 +103,6 @@ class control_box(QtWidgets.QWidget): except ValueError: print("Bad amplitude value entered") - def freq2EditText(self): try: newfreq = float(self.freq2Edit.text()) @@ -133,35 +132,36 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0) src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) - src = blocks.add_ff() - thr = blocks.throttle(gr.sizeof_float, 100*npts) + src = blocks.add_ff() + thr = blocks.throttle(gr.sizeof_float, 100 * npts) self.snk1 = qtgui.freq_sink_f(npts, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Real freq Example", 3, None) - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) - self.connect(src, thr, (self.snk1, 0)) - self.connect(src1, (self.snk1, 1)) - self.connect(src2, (self.snk1, 2)) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) + self.connect(src, thr, (self.snk1, 0)) + self.connect(src1, (self.snk1, 1)) + self.connect(src2, (self.snk1, 2)) self.ctrl_win = control_box() self.ctrl_win.attach_signal1(src1) self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget pyWin = sip.wrapinstance(pyQt, QtWidgets.QWidget) - #pyWin.show() + # pyWin.show() self.main_box = dialog_box(pyWin, self.ctrl_win) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_histogram_f.py b/gr-qtgui/examples/pyqt_histogram_f.py index d35cc90cc..8360e5aec 100644 --- a/gr-qtgui/examples/pyqt_histogram_f.py +++ b/gr-qtgui/examples/pyqt_histogram_f.py @@ -26,17 +26,20 @@ except ImportError: sys.stderr.write("Error: Program requires gr-analog.\n") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display, control): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, snk, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -59,7 +62,6 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Sine Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) @@ -91,7 +93,6 @@ class control_box(QtWidgets.QWidget): self.quit.clicked.connect(QtWidgets.qApp.quit) - def attach_signal1(self, signal): self.signal1 = signal self.freq1Edit.setText(("{0}").format(self.signal1.frequency())) @@ -149,14 +150,14 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0, 0) src2 = analog.noise_source_f(analog.GR_GAUSSIAN, 1) - src = blocks.add_ff() - thr = blocks.throttle(gr.sizeof_float, 100*npts) + src = blocks.add_ff() + thr = blocks.throttle(gr.sizeof_float, 100 * npts) self.snk1 = qtgui.histogram_sink_f(npts, 200, -5, 5, "Histogram", 1, None) self.snk1.disable_legend() - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) self.connect(src, thr, self.snk1) self.ctrl_win = control_box(self.snk1) @@ -164,18 +165,19 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget pyWin = sip.wrapinstance(pyQt, QtWidgets.QWidget) - #pyWin.show() + # pyWin.show() self.main_box = dialog_box(pyWin, self.ctrl_win) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_time_c.py b/gr-qtgui/examples/pyqt_time_c.py index 3a47a6d57..e784b7e4d 100644 --- a/gr-qtgui/examples/pyqt_time_c.py +++ b/gr-qtgui/examples/pyqt_time_c.py @@ -32,17 +32,20 @@ except ImportError: sys.stderr.write("Error: Program requires gr-channels.\n") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display, control): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -64,14 +67,12 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Signal 1 Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.freq2Edit = QtWidgets.QLineEdit(self) self.freq2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Frequency:", self.freq2Edit) self.freq2Edit.editingFinished.connect(self.freq2EditText) - self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Amplitude:", self.amp2Edit) @@ -107,7 +108,6 @@ class control_box(QtWidgets.QWidget): except ValueError: print("Bad amplitude value entered") - def freq2EditText(self): try: newfreq = float(self.freq2Edit.text()) @@ -141,15 +141,15 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0) src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) - src = blocks.add_cc() + src = blocks.add_cc() channel = channels.channel_model(0.01) - thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) + thr = blocks.throttle(gr.sizeof_gr_complex, 100 * npts) self.snk1 = qtgui.time_sink_c(npts, Rs, "Complex Time Example", 1, None) - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) - self.connect(src, channel, thr, (self.snk1, 0)) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) + self.connect(src, channel, thr, (self.snk1, 0)) #self.connect(src1, (self.snk1, 1)) #self.connect(src2, (self.snk1, 2)) @@ -158,7 +158,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget @@ -166,7 +166,7 @@ class my_top_block(gr.top_block): # Example of using signal/slot to set the title of a curve # FIXME: update for Qt5 - #pyWin.setLineLabel.connect(pyWin.setLineLabel) + # pyWin.setLineLabel.connect(pyWin.setLineLabel) #pyWin.emit(QtCore.SIGNAL("setLineLabel(int, QString)"), 0, "Re{sum}") self.snk1.set_line_label(0, "Re{Sum}") self.snk1.set_line_label(1, "Im{Sum}") @@ -180,12 +180,13 @@ class my_top_block(gr.top_block): self.snk1.set_update_time(0.5) - #pyWin.show() + # pyWin.show() self.main_box = dialog_box(pyWin, self.ctrl_win) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_time_f.py b/gr-qtgui/examples/pyqt_time_f.py index 0bbbfa57d..2ec181fb5 100644 --- a/gr-qtgui/examples/pyqt_time_f.py +++ b/gr-qtgui/examples/pyqt_time_f.py @@ -26,17 +26,20 @@ except ImportError: sys.stderr.write("Error: Program requires gr-analog.\n") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display, control): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -58,14 +61,12 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Signal 1 Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.freq2Edit = QtWidgets.QLineEdit(self) self.freq2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Frequency:", self.freq2Edit) self.freq2Edit.editingFinished.connect(self.freq2EditText) - self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Amplitude:", self.amp2Edit) @@ -101,7 +102,6 @@ class control_box(QtWidgets.QWidget): except ValueError: print("Bad amplitude value entered") - def freq2EditText(self): try: newfreq = float(self.freq2Edit.text()) @@ -131,17 +131,17 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0) src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) - src = blocks.add_ff() - thr = blocks.throttle(gr.sizeof_float, 100*npts) + src = blocks.add_ff() + thr = blocks.throttle(gr.sizeof_float, 100 * npts) noise = analog.noise_source_f(analog.GR_GAUSSIAN, 0.001) add = blocks.add_ff() self.snk1 = qtgui.time_sink_f(npts, Rs, "Complex Time Example", 3, None) - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) - self.connect(src, thr, (add,0)) - self.connect(noise, (add,1)) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) + self.connect(src, thr, (add, 0)) + self.connect(noise, (add, 1)) self.connect(add, self.snk1) self.connect(src1, (self.snk1, 1)) self.connect(src2, (self.snk1, 2)) @@ -151,7 +151,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget @@ -159,7 +159,7 @@ class my_top_block(gr.top_block): # Example of using signal/slot to set the title of a curve # FIXME: update for Qt5 - #pyWin.setLineLabel.connect(pyWin.setLineLabel) + # pyWin.setLineLabel.connect(pyWin.setLineLabel) #pyWin.emit(QtCore.SIGNAL("setLineLabel(int, QString)"), 0, "Re{sum}") self.snk1.set_line_label(0, "Re{sum}") self.snk1.set_line_label(1, "src1") @@ -168,12 +168,13 @@ class my_top_block(gr.top_block): # Can also set the color of a curve #self.snk1.set_color(5, "blue") - #pyWin.show() + # pyWin.show() self.main_box = dialog_box(pyWin, self.ctrl_win) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_time_raster_b.py b/gr-qtgui/examples/pyqt_time_raster_b.py index 712fe3956..25c283385 100644 --- a/gr-qtgui/examples/pyqt_time_raster_b.py +++ b/gr-qtgui/examples/pyqt_time_raster_b.py @@ -21,25 +21,28 @@ except ImportError: print("Error: Program requires PyQt5 and gr-qtgui.") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.resize(800, 500) + class my_top_block(gr.top_block): def __init__(self): gr.top_block.__init__(self) self.qapp = QtWidgets.QApplication(sys.argv) - data0 = 10*[0,] + 40*[1,0] + 10*[0,] - data0 += 10*[0,] + 40*[0,1] + 10*[0,] - data1 = 20*[0,] + [0,0,0,1,1,1,0,0,0,0] + 70*[0,] + data0 = 10 * [0, ] + 40 * [1, 0] + 10 * [0, ] + data0 += 10 * [0, ] + 40 * [0, 1] + 10 * [0, ] + data1 = 20 * [0, ] + [0, 0, 0, 1, 1, 1, 0, 0, 0, 0] + 70 * [0, ] # Adjust these to change the layout of the plot. # Can be set to fractions. @@ -49,7 +52,7 @@ class my_top_block(gr.top_block): fs = 200 src0 = blocks.vector_source_b(data0, True) src1 = blocks.vector_source_b(data1, True) - thr = blocks.throttle(gr.sizeof_char, 50000) + thr = blocks.throttle(gr.sizeof_char, 50000) head = blocks.head(gr.sizeof_char, 10000000) self.snk1 = qtgui.time_raster_sink_b(fs, nrows, ncols, [], [], "Time Raster Example", 2, None) @@ -67,8 +70,9 @@ class my_top_block(gr.top_block): self.main_box = dialog_box(pyWin) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_time_raster_f.py b/gr-qtgui/examples/pyqt_time_raster_f.py index aa4e4a800..a86b7c910 100644 --- a/gr-qtgui/examples/pyqt_time_raster_f.py +++ b/gr-qtgui/examples/pyqt_time_raster_f.py @@ -20,25 +20,28 @@ except ImportError: print("Error: Program requires PyQt5 and gr-qtgui.") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.resize(800, 500) + class my_top_block(gr.top_block): def __init__(self): gr.top_block.__init__(self) self.qapp = QtWidgets.QApplication(sys.argv) - data0 = 10*[0,] + 40*[1,0] + 10*[0,] - data0 += 10*[0,] + 40*[0,1] + 10*[0,] - data1 = 20*[0,] + [0,0,0,1,1,1,0,0,0,0] + 70*[0,] + data0 = 10 * [0, ] + 40 * [1, 0] + 10 * [0, ] + data0 += 10 * [0, ] + 40 * [0, 1] + 10 * [0, ] + data1 = 20 * [0, ] + [0, 0, 0, 1, 1, 1, 0, 0, 0, 0] + 70 * [0, ] # Adjust these to change the layout of the plot. # Can be set to fractions. @@ -66,8 +69,9 @@ class my_top_block(gr.top_block): self.main_box = dialog_box(pyWin) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_waterfall_c.py b/gr-qtgui/examples/pyqt_waterfall_c.py index a3bf5282c..778a91ead 100644 --- a/gr-qtgui/examples/pyqt_waterfall_c.py +++ b/gr-qtgui/examples/pyqt_waterfall_c.py @@ -33,17 +33,20 @@ except ImportError: sys.stderr.write("Error: Program requires gr-channels.\n") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display, control): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -65,14 +68,12 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Signal 1 Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.freq2Edit = QtWidgets.QLineEdit(self) self.freq2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Frequency:", self.freq2Edit) self.freq2Edit.editingFinished.connect(self.freq2EditText) - self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Amplitude:", self.amp2Edit) @@ -108,7 +109,6 @@ class control_box(QtWidgets.QWidget): except ValueError: print("Bad amplitude value entered") - def freq2EditText(self): try: newfreq = float(self.freq2Edit.text()) @@ -144,9 +144,9 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0) src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) - src = blocks.add_cc() + src = blocks.add_cc() channel = channels.channel_model(0.01) - thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) + thr = blocks.throttle(gr.sizeof_gr_complex, 100 * npts) filt = filter.fft_filter_ccc(1, taps) self.snk1 = qtgui.waterfall_sink_c(npts, window.WIN_BLACKMAN_hARRIS, 0, Rs, @@ -154,9 +154,9 @@ class my_top_block(gr.top_block): self.snk1.set_color_map(0, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) self.snk1.set_color_map(1, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) - self.connect(src, channel, thr, (self.snk1, 0)) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) + self.connect(src, channel, thr, (self.snk1, 0)) self.connect(thr, filt, (self.snk1, 1)) self.ctrl_win = control_box() @@ -164,18 +164,19 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget pyWin = sip.wrapinstance(pyQt, QtWidgets.QWidget) - #pyWin.show() + # pyWin.show() self.main_box = dialog_box(pyWin, self.ctrl_win) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/examples/pyqt_waterfall_f.py b/gr-qtgui/examples/pyqt_waterfall_f.py index 15e0512df..ecbe84dee 100644 --- a/gr-qtgui/examples/pyqt_waterfall_f.py +++ b/gr-qtgui/examples/pyqt_waterfall_f.py @@ -27,17 +27,20 @@ except ImportError: sys.stderr.write("Error: Program requires gr-analog.\n") sys.exit(1) + class dialog_box(QtWidgets.QWidget): def __init__(self, display, control): QtWidgets.QWidget.__init__(self, None) self.setWindowTitle('PyQt Test GUI') - self.boxlayout = QtWidgets.QBoxLayout(QtWidgets.QBoxLayout.LeftToRight, self) + self.boxlayout = QtWidgets.QBoxLayout( + QtWidgets.QBoxLayout.LeftToRight, self) self.boxlayout.addWidget(display, 1) self.boxlayout.addWidget(control) self.resize(800, 500) + class control_box(QtWidgets.QWidget): def __init__(self, parent=None): QtWidgets.QWidget.__init__(self, parent) @@ -59,14 +62,12 @@ class control_box(QtWidgets.QWidget): self.layout.addRow("Signal 1 Amplitude:", self.amp1Edit) self.amp1Edit.editingFinished.connect(self.amp1EditText) - # Control the second signal self.freq2Edit = QtWidgets.QLineEdit(self) self.freq2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Frequency:", self.freq2Edit) self.freq2Edit.editingFinished.connect(self.freq2EditText) - self.amp2Edit = QtWidgets.QLineEdit(self) self.amp2Edit.setMinimumWidth(100) self.layout.addRow("Signal 2 Amplitude:", self.amp2Edit) @@ -102,7 +103,6 @@ class control_box(QtWidgets.QWidget): except ValueError: print("Bad amplitude value entered") - def freq2EditText(self): try: newfreq = float(self.freq2Edit.text()) @@ -132,17 +132,17 @@ class my_top_block(gr.top_block): src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0) src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) - src = blocks.add_ff() - thr = blocks.throttle(gr.sizeof_float, 100*npts) + src = blocks.add_ff() + thr = blocks.throttle(gr.sizeof_float, 100 * npts) self.snk1 = qtgui.waterfall_sink_f(npts, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Real Waterfall Example", 2, None) self.snk1.set_color_map(0, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) self.snk1.set_color_map(1, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) - self.connect(src1, (src,0)) - self.connect(src2, (src,1)) - self.connect(src, thr, (self.snk1, 0)) + self.connect(src1, (src, 0)) + self.connect(src2, (src, 1)) + self.connect(src, thr, (self.snk1, 0)) self.connect(src1, (self.snk1, 1)) self.ctrl_win = control_box() @@ -150,18 +150,19 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.qwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget pyWin = sip.wrapinstance(pyQt, QtWidgets.QWidget) - #pyWin.show() + # pyWin.show() self.main_box = dialog_box(pyWin, self.ctrl_win) self.main_box.show() + if __name__ == "__main__": - tb = my_top_block(); + tb = my_top_block() tb.start() tb.qapp.exec_() tb.stop() diff --git a/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py b/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py index ca3178e86..d40b0b825 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py +++ b/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py @@ -167,7 +167,7 @@ LINE_PARAMS = """ hide: ${{ ('part' if ( int(nconnections) >= {i} or (type == "complex" and int(nconnections) >= {i_cplx}) - or (type == "msg_complex" and {i_cplx} <= 1) + or (type == "msg_complex" and {i_cplx} <= 1) or (type == "msg_float" and {i} <= 1)) else 'all') }} @@ -179,7 +179,7 @@ LINE_PARAMS = """ hide: ${{ ('part' if ( int(nconnections) >= {i} or (type == "complex" and int(nconnections) >= {i_cplx}) - or (type == "msg_complex" and {i_cplx} <= 1) + or (type == "msg_complex" and {i_cplx} <= 1) or (type == "msg_float" and {i} <= 1)) else 'all') }} @@ -194,7 +194,7 @@ LINE_PARAMS = """ hide: ${{ ('part' if ( int(nconnections) >= {i} or (type == "complex" and int(nconnections) >= {i_cplx}) - or (type == "msg_complex" and {i_cplx} <= 1) + or (type == "msg_complex" and {i_cplx} <= 1) or (type == "msg_float" and {i} <= 1)) else 'all') }} @@ -209,7 +209,7 @@ LINE_PARAMS = """ hide: ${{ ('part' if ( int(nconnections) >= {i} or (type == "complex" and int(nconnections) >= {i_cplx}) - or (type == "msg_complex" and {i_cplx} <= 1) + or (type == "msg_complex" and {i_cplx} <= 1) or (type == "msg_float" and {i} <= 1)) else 'all') }} @@ -224,7 +224,7 @@ LINE_PARAMS = """ hide: ${{ ('part' if ( int(nconnections) >= {i} or (type == "complex" and int(nconnections) >= {i_cplx}) - or (type == "msg_complex" and {i_cplx} <= 1) + or (type == "msg_complex" and {i_cplx} <= 1) or (type == "msg_float" and {i} <= 1)) else 'all') }} @@ -237,7 +237,7 @@ LINE_PARAMS = """ hide: ${{ ('part' if ( int(nconnections) >= {i} or (type == "complex" and int(nconnections) >= {i_cplx}) - or (type == "msg_complex" and {i_cplx} <= 1) + or (type == "msg_complex" and {i_cplx} <= 1) or (type == "msg_float" and {i} <= 1)) else 'all') }} @@ -345,19 +345,21 @@ documentation: |- file_format: 1 """ + def make_yml(): """Return the YML file as a string""" default_colors = [ 'blue', 'red', 'green', 'black', 'cyan', 'magenta', 'yellow', 'dark red', 'dark green', 'dark blue' ] - line_params_1 = LINE_PARAMS.format(i=1, i_cplx=1, i_color=default_colors[0]) + line_params_1 = LINE_PARAMS.format( + i=1, i_cplx=1, i_color=default_colors[0]) line_params_1 = re.sub(r' base_key:.*\n', '', line_params_1) line_params_n = ''.join([ LINE_PARAMS.format( i=i, - i_cplx=int(math.ceil(float(i)/2)), - i_color=default_colors[(i-1) % len(default_colors)], + i_cplx=int(math.ceil(float(i) / 2)), + i_color=default_colors[(i - 1) % len(default_colors)], ) for i in range(2, 11) ]) @@ -378,4 +380,3 @@ if __name__ == '__main__': data = make_yml() with open(filename, 'wb') as fp: fp.write(data.encode()) - diff --git a/gr-qtgui/python/qtgui/__init__.py b/gr-qtgui/python/qtgui/__init__.py index 0522fed82..6edb8253f 100644 --- a/gr-qtgui/python/qtgui/__init__.py +++ b/gr-qtgui/python/qtgui/__init__.py @@ -23,12 +23,12 @@ except ImportError: from .qtgui_python import * try: - import matplotlib.pyplot as plt - from .distanceradar import DistanceRadar - from .azelplot import AzElPlot + import matplotlib.pyplot as plt + from .distanceradar import DistanceRadar + from .azelplot import AzElPlot except ImportError: - from gnuradio import gr - gr.log.warn("Matplotlib is a required dependency to use DistanceRadar and AzElPlot." + from gnuradio import gr + gr.log.warn("Matplotlib is a required dependency to use DistanceRadar and AzElPlot." " Please install matplotlib to use these blocks (https://matplotlib.org/)") from .range import Range, RangeWidget @@ -49,4 +49,3 @@ from .graphicoverlay import GrGraphicOverlay from .auto_correlator_sink import AutoCorrelatorSink from .auto_correlator_sink import AutoCorrelator from .auto_correlator_sink import Normalize - diff --git a/gr-qtgui/python/qtgui/auto_correlator_sink.py b/gr-qtgui/python/qtgui/auto_correlator_sink.py index ed69395d1..d1aa7728a 100644 --- a/gr-qtgui/python/qtgui/auto_correlator_sink.py +++ b/gr-qtgui/python/qtgui/auto_correlator_sink.py @@ -19,12 +19,13 @@ from gnuradio import blocks, fft, filter from PyQt5 import QtGui from PyQt5.QtWidgets import QWidget + class Normalize(gr.hier_block2): def __init__(self, vecsize=1024): gr.hier_block2.__init__( self, "Normalize", - gr.io_signature(1, 1, gr.sizeof_float*vecsize), - gr.io_signature(1, 1, gr.sizeof_float*vecsize), + gr.io_signature(1, 1, gr.sizeof_float * vecsize), + gr.io_signature(1, 1, gr.sizeof_float * vecsize), ) ################################################## @@ -35,7 +36,8 @@ class Normalize(gr.hier_block2): ################################################## # Blocks ################################################## - self.blocks_stream_to_vector_0 = blocks.stream_to_vector(gr.sizeof_float, vecsize) + self.blocks_stream_to_vector_0 = blocks.stream_to_vector( + gr.sizeof_float, vecsize) self.blocks_repeat_0 = blocks.repeat(gr.sizeof_float, vecsize) self.blocks_max_xx_0 = blocks.max_ff(vecsize) self.blocks_divide_xx_0 = blocks.divide_ff(vecsize) @@ -44,19 +46,21 @@ class Normalize(gr.hier_block2): # Connections ################################################## self.connect((self.blocks_divide_xx_0, 0), (self, 0)) - self.connect((self.blocks_stream_to_vector_0, 0), (self.blocks_divide_xx_0, 1)) + self.connect((self.blocks_stream_to_vector_0, 0), + (self.blocks_divide_xx_0, 1)) self.connect((self, 0), (self.blocks_max_xx_0, 0)) - self.connect((self.blocks_repeat_0, 0), (self.blocks_stream_to_vector_0, 0)) + self.connect((self.blocks_repeat_0, 0), + (self.blocks_stream_to_vector_0, 0)) self.connect((self.blocks_max_xx_0, 0), (self.blocks_repeat_0, 0)) self.connect((self, 0), (self.blocks_divide_xx_0, 0)) - def get_vecsize(self): return self.vecsize def set_vecsize(self, vecsize): self.vecsize = vecsize + class AutoCorrelator(gr.hier_block2): """ This block uses the Wiener Khinchin theorem that the FFT of a signal's @@ -64,19 +68,24 @@ class AutoCorrelator(gr.hier_block2): FAC Size controls the FFT size and therefore the length of time (samp_rate/fac_size) the auto-correlation runs over. """ + def __init__(self, sample_rate, fac_size, fac_decimation, use_db): - gr.hier_block2.__init__(self,"AutoCorrelator", - gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input sig - gr.io_signature(1, 1, gr.sizeof_float*fac_size)) # Output sig + gr.hier_block2.__init__(self, "AutoCorrelator", + gr.io_signature( + 1, 1, gr.sizeof_gr_complex), # Input sig + gr.io_signature(1, 1, gr.sizeof_float * fac_size)) # Output sig self.fac_size = fac_size self.fac_decimation = fac_decimation self.sample_rate = sample_rate - streamToVec = blocks.stream_to_vector(gr.sizeof_gr_complex, self.fac_size) + streamToVec = blocks.stream_to_vector( + gr.sizeof_gr_complex, self.fac_size) # Make sure N is at least 1 - decimation = int(self.sample_rate/self.fac_size/self.fac_decimation) - self.one_in_n = blocks.keep_one_in_n(gr.sizeof_gr_complex * self.fac_size, max(1, decimation)) + decimation = int(self.sample_rate / + self.fac_size / self.fac_decimation) + self.one_in_n = blocks.keep_one_in_n( + gr.sizeof_gr_complex * self.fac_size, max(1, decimation)) # FFT Note: No windowing. fac = fft.fft_vcc(self.fac_size, True, ()) @@ -84,7 +93,7 @@ class AutoCorrelator(gr.hier_block2): complex2Mag = blocks.complex_to_mag(self.fac_size) self.avg = filter.single_pole_iir_filter_ff(1.0, self.fac_size) - fac_fac = fft.fft_vfc(self.fac_size, True, ()) + fac_fac = fft.fft_vfc(self.fac_size, True, ()) fac_c2mag = blocks.complex_to_mag(fac_size) # There's a note in Baz's block about needing to add 3 dB to each bin but the DC bin, however it was never implemented @@ -93,28 +102,35 @@ class AutoCorrelator(gr.hier_block2): log = blocks.nlog10_ff(n, self.fac_size, k) if use_db: - self.connect(self, streamToVec, self.one_in_n, fac, complex2Mag, fac_fac, fac_c2mag, self.avg, log, self) + self.connect(self, streamToVec, self.one_in_n, fac, + complex2Mag, fac_fac, fac_c2mag, self.avg, log, self) else: - self.connect(self, streamToVec, self.one_in_n, fac, complex2Mag, fac_fac, fac_c2mag, self.avg, self) + self.connect(self, streamToVec, self.one_in_n, fac, + complex2Mag, fac_fac, fac_c2mag, self.avg, self) + class AutoCorrelatorSink(gr.hier_block2): """ docstring for block AutoCorrelatorSink """ + def __init__(self, sample_rate, fac_size, fac_decimation, title, autoScale, grid, yMin, yMax, use_db): gr.hier_block2.__init__(self, - "AutoCorrelatorSink", - gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature - gr.io_signature(0, 0, 0)) # Output signature + "AutoCorrelatorSink", + # Input signature + gr.io_signature(1, 1, gr.sizeof_gr_complex), + gr.io_signature(0, 0, 0)) # Output signature self.fac_size = fac_size self.fac_decimation = fac_decimation self.sample_rate = sample_rate - autoCorr = AutoCorrelator(sample_rate, fac_size, fac_decimation, use_db) + autoCorr = AutoCorrelator( + sample_rate, fac_size, fac_decimation, use_db) vecToStream = blocks.vector_to_stream(gr.sizeof_float, self.fac_size) - self.timeSink = qtgui.time_sink_f(self.fac_size//2, sample_rate, title, 1, None) + self.timeSink = qtgui.time_sink_f( + self.fac_size // 2, sample_rate, title, 1, None) self.timeSink.enable_grid(grid) self.timeSink.set_y_axis(yMin, yMax) self.timeSink.enable_autoscale(autoScale) @@ -127,6 +143,5 @@ class AutoCorrelatorSink(gr.hier_block2): norm = Normalize(self.fac_size) self.connect(self, autoCorr, norm, vecToStream, self.timeSink) - def getWidget(self): return sip.wrapinstance(self.timeSink.qwidget(), QWidget) diff --git a/gr-qtgui/python/qtgui/azelplot.py b/gr-qtgui/python/qtgui/azelplot.py index d23d39234..e091f7cc0 100644 --- a/gr-qtgui/python/qtgui/azelplot.py +++ b/gr-qtgui/python/qtgui/azelplot.py @@ -18,6 +18,7 @@ import math from gnuradio import gr import pmt + class AzElPlot(gr.sync_block, FigureCanvas): """ This block creates a polar plot with azimuth represented as the angle @@ -27,10 +28,11 @@ class AzElPlot(gr.sync_block, FigureCanvas): elevation < 0 is provided, the marker will turn to an open circle on the perimeter at the specified azimuth angle. """ + def __init__(self, lbl, backgroundColor, dotColor, Parent=None, width=4, height=4, dpi=90): - gr.sync_block.__init__(self, name = "MsgPushButton", in_sig = None, - out_sig = None) + gr.sync_block.__init__(self, name="MsgPushButton", in_sig=None, + out_sig=None) self.lbl = lbl @@ -46,15 +48,16 @@ class AzElPlot(gr.sync_block, FigureCanvas): self.fig = Figure(figsize=(width, height), dpi=dpi) self.fig.patch.set_facecolor(self.backgroundColor) - self.axes = self.fig.add_subplot(111, polar=True, facecolor=self.backgroundColor) + self.axes = self.fig.add_subplot( + 111, polar=True, facecolor=self.backgroundColor) # Create an "invisible" line at 90 to set the max for the plot - self.axes.plot(np.linspace(0, 2*np.pi, 90), np.ones(90)*90, color=self.scaleColor, + self.axes.plot(np.linspace(0, 2 * np.pi, 90), np.ones(90) * 90, color=self.scaleColor, linestyle='') # Plot line: Initialize out to 90 and blank radius = 90 - self.blackline = self.axes.plot(np.linspace(0, 2*np.pi, 90), np.ones(90)*radius, + self.blackline = self.axes.plot(np.linspace(0, 2 * np.pi, 90), np.ones(90) * radius, color=self.scaleColor, linestyle='-') self.reddot = None @@ -71,7 +74,8 @@ class AzElPlot(gr.sync_block, FigureCanvas): FigureCanvas.__init__(self, self.fig) self.setParent(Parent) - self.title = self.fig.suptitle(self.lbl, fontsize=8, fontweight='bold', color='black') + self.title = self.fig.suptitle( + self.lbl, fontsize=8, fontweight='bold', color='black') FigureCanvas.setSizePolicy(self, QtWidgets.QSizePolicy.Expanding, @@ -88,17 +92,20 @@ class AzElPlot(gr.sync_block, FigureCanvas): if new_val is not None: if type(new_val) == dict: if 'az' in new_val and 'el' in new_val: - self.updateData(float(new_val['az']), float(new_val['el'])) + self.updateData( + float(new_val['az']), float(new_val['el'])) else: - gr.log.error("az and el keys were not found in the dictionary.") + gr.log.error( + "az and el keys were not found in the dictionary.") else: gr.log.error("Value received was not a dictionary. Expecting a dictionary " "in the car message component with az and el keys.") else: gr.log.error("The CAR section of the inbound message was None. " - "This part should contain the dictionary with 'az' and 'el' float keys.") + "This part should contain the dictionary with 'az' and 'el' float keys.") except Exception as e: - gr.log.error("[AzElPlot] Error with message conversion: %s" % str(e)) + gr.log.error( + "[AzElPlot] Error with message conversion: %s" % str(e)) if new_val is not None: gr.log.error(str(new_val)) @@ -116,13 +123,12 @@ class AzElPlot(gr.sync_block, FigureCanvas): convertedElevation = 90.0 - elevation # Note: +azimuth for the plot is measured counter-clockwise, so need to reverse it. - self.reddot = self.axes.plot(-azimuth * math.pi/180.0, convertedElevation, self.dotColor, + self.reddot = self.axes.plot(-azimuth * math.pi / 180.0, convertedElevation, self.dotColor, markersize=8) else: # It's below the horizon. Show an open circle at the perimeter elevation = 0.0 - self.reddot = self.axes.plot(-azimuth * math.pi/180.0, 89.0, self.dotColor, + self.reddot = self.axes.plot(-azimuth * math.pi / 180.0, 89.0, self.dotColor, markerfacecolor="None", markersize=16, fillstyle=None) self.draw() - diff --git a/gr-qtgui/python/qtgui/compass.py b/gr-qtgui/python/qtgui/compass.py index 2c8a766f1..f1cdabf7d 100644 --- a/gr-qtgui/python/qtgui/compass.py +++ b/gr-qtgui/python/qtgui/compass.py @@ -27,13 +27,14 @@ NeedleFull = 1 NeedleIndicator = 0 NeedleMirrored = 2 + class LabeledCompass(QFrame): def __init__(self, lbl, min_size, update_time, setDebug=False, needleType=NeedleFull, position=1, backgroundColor='default'): # Positions: 1 = above, 2=below, 3=left, 4=right QFrame.__init__(self) self.numberControl = Compass(min_size, update_time, setDebug, - needleType, position, backgroundColor) + needleType, position, backgroundColor) if position < 3: layout = QVBoxLayout() @@ -62,17 +63,20 @@ class LabeledCompass(QFrame): self.setLayout(layout) if lbl: - self.setMinimumSize(min_size+30, min_size+35) + self.setMinimumSize(min_size + 30, min_size + 35) else: self.setMinimumSize(min_size, min_size) self.show() + def change_angle(self, angle): self.numberControl.change_angle(angle) def setColors(self, backgroundColor='default', needleTip='red', needleBody='black', scaleColor='black'): - self.numberControl.setColors(backgroundColor, needleTip, needleBody, scaleColor) + self.numberControl.setColors( + backgroundColor, needleTip, needleBody, scaleColor) + class Compass(QWidget): angleChanged = pyqtSignal(float) @@ -116,16 +120,18 @@ class Compass(QWidget): painter.setRenderHint(QPainter.Antialiasing) if self.backgroundColor == 'default': - painter.fillRect(event.rect(), self.palette().brush(QPalette.Window)) + painter.fillRect( + event.rect(), self.palette().brush(QPalette.Window)) else: size = self.size() - center_x = size.width()/2 + center_x = size.width() / 2 diameter = size.height() brush = QBrush(QColor(self.backgroundColor), Qtc.SolidPattern) painter.setBrush(brush) painter.setPen(QPen(QColor(self.scaleColor), 2)) painter.setRenderHint(QPainter.Antialiasing) - painter.drawEllipse(center_x-diameter/2+1, 1, diameter-4, diameter-4) + painter.drawEllipse(center_x - diameter / 2 + 1, + 1, diameter - 4, diameter - 4) self.drawMarkings(painter) self.drawNeedle(painter) @@ -134,9 +140,9 @@ class Compass(QWidget): def drawMarkings(self, painter): painter.save() - painter.translate(self.width()/2, self.height()/2) - scale = min((self.width() - self._margins)/120.0, - (self.height() - self._margins)/120.0) + painter.translate(self.width() / 2, self.height() / 2) + scale = min((self.width() - self._margins) / 120.0, + (self.height() - self._margins) / 120.0) painter.scale(scale, scale) font = QFont(self.font()) @@ -151,7 +157,8 @@ class Compass(QWidget): if i % 45 == 0: painter.drawLine(0, -40, 0, -50) - painter.drawText(-metrics.width(self._pointText[i])/2.0, -52, self._pointText[i]) + painter.drawText(-metrics.width( + self._pointText[i]) / 2.0, -52, self._pointText[i]) else: painter.drawLine(0, -45, 0, -50) @@ -163,9 +170,9 @@ class Compass(QWidget): def drawNeedle(self, painter): painter.save() # Set up painter - painter.translate(self.width()/2, self.height()/2) - scale = min((self.width() - self._margins)/120.0, - (self.height() - self._margins)/120.0) + painter.translate(self.width() / 2, self.height() / 2) + scale = min((self.width() - self._margins) / 120.0, + (self.height() - self._margins) / 120.0) painter.scale(scale, scale) painter.setPen(QPen(Qtc.NoPen)) @@ -211,7 +218,7 @@ class Compass(QWidget): painter.drawPolygon( QPolygon([QPoint(-3, -25), QPoint(0, -45), QPoint(3, -25), QPoint(0, -30), QPoint(-3, -25)]) - ) + ) painter.restore() @@ -240,12 +247,15 @@ class GrCompass(gr.sync_block, LabeledCompass): and mirrored (mirrored is useful for direction-finding where an ambiguity exists in front/back detection angle). """ + def __init__(self, title, min_size, update_time, setDebug=False, needleType=NeedleFull, usemsg=False, position=1, backgroundColor='default'): if usemsg: - gr.sync_block.__init__(self, name="QTCompass", in_sig=[], out_sig=[]) + gr.sync_block.__init__( + self, name="QTCompass", in_sig=[], out_sig=[]) else: - gr.sync_block.__init__(self, name="QTCompass", in_sig=[numpy.float32], out_sig=[]) + gr.sync_block.__init__(self, name="QTCompass", in_sig=[ + numpy.float32], out_sig=[]) LabeledCompass.__init__(self, title, min_size, update_time, setDebug, needleType, position, backgroundColor) @@ -266,7 +276,8 @@ class GrCompass(gr.sync_block, LabeledCompass): if type(new_val) == float or type(new_val) == int: super().change_angle(float(new_val)) else: - gr.log.error("Value received was not an int or a float: %s" % str(type(new_val))) + gr.log.error( + "Value received was not an int or a float: %s" % str(type(new_val))) except Exception as e: gr.log.error("Error with message conversion: %s" % str(e)) diff --git a/gr-qtgui/python/qtgui/dialcontrol.py b/gr-qtgui/python/qtgui/dialcontrol.py index 2e19e1821..1c7077176 100644 --- a/gr-qtgui/python/qtgui/dialcontrol.py +++ b/gr-qtgui/python/qtgui/dialcontrol.py @@ -16,6 +16,7 @@ from PyQt5.QtCore import QSize from gnuradio import gr import pmt + class LabeledDialControl(QFrame): def __init__(self, lbl='', parent=None, minimum=0, maximum=100, defaultvalue=0, backgroundColor='default', changedCallback=None, @@ -36,7 +37,7 @@ class LabeledDialControl(QFrame): self.lblcontrol.setAlignment(Qtc.AlignCenter) if self.showvalue: - textstr = self.buildTextStr(defaultvalue*self.scaleFactor) + textstr = self.buildTextStr(defaultvalue * self.scaleFactor) self.lblcontrol.setText(textstr) if len or self.showvalue: @@ -73,6 +74,7 @@ class LabeledDialControl(QFrame): textstr = self.buildTextStr(new_value) self.lblcontrol.setText(textstr) + class DialControl(Qt.QDial): def __init__(self, minimum=0, maximum=100, defaultvalue=0, backgroundColor='default', lablelCallback=None, changedCallback=None, minsize=100): @@ -99,6 +101,7 @@ class DialControl(Qt.QDial): if self.lablelCallback is not None: self.lablelCallback(self.value()) + class GrDialControl(gr.sync_block, LabeledDialControl): """ This block creates a dial control. The control does control a @@ -112,10 +115,12 @@ class GrDialControl(gr.sync_block, LabeledDialControl): the desired range. Think of the min/max as the increments, and the scale factor as the adjustment to get the values you want. """ + def __init__(self, lbl, parent, minimum, maximum, defaultvalue, backgroundColor='default', varCallback=None, isFloat=False, scaleFactor=1, minsize=100, showvalue=False, outputmsgname='value'): - gr.sync_block.__init__(self, name="GrDialControl", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="GrDialControl", + in_sig=None, out_sig=None) LabeledDialControl.__init__(self, lbl, parent, minimum, maximum, defaultvalue, backgroundColor, self.valueChanged, minsize, isFloat, scaleFactor, showvalue) @@ -139,4 +144,3 @@ class GrDialControl(gr.sync_block, LabeledDialControl): else: self.message_port_pub(pmt.intern("value"), pmt.cons(pmt.intern(self.outputmsgname), pmt.from_long(new_value))) - diff --git a/gr-qtgui/python/qtgui/dialgauge.py b/gr-qtgui/python/qtgui/dialgauge.py index af96f2e09..6dbb1bf84 100644 --- a/gr-qtgui/python/qtgui/dialgauge.py +++ b/gr-qtgui/python/qtgui/dialgauge.py @@ -18,6 +18,7 @@ from PyQt5.QtCore import Qt as Qtc from gnuradio import gr import pmt + class LabeledDialGauge(QFrame): # Positions: 1 = above, 2=below, 3=left, 4=right def __init__(self, lbl='', barColor='blue', backgroundColor='white', fontColor='black', @@ -45,7 +46,8 @@ class LabeledDialGauge(QFrame): self.lblcontrol.setText(lbl) if fontColor != 'default': - self.lblcontrol.setStyleSheet("QLabel { color : " + fontColor + "; }") + self.lblcontrol.setStyleSheet( + "QLabel { color : " + fontColor + "; }") # add top or left if len: @@ -69,6 +71,7 @@ class LabeledDialGauge(QFrame): def setValue(self, new_value): self.numberControl.setValue(new_value) + class DialGauge(QFrame): def __init__(self, barColor='blue', backgroundColor='white', fontColor='black', minValue=0, maxValue=100, maxSize=80, @@ -97,7 +100,7 @@ class DialGauge(QFrame): self.startAngle = 0.0 self.endAngle = 360.0 - self.degScaler = 16.0 # The span angle must be specified in 1/16 of a degree units + self.degScaler = 16.0 # The span angle must be specified in 1/16 of a degree units self.penWidth = max(int(0.1 * maxSize), 6) self.halfPenWidth = int(self.penWidth / 2) @@ -122,15 +125,17 @@ class DialGauge(QFrame): size = self.size() - percentRange = float(self.value - self.minValue) / float(self.maxValue - self.minValue) - endAngle = self.startAngle + round(percentRange * float(self.endAngle - self.startAngle), 0) + percentRange = float(self.value - self.minValue) / \ + float(self.maxValue - self.minValue) + endAngle = self.startAngle + \ + round(percentRange * float(self.endAngle - self.startAngle), 0) # Now convert angles to 1/16 scale startAngle = int(round(self.startAngle * self.degScaler, 0)) endAngle = int(round(endAngle * self.degScaler, 0)) - rect = QtCore.QRect(self.halfPenWidth, self.halfPenWidth, size.width()-self.penWidth, - size.height()-self.penWidth) + rect = QtCore.QRect(self.halfPenWidth, self.halfPenWidth, size.width() - self.penWidth, + size.height() - self.penWidth) # Set up the painting canvass painter = QPainter() @@ -146,7 +151,7 @@ class DialGauge(QFrame): else: printText = str(int(self.value)) - painter.drawText(size.width()/2-self.metrics.width(printText)/2, size.height()/2, + painter.drawText(size.width() / 2 - self.metrics.width(printText) / 2, size.height() / 2, printText) painter.save() @@ -155,27 +160,31 @@ class DialGauge(QFrame): # First draw complete circle painter.setPen(QPen(QColor(self.backgroundColor), self.penWidth)) - painter.drawArc(rect, startAngle, self.endAngle*self.degScaler) + painter.drawArc(rect, startAngle, self.endAngle * self.degScaler) # First draw complete circle painter.setPen(QPen(QColor(self.barColor), self.penWidth)) painter.drawArc(rect, startAngle, -endAngle) painter.setPen(QPen(QColor('darkgray'), 2)) - painter.drawEllipse(1, 1, rect.width()+self.penWidth-2, rect.width()+self.penWidth-2) - painter.drawEllipse(1+self.penWidth, 1+self.penWidth, rect.width()-self.penWidth-2, - rect.width()-self.penWidth-2) + painter.drawEllipse(1, 1, rect.width() + self.penWidth - + 2, rect.width() + self.penWidth - 2) + painter.drawEllipse(1 + self.penWidth, 1 + self.penWidth, rect.width() - self.penWidth - 2, + rect.width() - self.penWidth - 2) painter.restore() painter.end() + class GrDialGauge(gr.sync_block, LabeledDialGauge): """ This block creates a dial-style gauge. The value can be set either with a variable or an input message. """ + def __init__(self, lbl='', barColor='blue', backgroundColor='white', fontColor='black', minValue=0, maxValue=100, maxSize=80, position=1, isFloat=False, showValue=False, fixedOrMin=True, parent=None): - gr.sync_block.__init__(self, name="DialGauge", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="DialGauge", + in_sig=None, out_sig=None) LabeledDialGauge.__init__(self, lbl, barColor, backgroundColor, fontColor, minValue, maxValue, maxSize, position, isFloat, showValue, fixedOrMin, parent) @@ -188,7 +197,6 @@ class GrDialGauge(gr.sync_block, LabeledDialGauge): self.message_port_register_in(pmt.intern("value")) self.set_msg_handler(pmt.intern("value"), self.msgHandler) - def msgHandler(self, msg): try: new_val = pmt.to_python(pmt.cdr(msg)) @@ -197,12 +205,10 @@ class GrDialGauge(gr.sync_block, LabeledDialGauge): super().setValue(new_val) else: gr.log.error("Value received was not an int or a float. " - "Received %s" % str(type(new_val))) + "Received %s" % str(type(new_val))) except Exception as e: gr.log.error("Error with message conversion: %s" % str(e)) - def setValue(self, new_value): super().setValue(new_value) - diff --git a/gr-qtgui/python/qtgui/digitalnumbercontrol.py b/gr-qtgui/python/qtgui/digitalnumbercontrol.py index 44ddfbd8c..cbaf322b7 100644 --- a/gr-qtgui/python/qtgui/digitalnumbercontrol.py +++ b/gr-qtgui/python/qtgui/digitalnumbercontrol.py @@ -23,13 +23,14 @@ import pmt # # + class LabeledDigitalNumberControl(QFrame): def __init__(self, lbl='', min_freq_hz=0, max_freq_hz=6000000000, parent=None, thousands_separator=',', background_color='black', fontColor='white', click_callback=None): QFrame.__init__(self, parent) self.numberControl = DigitalNumberControl(min_freq_hz, max_freq_hz, self, - thousands_separator, background_color, fontColor, click_callback) + thousands_separator, background_color, fontColor, click_callback) layout = QVBoxLayout() @@ -47,9 +48,9 @@ class LabeledDigitalNumberControl(QFrame): def minimumSizeHint(self): if self.hasLabel: - return QSize(self.numberControl.minimumWidth()+10, 100) + return QSize(self.numberControl.minimumWidth() + 10, 100) else: - return QSize(self.numberControl.minimumWidth()+10, 50) + return QSize(self.numberControl.minimumWidth() + 10, 50) def setReadOnly(self, b_read_only): self.numberControl.setReadOnly(b_read_only) @@ -60,6 +61,7 @@ class LabeledDigitalNumberControl(QFrame): def getFrequency(self): return self.numberControl.getFrequency() + class DigitalNumberControl(QFrame): # Notifies to avoid thread conflicts on paints updateInt = pyqtSignal(int) @@ -96,7 +98,7 @@ class DigitalNumberControl(QFrame): fm = QFontMetrics(self.numberFont) if len(self.thousands_separator) > 0: # The -1 makes sure we don't count an extra for 123,456,789. Answer should be 2 not 3. - numgroups = int(float(self.numDigitsInFreq-1) / 3.0) + numgroups = int(float(self.numDigitsInFreq - 1) / 3.0) if numgroups > 0: for i in range(0, numgroups): teststr += self.thousands_separator @@ -129,7 +131,8 @@ class DigitalNumberControl(QFrame): if self.read_only: if self.debug_click: - gr.log.info("click received but read-only. Not changing frequency.") + gr.log.info( + "click received but read-only. Not changing frequency.") return fm = QFontMetrics(self.numberFont) @@ -154,12 +157,12 @@ class DigitalNumberControl(QFrame): found_number = False clicked_thousands = False - for i in range(1, len(textstr)+1): + for i in range(1, len(textstr) + 1): width = fm.width(textstr[-i:]) charstr = textstr[-i:] widthchar = fm.width(charstr[0]) - if clickpos >= (width-widthchar) and clickpos <= width: - clicked_char = i-1 + if clickpos >= (width - widthchar) and clickpos <= width: + clicked_char = i - 1 clicked_num_index = clicked_char @@ -170,7 +173,8 @@ class DigitalNumberControl(QFrame): numSeps = charstr.count(self.thousands_separator) clicked_num_index -= numSeps if self.debug_click: - gr.log.info("clicked number: " + str(clicked_num_index)) + gr.log.info("clicked number: " + + str(clicked_num_index)) else: clicked_thousands = True if self.debug_click: @@ -181,7 +185,7 @@ class DigitalNumberControl(QFrame): # Remember y=0 is at the top so this is reversed clicked_up = False - if self.offset.y() > self.size().height()/2: + if self.offset.y() > self.size().height() / 2: if self.debug_click: gr.log.info('clicked down') else: @@ -200,7 +204,7 @@ class DigitalNumberControl(QFrame): # Cannot call setFrequency to emit. Change must happen now for # paint event when clicked. self.setFrequencyNow(cur_freq) - + if self.click_callback is not None: self.click_callback(self.getFrequency()) break @@ -208,7 +212,7 @@ class DigitalNumberControl(QFrame): if (not found_number) and (not clicked_thousands): # See if we clicked in the high area, if so, increment there. clicked_up = False - if self.offset.y() > self.size().height()/2: + if self.offset.y() > self.size().height() / 2: if self.debug_click: gr.log.info('clicked down in the high area') else: @@ -228,16 +232,17 @@ class DigitalNumberControl(QFrame): # Cannot call setFrequency to emit. Change must happen now for # paint event when clicked. self.setFrequencyNow(cur_freq) - + if self.click_callback is not None: if self.debug_click: gr.log.info('Calling self.click_callback') - + self.click_callback(self.getFrequency()) else: if self.debug_click: - gr.log.info('self.click_callback is None. Not calling callback.') - + gr.log.info( + 'self.click_callback is None. Not calling callback.') + def setColors(self, background, fontColor): self.background_color = background self.fontColor = fontColor @@ -265,7 +270,7 @@ class DigitalNumberControl(QFrame): if (new_freq >= self.min_freq) and (new_freq <= self.max_freq): self.cur_freq = int(new_freq) self.update() - + def setFrequency(self, new_freq): if type(new_freq) == int: self.updateInt.emit(new_freq) @@ -290,7 +295,7 @@ class DigitalNumberControl(QFrame): brush = QBrush() brush.setColor(self.background_color) brush.setStyle(Qt.SolidPattern) - rect = QtCore.QRect(2, 2, size.width()-4, size.height()-4) + rect = QtCore.QRect(2, 2, size.width() - 4, size.height() - 4) painter.fillRect(rect, brush) self.numberFont.setPixelSize(0.9 * size.height()) @@ -307,13 +312,15 @@ class DigitalNumberControl(QFrame): else: textstr = str(self.getFrequency()) - rect = QtCore.QRect(0, 0, size.width()-4, size.height()) - + rect = QtCore.QRect(0, 0, size.width() - 4, size.height()) + painter.drawText(rect, Qt.AlignRight + Qt.AlignVCenter, textstr) # ################################################################################ # GNU Radio Class + + class MsgDigitalNumberControl(gr.sync_block, LabeledDigitalNumberControl): def __init__(self, lbl='', min_freq_hz=0, max_freq_hz=6000000000, parent=None, thousands_separator=',', background_color='black', fontColor='white', @@ -321,7 +328,7 @@ class MsgDigitalNumberControl(gr.sync_block, LabeledDigitalNumberControl): gr.sync_block.__init__(self, name="MsgDigitalNumberControl", in_sig=None, out_sig=None) LabeledDigitalNumberControl.__init__(self, lbl, min_freq_hz, max_freq_hz, parent, - thousands_separator, background_color, fontColor, self.click_callback) + thousands_separator, background_color, fontColor, self.click_callback) self.var_callback = var_callback self.outputmsgname = outputmsgname @@ -339,7 +346,8 @@ class MsgDigitalNumberControl(gr.sync_block, LabeledDigitalNumberControl): self.setValue(new_val) else: - gr.log.error("Value received was not an int or a float. %s" % str(type(new_val))) + gr.log.error( + "Value received was not an int or a float. %s" % str(type(new_val))) except Exception as e: gr.log.error("Error with message conversion: %s" % str(e)) @@ -354,16 +362,17 @@ class MsgDigitalNumberControl(gr.sync_block, LabeledDigitalNumberControl): def click_callback(self, new_value): self.call_var_callback(new_value) - self.message_port_pub(pmt.intern("valueout"), pmt.cons(pmt.intern(self.outputmsgname), pmt.from_double(float(new_value)))) + self.message_port_pub(pmt.intern("valueout"), pmt.cons( + pmt.intern(self.outputmsgname), pmt.from_double(float(new_value)))) def setValue(self, new_val): self.setFrequency(new_val) - self.message_port_pub(pmt.intern("valueout"), pmt.cons(pmt.intern(self.outputmsgname), pmt.from_double(float(self.getFrequency())))) + self.message_port_pub(pmt.intern("valueout"), pmt.cons(pmt.intern( + self.outputmsgname), pmt.from_double(float(self.getFrequency())))) def getValue(self): self.getFrequency() def setReadOnly(self, b_read_only): super().setReadOnly(b_read_only) - diff --git a/gr-qtgui/python/qtgui/distanceradar.py b/gr-qtgui/python/qtgui/distanceradar.py index 5659045c2..6619ef217 100644 --- a/gr-qtgui/python/qtgui/distanceradar.py +++ b/gr-qtgui/python/qtgui/distanceradar.py @@ -15,10 +15,11 @@ import numpy as np import matplotlib.pyplot as plt from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas from matplotlib.figure import Figure - + from gnuradio import gr import pmt + class DistanceRadar(gr.sync_block, FigureCanvas): """ This block creates a radar-like screen used to represent distance or size. @@ -28,9 +29,11 @@ class DistanceRadar(gr.sync_block, FigureCanvas): Note: Incoming values should range between 0 (center bullseye) and 100 (all the way out) """ + def __init__(self, lbl, ticklabels, backgroundColor, fontColor, ringColor, Parent=None, width=4, height=4, dpi=100): - gr.sync_block.__init__(self, name="distanceradar", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="distanceradar", + in_sig=None, out_sig=None) self.lbl = lbl @@ -43,15 +46,16 @@ class DistanceRadar(gr.sync_block, FigureCanvas): self.fig = Figure(figsize=(width, height), dpi=dpi) self.fig.patch.set_facecolor(self.backgroundColor) - self.axes = self.fig.add_subplot(111, polar=True, facecolor=self.backgroundColor) + self.axes = self.fig.add_subplot( + 111, polar=True, facecolor=self.backgroundColor) # Create an "invisible" line at 100 to set the max for the plot - self.axes.plot(np.linspace(0, 2*np.pi, 100), np.ones(100)*100, color=self.fontColor, + self.axes.plot(np.linspace(0, 2 * np.pi, 100), np.ones(100) * 100, color=self.fontColor, linestyle='') # Plot line: Initialize out to 100 and blank radius = 100 - self.blackline = self.axes.plot(np.linspace(0, 2*np.pi, 100), np.ones(100)*radius, + self.blackline = self.axes.plot(np.linspace(0, 2 * np.pi, 100), np.ones(100) * radius, color=self.fontColor, linestyle='-') self.redline = None @@ -70,9 +74,8 @@ class DistanceRadar(gr.sync_block, FigureCanvas): FigureCanvas.__init__(self, self.fig) self.setParent(Parent) - self.title = self.fig.suptitle(self.lbl, fontsize=8, fontweight='bold', - color=self.fontColor) + color=self.fontColor) FigureCanvas.setSizePolicy(self, QtWidgets.QSizePolicy.Expanding, @@ -87,7 +90,7 @@ class DistanceRadar(gr.sync_block, FigureCanvas): self.updateData(new_val) else: gr.log.error("Value received was not an int or a " - "float: %s" % str(type(new_val))) + "float: %s" % str(type(new_val))) except Exception as e: gr.log.error("Error with message conversion: %s" % str(e)) @@ -95,7 +98,7 @@ class DistanceRadar(gr.sync_block, FigureCanvas): def updateData(self, radius): if self.redline is not None: self.redline.pop(0).remove() - self.redline = self.axes.plot(np.linspace(0, 2*np.pi, 100), np.ones(100)*radius, + self.redline = self.axes.plot(np.linspace(0, 2 * np.pi, 100), np.ones(100) * radius, color='r', linestyle='-') if self.filledcircle: @@ -111,4 +114,3 @@ class DistanceRadar(gr.sync_block, FigureCanvas): self.bullseye = self.axes.add_artist(circle) self.draw() - diff --git a/gr-qtgui/python/qtgui/graphicitem.py b/gr-qtgui/python/qtgui/graphicitem.py index ecc7cc20f..871aa0949 100644 --- a/gr-qtgui/python/qtgui/graphicitem.py +++ b/gr-qtgui/python/qtgui/graphicitem.py @@ -20,6 +20,7 @@ import sys from gnuradio import gr import pmt + class GrGraphicItem(gr.sync_block, QLabel): """ This block displays the selected graphic item. You can pass a @@ -32,8 +33,10 @@ class GrGraphicItem(gr.sync_block, QLabel): Otherwise items are indexed by filename and can be animated throughout the background image. """ + def __init__(self, image_file, scaleImage=True, fixedSize=False, setWidth=0, setHeight=0): - gr.sync_block.__init__(self, name="GrGraphicsItem", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="GrGraphicsItem", + in_sig=None, out_sig=None) QLabel.__init__(self) if not os.path.isfile(image_file): @@ -67,9 +70,9 @@ class GrGraphicItem(gr.sync_block, QLabel): overlayitem = pmt.to_python(pmt.car(msg)) if overlayitem is None: gr.log.error('Overlay message contains None in the car portion ' - 'of the message. Please pass in a dictionary or list of dictionaries in this ' - 'portion of the message. Each dictionary should have the following keys: ' - 'filename,x,y. Use x=y=-1 to remove an overlay item.') + 'of the message. Please pass in a dictionary or list of dictionaries in this ' + 'portion of the message. Each dictionary should have the following keys: ' + 'filename,x,y. Use x=y=-1 to remove an overlay item.') return if type(overlayitem) is dict: @@ -79,41 +82,43 @@ class GrGraphicItem(gr.sync_block, QLabel): itemlist = overlayitem else: gr.log.error("Overlay message type is not correct. Please pass in " - "a dictionary or list of dictionaries in this portion of the message. Each " - "dictionary should have the following keys: filename,x,y. Use x=y=-1 to " - "remove an overlay item.") + "a dictionary or list of dictionaries in this portion of the message. Each " + "dictionary should have the following keys: filename,x,y. Use x=y=-1 to " + "remove an overlay item.") return # Check each dict item to make sure it's valid. for curitem in itemlist: if type(curitem) == dict: if 'filename' not in curitem: - gr.log.error("Dictionary item did not contain the 'filename' key.") + gr.log.error( + "Dictionary item did not contain the 'filename' key.") gr.log.error("Received " + str(curitem)) continue if 'x' not in curitem: gr.log.error("The dictionary for filename " + - curitem['filename'] + " did not contain an 'x' key.") + curitem['filename'] + " did not contain an 'x' key.") gr.log.error("Received " + str(curitem)) continue if 'y' not in curitem: gr.log.error("The dictionary for filename " + - curitem['filename'] + " did not contain an 'y' key.") + curitem['filename'] + " did not contain an 'y' key.") gr.log.error("Received " + str(curitem)) continue if not os.path.isfile(curitem['filename']): gr.log.error("Unable to find overlay file " + - curitem['filename']) + curitem['filename']) gr.log.error("Received " + str(curitem)) continue # Now either add/update our list or remove the item. if curitem['x'] == -1 and curitem['y'] == -1: try: - del self.overlays[curitem['filename']] # remove item + # remove item + del self.overlays[curitem['filename']] except: pass else: @@ -142,9 +147,10 @@ class GrGraphicItem(gr.sync_block, QLabel): scale = curOverlay['scalefactor'] w = newOverlay.width() h = newOverlay.height() - newOverlay = newOverlay.scaled(int(w*scale), int(h*scale), + newOverlay = newOverlay.scaled(int(w * scale), int(h * scale), Qtc.KeepAspectRatio) - painter.drawPixmap(curOverlay['x'], curOverlay['y'], newOverlay) + painter.drawPixmap( + curOverlay['x'], curOverlay['y'], newOverlay) except Exception as e: gr.log.error("Error adding overlay: %s" % str(e)) return @@ -172,13 +178,13 @@ class GrGraphicItem(gr.sync_block, QLabel): self.updateGraphic() else: gr.log.error("Value received was not an int or " - "a bool: %s" % str(type(new_val))) + "a bool: %s" % str(type(new_val))) except Exception as e: gr.log.error("Error with message conversion: %s" % str(e)) def minimumSizeHint(self): - return QSize(self.pixmap.width(),self.pixmap.height()) + return QSize(self.pixmap.width(), self.pixmap.height()) def resizeEvent(self, event): if self.scaleImage: @@ -191,4 +197,3 @@ class GrGraphicItem(gr.sync_block, QLabel): Qtc.KeepAspectRatio) self.updateGraphic() - diff --git a/gr-qtgui/python/qtgui/graphicoverlay.py b/gr-qtgui/python/qtgui/graphicoverlay.py index defef31d1..dad40dfe1 100644 --- a/gr-qtgui/python/qtgui/graphicoverlay.py +++ b/gr-qtgui/python/qtgui/graphicoverlay.py @@ -18,39 +18,42 @@ import pmt # This thread just gets us out of the sync_block's init function so the messaging # system and scheduler are active. + + class offloadThread(threading.Thread): - def __init__(self, callback, overlayList, listDelay, repeat): - threading.Thread.__init__(self) - self.callback = callback - self.overlayList = overlayList - self.listDelay = listDelay - self.threadRunning = False - self.stopThread = False - self.repeat = repeat + def __init__(self, callback, overlayList, listDelay, repeat): + threading.Thread.__init__(self) + self.callback = callback + self.overlayList = overlayList + self.listDelay = listDelay + self.threadRunning = False + self.stopThread = False + self.repeat = repeat - def run(self): - self.stopThread = False - self.threadRunning = True + def run(self): + self.stopThread = False + self.threadRunning = True - # Wait for main __init__ to finish - time.sleep(0.5) + # Wait for main __init__ to finish + time.sleep(0.5) - if (type(self.overlayList) == list and self.listDelay > 0.0): - while self.repeat and not self.stopThread: - for curItem in self.overlayList: - self.callback(curItem) + if (type(self.overlayList) == list and self.listDelay > 0.0): + while self.repeat and not self.stopThread: + for curItem in self.overlayList: + self.callback(curItem) - if self.stopThread: - break + if self.stopThread: + break - time.sleep(self.listDelay) + time.sleep(self.listDelay) - if self.stopThread: - break - else: - self.callback(self.overlayList) + if self.stopThread: + break + else: + self.callback(self.overlayList) + + self.threadRunning = False - self.threadRunning = False class GrGraphicOverlay(gr.sync_block): """ @@ -69,6 +72,7 @@ class GrGraphicOverlay(gr.sync_block): you can use a list with the same file but different coordinates and use the update delay > 0.0 to animate it. """ + def __init__(self, overlayList, listDelay, repeat): gr.sync_block.__init__(self, name="GrGraphicsOverlay", in_sig=None, out_sig=None) @@ -77,8 +81,8 @@ class GrGraphicOverlay(gr.sync_block): self.listDelay = listDelay if type(self.overlayList) is not dict and type(self.overlayList) is not list: gr.log.error("The specified input is not valid. " - "Please specify either a dictionary item with the following keys: " - "'filename','x','y'[,'scalefactor'] or a list of dictionary items.") + "Please specify either a dictionary item with the following keys: " + "'filename','x','y'[,'scalefactor'] or a list of dictionary items.") sys.exit(1) self.message_port_register_out(pmt.intern("overlay")) @@ -100,4 +104,3 @@ class GrGraphicOverlay(gr.sync_block): time.sleep(0.1) return True - diff --git a/gr-qtgui/python/qtgui/ledindicator.py b/gr-qtgui/python/qtgui/ledindicator.py index 09b2bd8e1..094197cf2 100644 --- a/gr-qtgui/python/qtgui/ledindicator.py +++ b/gr-qtgui/python/qtgui/ledindicator.py @@ -18,12 +18,14 @@ from PyQt5.QtGui import QRadialGradient from gnuradio import gr import pmt + class LabeledLEDIndicator(QFrame): # Positions: 1 = above, 2=below, 3=left, 4=right def __init__(self, lbl='', onColor='green', offColor='red', initialState=False, maxSize=80, position=1, alignment=1, valignment=1, parent=None): QFrame.__init__(self, parent) - self.numberControl = LEDIndicator(onColor, offColor, initialState, maxSize, parent) + self.numberControl = LEDIndicator( + onColor, offColor, initialState, maxSize, parent) if position < 3: layout = QVBoxLayout() @@ -72,17 +74,18 @@ class LabeledLEDIndicator(QFrame): textfont = self.lblcontrol.font() metrics = QFontMetricsF(textfont) - maxWidth = max((maxSize+30), (maxSize + metrics.width(lbl)+4)) - maxHeight = max((maxSize+35), (maxSize + metrics.height()+2)) + maxWidth = max((maxSize + 30), (maxSize + metrics.width(lbl) + 4)) + maxHeight = max((maxSize + 35), (maxSize + metrics.height() + 2)) self.setMinimumSize(maxWidth, maxHeight) else: - self.setMinimumSize(maxSize+2, maxSize+2) + self.setMinimumSize(maxSize + 2, maxSize + 2) self.show() def setState(self, on_off): self.numberControl.setState(on_off) + class LEDIndicator(QFrame): def __init__(self, onColor='green', offColor='red', initialState=False, maxSize=80, parent=None): @@ -112,11 +115,11 @@ class LEDIndicator(QFrame): if smallest_dim > size.height(): smallest_dim = size.height() - smallest_dim = smallest_dim/2 + smallest_dim = smallest_dim / 2 smallest_dim -= 2 - center_x = size.width()/2 - center_y = size.height()/2 + center_x = size.width() / 2 + center_y = size.height() / 2 centerpoint = QPoint(center_x, center_y) radius = smallest_dim @@ -124,14 +127,14 @@ class LEDIndicator(QFrame): painter.setPen(QPen(QColor('lightgray'), 0)) brush.setStyle(Qtc.SolidPattern) - radial = QRadialGradient(center_x, center_y/2, radius) + radial = QRadialGradient(center_x, center_y / 2, radius) radial.setColorAt(0, Qtc.white) radial.setColorAt(0.8, Qtc.darkGray) painter.setBrush(QBrush(radial)) painter.drawEllipse(centerpoint, radius, radius) # Draw the colored center - radial = QRadialGradient(center_x, center_y/2, radius) + radial = QRadialGradient(center_x, center_y / 2, radius) radial.setColorAt(0, Qtc.white) if self.curState: @@ -159,13 +162,16 @@ class LEDIndicator(QFrame): radius = radius - 9 painter.drawEllipse(centerpoint, radius, radius) + class GrLEDIndicator(gr.sync_block, LabeledLEDIndicator): """ This block makes a basic LED indicator """ + def __init__(self, lbl='', onColor='green', offColor='red', initialState=False, maxSize=80, position=1, alignment=1, valignment=1, parent=None): - gr.sync_block.__init__(self, name="LEDIndicator", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="LEDIndicator", + in_sig=None, out_sig=None) LabeledLEDIndicator.__init__(self, lbl, onColor, offColor, initialState, maxSize, position, alignment, valignment, parent) self.lbl = lbl @@ -173,7 +179,6 @@ class GrLEDIndicator(gr.sync_block, LabeledLEDIndicator): self.message_port_register_in(pmt.intern("state")) self.set_msg_handler(pmt.intern("state"), self.msgHandler) - def msgHandler(self, msg): try: new_val = pmt.to_python(pmt.cdr(msg)) @@ -187,11 +192,11 @@ class GrLEDIndicator(gr.sync_block, LabeledLEDIndicator): else: super().setState(False) else: - gr.log.error("Value received was not an int or a bool: %s" % str(type(new_val))) + gr.log.error( + "Value received was not an int or a bool: %s" % str(type(new_val))) except Exception as e: gr.log.error("Error with message conversion: %s" % str(e)) def setState(self, on_off): super().setState(on_off) - diff --git a/gr-qtgui/python/qtgui/levelgauge.py b/gr-qtgui/python/qtgui/levelgauge.py index cee33eb58..770340003 100644 --- a/gr-qtgui/python/qtgui/levelgauge.py +++ b/gr-qtgui/python/qtgui/levelgauge.py @@ -21,6 +21,7 @@ from PyQt5.QtGui import QPalette from gnuradio import gr import pmt + class LabeledLevelGauge(QFrame): # Positions: 1 = above, 2=below, 3=left, 4=right def __init__(self, lbl='', barColor='blue', backgroundColor='white', fontColor='black', @@ -48,11 +49,12 @@ class LabeledLevelGauge(QFrame): # For whatever reason, the progressbar doesn't show the number in the bar if it's # vertical, only if it's horizontal if self.showvalue and (isFloat or self.isVertical): - textstr = self.buildTextStr(minValue/self.scaleFactor) + textstr = self.buildTextStr(minValue / self.scaleFactor) self.lblcontrol.setText(textstr) if fontColor != 'default': - self.lblcontrol.setStyleSheet("QLabel { color : " + fontColor + "; }") + self.lblcontrol.setStyleSheet( + "QLabel { color : " + fontColor + "; }") # add top or left if len: @@ -102,6 +104,7 @@ class LabeledLevelGauge(QFrame): self.numberControl.setValue(new_value) + class LevelGauge(QProgressBar): # Notifies to avoid thread conflicts on paints updateInt = pyqtSignal(int) @@ -170,6 +173,7 @@ class LevelGauge(QProgressBar): else: self.updateFloat.emit(new_value) + class GrLevelGauge(gr.sync_block, LabeledLevelGauge): """ This block creates a level gauge. The value can be set either @@ -182,10 +186,12 @@ class GrLevelGauge(gr.sync_block, LabeledLevelGauge): are 0-100 but your incoming values are 0.0-1.0, you will need to set a scalefactor of 100. """ + def __init__(self, lbl='', barColor='blue', backgroundColor='white', fontColor='black', minValue=0, maxValue=100, maxSize=80, isVertical=True, position=1, isFloat=False, scaleFactor=1, showValue=False, parent=None): - gr.sync_block.__init__(self, name="LevelGauge", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="LevelGauge", + in_sig=None, out_sig=None) LabeledLevelGauge.__init__(self, lbl, barColor, backgroundColor, fontColor, minValue, maxValue, maxSize, position, isVertical, isFloat, scaleFactor, showValue, parent) @@ -205,7 +211,8 @@ class GrLevelGauge(gr.sync_block, LabeledLevelGauge): if type(new_val) == float or type(new_val) == int: super().setValue(new_val) else: - gr.log.error("Value received was not an int or a float: %s" % str(type(new_val))) + gr.log.error( + "Value received was not an int or a float: %s" % str(type(new_val))) except Exception as e: gr.log.error("Error with message conversion: %s" % str(e)) diff --git a/gr-qtgui/python/qtgui/msgcheckbox.py b/gr-qtgui/python/qtgui/msgcheckbox.py index f01c78bc0..d1fde95a5 100644 --- a/gr-qtgui/python/qtgui/msgcheckbox.py +++ b/gr-qtgui/python/qtgui/msgcheckbox.py @@ -16,6 +16,7 @@ from PyQt5.QtCore import Qt as Qtc from gnuradio import gr import pmt + class CheckBoxEx(Qt.QCheckBox): def __init__(self, lbl, callback=None): Qt.QCheckBox.__init__(self) @@ -28,6 +29,7 @@ class CheckBoxEx(Qt.QCheckBox): if self.callback is not None: self.callback(super().isChecked()) + class MsgCheckBox(gr.sync_block, QFrame): """ This block creates a variable checkbox. Leave the label blank to @@ -39,9 +41,11 @@ class MsgCheckBox(gr.sync_block, QFrame): This control will also produce a state message matching the set values. """ + def __init__(self, callback, lbl, pressedReleasedDict, initPressed, alignment, valignment, outputmsgname='value'): - gr.sync_block.__init__(self, name="MsgCheckBox", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="MsgCheckBox", + in_sig=None, out_sig=None) QFrame.__init__(self) self.outputmsgname = outputmsgname @@ -84,36 +88,36 @@ class MsgCheckBox(gr.sync_block, QFrame): if type(self.pressReleasedDict['Pressed']) == bool: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_bool(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_bool(self.pressReleasedDict['Pressed']))) elif type(self.pressReleasedDict['Pressed']) == int: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_long(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_long(self.pressReleasedDict['Pressed']))) elif type(self.pressReleasedDict['Pressed']) == float: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_double(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_double(self.pressReleasedDict['Pressed']))) else: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.intern(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.intern(self.pressReleasedDict['Pressed']))) else: self.callback(self.pressReleasedDict['Released']) if type(self.pressReleasedDict['Released']) == bool: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_bool(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_bool(self.pressReleasedDict['Released']))) elif type(self.pressReleasedDict['Released']) == int: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_long(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_long(self.pressReleasedDict['Released']))) elif type(self.pressReleasedDict['Released']) == float: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_double(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_double(self.pressReleasedDict['Released']))) else: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.intern(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.intern(self.pressReleasedDict['Released']))) diff --git a/gr-qtgui/python/qtgui/msgpushbutton.py b/gr-qtgui/python/qtgui/msgpushbutton.py index a3ecaf06c..4865cc1eb 100644 --- a/gr-qtgui/python/qtgui/msgpushbutton.py +++ b/gr-qtgui/python/qtgui/msgpushbutton.py @@ -13,6 +13,7 @@ from PyQt5 import Qt from gnuradio import gr import pmt + class MsgPushButton(gr.sync_block, Qt.QPushButton): """ This block creates a variable push button that creates a message @@ -20,8 +21,10 @@ class MsgPushButton(gr.sync_block, Qt.QPushButton): the label. You can define both the output message pmt name as well as the value and value type. """ + def __init__(self, lbl, msgName, msgValue, relBackColor, relFontColor): - gr.sync_block.__init__(self, name="MsgPushButton", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="MsgPushButton", + in_sig=None, out_sig=None) Qt.QPushButton.__init__(self, lbl) self.lbl = lbl @@ -44,13 +47,13 @@ class MsgPushButton(gr.sync_block, Qt.QPushButton): def onBtnClicked(self, pressed): if type(self.msgValue) == int: self.message_port_pub(pmt.intern("pressed"), - pmt.cons(pmt.intern(self.msgName), pmt.from_long(self.msgValue))) + pmt.cons(pmt.intern(self.msgName), pmt.from_long(self.msgValue))) elif type(self.msgValue) == float: self.message_port_pub(pmt.intern("pressed"), - pmt.cons(pmt.intern(self.msgName), pmt.from_double(self.msgValue))) + pmt.cons(pmt.intern(self.msgName), pmt.from_double(self.msgValue))) elif type(self.msgValue) == str: self.message_port_pub(pmt.intern("pressed"), - pmt.cons(pmt.intern(self.msgName), pmt.intern(self.msgValue))) + pmt.cons(pmt.intern(self.msgName), pmt.intern(self.msgValue))) elif type(self.msgValue) == bool: self.message_port_pub(pmt.intern("pressed"), - pmt.cons(pmt.intern(self.msgName), pmt.from_bool(self.msgValue))) + pmt.cons(pmt.intern(self.msgName), pmt.from_bool(self.msgValue))) diff --git a/gr-qtgui/python/qtgui/range.py.cmakein b/gr-qtgui/python/qtgui/range.py.cmakein index 05f2f421e..1fc85b8e4 100755 --- a/gr-qtgui/python/qtgui/range.py.cmakein +++ b/gr-qtgui/python/qtgui/range.py.cmakein @@ -37,21 +37,22 @@ class Range(object): self.precision = (precision + 2) if precision > 0 else 0 def find_nsteps(self): - self.nsteps = (self.max + self.step - self.min)/self.step + self.nsteps = (self.max + self.step - self.min) / self.step def demap_range(self, val): if val > self.max: val = self.max if val < self.min: val = self.min - return ((val-self.min)/self.step) + return ((val - self.min) / self.step) def map_range(self, val): if val > self.nsteps: val = self.max if val < 0: val = 0 - return (val*self.step+self.min) + return (val * self.step + self.min) + class QEngValidator(Qt.QValidator): def __init__(self, minimum, maximum, parent): @@ -63,9 +64,9 @@ class QEngValidator(Qt.QValidator): def validate(self, s, pos): try: - val=eng_notation.str_to_num(s) + val = eng_notation.str_to_num(s) except (IndexError, ValueError) as e: - if re.match(self.re,s): + if re.match(self.re, s): self.parent.setStyleSheet("background-color: yellow;") return (Qt.QValidator.Intermediate, s, pos) else: @@ -83,6 +84,7 @@ class QEngValidator(Qt.QValidator): def fixup(self, s): pass + class RangeWidget(QtWidgets.QWidget): def __init__(self, ranges, slot, label, style, rangeType=float, orientation=QtCore.Qt.Horizontal): """ Creates the QT Range widget """ @@ -100,38 +102,45 @@ class RangeWidget(QtWidgets.QWidget): self.notifyChanged = slot layout = Qt.QHBoxLayout() - layout.setContentsMargins( 0,0,0,0 ) + layout.setContentsMargins(0, 0, 0, 0) label = Qt.QLabel(label) layout.addWidget(label) if style == "dial": - self.d_widget = self.Dial(self, self.range, self.notifyChanged, rangeType) + self.d_widget = self.Dial( + self, self.range, self.notifyChanged, rangeType) elif style == "slider": - self.d_widget = self.Slider(self, self.range, self.notifyChanged, rangeType, orientation) + self.d_widget = self.Slider( + self, self.range, self.notifyChanged, rangeType, orientation) elif style == "counter": # The counter widget can be directly wired to the notifyChanged slot - self.d_widget = self.Counter(self, self.range, self.notifyChanged, rangeType) + self.d_widget = self.Counter( + self, self.range, self.notifyChanged, rangeType) elif style == "eng": # Text input with engineering notation support - self.d_widget = self.Eng(self, self.range, self.notifyChanged, rangeType) + self.d_widget = self.Eng( + self, self.range, self.notifyChanged, rangeType) elif style == "eng_slider": - self.d_widget = self.EngSlider(self, self.range, self.notifyChanged, rangeType, orientation) + self.d_widget = self.EngSlider( + self, self.range, self.notifyChanged, rangeType, orientation) else: # The CounterSlider needs its own internal handlers before calling notifyChanged - self.d_widget = self.CounterSlider(self, self.range, self.notifyChanged, rangeType, orientation) + self.d_widget = self.CounterSlider( + self, self.range, self.notifyChanged, rangeType, orientation) layout.addWidget(self.d_widget) self.setLayout(layout) class Dial(QtWidgets.QDial): """ Creates the range using a dial """ + def __init__(self, parent, ranges, slot, rangeType=float): QtWidgets.QDial.__init__(self, parent) self.rangeType = rangeType # Setup the dial - self.setRange(0, int(ranges.nsteps-1)) + self.setRange(0, int(ranges.nsteps - 1)) self.setSingleStep(1) self.setNotchesVisible(True) self.range = ranges @@ -151,13 +160,14 @@ class RangeWidget(QtWidgets.QWidget): class Slider(QtWidgets.QSlider): """ Creates the range using a slider """ + def __init__(self, parent, ranges, slot, rangeType=float, orientation=QtCore.Qt.Horizontal): QtWidgets.QSlider.__init__(self, orientation, parent) self.rangeType = rangeType # Setup the slider - #self.setFocusPolicy(QtCore.Qt.NoFocus) + # self.setFocusPolicy(QtCore.Qt.NoFocus) self.setRange(0, int(ranges.nsteps - 1)) self.setTickPosition(2) self.setSingleStep(1) @@ -169,7 +179,7 @@ class RangeWidget(QtWidgets.QWidget): self.setValue(temp) if ranges.nsteps > ranges.min_length: - interval = int(ranges.nsteps/ranges.min_length) + interval = int(ranges.nsteps / ranges.min_length) self.setTickInterval(interval) self.setPageStep(interval) else: @@ -188,9 +198,9 @@ class RangeWidget(QtWidgets.QWidget): def mousePressEvent(self, event): if((event.button() == QtCore.Qt.LeftButton)): if self.orientation == QtCore.Qt.Horizontal: - new = self.minimum() + ((self.maximum()-self.minimum()) * event.x()) / self.width() + new = self.minimum() + ((self.maximum() - self.minimum()) * event.x()) / self.width() else: - new = self.minimum() + ((self.maximum()-self.minimum()) * event.y()) / self.height() + new = self.minimum() + ((self.maximum() - self.minimum()) * event.y()) / self.height() self.setValue(int(new)) event.accept() # Use repaint rather than calling the super mousePressEvent. @@ -199,15 +209,16 @@ class RangeWidget(QtWidgets.QWidget): def mouseMoveEvent(self, event): if self.orientation == QtCore.Qt.Horizontal: - new = self.minimum() + ((self.maximum()-self.minimum()) * event.x()) / self.width() + new = self.minimum() + ((self.maximum() - self.minimum()) * event.x()) / self.width() else: - new = self.minimum() + ((self.maximum()-self.minimum()) * event.y()) / self.height() + new = self.minimum() + ((self.maximum() - self.minimum()) * event.y()) / self.height() self.setValue(int(new)) event.accept() QtWidgets.QSlider.repaint(self) class Counter(QtWidgets.QDoubleSpinBox): """ Creates the range using a counter """ + def __init__(self, parent, ranges, slot, rangeType=float): QtWidgets.QDoubleSpinBox.__init__(self, parent) @@ -230,6 +241,7 @@ class RangeWidget(QtWidgets.QWidget): class Eng(QtWidgets.QLineEdit): """ Creates the range using a text input """ + def __init__(self, parent, ranges, slot, rangeType=float): QtWidgets.QLineEdit.__init__(self) @@ -251,6 +263,7 @@ class RangeWidget(QtWidgets.QWidget): class CounterSlider(QtWidgets.QWidget): """ Creates the range using a counter and slider """ + def __init__(self, parent, ranges, slot, rangeType=float, orientation=QtCore.Qt.Horizontal): QtWidgets.QWidget.__init__(self, parent) @@ -259,12 +272,14 @@ class RangeWidget(QtWidgets.QWidget): # Slot to call in the parent self.notifyChanged = slot - self.slider = RangeWidget.Slider(parent, ranges, self.sliderChanged, rangeType, orientation) - self.counter = RangeWidget.Counter(parent, ranges, self.counterChanged, rangeType) + self.slider = RangeWidget.Slider( + parent, ranges, self.sliderChanged, rangeType, orientation) + self.counter = RangeWidget.Counter( + parent, ranges, self.counterChanged, rangeType) # Need another horizontal layout to wrap the other widgets. layout = Qt.QHBoxLayout() - layout.setContentsMargins( 0,0,0,0 ) + layout.setContentsMargins(0, 0, 0, 0) layout.setSpacing(10) layout.addWidget(self.slider) layout.addWidget(self.counter) @@ -308,6 +323,7 @@ class RangeWidget(QtWidgets.QWidget): class EngSlider(QtWidgets.QWidget): """ Creates the range using a counter and slider """ + def __init__(self, parent, ranges, slot, rangeType=float, orientation=QtCore.Qt.Horizontal): QtWidgets.QWidget.__init__(self, parent) @@ -317,8 +333,10 @@ class RangeWidget(QtWidgets.QWidget): # Slot to call in the parent self.notifyChanged = slot - self.slider = RangeWidget.Slider(parent, ranges, self.sliderChanged, rangeType, orientation) - self.counter = RangeWidget.Eng(parent, ranges, self.counterChanged, rangeType) + self.slider = RangeWidget.Slider( + parent, ranges, self.sliderChanged, rangeType, orientation) + self.counter = RangeWidget.Eng( + parent, ranges, self.counterChanged, rangeType) # Need another horizontal layout to wrap the other widgets. layout = Qt.QHBoxLayout() @@ -338,7 +356,8 @@ class RangeWidget(QtWidgets.QWidget): if not self.ignoreSlider: # convert Value to eng string self.ignoreCounter = True - self.counter.setText(eng_notation.num_to_str(self.rangeType(value))) + self.counter.setText( + eng_notation.num_to_str(self.rangeType(value))) self.notifyChanged(self.rangeType(value)) self.ignoreSlider = False @@ -346,17 +365,17 @@ class RangeWidget(QtWidgets.QWidget): """ Handles changing the slider when the counter is updated """ # Get the current slider value and check to see if the new value changes it current = self.slider.value() - print("counterChanged",value,"ign",self.ignoreCounter) + print("counterChanged", value, "ign", self.ignoreCounter) new = int(round(self.range.demap_range(value), 0)) # If it needs to change, ignore the slider event # Otherwise, the slider will cause the counter to round to the nearest tick if current != new: - self.ignoreSlider = True - self.slider.setValue(new) + self.ignoreSlider = True + self.slider.setValue(new) if not self.ignoreCounter: - print("to notify",self.rangeType(value)) + print("to notify", self.rangeType(value)) self.notifyChanged(self.rangeType(value)) self.ignoreCounter = False @@ -369,6 +388,7 @@ class RangeWidget(QtWidgets.QWidget): self.slider.setValue(new) self.first = False + if __name__ == "__main__": from PyQt5 import Qt import sys @@ -377,7 +397,8 @@ if __name__ == "__main__": print("Value updated - " + str(frequency)) app = Qt.QApplication(sys.argv) - widget = RangeWidget(Range(0, 100, 10, 1, 100), valueChanged, "Test", "counter_slider", int) + widget = RangeWidget(Range(0, 100, 10, 1, 100), + valueChanged, "Test", "counter_slider", int) widget.show() widget.setWindowTitle("Test Qt Range") diff --git a/gr-qtgui/python/qtgui/togglebutton.py b/gr-qtgui/python/qtgui/togglebutton.py index 99358cd0e..cfa0f91d3 100644 --- a/gr-qtgui/python/qtgui/togglebutton.py +++ b/gr-qtgui/python/qtgui/togglebutton.py @@ -14,6 +14,7 @@ from PyQt5 import Qt from gnuradio import gr import pmt + class ToggleButton(gr.sync_block, Qt.QPushButton): """ This block creates a variable toggle button. Leave the label @@ -24,8 +25,10 @@ class ToggleButton(gr.sync_block, Qt.QPushButton): or released. This button will also produce a state message matching the set values. """ + def __init__(self, callback, lbl, pressedReleasedDict, initPressed, outputmsgname='value'): - gr.sync_block.__init__(self, name="ToggleButton", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="ToggleButton", + in_sig=None, out_sig=None) Qt.QPushButton.__init__(self, lbl) self.setCheckable(True) self.lbl = lbl @@ -89,34 +92,34 @@ class ToggleButton(gr.sync_block, Qt.QPushButton): if pressed: if type(self.pressReleasedDict['Pressed']) == bool: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_bool(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_bool(self.pressReleasedDict['Pressed']))) elif type(self.pressReleasedDict['Pressed']) == int: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_long(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_long(self.pressReleasedDict['Pressed']))) elif type(self.pressReleasedDict['Pressed']) == float: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_double(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_double(self.pressReleasedDict['Pressed']))) else: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.intern(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.intern(self.pressReleasedDict['Pressed']))) else: if type(self.pressReleasedDict['Released']) == bool: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_bool(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_bool(self.pressReleasedDict['Released']))) elif type(self.pressReleasedDict['Released']) == int: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_long(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_long(self.pressReleasedDict['Released']))) elif type(self.pressReleasedDict['Released']) == float: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_double(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_double(self.pressReleasedDict['Released']))) else: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.intern(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.intern(self.pressReleasedDict['Released']))) diff --git a/gr-qtgui/python/qtgui/toggleswitch.py b/gr-qtgui/python/qtgui/toggleswitch.py index a869e574d..ce57f907b 100644 --- a/gr-qtgui/python/qtgui/toggleswitch.py +++ b/gr-qtgui/python/qtgui/toggleswitch.py @@ -17,13 +17,14 @@ from PyQt5.QtGui import QPainter, QBrush, QColor, QPen, QFontMetricsF from PyQt5.QtCore import Qt as Qtc from PyQt5.QtCore import QRect + class LabeledToggleSwitch(QFrame): # Positions: 1 = above, 2=below, 3=left, 4=right def __init__(self, lbl='', onColor='green', offColor='red', initialState=False, maxSize=50, position=1, parent=None, callback=None, alignment=1, valignment=1): QFrame.__init__(self, parent) self.numberControl = ToggleSwitch(onColor, offColor, initialState, maxSize, - parent, callback) + parent, callback) if position < 3: layout = QVBoxLayout() @@ -33,9 +34,9 @@ class LabeledToggleSwitch(QFrame): self.lbl = lbl self.lblcontrol = QLabel(lbl, self) - if position == 3: # left of switch + if position == 3: # left of switch self.lblcontrol.setAlignment(Qtc.AlignRight) - elif position == 4: # right of switch + elif position == 4: # right of switch self.lblcontrol.setAlignment(Qtc.AlignLeft) else: # Above or below @@ -74,8 +75,9 @@ class LabeledToggleSwitch(QFrame): textfont = self.lblcontrol.font() metrics = QFontMetricsF(textfont) - maxWidth = max((maxSize+4), (maxSize*2 + metrics.width(lbl))) - maxHeight = max((maxSize/2+4), (maxSize/2 + metrics.height()+2)) + maxWidth = max((maxSize + 4), (maxSize * 2 + metrics.width(lbl))) + maxHeight = max((maxSize / 2 + 4), + (maxSize / 2 + metrics.height() + 2)) self.setMinimumSize(int(maxWidth), int(maxHeight)) @@ -84,6 +86,7 @@ class LabeledToggleSwitch(QFrame): def setState(self, on_off): self.numberControl.setState(on_off) + class ToggleSwitch(QFrame): def __init__(self, onColor='green', offColor='red', initialState=False, maxSize=50, parent=None, callback=None): @@ -94,8 +97,8 @@ class ToggleSwitch(QFrame): self.onColor = QColor(onColor) self.offColor = QColor(offColor) self.callback = callback - self.setMinimumSize(maxSize, maxSize/2) - self.setMaximumSize(maxSize, maxSize/2) + self.setMinimumSize(maxSize, maxSize / 2) + self.setMaximumSize(maxSize, maxSize / 2) def setState(self, on_off): self.curState = on_off @@ -113,7 +116,7 @@ class ToggleSwitch(QFrame): size = self.size() brush = QBrush() - center_x = size.width()/2 + center_x = size.width() / 2 if self.curState: brush.setColor(self.onColor) @@ -126,38 +129,43 @@ class ToggleSwitch(QFrame): painter.setBrush(brush) # Draw the switch background - centerRect = QRect(size.width()/4, 0, size.width()/2-4, size.height()) + centerRect = QRect(size.width() / 4, 0, + size.width() / 2 - 4, size.height()) painter.drawRect(centerRect) painter.drawEllipse(0, 0, size.height(), size.height()) - painter.drawEllipse(size.width()/2, 0, size.height(), size.height()) + painter.drawEllipse(size.width() / 2, 0, size.height(), size.height()) # Draw the switch itself brush.setColor(QColor('white')) painter.setBrush(brush) painter.setPen(QPen(QColor('white'), 0)) if self.curState: - painter.drawEllipse(center_x+2, 2, size.height() - 4, size.height() - 4) + painter.drawEllipse( + center_x + 2, 2, size.height() - 4, size.height() - 4) else: painter.drawEllipse(2, 2, size.height() - 4, size.height() - 4) def mousePressEvent(self, event): - if event.x() <= self.size().width()/2: + if event.x() <= self.size().width() / 2: self.setState(False) else: self.setState(True) super().update() + class GrToggleSwitch(gr.sync_block, LabeledToggleSwitch): """ This block creates a modern toggle switch. The variable will take on one value or the other as set in the dialog. This button will also produce a state message matching the set values. """ + def __init__(self, callback, lbl, pressedReleasedDict, initialState=False, onColor='green', offColor='silver', position=3, maxSize=50, alignment=1, valignment=1, parent=None, outputmsgname='value'): - gr.sync_block.__init__(self, name="ToggleSwitch", in_sig=None, out_sig=None) + gr.sync_block.__init__(self, name="ToggleSwitch", + in_sig=None, out_sig=None) LabeledToggleSwitch.__init__(self, lbl, onColor, offColor, initialState, maxSize, position, parent, self.notifyUpdate, alignment, valignment) @@ -177,34 +185,34 @@ class GrToggleSwitch(gr.sync_block, LabeledToggleSwitch): if new_val: if type(self.pressReleasedDict['Pressed']) == bool: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_bool(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_bool(self.pressReleasedDict['Pressed']))) elif type(self.pressReleasedDict['Pressed']) == int: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_long(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_long(self.pressReleasedDict['Pressed']))) elif type(self.pressReleasedDict['Pressed']) == float: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_double(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_double(self.pressReleasedDict['Pressed']))) else: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.intern(self.pressReleasedDict['Pressed']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.intern(self.pressReleasedDict['Pressed']))) else: if type(self.pressReleasedDict['Released']) == bool: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_bool(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_bool(self.pressReleasedDict['Released']))) elif type(self.pressReleasedDict['Released']) == int: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_long(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_long(self.pressReleasedDict['Released']))) elif type(self.pressReleasedDict['Released']) == float: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.from_double(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.from_double(self.pressReleasedDict['Released']))) else: self.message_port_pub(pmt.intern("state"), - pmt.cons(pmt.intern(self.outputmsgname), - pmt.intern(self.pressReleasedDict['Released']))) + pmt.cons(pmt.intern(self.outputmsgname), + pmt.intern(self.pressReleasedDict['Released']))) diff --git a/gr-qtgui/python/qtgui/util.py.cmakein b/gr-qtgui/python/qtgui/util.py.cmakein index 1eb069993..cdf90608d 100644 --- a/gr-qtgui/python/qtgui/util.py.cmakein +++ b/gr-qtgui/python/qtgui/util.py.cmakein @@ -15,9 +15,9 @@ from gnuradio import gr def check_set_qss(): app = QtWidgets.qApp - qssfile = gr.prefs().get_string("qtgui","qss","") - if(len(qssfile)>0): + qssfile = gr.prefs().get_string("qtgui", "qss", "") + if(len(qssfile) > 0): try: app.setStyleSheet(open(qssfile).read()) except: - print("WARNING: bad QSS file, %s"%(qssfile)) + print("WARNING: bad QSS file, %s" % (qssfile)) |