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

Fix statusbar mode update connection

Browse Source
This commit is contained in:
Jan Käberich 2022-06-27 19:58:30 +02:00
parent 3765e4009f
commit 506502ce02
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Software/PC_Application/appwindow.cpp
View File

@ -253,13 +253,6 @@ AppWindow::AppWindow(QWidget *parent)
Mode::getActiveMode()->saveSreenshot(); Mode::getActiveMode()->saveSreenshot();
}); });
auto setModeStatusbar = [=](QString msg) {
lModeInfo.setText(msg);
};
connect(vna, &Mode::statusbarMessage, setModeStatusbar);
connect(generator, &Mode::statusbarMessage, setModeStatusbar);
connect(spectrumAnalyzer, &Mode::statusbarMessage, setModeStatusbar);
connect(ui->actionManual_Control, &QAction::triggered, this, &AppWindow::StartManualControl); connect(ui->actionManual_Control, &QAction::triggered, this, &AppWindow::StartManualControl);
connect(ui->actionFirmware_Update, &QAction::triggered, this, &AppWindow::StartFirmwareUpdateDialog); connect(ui->actionFirmware_Update, &QAction::triggered, this, &AppWindow::StartFirmwareUpdateDialog);
connect(ui->actionSource_Calibration, &QAction::triggered, this, &AppWindow::SourceCalibrationDialog); connect(ui->actionSource_Calibration, &QAction::triggered, this, &AppWindow::SourceCalibrationDialog);
@ -893,6 +886,11 @@ SCPI* AppWindow::getSCPI()
return &scpi; return &scpi;
} }
void AppWindow::setModeStatus(QString msg)
{
lModeInfo.setText(msg);
}
int AppWindow::UpdateDeviceList() int AppWindow::UpdateDeviceList()
{ {
deviceActionGroup->setExclusive(true); deviceActionGroup->setExclusive(true);

3
Software/PC_Application/appwindow.h
View File

@ -50,6 +50,9 @@ public:
SCPI* getSCPI(); SCPI* getSCPI();
public slots:
void setModeStatus(QString msg);
protected: protected:
void closeEvent(QCloseEvent *event) override; void closeEvent(QCloseEvent *event) override;
private slots: private slots:

1
Software/PC_Application/mode.cpp
View File

@ -88,6 +88,7 @@ Mode::Mode(AppWindow *window, QString name, QString SCPIname)
delete modes[index]; delete modes[index];
}); });
} }
connect(this, &Mode::statusbarMessage, window, &AppWindow::setModeStatus);
modes.push_back(this); modes.push_back(this);
tabbar->blockSignals(true); tabbar->blockSignals(true);
tabbar->insertTab(tabbar->count(), name); tabbar->insertTab(tabbar->count(), name);