kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
S-parameter chart
Rune Broberg
rodzic
efe756a90f
commit
63e51d32f6
|
|
@ -1353,6 +1353,148 @@ class LogMagChart(FrequencyChart):
|
|||
return new_chart
|
||||
|
||||
|
||||
class SParameterChart(FrequencyChart):
|
||||
def __init__(self, name=""):
|
||||
super().__init__(name)
|
||||
self.leftMargin = 30
|
||||
self.chartWidth = 250
|
||||
self.chartHeight = 250
|
||||
self.minDisplayValue = -1
|
||||
self.maxDisplayValue = 1
|
||||
self.fixedValues = True
|
||||
|
||||
self.y_action_automatic.setChecked(False)
|
||||
self.y_action_fixed_span.setChecked(True)
|
||||
|
||||
self.minValue = 0
|
||||
self.maxValue = 1
|
||||
self.span = 1
|
||||
|
||||
self.isInverted = False
|
||||
|
||||
self.setMinimumSize(self.chartWidth + self.rightMargin + self.leftMargin, self.chartHeight + self.topMargin + self.bottomMargin)
|
||||
self.setSizePolicy(QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding))
|
||||
pal = QtGui.QPalette()
|
||||
pal.setColor(QtGui.QPalette.Background, self.backgroundColor)
|
||||
self.setPalette(pal)
|
||||
self.setAutoFillBackground(True)
|
||||
|
||||
def drawChart(self, qp: QtGui.QPainter):
|
||||
qp.setPen(QtGui.QPen(self.textColor))
|
||||
qp.drawText(int(round(self.chartWidth / 2)) - 20, 15, self.name + "")
|
||||
qp.drawText(10, 15, "Real")
|
||||
qp.drawText(self.leftMargin + self.chartWidth - 15, 15, "Imag")
|
||||
qp.setPen(QtGui.QPen(self.foregroundColor))
|
||||
qp.drawLine(self.leftMargin, 20, self.leftMargin, self.topMargin+self.chartHeight+5)
|
||||
qp.drawLine(self.leftMargin-5, self.topMargin+self.chartHeight, self.leftMargin+self.chartWidth, self.topMargin + self.chartHeight)
|
||||
|
||||
def drawValues(self, qp: QtGui.QPainter):
|
||||
if len(self.data) == 0 and len(self.reference) == 0:
|
||||
return
|
||||
pen = QtGui.QPen(self.sweepColor)
|
||||
pen.setWidth(self.pointSize)
|
||||
line_pen = QtGui.QPen(self.sweepColor)
|
||||
line_pen.setWidth(self.lineThickness)
|
||||
highlighter = QtGui.QPen(QtGui.QColor(20, 0, 255))
|
||||
highlighter.setWidth(1)
|
||||
if not self.fixedSpan:
|
||||
if len(self.data) > 0:
|
||||
fstart = self.data[0].freq
|
||||
fstop = self.data[len(self.data)-1].freq
|
||||
else:
|
||||
fstart = self.reference[0].freq
|
||||
fstop = self.reference[len(self.reference) - 1].freq
|
||||
self.fstart = fstart
|
||||
self.fstop = fstop
|
||||
else:
|
||||
fstart = self.fstart = self.minFrequency
|
||||
fstop = self.fstop = self.maxFrequency
|
||||
|
||||
# Draw bands if required
|
||||
if self.bands.enabled:
|
||||
self.drawBands(qp, fstart, fstop)
|
||||
|
||||
if self.fixedValues:
|
||||
maxValue = self.maxDisplayValue
|
||||
minValue = self.minDisplayValue
|
||||
self.maxValue = maxValue
|
||||
self.minValue = minValue
|
||||
else:
|
||||
# Find scaling
|
||||
minValue = 1
|
||||
maxValue = -1
|
||||
# for d in self.data:
|
||||
# val = d.re
|
||||
# if val > maxValue:
|
||||
# maxValue = val
|
||||
# if val < minValue:
|
||||
# minValue = val
|
||||
# for d in self.reference: # Also check min/max for the reference sweep
|
||||
# if d.freq < self.fstart or d.freq > self.fstop:
|
||||
# continue
|
||||
# logmag = self.logMag(d)
|
||||
# if logmag > maxValue:
|
||||
# maxValue = logmag
|
||||
# if logmag < minValue:
|
||||
# minValue = logmag
|
||||
|
||||
# minValue = 10*math.floor(minValue/10)
|
||||
# self.minValue = minValue
|
||||
# maxValue = 10*math.ceil(maxValue/10)
|
||||
# self.maxValue = maxValue
|
||||
|
||||
span = maxValue-minValue
|
||||
self.span = span
|
||||
|
||||
tick_count = math.floor(self.chartHeight / 60)
|
||||
tick_step = self.span / tick_count
|
||||
|
||||
for i in range(tick_count):
|
||||
val = minValue + i * tick_step
|
||||
y = self.topMargin + round((maxValue - val)/span*self.chartHeight)
|
||||
qp.setPen(QtGui.QPen(self.foregroundColor))
|
||||
qp.drawLine(self.leftMargin-5, y, self.leftMargin+self.chartWidth, y)
|
||||
if val > minValue and val != maxValue:
|
||||
qp.setPen(QtGui.QPen(self.textColor))
|
||||
qp.drawText(3, y + 4, str(round(val, 2)))
|
||||
|
||||
qp.setPen(QtGui.QPen(self.foregroundColor))
|
||||
qp.drawLine(self.leftMargin - 5, self.topMargin,
|
||||
self.leftMargin + self.chartWidth, self.topMargin)
|
||||
qp.setPen(self.textColor)
|
||||
qp.drawText(3, self.topMargin + 4, str(maxValue))
|
||||
qp.drawText(3, self.chartHeight+self.topMargin, str(minValue))
|
||||
self.drawFrequencyTicks(qp)
|
||||
|
||||
self.drawData(qp, self.data, self.sweepColor, self.getReYPosition)
|
||||
self.drawData(qp, self.reference, self.referenceColor, self.getReYPosition)
|
||||
self.drawData(qp, self.data, self.secondarySweepColor, self.getImYPosition)
|
||||
self.drawData(qp, self.reference, self.secondaryReferenceColor, self.getImYPosition)
|
||||
self.drawMarkers(qp, y_function=self.getReYPosition)
|
||||
self.drawMarkers(qp, y_function=self.getImYPosition)
|
||||
|
||||
def getYPosition(self, d: Datapoint) -> int:
|
||||
return self.topMargin + round((self.maxValue - d.re) / self.span * self.chartHeight)
|
||||
|
||||
def getReYPosition(self, d: Datapoint) -> int:
|
||||
return self.topMargin + round((self.maxValue - d.re) / self.span * self.chartHeight)
|
||||
|
||||
def getImYPosition(self, d: Datapoint) -> int:
|
||||
return self.topMargin + round((self.maxValue - d.im) / self.span * self.chartHeight)
|
||||
|
||||
def logMag(self, p: Datapoint) -> float:
|
||||
if self.isInverted:
|
||||
return -RFTools.gain(p)
|
||||
else:
|
||||
return RFTools.gain(p)
|
||||
|
||||
def copy(self):
|
||||
new_chart: LogMagChart = super().copy()
|
||||
new_chart.isInverted = self.isInverted
|
||||
new_chart.span = self.span
|
||||
return new_chart
|
||||
|
||||
|
||||
class CombinedLogMagChart(FrequencyChart):
|
||||
def __init__(self, name=""):
|
||||
super().__init__(name)
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ from serial.tools import list_ports
|
|||
from .Hardware import VNA, InvalidVNA, Version
|
||||
from .RFTools import RFTools, Datapoint
|
||||
from .Chart import Chart, PhaseChart, VSWRChart, PolarChart, SmithChart, LogMagChart, QualityFactorChart, TDRChart, \
|
||||
RealImaginaryChart, MagnitudeChart, MagnitudeZChart, CombinedLogMagChart
|
||||
RealImaginaryChart, MagnitudeChart, MagnitudeZChart, CombinedLogMagChart, SParameterChart
|
||||
from .Calibration import CalibrationWindow, Calibration
|
||||
from .Marker import Marker
|
||||
from .SweepWorker import SweepWorker
|
||||
|
|
@ -119,6 +119,8 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
|
||||
self.s11SmithChart = SmithChart("S11 Smith Chart")
|
||||
self.s21PolarChart = PolarChart("S21 Polar Plot")
|
||||
self.s11SParameterChart = SParameterChart("S11 Real/Imaginary")
|
||||
self.s21SParameterChart = SParameterChart("S21 Real/Imaginary")
|
||||
self.s11LogMag = LogMagChart("S11 Return Loss")
|
||||
self.s21LogMag = LogMagChart("S21 Gain")
|
||||
self.s11Mag = MagnitudeChart("|S11|")
|
||||
|
|
@ -143,6 +145,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
self.s11charts.append(self.s11VSWR)
|
||||
self.s11charts.append(self.s11RealImaginary)
|
||||
self.s11charts.append(self.s11QualityFactor)
|
||||
self.s11charts.append(self.s11SParameterChart)
|
||||
|
||||
# List of all the S21 charts, for selecting
|
||||
self.s21charts: List[Chart] = []
|
||||
|
|
@ -150,6 +153,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
self.s21charts.append(self.s21LogMag)
|
||||
self.s21charts.append(self.s21Mag)
|
||||
self.s21charts.append(self.s21Phase)
|
||||
self.s21charts.append(self.s21SParameterChart)
|
||||
|
||||
# List of all charts that use both S11 and S21
|
||||
self.combinedCharts: List[Chart] = []
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue