From d4d1d2d2721362a5fb257a19d0d65ff1b428e4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Thu, 17 Nov 2022 12:06:15 +0100 Subject: [PATCH] limit calibration span to selected standard --- .../Calibration/calibrationmeasurement.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp b/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp index c8eea30..ca08a84 100644 --- a/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp +++ b/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp @@ -224,8 +224,8 @@ CalStandard::Virtual* CalibrationMeasurement::Base::getStandard() const double CalibrationMeasurement::OnePort::minFreq() { - if(points.size() > 0) { - return points.front().frequency; + if(points.size() > 0 && standard) { + return min(points.front().frequency, standard->minFrequency()); } else { return numeric_limits::max(); } @@ -233,8 +233,8 @@ double CalibrationMeasurement::OnePort::minFreq() double CalibrationMeasurement::OnePort::maxFreq() { - if(points.size() > 0) { - return points.back().frequency; + if(points.size() > 0 && standard) { + return max(points.back().frequency, standard->maxFrequency()); } else { return 0; } @@ -368,8 +368,8 @@ std::vector CalibrationMeasurement::OneP double CalibrationMeasurement::TwoPort::minFreq() { - if(points.size() > 0) { - return points.front().frequency; + if(points.size() > 0 && standard) { + return min(points.front().frequency, standard->minFrequency()); } else { return numeric_limits::max(); } @@ -377,8 +377,8 @@ double CalibrationMeasurement::TwoPort::minFreq() double CalibrationMeasurement::TwoPort::maxFreq() { - if(points.size() > 0) { - return points.back().frequency; + if(points.size() > 0 && standard) { + return max(points.back().frequency, standard->maxFrequency()); } else { return 0; }