kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
Putting all file handling into a separate window.
Rune B. Broberg
rodzic
249e614c8c
commit
9dfa6a9b3e
|
|
@ -170,6 +170,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
s11_control_box.setTitle("S11")
|
||||
s11_control_layout = QtWidgets.QFormLayout()
|
||||
s11_control_box.setLayout(s11_control_layout)
|
||||
s11_control_box.setMaximumWidth(400)
|
||||
|
||||
self.s11_min_swr_label = QtWidgets.QLabel()
|
||||
s11_control_layout.addRow("Min VSWR:", self.s11_min_swr_label)
|
||||
|
|
@ -182,6 +183,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
s21_control_box.setTitle("S21")
|
||||
s21_control_layout = QtWidgets.QFormLayout()
|
||||
s21_control_box.setLayout(s21_control_layout)
|
||||
s21_control_box.setMaximumWidth(400)
|
||||
|
||||
self.s21_min_gain_label = QtWidgets.QLabel()
|
||||
s21_control_layout.addRow("Min gain:", self.s21_min_gain_label)
|
||||
|
|
@ -195,6 +197,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
tdr_control_box.setTitle("TDR")
|
||||
tdr_control_layout = QtWidgets.QFormLayout()
|
||||
tdr_control_box.setLayout(tdr_control_layout)
|
||||
tdr_control_box.setMaximumWidth(400)
|
||||
|
||||
self.tdr_velocity_dropdown = QtWidgets.QComboBox()
|
||||
self.tdr_velocity_dropdown.addItem("Jelly filled (0.64)", 0.64)
|
||||
|
|
@ -233,8 +236,9 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
# Calibration
|
||||
################################################################################################################
|
||||
calibration_control_box = QtWidgets.QGroupBox("Calibration")
|
||||
calibration_control_box.setMaximumWidth(400)
|
||||
calibration_control_layout = QtWidgets.QFormLayout(calibration_control_box)
|
||||
b = QtWidgets.QPushButton("Calibration")
|
||||
b = QtWidgets.QPushButton("Calibration ...")
|
||||
self.calibrationWindow = CalibrationWindow(self)
|
||||
b.clicked.connect(self.calibrationWindow.show)
|
||||
calibration_control_layout.addRow(b)
|
||||
|
|
@ -272,25 +276,6 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
reference_control_layout.addRow(set_reference_layout)
|
||||
reference_control_layout.addRow(self.btnResetReference)
|
||||
|
||||
self.referenceFileNameInput = QtWidgets.QLineEdit("")
|
||||
btnReferenceFilePicker = QtWidgets.QPushButton("...")
|
||||
btnReferenceFilePicker.setMaximumWidth(25)
|
||||
btnReferenceFilePicker.clicked.connect(self.pickReferenceFile)
|
||||
referenceFileNameLayout = QtWidgets.QHBoxLayout()
|
||||
referenceFileNameLayout.addWidget(self.referenceFileNameInput)
|
||||
referenceFileNameLayout.addWidget(btnReferenceFilePicker)
|
||||
|
||||
reference_control_layout.addRow(QtWidgets.QLabel("Filename"), referenceFileNameLayout)
|
||||
|
||||
import_button_layout = QtWidgets.QHBoxLayout()
|
||||
btnLoadReference = QtWidgets.QPushButton("Load reference")
|
||||
btnLoadReference.clicked.connect(self.loadReferenceFile)
|
||||
btnLoadSweep = QtWidgets.QPushButton("Load as sweep")
|
||||
btnLoadSweep.clicked.connect(self.loadSweepFile)
|
||||
import_button_layout.addWidget(btnLoadReference)
|
||||
import_button_layout.addWidget(btnLoadSweep)
|
||||
reference_control_layout.addRow(import_button_layout)
|
||||
|
||||
left_column.addWidget(reference_control_box)
|
||||
|
||||
################################################################################################################
|
||||
|
|
@ -319,6 +304,31 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
# File control
|
||||
################################################################################################################
|
||||
|
||||
self.fileWindow = QtWidgets.QWidget()
|
||||
self.fileWindow.setWindowTitle("Files")
|
||||
file_window_layout = QtWidgets.QVBoxLayout()
|
||||
self.fileWindow.setLayout(file_window_layout)
|
||||
|
||||
reference_file_control_box = QtWidgets.QGroupBox("Import file")
|
||||
reference_file_control_layout = QtWidgets.QFormLayout(reference_file_control_box)
|
||||
self.referenceFileNameInput = QtWidgets.QLineEdit("")
|
||||
btnReferenceFilePicker = QtWidgets.QPushButton("...")
|
||||
btnReferenceFilePicker.setMaximumWidth(25)
|
||||
btnReferenceFilePicker.clicked.connect(self.pickReferenceFile)
|
||||
referenceFileNameLayout = QtWidgets.QHBoxLayout()
|
||||
referenceFileNameLayout.addWidget(self.referenceFileNameInput)
|
||||
referenceFileNameLayout.addWidget(btnReferenceFilePicker)
|
||||
|
||||
reference_file_control_layout.addRow(QtWidgets.QLabel("Filename"), referenceFileNameLayout)
|
||||
file_window_layout.addWidget(reference_file_control_box)
|
||||
|
||||
btnLoadReference = QtWidgets.QPushButton("Load reference")
|
||||
btnLoadReference.clicked.connect(self.loadReferenceFile)
|
||||
btnLoadSweep = QtWidgets.QPushButton("Load as sweep")
|
||||
btnLoadSweep.clicked.connect(self.loadSweepFile)
|
||||
reference_file_control_layout.addRow(btnLoadReference)
|
||||
reference_file_control_layout.addRow(btnLoadSweep)
|
||||
|
||||
file_control_box = QtWidgets.QGroupBox()
|
||||
file_control_box.setTitle("Export file")
|
||||
file_control_box.setMaximumWidth(400)
|
||||
|
|
@ -341,6 +351,16 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
self.btnExportFile.clicked.connect(self.exportFileS2P)
|
||||
file_control_layout.addRow(self.btnExportFile)
|
||||
|
||||
file_window_layout.addWidget(file_control_box)
|
||||
|
||||
file_control_box = QtWidgets.QGroupBox()
|
||||
file_control_box.setTitle("Files")
|
||||
file_control_box.setMaximumWidth(400)
|
||||
file_control_layout = QtWidgets.QFormLayout(file_control_box)
|
||||
btnOpenFileWindow = QtWidgets.QPushButton("Files ...")
|
||||
file_control_layout.addWidget(btnOpenFileWindow)
|
||||
btnOpenFileWindow.clicked.connect(lambda: self.fileWindow.show())
|
||||
|
||||
left_column.addWidget(file_control_box)
|
||||
|
||||
################################################################################################################
|
||||
|
|
@ -348,7 +368,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
################################################################################################################
|
||||
|
||||
self.lister = QtWidgets.QPlainTextEdit()
|
||||
self.lister.setFixedHeight(100)
|
||||
self.lister.setFixedHeight(80)
|
||||
charts = QtWidgets.QGridLayout()
|
||||
charts.addWidget(self.s11SmithChart, 0, 0)
|
||||
charts.addWidget(self.s21SmithChart, 1, 0)
|
||||
|
|
@ -375,11 +395,13 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
|
||||
def pickReferenceFile(self):
|
||||
filename, _ = QtWidgets.QFileDialog.getOpenFileName(directory=self.referenceFileNameInput.text(), filter="Touchstone Files (*.s1p *.s2p);;All files (*.*)")
|
||||
self.referenceFileNameInput.setText(filename)
|
||||
if filename != "":
|
||||
self.referenceFileNameInput.setText(filename)
|
||||
|
||||
def pickFile(self):
|
||||
filename, _ = QtWidgets.QFileDialog.getSaveFileName(directory=self.fileNameInput.text(), filter="Touchstone Files (*.s1p *.s2p);;All files (*.*)")
|
||||
self.fileNameInput.setText(filename)
|
||||
if filename != "":
|
||||
self.fileNameInput.setText(filename)
|
||||
|
||||
def exportFileS1P(self):
|
||||
print("Save file to " + self.fileNameInput.text())
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue