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

Improve autonaming of calibration

Browse Source
This commit is contained in:
Jan Käberich 2022-10-14 17:55:46 +02:00
parent 735aa1d746
commit a7f3565064
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Software/PC_Application/LibreVNA-GUI/Calibration/calibration.cpp
View File

@ -1224,11 +1224,16 @@ QString Calibration::descriptiveCalName()
} }
QString tmp = QString tmp =
caltype.getReadableDescription() caltype.getShortString()
+ " " + "_"
+ lo + "-" + hi + lo + "-" + hi
+ " " + "_"
+ QString::number(this->points.size()) + "pt"; + QString::number(this->points.size()) + "pt";
tmp = tmp.replace(" ", "_");
tmp = tmp.replace("[", "");
tmp = tmp.replace("]", "");
tmp = tmp.replace(".", "_");
tmp = tmp.replace(",", "_");
return tmp; return tmp;
} }
@ -1313,9 +1318,6 @@ bool Calibration::toFile(QString filename)
file.open(calibration_file.toStdString()); file.open(calibration_file.toStdString());
file << setw(1) << toJSON(); file << setw(1) << toJSON();
auto calkit_file = filename + ".calkit";
qDebug() << "Saving associated calibration kit to file" << calkit_file;
kit.toFile(calkit_file);
this->currentCalFile = calibration_file; // if all ok, remember this this->currentCalFile = calibration_file; // if all ok, remember this
unsavedChanges = false; unsavedChanges = false;