mirror
/
nanovna-saver
kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Show shortend frequency values in sweep input

pull/69/head
Holger Mueller 2019-10-27 17:00:22 +01:00
rodzic 0512dd3224
commit 3e85ed1c9c
1 zmienionych plików z 10 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
NanoVNASaver/NanoVNASaver.py
Wyświetl plik

@ -616,11 +616,11 @@ class NanoVNASaver(QtWidgets.QWidget):
if frequencies:
logger.info("Read starting frequency %s and end frequency %s", frequencies[0], frequencies[100])
if int(frequencies[0]) == int(frequencies[100]) and (self.sweepStartInput.text() == "" or self.sweepEndInput.text() == ""):
self.sweepStartInput.setText(frequencies[0])
self.sweepEndInput.setText(str(int(frequencies[100]) + 100000))
self.sweepStartInput.setText(RFTools.formatFixedFrequency(int(frequencies[0])))
self.sweepEndInput.setText(RFTools.formatFixedFrequency(int(frequencies[100]) + 100000))
elif self.sweepStartInput.text() == "" or self.sweepEndInput.text() == "":
self.sweepStartInput.setText(frequencies[0])
self.sweepEndInput.setText(frequencies[100])
self.sweepStartInput.setText(RFTools.formatFixedFrequency(int(frequencies[0])))
self.sweepEndInput.setText(RFTools.formatFixedFrequency(int(frequencies[100])))
self.sweepStartInput.textEdited.emit(self.sweepStartInput.text())
self.sweepStartInput.textChanged.emit(self.sweepStartInput.text())
else:
@ -759,8 +759,8 @@ class NanoVNASaver(QtWidgets.QWidget):
fcenter = int(round((fstart+fstop)/2))
if fspan < 0 or fstart < 0 or fstop < 0:
return
self.sweepSpanInput.setText(str(fspan))
self.sweepCenterInput.setText(str(fcenter))
self.sweepSpanInput.setText(RFTools.formatFixedFrequency(fspan))
self.sweepCenterInput.setText(RFTools.formatFixedFrequency(fcenter))
def updateStartEnd(self):
fcenter = RFTools.parseFrequency(self.sweepCenterInput.text())
@ -771,8 +771,8 @@ class NanoVNASaver(QtWidgets.QWidget):
fstop = int(round(fcenter + fspan/2))
if fstart < 0 or fstop < 0:
return
self.sweepStartInput.setText(str(fstart))
self.sweepEndInput.setText(str(fstop))
self.sweepStartInput.setText(RFTools.formatFixedFrequency(fstart))
self.sweepEndInput.setText(RFTools.formatFixedFrequency(fstop))
def updateStepSize(self):
fspan = RFTools.parseFrequency(self.sweepSpanInput.text())
@ -1888,8 +1888,8 @@ class SweepSettingsWindow(QtWidgets.QWidget):
start = max(1, start)
stop += round(span / 10)
self.app.sweepStartInput.setText(str(start))
self.app.sweepEndInput.setText(str(stop))
self.app.sweepStartInput.setText(RFTools.formatFixedFrequency(start))
self.app.sweepEndInput.setText(RFTools.formatFixedFrequency(stop))
self.app.sweepEndInput.textEdited.emit(self.app.sweepEndInput.text())
def updateAveraging(self):