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

- Fixed frequency span settings for VSWR chart.

pull/42/head
Rune B. Broberg 2019-09-27 22:33:59 +02:00
rodzic 6f7073aff5
commit 9f331fcdf5
1 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
NanoVNASaver/Chart.py
Wyświetl plik

@ -613,14 +613,14 @@ class VSWRChart(FrequencyChart):
qp.setPen(pen)
for i in range(len(self.data)):
_, _, vswr = NanoVNASaver.vswr(self.data[i])
x = self.leftMargin + 1 + round(self.chartWidth/len(self.data) * i)
x = self.getXPosition(self.data[i])
y = 30 + round((maxVSWR-vswr)/span*(self.chartHeight-10))
if y < 30:
continue
qp.drawPoint(int(x), int(y))
if self.drawLines and i > 0:
_, _, vswr = NanoVNASaver.vswr(self.data[i-1])
prevx = self.leftMargin + 1 + round(self.chartWidth / len(self.data) * (i-1))
prevx = self.getXPosition(self.data[i-1])
prevy = 30 + round((maxVSWR - vswr) / span * (self.chartHeight - 10))
if prevy < 30:
continue
@ -634,14 +634,14 @@ class VSWRChart(FrequencyChart):
if self.reference[i].freq < fstart or self.reference[i].freq > fstop:
continue
_, _, vswr = NanoVNASaver.vswr(self.reference[i])
x = self.leftMargin + 1 + round(self.chartWidth*(self.reference[i].freq - fstart)/fspan)
x = self.getXPosition(self.reference[i])
y = 30 + round((maxVSWR - vswr) / span * (self.chartHeight - 10))
if y < 30:
continue
qp.drawPoint(int(x), int(y))
if self.drawLines and i > 0:
_, _, vswr = NanoVNASaver.vswr(self.reference[i-1])
prevx = self.leftMargin + 1 + round(self.chartWidth*(self.reference[i-1].freq - fstart)/fspan)
prevx = self.getXPosition(self.reference[i-1])
prevy = 30 + round((maxVSWR - vswr) / span * (self.chartHeight - 10))
if prevy < 30:
continue
@ -654,7 +654,7 @@ class VSWRChart(FrequencyChart):
highlighter.setColor(m.color)
qp.setPen(highlighter)
_, _, vswr = NanoVNASaver.vswr(self.data[m.location])
x = self.leftMargin + 1 + round(self.chartWidth/len(self.data) * m.location)
x = self.getXPosition(self.data[m.location])
y = 30 + round((maxVSWR-vswr) / span * (self.chartHeight - 10))
if y < 30:
continue