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

use enum class for DeviceStatusBar

Browse Source
This commit is contained in:
Jan Käberich 2021-10-17 20:57:23 +02:00
parent 07e000f01e
commit c1bdc3aa89
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Software/PC_Application/appwindow.cpp
View File

@ -103,7 +103,7 @@ AppWindow::AppWindow(QWidget *parent)
ui->setupUi(this); ui->setupUi(this);
SetupStatusBar(); SetupStatusBar();
UpdateStatusBar(Disconnected); UpdateStatusBar(DeviceStatusBar::Disconnected);
CreateToolbars(); CreateToolbars();
@ -320,7 +320,7 @@ void AppWindow::DisconnectDevice()
if(deviceActionGroup->checkedAction()) { if(deviceActionGroup->checkedAction()) {
deviceActionGroup->checkedAction()->setChecked(false); deviceActionGroup->checkedAction()->setChecked(false);
} }
UpdateStatusBar(AppWindow::DeviceStatusBar::Disconnected); UpdateStatusBar(DeviceStatusBar::Disconnected);
Mode::getActiveMode()->deviceDisconnected(); Mode::getActiveMode()->deviceDisconnected();
qDebug() << "Disconnected device"; qDebug() << "Disconnected device";
} }
@ -967,16 +967,16 @@ void AppWindow::SetupStatusBar()
void AppWindow::UpdateStatusBar(DeviceStatusBar status) void AppWindow::UpdateStatusBar(DeviceStatusBar status)
{ {
switch(status) { switch(status) {
case Connected: case DeviceStatusBar::Connected:
lConnectionStatus.setText("Connected to " + device->serial()); lConnectionStatus.setText("Connected to " + device->serial());
qInfo() << "Connected to" << device->serial(); qInfo() << "Connected to" << device->serial();
lDeviceInfo.setText(device->getLastDeviceInfoString()); lDeviceInfo.setText(device->getLastDeviceInfoString());
break; break;
case Disconnected: case DeviceStatusBar::Disconnected:
lConnectionStatus.setText("No device connected"); lConnectionStatus.setText("No device connected");
lDeviceInfo.setText("No device information available yet"); lDeviceInfo.setText("No device information available yet");
break; break;
case Updated: case DeviceStatusBar::Updated:
lDeviceInfo.setText(device->getLastDeviceInfoString()); lDeviceInfo.setText(device->getLastDeviceInfoString());
lADCOverload.setVisible(device->Info().ADC_overload); lADCOverload.setVisible(device->Info().ADC_overload);
lUnlevel.setVisible(device->Info().unlevel); lUnlevel.setVisible(device->Info().unlevel);

2
Software/PC_Application/appwindow.h
View File

@ -62,7 +62,7 @@ private slots:
void LoadSetup(nlohmann::json j); void LoadSetup(nlohmann::json j);
private: private:
enum DeviceStatusBar { enum class DeviceStatusBar {
Connected, Connected,
Updated, Updated,
Disconnected, Disconnected,