refactoring fixes

NanoVNASaver/Analysis/AntennaAnalysis.py

@@ -55,18 +55,18 @@ class MagLoopAnalysis(VSWRAnalysis):
                     (self.app.data11[end].freq - self.app.data11[start].freq)
                 self.layout.addRow(
                     "Q", QtWidgets.QLabel("{}".format(int(Q))))
-                self.app.sweepStartInput.setText(self.app.data11[start].freq)
-                self.app.sweepStartInput.textEdited.emit(
-                    self.app.sweepStartInput.text())
-                self.app.sweepEndInput.setText(self.app.data11[end].freq)
-                self.app.sweepEndInput.textEdited.emit(
-                    self.app.sweepEndInput.text())
+                self.app.sweep_control.input_start.setText(self.app.data11[start].freq)
+                self.app.sweep_control.input_start.textEdited.emit(
+                    self.app.sweep_control.input_start.text())
+                self.app.sweep_control.input_end.setText(self.app.data11[end].freq)
+                self.app.sweep_control.input_end.textEdited.emit(
+                    self.app.sweep_control.input_end.text())
             else:
-                self.app.sweepStartInput.setText(
+                self.app.sweep_control.input_start.setText(
                     self.app.data11[start].freq - self.bandwith)
-                self.app.sweepStartInput.textEdited.emit(
-                    self.app.sweepStartInput.text())
-                self.app.sweepEndInput.setText(
+                self.app.sweep_control.input_start.textEdited.emit(
+                    self.app.sweep_control.input_start.text())
+                self.app.sweep_control.input_end.setText(
                     self.app.data11[end].freq + self.bandwith)
-                self.app.sweepEndInput.textEdited.emit(
-                    self.app.sweepEndInput.text())
+                self.app.sweep_control.input_end.textEdited.emit(
+                    self.app.sweep_control.input_end.text())

NanoVNASaver/Widgets/SweepControl.py

@@ -89,7 +89,7 @@ class SweepControl(QtWidgets.QGroupBox):
 
         btn_settings_window = QtWidgets.QPushButton("Sweep settings ...")
         btn_settings_window.clicked.connect(
-            lambda: self.app.display_window("settings"))
+            lambda: self.app.display_window("sweep_settings"))
 
         control_layout.addRow(btn_settings_window)
 

NanoVNASaver/Windows/SweepSettings.py

@@ -190,9 +190,12 @@ class SweepSettingsWindow(QtWidgets.QWidget):
             start = max(1, start)
             stop += round(span * padding / 100)
 
-        self.app.sweepStartInput.setText(format_frequency_sweep(start))
-        self.app.sweepEndInput.setText(format_frequency_sweep(stop))
-        self.app.sweepEndInput.textEdited.emit(self.app.sweepEndInput.text())
+        self.app.sweep_control.input_start.setText(
+            format_frequency_sweep(start))
+        self.app.sweep_control.input_end.setText(
+            format_frequency_sweep(stop))
+        self.app.sweep_control.input_end.textEdited.emit(
+            self.app.sweep_control.input_end.text())
 
     def updateAveraging(self):
         self.app.worker.setAveraging(self.averaged_sweep_radiobutton.isChecked(),