From 7a561224e2945742ab17d7780858052ba6022db7 Mon Sep 17 00:00:00 2001 From: Alexander Voronov Date: Fri, 24 Mar 2023 22:36:06 +0300 Subject: [PATCH] LibreVNA-GUI: Fix 'QButtonGroup' signals usage --- .../LibreVNA-GUI/CustomWidgets/touchstoneimport.cpp | 4 ++-- .../Device/LibreVNA/manualcontroldialogV1.cpp | 6 +++--- .../LibreVNA-GUI/Tools/impedancematchdialog.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Software/PC_Application/LibreVNA-GUI/CustomWidgets/touchstoneimport.cpp b/Software/PC_Application/LibreVNA-GUI/CustomWidgets/touchstoneimport.cpp index e2fc910..d68c041 100644 --- a/Software/PC_Application/LibreVNA-GUI/CustomWidgets/touchstoneimport.cpp +++ b/Software/PC_Application/LibreVNA-GUI/CustomWidgets/touchstoneimport.cpp @@ -29,10 +29,10 @@ TouchstoneImport::TouchstoneImport(QWidget *parent, int ports) : ui->port2Group->setId(ui->port2_3, 2); ui->port2Group->setId(ui->port2_4, 3); // prevent selection of same port for port1 and 2 - connect(ui->port1Group, qOverload(&QButtonGroup::buttonClicked), [=](int id) { + connect(ui->port1Group, qOverload(&QButtonGroup::idClicked), [=](int id) { preventCollisionWithGroup(ui->port2Group, id); }); - connect(ui->port2Group, qOverload(&QButtonGroup::buttonClicked), [=](int id) { + connect(ui->port2Group, qOverload(&QButtonGroup::idClicked), [=](int id) { preventCollisionWithGroup(ui->port1Group, id); }); connect(ui->file, &QLineEdit::textChanged, this, &TouchstoneImport::setFile); diff --git a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/manualcontroldialogV1.cpp b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/manualcontroldialogV1.cpp index 5d2862f..b4632b8 100644 --- a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/manualcontroldialogV1.cpp +++ b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/manualcontroldialogV1.cpp @@ -87,7 +87,7 @@ ManualControlDialogV1::ManualControlDialogV1(LibreVNADriver &dev, QWidget *paren connect(ui->LO2Frequency, &SIUnitEdit::valueChanged, [=](double) { UpdateLO2(); }); - connect(ui->SourceSwitchGroup, qOverload(&QButtonGroup::buttonToggled), [=](int, bool) { + connect(ui->SourceSwitchGroup, qOverload(&QButtonGroup::idToggled), [=](int, bool) { UpdateLO1(); UpdateLO2(); }); @@ -179,8 +179,8 @@ ManualControlDialogV1::ManualControlDialogV1(LibreVNADriver &dev, QWidget *paren connect(ui->LO2Frequency, &SIUnitEdit::valueChanged, [=](double) { UpdateDevice(); }); connect(ui->IF2, &SIUnitEdit::valueChanged, [=](double) { UpdateDevice(); }); - connect(ui->PortSwitchGroup, qOverload(&QButtonGroup::buttonToggled), [=](int, bool) { UpdateDevice(); }); - connect(ui->SourceSwitchGroup, qOverload(&QButtonGroup::buttonToggled), [=](int, bool) { UpdateDevice(); }); + connect(ui->PortSwitchGroup, qOverload(&QButtonGroup::idToggled), [=](int, bool) { UpdateDevice(); }); + connect(ui->SourceSwitchGroup, qOverload(&QButtonGroup::idToggled), [=](int, bool) { UpdateDevice(); }); connect(ui->Attenuator, qOverload(&QDoubleSpinBox::valueChanged), [=](double) { UpdateDevice(); }); connect(ui->Samples, qOverload(&QSpinBox::valueChanged), [=](double) { UpdateDevice(); }); diff --git a/Software/PC_Application/LibreVNA-GUI/Tools/impedancematchdialog.cpp b/Software/PC_Application/LibreVNA-GUI/Tools/impedancematchdialog.cpp index 3e4ac85..19e5d63 100644 --- a/Software/PC_Application/LibreVNA-GUI/Tools/impedancematchdialog.cpp +++ b/Software/PC_Application/LibreVNA-GUI/Tools/impedancematchdialog.cpp @@ -33,11 +33,11 @@ ImpedanceMatchDialog::ImpedanceMatchDialog(MarkerModel &model, Marker *marker, Q connect(ui->zFreq, &SIUnitEdit::valueChanged, this, &ImpedanceMatchDialog::calculateMatch); connect(ui->zImag, &SIUnitEdit::valueChanged, this, &ImpedanceMatchDialog::calculateMatch); connect(ui->zReal, &SIUnitEdit::valueChanged, this, &ImpedanceMatchDialog::calculateMatch); - connect(ui->zGroup, qOverload(&QButtonGroup::buttonClicked), this, &ImpedanceMatchDialog::calculateMatch); + connect(ui->zGroup, qOverload(&QButtonGroup::idClicked), this, &ImpedanceMatchDialog::calculateMatch); connect(ui->cMatchType, qOverload(&QComboBox::currentIndexChanged), this, &ImpedanceMatchDialog::calculateMatch); - connect(ui->lGroup, qOverload(&QButtonGroup::buttonClicked), this, &ImpedanceMatchDialog::calculateMatch); - connect(ui->cGroup, qOverload(&QButtonGroup::buttonClicked), this, &ImpedanceMatchDialog::calculateMatch); - connect(ui->zGroup, qOverload(&QButtonGroup::buttonClicked), this, &ImpedanceMatchDialog::calculateMatch); + connect(ui->lGroup, qOverload(&QButtonGroup::idClicked), this, &ImpedanceMatchDialog::calculateMatch); + connect(ui->cGroup, qOverload(&QButtonGroup::idClicked), this, &ImpedanceMatchDialog::calculateMatch); + connect(ui->zGroup, qOverload(&QButtonGroup::idClicked), this, &ImpedanceMatchDialog::calculateMatch); // populate marker options auto markers = model.getMarkers();