diff --git a/NanoVNASaver/Chart.py b/NanoVNASaver/Chart.py index 9e6495e..2c6d7b0 100644 --- a/NanoVNASaver/Chart.py +++ b/NanoVNASaver/Chart.py @@ -99,7 +99,7 @@ class Chart(QtWidgets.QWidget): return 0 def getPosition(self, d: Datapoint) -> (int, int): - return (self.getXPosition(d), self.getYPosition(d)) + return self.getXPosition(d), self.getYPosition(d) def setDrawLines(self, drawLines): self.drawLines = drawLines diff --git a/NanoVNASaver/Marker.py b/NanoVNASaver/Marker.py index 2c5f58e..987d71d 100644 --- a/NanoVNASaver/Marker.py +++ b/NanoVNASaver/Marker.py @@ -157,10 +157,13 @@ class Marker(QtCore.QObject): from NanoVNASaver.NanoVNASaver import NanoVNASaver if self.location != -1: im50, re50, vswr = NanoVNASaver.vswr(s11data[self.location]) + re50 = round(re50, 4 - math.floor(math.log10(abs(re50)))) + im50 = round(im50, 4 - math.floor(math.log10(abs(im50)))) + if im50 < 0: - im50str = " -j" + str(round(-1 * im50, 3)) + im50str = " -j" + str(-1 * im50) else: - im50str = " +j" + str(round(im50, 3)) + im50str = " +j" + str(im50) self.frequency_label.setText(NanoVNASaver.formatFrequency(s11data[self.location].freq)) self.impedance_label.setText(str(round(re50, 3)) + im50str) self.returnloss_label.setText(str(round(20 * math.log10((vswr - 1) / (vswr + 1)), 3)) + " dB")