caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

limit calibration span to selected standard

Browse Source
This commit is contained in:
Jan Käberich 2022-11-17 12:06:15 +01:00
parent a4b1978098
commit d4d1d2d272
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp
View File

@ -224,8 +224,8 @@ CalStandard::Virtual* CalibrationMeasurement::Base::getStandard() const
double CalibrationMeasurement::OnePort::minFreq() double CalibrationMeasurement::OnePort::minFreq()
{ {
if(points.size() > 0) { if(points.size() > 0 && standard) {
return points.front().frequency; return min(points.front().frequency, standard->minFrequency());
} else { } else {
return numeric_limits<double>::max(); return numeric_limits<double>::max();
} }
@ -233,8 +233,8 @@ double CalibrationMeasurement::OnePort::minFreq()
double CalibrationMeasurement::OnePort::maxFreq() double CalibrationMeasurement::OnePort::maxFreq()
{ {
if(points.size() > 0) { if(points.size() > 0 && standard) {
return points.back().frequency; return max(points.back().frequency, standard->maxFrequency());
} else { } else {
return 0; return 0;
} }
@ -368,8 +368,8 @@ std::vector<CalibrationMeasurement::OnePort::Point> CalibrationMeasurement::OneP
double CalibrationMeasurement::TwoPort::minFreq() double CalibrationMeasurement::TwoPort::minFreq()
{ {
if(points.size() > 0) { if(points.size() > 0 && standard) {
return points.front().frequency; return min(points.front().frequency, standard->minFrequency());
} else { } else {
return numeric_limits<double>::max(); return numeric_limits<double>::max();
} }
@ -377,8 +377,8 @@ double CalibrationMeasurement::TwoPort::minFreq()
double CalibrationMeasurement::TwoPort::maxFreq() double CalibrationMeasurement::TwoPort::maxFreq()
{ {
if(points.size() > 0) { if(points.size() > 0 && standard) {
return points.back().frequency; return max(points.back().frequency, standard->maxFrequency());
} else { } else {
return 0; return 0;
} }