jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2025-12-06 07:12:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow manual calibration of incomplete trace sets
Some checks failed
Build / PC_Application_Ubuntu (push) Has been cancelled
Details
Build / PC_Application_RPi5 (push) Has been cancelled
Details
Build / PC_Application_Windows (push) Has been cancelled
Details
Build / PC_Application_OSX (push) Has been cancelled
Details
Build / PC_Application_OSX_13 (push) Has been cancelled
Details
Build / Embedded_Firmware (push) Has been cancelled
Details
HIL_Tests / Get_Repository (push) Has been cancelled
Details
Unit_Tests / Tests (push) Has been cancelled
Details
HIL_Tests / PC_Application_RPi5 (push) Has been cancelled
Details
HIL_Tests / Embedded_Firmware (push) Has been cancelled
Details
HIL_Tests / HIL (push) Has been cancelled
Details

Browse source
This commit is contained in:
Jan Käberich 2025-08-10 17:48:18 +02:00
parent 2f018e3867
commit 10ba138104
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Software/PC_Application/LibreVNA-GUI/Calibration/manualcalibrationdialog.cpp
View file

@ -7,7 +7,7 @@ ManualCalibrationDialog::ManualCalibrationDialog(const TraceModel &model, Calibr
ui(new Ui::ManualCalibrationDialog)
{
ui->setupUi(this);
auto traceSelector = new SparamTraceSelector(model, cal->getCaltype().usedPorts);
auto traceSelector = new SparamTraceSelector(model, cal->getCaltype().usedPorts, true);
ui->verticalLayout->insertWidget(1, traceSelector, 1.0);
ui->buttonBox->setEnabled(false);
connect(traceSelector, &SparamTraceSelector::selectionValid, ui->buttonBox, &QDialogButtonBox::setEnabled);

35
Software/PC_Application/LibreVNA-GUI/Traces/trace.cpp
View file

@ -318,6 +318,10 @@ void Trace::fillFromDatapoints(std::map<QString, Trace *> traceSet, const std::v
{
// remove all previous points
for(auto m : traceSet) {
if(!m.second) {
// no trace, skip
continue;
}
if(!deembedded) {
m.second->clear();
} else {
@ -332,6 +336,10 @@ void Trace::fillFromDatapoints(std::map<QString, Trace *> traceSet, const std::v
td.y = m.second;
QString measurement = m.first;
if(traceSet.count(measurement)) {
if(!traceSet[measurement]) {
// no trace, skip
continue;
}
if(!deembedded) {
traceSet[measurement]->addData(td, DataType::Frequency);
} else {
@ -1065,16 +1073,24 @@ std::vector<DeviceDriver::VNAMeasurement> Trace::assembleDatapoints(std::map<QSt
vector<DeviceDriver::VNAMeasurement> ret;
// Sanity check traces
unsigned int samples = traceSet.begin()->second->size();
auto impedance = traceSet.begin()->second->getReferenceImpedance();
unsigned int samples = 0;
auto impedance = 0;
vector<double> freqs;
for(auto m : traceSet) {
const Trace *t = m.second;
if(t->size() != samples) {
if(!t) {
// trace not valid, skip
continue;
}
if(samples == 0) {
samples = t->size();
} else if(t->size() != samples) {
qWarning() << "Selected traces do not have the same size";
return ret;
}
if(t->getReferenceImpedance() != impedance) {
if(impedance == 0) {
impedance = t->getReferenceImpedance();
} else if(t->getReferenceImpedance() != impedance) {
qWarning() << "Selected traces do not have the same reference impedance";
return ret;
}
@ -1098,13 +1114,22 @@ std::vector<DeviceDriver::VNAMeasurement> Trace::assembleDatapoints(std::map<QSt
}
}
if(samples == 0 || freqs.size() == 0) {
qWarning() << "Empty trace set";
return ret;
}
// Checks passed, assemble datapoints
for(unsigned int i=0;i<samples;i++) {
DeviceDriver::VNAMeasurement d;
for(auto m : traceSet) {
QString measurement = m.first;
const Trace *t = m.second;
d.measurements[measurement] = t->sample(i).y;
if(t) {
d.measurements[measurement] = t->sample(i).y;
} else {
d.measurements[measurement] = 0.0;
}
}
d.pointNum = i;
d.frequency = freqs[i];