Skip to content

Commit 29fd7c7

Browse files
committedNov 24, 2021
qtgui: pep8 formatting
Signed-off-by: Josh Morman <[email protected]>
1 parent aa58bb7 commit 29fd7c7

33 files changed

+654
-479
lines changed
 

‎gr-qtgui/apps/uhd_display.py

+21-18
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ def pauseFg(self):
8282
self.fg.start()
8383
self.gui.pauseButton.setText("Pause")
8484

85-
8685
# Functions to set the values in the GUI
86+
8787
def set_frequency(self, freq):
8888
self.freq = freq
8989
sfreq = eng_notation.num_to_str(self.freq)
@@ -102,11 +102,12 @@ def set_amplifier(self, amp):
102102
self.amp = amp
103103
self.gui.amplifierEdit.setText(QtCore.QString("%1").arg(self.amp))
104104

105-
106105
# Functions called when signals are triggered in the GUI
106+
107107
def frequencyEditText(self):
108108
try:
109-
freq = eng_notation.str_to_num(self.gui.frequencyEdit.text().toAscii())
109+
freq = eng_notation.str_to_num(
110+
self.gui.frequencyEdit.text().toAscii())
110111
self.fg.set_frequency(freq)
111112
self.freq = freq
112113
except RuntimeError:
@@ -122,7 +123,8 @@ def gainEditText(self):
122123

123124
def bandwidthEditText(self):
124125
try:
125-
bw = eng_notation.str_to_num(self.gui.bandwidthEdit.text().toAscii())
126+
bw = eng_notation.str_to_num(
127+
self.gui.bandwidthEdit.text().toAscii())
126128
self.fg.set_bandwidth(bw)
127129
self.bw = bw
128130
except ValueError:
@@ -137,7 +139,8 @@ def amplifierEditText(self):
137139
pass
138140

139141
def saveData(self):
140-
fileName = QtGui.QFileDialog.getSaveFileName(self, "Save data to file", ".");
142+
fileName = QtGui.QFileDialog.getSaveFileName(
143+
self, "Save data to file", ".")
141144
if(len(fileName)):
142145
self.fg.save_to_file(str(fileName))
143146

@@ -150,7 +153,6 @@ def dcCancelClicked(self, state):
150153
self.fg.cancel_dc(state)
151154

152155

153-
154156
class my_top_block(gr.top_block):
155157
def __init__(self, options):
156158
gr.top_block.__init__(self)
@@ -160,7 +162,8 @@ def __init__(self, options):
160162

161163
self.qapp = QtGui.QApplication(sys.argv)
162164

163-
self.u = uhd.usrp_source(device_addr=options.address, stream_args=uhd.stream_args('fc32'))
165+
self.u = uhd.usrp_source(
166+
device_addr=options.address, stream_args=uhd.stream_args('fc32'))
164167

165168
if(options.antenna):
166169
self.u.set_antenna(options.antenna, 0)
@@ -170,13 +173,13 @@ def __init__(self, options):
170173
if options.gain is None:
171174
# if no gain was specified, use the mid-point in dB
172175
g = self.u.get_gain_range()
173-
options.gain = float(g.start()+g.stop()) / 2
176+
options.gain = float(g.start() + g.stop()) / 2
174177
self.set_gain(options.gain)
175178

176179
if options.freq is None:
177180
# if no freq was specified, use the mid-point
178181
r = self.u.get_freq_range()
179-
options.freq = float(r.start()+r.stop()) / 2
182+
options.freq = float(r.start() + r.stop()) / 2
180183
self.set_frequency(options.freq)
181184

182185
self._fftsize = options.fft_size
@@ -218,7 +221,6 @@ def __init__(self, options):
218221

219222
self.main_win.show()
220223

221-
222224
def save_to_file(self, name):
223225
self.lock()
224226

@@ -262,19 +264,20 @@ def cancel_dc(self, state):
262264

263265
if(state):
264266
self.disconnect(self.u, self.amp)
265-
self.connect(self.u, (self.dc_sub,0))
266-
self.connect(self.u, self.dc, (self.dc_sub,1))
267+
self.connect(self.u, (self.dc_sub, 0))
268+
self.connect(self.u, self.dc, (self.dc_sub, 1))
267269
self.connect(self.dc_sub, self.amp)
268270
else:
269271
self.disconnect(self.dc_sub, self.amp)
270-
self.disconnect(self.dc, (self.dc_sub,1))
272+
self.disconnect(self.dc, (self.dc_sub, 1))
271273
self.disconnect(self.u, self.dc)
272-
self.disconnect(self.u, (self.dc_sub,0))
274+
self.disconnect(self.u, (self.dc_sub, 0))
273275
self.connect(self.u, self.amp)
274276

275277
self.unlock()
276278

277-
def main ():
279+
280+
def main():
278281
parser = OptionParser(option_class=eng_option)
279282
parser.add_option("-a", "--address", type="string", default="addr=192.168.10.2",
280283
help="Address of UHD device, [default=%default]")
@@ -296,11 +299,11 @@ def main ():
296299

297300
tb = my_top_block(options)
298301
tb.start()
299-
tb.snk.exec_();
302+
tb.snk.exec_()
303+
300304

301305
if __name__ == '__main__':
302306
try:
303-
main ()
307+
main()
304308
except KeyboardInterrupt:
305309
pass
306-

‎gr-qtgui/apps/usrp_display_qtgui.py

+85-43
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
from PyQt5 import QtCore, QtGui
1111

12+
1213
class Ui_MainWindow(object):
1314
def setupUi(self, MainWindow):
1415
MainWindow.setObjectName("MainWindow")
@@ -20,10 +21,12 @@ def setupUi(self, MainWindow):
2021
self.horizontalLayout_2 = QtGui.QHBoxLayout()
2122
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
2223
self.groupBox = QtGui.QGroupBox(self.centralwidget)
23-
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
24+
sizePolicy = QtGui.QSizePolicy(
25+
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
2426
sizePolicy.setHorizontalStretch(0)
2527
sizePolicy.setVerticalStretch(0)
26-
sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth())
28+
sizePolicy.setHeightForWidth(
29+
self.groupBox.sizePolicy().hasHeightForWidth())
2730
self.groupBox.setSizePolicy(sizePolicy)
2831
self.groupBox.setMinimumSize(QtCore.QSize(240, 150))
2932
self.groupBox.setMaximumSize(QtCore.QSize(240, 16777215))
@@ -35,52 +38,68 @@ def setupUi(self, MainWindow):
3538
self.formLayout.setObjectName("formLayout")
3639
self.frequencyLabel = QtGui.QLabel(self.formLayoutWidget)
3740
self.frequencyLabel.setObjectName("frequencyLabel")
38-
self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.frequencyLabel)
41+
self.formLayout.setWidget(
42+
0, QtGui.QFormLayout.LabelRole, self.frequencyLabel)
3943
self.gainLabel = QtGui.QLabel(self.formLayoutWidget)
4044
self.gainLabel.setObjectName("gainLabel")
41-
self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.gainLabel)
45+
self.formLayout.setWidget(
46+
1, QtGui.QFormLayout.LabelRole, self.gainLabel)
4247
self.bandwidthLabel = QtGui.QLabel(self.formLayoutWidget)
4348
self.bandwidthLabel.setObjectName("bandwidthLabel")
44-
self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.bandwidthLabel)
49+
self.formLayout.setWidget(
50+
2, QtGui.QFormLayout.LabelRole, self.bandwidthLabel)
4551
self.frequencyEdit = QtGui.QLineEdit(self.formLayoutWidget)
46-
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
52+
sizePolicy = QtGui.QSizePolicy(
53+
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
4754
sizePolicy.setHorizontalStretch(0)
4855
sizePolicy.setVerticalStretch(0)
49-
sizePolicy.setHeightForWidth(self.frequencyEdit.sizePolicy().hasHeightForWidth())
56+
sizePolicy.setHeightForWidth(
57+
self.frequencyEdit.sizePolicy().hasHeightForWidth())
5058
self.frequencyEdit.setSizePolicy(sizePolicy)
5159
self.frequencyEdit.setMinimumSize(QtCore.QSize(120, 26))
5260
self.frequencyEdit.setObjectName("frequencyEdit")
53-
self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.frequencyEdit)
61+
self.formLayout.setWidget(
62+
0, QtGui.QFormLayout.FieldRole, self.frequencyEdit)
5463
self.gainEdit = QtGui.QLineEdit(self.formLayoutWidget)
55-
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
64+
sizePolicy = QtGui.QSizePolicy(
65+
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
5666
sizePolicy.setHorizontalStretch(0)
5767
sizePolicy.setVerticalStretch(0)
58-
sizePolicy.setHeightForWidth(self.gainEdit.sizePolicy().hasHeightForWidth())
68+
sizePolicy.setHeightForWidth(
69+
self.gainEdit.sizePolicy().hasHeightForWidth())
5970
self.gainEdit.setSizePolicy(sizePolicy)
6071
self.gainEdit.setMinimumSize(QtCore.QSize(120, 26))
6172
self.gainEdit.setObjectName("gainEdit")
62-
self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.gainEdit)
73+
self.formLayout.setWidget(
74+
1, QtGui.QFormLayout.FieldRole, self.gainEdit)
6375
self.bandwidthEdit = QtGui.QLineEdit(self.formLayoutWidget)
64-
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
76+
sizePolicy = QtGui.QSizePolicy(
77+
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
6578
sizePolicy.setHorizontalStretch(0)
6679
sizePolicy.setVerticalStretch(0)
67-
sizePolicy.setHeightForWidth(self.bandwidthEdit.sizePolicy().hasHeightForWidth())
80+
sizePolicy.setHeightForWidth(
81+
self.bandwidthEdit.sizePolicy().hasHeightForWidth())
6882
self.bandwidthEdit.setSizePolicy(sizePolicy)
6983
self.bandwidthEdit.setMinimumSize(QtCore.QSize(120, 26))
7084
self.bandwidthEdit.setObjectName("bandwidthEdit")
71-
self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.bandwidthEdit)
85+
self.formLayout.setWidget(
86+
2, QtGui.QFormLayout.FieldRole, self.bandwidthEdit)
7287
self.amplifierLabel = QtGui.QLabel(self.formLayoutWidget)
7388
self.amplifierLabel.setObjectName("amplifierLabel")
74-
self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.amplifierLabel)
89+
self.formLayout.setWidget(
90+
3, QtGui.QFormLayout.LabelRole, self.amplifierLabel)
7591
self.amplifierEdit = QtGui.QLineEdit(self.formLayoutWidget)
76-
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
92+
sizePolicy = QtGui.QSizePolicy(
93+
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
7794
sizePolicy.setHorizontalStretch(0)
7895
sizePolicy.setVerticalStretch(0)
79-
sizePolicy.setHeightForWidth(self.amplifierEdit.sizePolicy().hasHeightForWidth())
96+
sizePolicy.setHeightForWidth(
97+
self.amplifierEdit.sizePolicy().hasHeightForWidth())
8098
self.amplifierEdit.setSizePolicy(sizePolicy)
8199
self.amplifierEdit.setMinimumSize(QtCore.QSize(120, 26))
82100
self.amplifierEdit.setObjectName("amplifierEdit")
83-
self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.amplifierEdit)
101+
self.formLayout.setWidget(
102+
3, QtGui.QFormLayout.FieldRole, self.amplifierEdit)
84103
self.horizontalLayout_2.addWidget(self.groupBox)
85104
self.frame_2 = QtGui.QFrame(self.centralwidget)
86105
self.frame_2.setMinimumSize(QtCore.QSize(200, 0))
@@ -104,28 +123,35 @@ def setupUi(self, MainWindow):
104123
self.dcGainEdit.setObjectName("dcGainEdit")
105124
self.horizontalLayout.addWidget(self.dcGainEdit)
106125
self.verticalLayout_3.addLayout(self.horizontalLayout)
107-
spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
126+
spacerItem = QtGui.QSpacerItem(
127+
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
108128
self.verticalLayout_3.addItem(spacerItem)
109129
self.horizontalLayout_2.addWidget(self.frame_2)
110-
spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
130+
spacerItem1 = QtGui.QSpacerItem(
131+
40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
111132
self.horizontalLayout_2.addItem(spacerItem1)
112133
self.verticalLayout = QtGui.QVBoxLayout()
113134
self.verticalLayout.setObjectName("verticalLayout")
114-
spacerItem2 = QtGui.QSpacerItem(20, 80, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
135+
spacerItem2 = QtGui.QSpacerItem(
136+
20, 80, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
115137
self.verticalLayout.addItem(spacerItem2)
116138
self.pauseButton = QtGui.QPushButton(self.centralwidget)
117-
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
139+
sizePolicy = QtGui.QSizePolicy(
140+
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
118141
sizePolicy.setHorizontalStretch(0)
119142
sizePolicy.setVerticalStretch(0)
120-
sizePolicy.setHeightForWidth(self.pauseButton.sizePolicy().hasHeightForWidth())
143+
sizePolicy.setHeightForWidth(
144+
self.pauseButton.sizePolicy().hasHeightForWidth())
121145
self.pauseButton.setSizePolicy(sizePolicy)
122146
self.pauseButton.setObjectName("pauseButton")
123147
self.verticalLayout.addWidget(self.pauseButton)
124148
self.closeButton = QtGui.QPushButton(self.centralwidget)
125-
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
149+
sizePolicy = QtGui.QSizePolicy(
150+
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
126151
sizePolicy.setHorizontalStretch(0)
127152
sizePolicy.setVerticalStretch(0)
128-
sizePolicy.setHeightForWidth(self.closeButton.sizePolicy().hasHeightForWidth())
153+
sizePolicy.setHeightForWidth(
154+
self.closeButton.sizePolicy().hasHeightForWidth())
129155
self.closeButton.setSizePolicy(sizePolicy)
130156
self.closeButton.setMinimumSize(QtCore.QSize(75, 0))
131157
self.closeButton.setObjectName("closeButton")
@@ -135,10 +161,12 @@ def setupUi(self, MainWindow):
135161
self.verticalLayout_2 = QtGui.QVBoxLayout()
136162
self.verticalLayout_2.setObjectName("verticalLayout_2")
137163
self.frame = QtGui.QFrame(self.centralwidget)
138-
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
164+
sizePolicy = QtGui.QSizePolicy(
165+
QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
139166
sizePolicy.setHorizontalStretch(0)
140167
sizePolicy.setVerticalStretch(1)
141-
sizePolicy.setHeightForWidth(self.frame.sizePolicy().hasHeightForWidth())
168+
sizePolicy.setHeightForWidth(
169+
self.frame.sizePolicy().hasHeightForWidth())
142170
self.frame.setSizePolicy(sizePolicy)
143171
self.frame.setMinimumSize(QtCore.QSize(800, 550))
144172
self.frame.setFrameShape(QtGui.QFrame.StyledPanel)
@@ -170,22 +198,36 @@ def setupUi(self, MainWindow):
170198
self.menubar.addAction(self.menuFile.menuAction())
171199

172200
self.retranslateUi(MainWindow)
173-
QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), MainWindow.close)
174-
QtCore.QObject.connect(self.actionExit, QtCore.SIGNAL("triggered()"), MainWindow.close)
201+
QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL(
202+
"clicked()"), MainWindow.close)
203+
QtCore.QObject.connect(self.actionExit, QtCore.SIGNAL(
204+
"triggered()"), MainWindow.close)
175205
QtCore.QMetaObject.connectSlotsByName(MainWindow)
176206

177207
def retranslateUi(self, MainWindow):
178-
MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "USRP Display", None, QtGui.QApplication.UnicodeUTF8))
179-
self.groupBox.setTitle(QtGui.QApplication.translate("MainWindow", "Receiver Parameters", None, QtGui.QApplication.UnicodeUTF8))
180-
self.frequencyLabel.setText(QtGui.QApplication.translate("MainWindow", "Frequency (Hz)", None, QtGui.QApplication.UnicodeUTF8))
181-
self.gainLabel.setText(QtGui.QApplication.translate("MainWindow", "RF Gain", None, QtGui.QApplication.UnicodeUTF8))
182-
self.bandwidthLabel.setText(QtGui.QApplication.translate("MainWindow", "Bandwidth", None, QtGui.QApplication.UnicodeUTF8))
183-
self.amplifierLabel.setText(QtGui.QApplication.translate("MainWindow", "Amplifier", None, QtGui.QApplication.UnicodeUTF8))
184-
self.dcCancelCheckBox.setText(QtGui.QApplication.translate("MainWindow", "Cancel DC", None, QtGui.QApplication.UnicodeUTF8))
185-
self.dcGainLabel.setText(QtGui.QApplication.translate("MainWindow", "DC Canceller Gain", None, QtGui.QApplication.UnicodeUTF8))
186-
self.pauseButton.setText(QtGui.QApplication.translate("MainWindow", "Pause", None, QtGui.QApplication.UnicodeUTF8))
187-
self.closeButton.setText(QtGui.QApplication.translate("MainWindow", "Close", None, QtGui.QApplication.UnicodeUTF8))
188-
self.menuFile.setTitle(QtGui.QApplication.translate("MainWindow", "&File", None, QtGui.QApplication.UnicodeUTF8))
189-
self.actionExit.setText(QtGui.QApplication.translate("MainWindow", "E&xit", None, QtGui.QApplication.UnicodeUTF8))
190-
self.actionSaveData.setText(QtGui.QApplication.translate("MainWindow", "&Save Data", None, QtGui.QApplication.UnicodeUTF8))
191-
208+
MainWindow.setWindowTitle(QtGui.QApplication.translate(
209+
"MainWindow", "USRP Display", None, QtGui.QApplication.UnicodeUTF8))
210+
self.groupBox.setTitle(QtGui.QApplication.translate(
211+
"MainWindow", "Receiver Parameters", None, QtGui.QApplication.UnicodeUTF8))
212+
self.frequencyLabel.setText(QtGui.QApplication.translate(
213+
"MainWindow", "Frequency (Hz)", None, QtGui.QApplication.UnicodeUTF8))
214+
self.gainLabel.setText(QtGui.QApplication.translate(
215+
"MainWindow", "RF Gain", None, QtGui.QApplication.UnicodeUTF8))
216+
self.bandwidthLabel.setText(QtGui.QApplication.translate(
217+
"MainWindow", "Bandwidth", None, QtGui.QApplication.UnicodeUTF8))
218+
self.amplifierLabel.setText(QtGui.QApplication.translate(
219+
"MainWindow", "Amplifier", None, QtGui.QApplication.UnicodeUTF8))
220+
self.dcCancelCheckBox.setText(QtGui.QApplication.translate(
221+
"MainWindow", "Cancel DC", None, QtGui.QApplication.UnicodeUTF8))
222+
self.dcGainLabel.setText(QtGui.QApplication.translate(
223+
"MainWindow", "DC Canceller Gain", None, QtGui.QApplication.UnicodeUTF8))
224+
self.pauseButton.setText(QtGui.QApplication.translate(
225+
"MainWindow", "Pause", None, QtGui.QApplication.UnicodeUTF8))
226+
self.closeButton.setText(QtGui.QApplication.translate(
227+
"MainWindow", "Close", None, QtGui.QApplication.UnicodeUTF8))
228+
self.menuFile.setTitle(QtGui.QApplication.translate(
229+
"MainWindow", "&File", None, QtGui.QApplication.UnicodeUTF8))
230+
self.actionExit.setText(QtGui.QApplication.translate(
231+
"MainWindow", "E&xit", None, QtGui.QApplication.UnicodeUTF8))
232+
self.actionSaveData.setText(QtGui.QApplication.translate(
233+
"MainWindow", "&Save Data", None, QtGui.QApplication.UnicodeUTF8))

0 commit comments

Comments
 (0)
Please sign in to comment.