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

improve autostart from setup file

Browse source
This commit is contained in:
Jan Käberich 2022-01-30 18:09:47 +01:00
parent 0c782fc009
commit cb5f472c47
5 changed files with 514 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Software/PC_Application/appwindow.cpp
View file

@ -144,15 +144,7 @@ AppWindow::AppWindow(QWidget *parent)
// aborted selection
return;
}
if(!filename.endsWith(".setup")) {
filename.append(".setup");
}
ofstream file;
file.open(filename.toStdString());
file << setw(4) << SaveSetup() << endl;
file.close();
QFileInfo fi(filename);
lSetupName.setText("Setup: "+fi.fileName());
SaveSetup(filename);
});
connect(ui->actionLoad_setup, &QAction::triggered, [=](){
auto filename = QFileDialog::getOpenFileName(nullptr, "Load setup data", "", "Setup files (*.setup)", nullptr, QFileDialog::DontUseNativeDialog);
@ -243,9 +235,12 @@ AppWindow::AppWindow(QWidget *parent)
qRegisterMetaType<Protocol::SpectrumAnalyzerResult>("SpectrumAnalyzerResult");
qRegisterMetaType<Protocol::AmplitudeCorrectionPoint>("AmplitudeCorrection");
auto pref = Preferences::getInstance();
if(pref.Startup.UseSetupFile) {
LoadSetup(pref.Startup.SetupFile);
}
// List available devices
UpdateDeviceList();
auto pref = Preferences::getInstance();
if(pref.Startup.ConnectToFirstDevice) {
// at least one device available
ConnectToDevice();
@ -257,9 +252,6 @@ AppWindow::AppWindow(QWidget *parent)
} else {
InformationBox::setGUI(false);
}
if(pref.Startup.UseSetupFile) {
LoadSetup(pref.Startup.SetupFile);
}
}
AppWindow::~AppWindow()
@ -270,6 +262,10 @@ AppWindow::~AppWindow()
void AppWindow::closeEvent(QCloseEvent *event)
{
auto pref = Preferences::getInstance();
if(pref.Startup.UseSetupFile && pref.Startup.AutosaveSetupFile) {
SaveSetup(pref.Startup.SetupFile);
}
vna->shutdown();
generator->shutdown();
spectrumAnalyzer->shutdown();
@ -280,7 +276,7 @@ void AppWindow::closeEvent(QCloseEvent *event)
if(Mode::getActiveMode()) {
Mode::getActiveMode()->deactivate();
}
Preferences::getInstance().store();
pref.store();
QMainWindow::closeEvent(event);
}
@ -926,6 +922,19 @@ void AppWindow::FrequencyCalibrationDialog()
d->exec();
}
void AppWindow::SaveSetup(QString filename)
{
if(!filename.endsWith(".setup")) {
filename.append(".setup");
}
ofstream file;
file.open(filename.toStdString());
file << setw(4) << SaveSetup() << endl;
file.close();
QFileInfo fi(filename);
lSetupName.setText("Setup: "+fi.fileName());
}
nlohmann::json AppWindow::SaveSetup()
{
nlohmann::json j;