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

Clamp frequency input to only positive values

pull/116/head
Holger Mueller 2019-12-08 21:20:04 +01:00
rodzic a7ff08521c
commit ca23f8ff2d
2 zmienionych plików z 3 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
NanoVNASaver/Marker.py
Wyświetl plik

@ -276,28 +276,8 @@ class Marker(QtCore.QObject):
self.right_form.addRow(label, value)
value.show()
# Left side
# self.left_form.addRow("Frequency:", self.frequency_label)
# self.left_form.addRow("Impedance:", self.impedance_label)
# # left_form.addRow("Admittance:", self.admittance_label)
# self.left_form.addRow("Parallel R:", self.parallel_r_label)
# self.left_form.addRow("Parallel X:", self.parallel_x_label)
# self.left_form.addRow("L equiv.:", self.inductance_label)
# self.left_form.addRow("C equiv.:", self.capacitance_label)
#
# # Right side
# self.right_form.addRow("Return loss:", self.returnloss_label)
# if "vswr" in self.fieldSelection:
# self.right_form.addRow("VSWR:", self.vswr_label)
# self.vswr_label.show()
# self.right_form.addRow("Q:", self.quality_factor_label)
# self.right_form.addRow("S11 Phase:", self.s11_phase_label)
# self.right_form.addRow("S21 Gain:", self.gain_label)
# self.right_form.addRow("S21 Phase:", self.s21_phase_label)
def setFrequency(self, frequency):
f = RFTools.RFTools.parseFrequency(frequency)
self.frequency = max(f, 0)
self.frequency = RFTools.RFTools.parseFrequency(frequency)
self.updated.emit(self)
def setFieldSelection(self, fields):

3
NanoVNASaver/RFTools.py
Wyświetl plik

@ -23,7 +23,8 @@ from NanoVNASaver.SITools import Value, Format, clamp_value
FMT_FREQ = Format()
FMT_SHORT = Format(max_nr_digits=4)
FMT_SWEEP = Format(max_nr_digits=9, allow_strip=True)
FMT_PARSE = Format(parse_sloppy_unit=True, parse_sloppy_kilo=True)
FMT_PARSE = Format(parse_sloppy_unit=True, parse_sloppy_kilo=True,
parse_clamp_min=0)
def parallel_to_serial(z: complex) -> complex: