Refactoring Controls

NanoVNASaver/Controls/SerialControl.py

@@ -35,7 +35,7 @@ class SerialControl(QtWidgets.QGroupBox):
         self.setTitle(title)
         self.setMaximumWidth(240)
 
-        control_layout = QtWidgets.QFormLayout(self)
+        self.layout = QtWidgets.QFormLayout(self)
         self.inp_port = QtWidgets.QComboBox()
         self.inp_port.setMinimumHeight(20)
         self.rescanSerialPort()
@@ -48,7 +48,7 @@ class SerialControl(QtWidgets.QGroupBox):
         intput_layout.addWidget(QtWidgets.QLabel("Port"), stretch=0)
         intput_layout.addWidget(self.inp_port, stretch=1)
         intput_layout.addWidget(self.btn_rescan, stretch=0)
-        control_layout.addRow(intput_layout)
+        self.layout.addRow(intput_layout)
 
         button_layout = QtWidgets.QHBoxLayout()
 
@@ -64,7 +64,7 @@ class SerialControl(QtWidgets.QGroupBox):
             lambda: self.app.display_window("device_settings"))
 
         button_layout.addWidget(self.btn_settings, stretch=0)
-        control_layout.addRow(button_layout)
+        self.layout.addRow(button_layout)
 
     def rescanSerialPort(self):
         self.inp_port.clear()

NanoVNASaver/Controls/SweepControl.py

@@ -38,7 +38,7 @@ class SweepControl(QtWidgets.QGroupBox):
         self.app = app
         self.setMaximumWidth(240)
         self.setTitle(title)
-        control_layout = QtWidgets.QFormLayout(self)
+        self.layout = QtWidgets.QFormLayout(self)
 
         line = QtWidgets.QFrame()
         line.setFrameShape(QtWidgets.QFrame.VLine)
@@ -49,7 +49,7 @@ class SweepControl(QtWidgets.QGroupBox):
         input_layout.addLayout(input_left_layout)
         input_layout.addWidget(line)
         input_layout.addLayout(input_right_layout)
-        control_layout.addRow(input_layout)
+        self.layout.addRow(input_layout)
 
         self.input_start = FrequencyInputWidget()
         self.input_start.setFixedHeight(20)
@@ -93,19 +93,19 @@ class SweepControl(QtWidgets.QGroupBox):
         segment_layout = QtWidgets.QHBoxLayout()
         segment_layout.addWidget(self.input_segments)
         segment_layout.addWidget(self.label_step)
-        control_layout.addRow(QtWidgets.QLabel("Segments"), segment_layout)
+        self.layout.addRow(QtWidgets.QLabel("Segments"), segment_layout)
 
         btn_settings_window = QtWidgets.QPushButton("Sweep settings ...")
         btn_settings_window.setFixedHeight(20)
         btn_settings_window.clicked.connect(
             lambda: self.app.display_window("sweep_settings"))
 
-        control_layout.addRow(btn_settings_window)
+        self.layout.addRow(btn_settings_window)
 
         self.progress_bar = QtWidgets.QProgressBar()
         self.progress_bar.setMaximum(100)
         self.progress_bar.setValue(0)
-        control_layout.addRow(self.progress_bar)
+        self.layout.addRow(self.progress_bar)
 
         self.btn_start = QtWidgets.QPushButton("Sweep")
         self.btn_start.setFixedHeight(20)
@@ -122,7 +122,7 @@ class SweepControl(QtWidgets.QGroupBox):
         btn_layout.setContentsMargins(0, 0, 0, 0)
         btn_layout_widget = QtWidgets.QWidget()
         btn_layout_widget.setLayout(btn_layout)
-        control_layout.addRow(btn_layout_widget)
+        self.layout.addRow(btn_layout_widget)
 
         self.input_start.textEdited.emit(self.input_start.text())
         self.input_start.textChanged.emit(self.input_start.text())

NanoVNASaver/NanoVNASaver.py

@@ -20,7 +20,7 @@ import logging
 import sys
 import threading
 from collections import OrderedDict
-from time import sleep, strftime, localtime
+from time import strftime, localtime
 
 from PyQt5 import QtWidgets, QtCore, QtGui