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

Update calibration when calkit dialog is closed

Browse Source
This commit is contained in:
Jan Käberich 2020-11-14 20:43:36 +01:00
parent 3d97e4ca20
commit 735e7096f4
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Software/PC_Application/Calibration/calkit.cpp
View File

@ -184,9 +184,14 @@ Calkit Calkit::fromFile(QString filename)
return c; return c;
} }
void Calkit::edit() void Calkit::edit(std::function<void (void)> done)
{ {
auto dialog = new CalkitDialog(*this); auto dialog = new CalkitDialog(*this);
if(done) {
QObject::connect(dialog, &QDialog::accepted, [=](){
done();
});
}
dialog->show(); dialog->show();
} }

2
Software/PC_Application/Calibration/calkit.h
View File

@ -36,7 +36,7 @@ public:
void toFile(QString filename); void toFile(QString filename);
static Calkit fromFile(QString filename); static Calkit fromFile(QString filename);
void edit(); void edit(std::function<void(void)> done = nullptr);
SOLT toSOLT(double frequency); SOLT toSOLT(double frequency);
TRL toTRL(double frequency); TRL toTRL(double frequency);
double minFreq(bool trl = false); double minFreq(bool trl = false);

4
Software/PC_Application/Calibration/calkitdialog.cpp
View File

@ -111,10 +111,10 @@ CalkitDialog::CalkitDialog(Calkit &c, QWidget *parent) :
connect(ui->buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, [this]() { connect(ui->buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, [this]() {
parseEntries(); parseEntries();
editKit = ownKit; editKit = ownKit;
delete this; accept();
}); });
connect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, [this]() { connect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, [this]() {
delete this; reject();
}); });
connect(ui->buttonBox->button(QDialogButtonBox::Open), &QPushButton::clicked, [=](){ connect(ui->buttonBox->button(QDialogButtonBox::Open), &QPushButton::clicked, [=](){
auto filename = QFileDialog::getOpenFileName(this, "Open calibration kit coefficients", "", "Calibration kit files (*.calkit)", nullptr, QFileDialog::DontUseNativeDialog); auto filename = QFileDialog::getOpenFileName(this, "Open calibration kit coefficients", "", "Calibration kit files (*.calkit)", nullptr, QFileDialog::DontUseNativeDialog);

14
Software/PC_Application/VNA/vna.cpp
View File

@ -97,10 +97,10 @@ VNA::VNA(AppWindow *window)
saveCal->setEnabled(false); saveCal->setEnabled(false);
connect(calLoad, &QAction::triggered, [=](){ connect(calLoad, &QAction::triggered, [=](){
cal.openFromFile(); cal.openFromFile();
if(cal.getType() == Calibration::Type::None) { if(cal.getType() == Calibration::Type::None) {
DisableCalibration(); DisableCalibration();
} else { } else {
ApplyCalibration(cal.getType()); ApplyCalibration(cal.getType());
} }
}); });
@ -127,7 +127,11 @@ VNA::VNA(AppWindow *window)
auto calEditKit = calMenu->addAction("Edit Calibration Kit"); auto calEditKit = calMenu->addAction("Edit Calibration Kit");
connect(calEditKit, &QAction::triggered, [=](){ connect(calEditKit, &QAction::triggered, [=](){
cal.getCalibrationKit().edit(); cal.getCalibrationKit().edit([=](){
if(calValid) {
ApplyCalibration(cal.getType());
}
});
}); });
portExtension.setCalkit(&cal.getCalibrationKit()); portExtension.setCalkit(&cal.getCalibrationKit());