kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
Show fewer digits of impedance and admittance, and "k" if needed.
rodzic
483eee5631
commit
5501e8c73b
|
@ -285,17 +285,29 @@ class Marker(QtCore.QObject):
|
||||||
vswr = RFTools.calculateVSWR(s11data[self.location])
|
vswr = RFTools.calculateVSWR(s11data[self.location])
|
||||||
if re50 > 0:
|
if re50 > 0:
|
||||||
rp = (re50 ** 2 + im50 ** 2) / re50
|
rp = (re50 ** 2 + im50 ** 2) / re50
|
||||||
rp = round(rp, 4 - max(0, math.floor(math.log10(abs(rp)))))
|
rp = round(rp, 3 - max(0, math.floor(math.log10(abs(rp)))))
|
||||||
rpstr = str(rp)
|
if rp > 10000:
|
||||||
|
rpstr = str(round(rp/1000, 2)) + "k"
|
||||||
|
elif rp > 1000:
|
||||||
|
rpstr = str(round(rp))
|
||||||
|
else:
|
||||||
|
rpstr = str(rp)
|
||||||
|
|
||||||
re50 = round(re50, 4 - max(0, math.floor(math.log10(abs(re50)))))
|
re50 = round(re50, 3 - max(0, math.floor(math.log10(abs(re50)))))
|
||||||
|
if re50 > 10000:
|
||||||
|
re50str = str(round(re50/1000, 2)) + "k"
|
||||||
|
elif re50 > 1000:
|
||||||
|
re50str = str(round(re50)) # Remove the ".0"
|
||||||
|
else:
|
||||||
|
re50str = str(re50)
|
||||||
else:
|
else:
|
||||||
rpstr = "-"
|
rpstr = "-"
|
||||||
re50 = 0
|
re50 = 0
|
||||||
|
re50str = "-"
|
||||||
|
|
||||||
if im50 != 0:
|
if im50 != 0:
|
||||||
xp = (re50 ** 2 + im50 ** 2) / im50
|
xp = (re50 ** 2 + im50 ** 2) / im50
|
||||||
xp = round(xp, 4 - max(0, math.floor(math.log10(abs(xp)))))
|
xp = round(xp, 3 - max(0, math.floor(math.log10(abs(xp)))))
|
||||||
xpcstr = RFTools.capacitanceEquivalent(xp, s11data[self.location].freq)
|
xpcstr = RFTools.capacitanceEquivalent(xp, s11data[self.location].freq)
|
||||||
xplstr = RFTools.inductanceEquivalent(xp, s11data[self.location].freq)
|
xplstr = RFTools.inductanceEquivalent(xp, s11data[self.location].freq)
|
||||||
if xp < 0:
|
if xp < 0:
|
||||||
|
@ -310,7 +322,7 @@ class Marker(QtCore.QObject):
|
||||||
xpstr = xpcstr = xplstr = "-"
|
xpstr = xpcstr = xplstr = "-"
|
||||||
|
|
||||||
if im50 != 0:
|
if im50 != 0:
|
||||||
im50 = round(im50, 4 - max(0, math.floor(math.log10(abs(im50)))))
|
im50 = round(im50, 3 - max(0, math.floor(math.log10(abs(im50)))))
|
||||||
|
|
||||||
if im50 < 0:
|
if im50 < 0:
|
||||||
im50str = " -j" + str(-1 * im50)
|
im50str = " -j" + str(-1 * im50)
|
||||||
|
@ -319,9 +331,9 @@ class Marker(QtCore.QObject):
|
||||||
im50str += " \N{OHM SIGN}"
|
im50str += " \N{OHM SIGN}"
|
||||||
|
|
||||||
self.frequency_label.setText(RFTools.formatFrequency(s11data[self.location].freq))
|
self.frequency_label.setText(RFTools.formatFrequency(s11data[self.location].freq))
|
||||||
self.impedance_label.setText(str(re50) + im50str)
|
self.impedance_label.setText(re50str + im50str)
|
||||||
self.admittance_label.setText(rpstr + xp50str)
|
self.admittance_label.setText(rpstr + xp50str)
|
||||||
self.series_r_label.setText(str(re50) + " \N{OHM SIGN}")
|
self.series_r_label.setText(re50str + " \N{OHM SIGN}")
|
||||||
self.parallel_r_label.setText(rpstr + " \N{OHM SIGN}")
|
self.parallel_r_label.setText(rpstr + " \N{OHM SIGN}")
|
||||||
self.parallel_x_label.setText(xpstr)
|
self.parallel_x_label.setText(xpstr)
|
||||||
if self.returnloss_is_positive:
|
if self.returnloss_is_positive:
|
||||||
|
|
Ładowanie…
Reference in New Issue