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

app: implement setup menu

Browse Source 
Offload app window initialization by moving
all menu related logic into another place.
This commit is contained in:
Kiara Navarro 2022-07-12 18:51:11 -05:00
parent b420dc3019
commit 2f34998904
No known key found for this signature in database
GPG Key ID: CBA9F2172CE33FBA
2 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Software/PC_Application/appwindow.cpp
View File

@ -234,6 +234,60 @@ AppWindow::AppWindow(QWidget *parent)
auto generator = new Generator(this); auto generator = new Generator(this);
auto spectrumAnalyzer = new SpectrumAnalyzer(this); auto spectrumAnalyzer = new SpectrumAnalyzer(this);
SetupMenu();
setWindowTitle(qlibrevnaApp->applicationName() + " v" + getAppVersion());
setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
{
QSettings settings;
restoreGeometry(settings.value("geometry").toByteArray());
}
SetupSCPI();
// Set default mode
vna->activate();
auto pref = Preferences::getInstance();
if(pref.Startup.UseSetupFile) {
LoadSetup(pref.Startup.SetupFile);
}
// List available devices
UpdateDeviceList();
if(pref.Startup.ConnectToFirstDevice) {
// at least one device available
ConnectToDevice();
}
if(parser.isSet("setup")) {
LoadSetup(parser.value("setup"));
}
if(parser.isSet("cal")) {
vna->LoadCalibration(parser.value("cal"));
}
if(!parser.isSet("no-gui")) {
InformationBox::setGUI(true);
resize(1280, 800);
show();
} else {
InformationBox::setGUI(false);
noGUIset = true;
}
}
AppWindow::~AppWindow()
{
StopTCPServer();
delete ui;
}
void AppWindow::SetupMenu()
{
// UI connections // UI connections
connect(ui->actionUpdate_Device_List, &QAction::triggered, this, &AppWindow::UpdateDeviceList); connect(ui->actionUpdate_Device_List, &QAction::triggered, this, &AppWindow::UpdateDeviceList);
connect(ui->actionDisconnect, &QAction::triggered, this, &AppWindow::DisconnectDevice); connect(ui->actionDisconnect, &QAction::triggered, this, &AppWindow::DisconnectDevice);
@ -324,54 +378,6 @@ AppWindow::AppWindow(QWidget *parent)
a.about(); a.about();
}); });
setWindowTitle(qlibrevnaApp->applicationName() + " v" + getAppVersion());
setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
{
QSettings settings;
restoreGeometry(settings.value("geometry").toByteArray());
}
SetupSCPI();
// Set default mode
vna->activate();
auto pref = Preferences::getInstance();
if(pref.Startup.UseSetupFile) {
LoadSetup(pref.Startup.SetupFile);
}
// List available devices
UpdateDeviceList();
if(pref.Startup.ConnectToFirstDevice) {
// at least one device available
ConnectToDevice();
}
if(parser.isSet("setup")) {
LoadSetup(parser.value("setup"));
}
if(parser.isSet("cal")) {
vna->LoadCalibration(parser.value("cal"));
}
if(!parser.isSet("no-gui")) {
InformationBox::setGUI(true);
resize(1280, 800);
show();
} else {
InformationBox::setGUI(false);
noGUIset = true;
}
}
AppWindow::~AppWindow()
{
StopTCPServer();
delete ui;
} }
void AppWindow::closeEvent(QCloseEvent *event) void AppWindow::closeEvent(QCloseEvent *event)

1
Software/PC_Application/appwindow.h
View File

@ -82,6 +82,7 @@ private:
void DeviceConnectionLost(); void DeviceConnectionLost();
void SetupMenu();
void SetupStatusBar(); void SetupStatusBar();
void UpdateStatusBar(DeviceStatusBar status); void UpdateStatusBar(DeviceStatusBar status);
void CreateToolbars(); void CreateToolbars();