jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-05 14:35:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

attempt to fix --no-gui option for windows

Browse source
This commit is contained in:
Jan Käberich 2022-03-03 12:28:59 +01:00
parent 6e07be0af5
commit c9ffdcd52b
25 changed files with 141 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Software/PC_Application/appwindow.cpp
View file

@ -64,6 +64,8 @@ static const QString APP_VERSION = QString::number(FW_MAJOR) + "." +
QString::number(FW_PATCH);
static const QString APP_GIT_HASH = QString(GITHASH);
static bool noGUIset = false;
AppWindow::AppWindow(QWidget *parent)
: QMainWindow(parent)
, deviceActionGroup(new QActionGroup(this))
@ -247,6 +249,7 @@ AppWindow::AppWindow(QWidget *parent)
// at least one device available
ConnectToDevice();
}
if(parser.isSet("setup")) {
LoadSetup(parser.value("setup"));
}
@ -259,6 +262,7 @@ AppWindow::AppWindow(QWidget *parent)
show();
} else {
InformationBox::setGUI(false);
noGUIset = true;
}
}
@ -842,7 +846,9 @@ void AppWindow::StartManualControl()
Mode::getActiveMode()->initializeDevice();
}
});
manual->show();
if(AppWindow::showGUI()) {
manual->show();
}
}
void AppWindow::UpdateReference()
@ -895,7 +901,9 @@ void AppWindow::StartFirmwareUpdateDialog()
auto fw_update = new FirmwareUpdateDialog(device);
connect(fw_update, &FirmwareUpdateDialog::DeviceRebooting, this, &AppWindow::DisconnectDevice);
connect(fw_update, &FirmwareUpdateDialog::DeviceRebooted, this, &AppWindow::ConnectToDevice);
fw_update->exec();
if(AppWindow::showGUI()) {
fw_update->exec();
}
}
}
@ -918,19 +926,25 @@ void AppWindow::DeviceInfoUpdated()
void AppWindow::SourceCalibrationDialog()
{
auto d = new SourceCalDialog(device);
d->exec();
if(AppWindow::showGUI()) {
d->exec();
}
}
void AppWindow::ReceiverCalibrationDialog()
{
auto d = new ReceiverCalDialog(device);
d->exec();
if(AppWindow::showGUI()) {
d->exec();
}
}
void AppWindow::FrequencyCalibrationDialog()
{
auto d = new FrequencyCalDialog(device);
d->exec();
if(AppWindow::showGUI()) {
d->exec();
}
}
void AppWindow::SaveSetup(QString filename)
@ -1035,6 +1049,11 @@ const QString& AppWindow::getAppGitHash() const
return appGitHash;
}
bool AppWindow::showGUI()
{
return !noGUIset;
}
void AppWindow::SetupStatusBar()
{
ui->statusbar->addWidget(&lConnectionStatus);