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

Merge pull request #105 from sophiekovalevsky/improving-app

Browse Source 
gui/main: adjustments
This commit is contained in:
jankae 2022-05-28 18:41:33 +02:00 committed by GitHub
commit 5f0f99cfbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Software/PC_Application/main.cpp
View File

@ -1,21 +1,19 @@
#include "appwindow.h" #include "appwindow.h"
#include "Calibration/calkit.h"
#include "touchstone.h"
#include <iostream>
#include <unistd.h>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#ifdef Q_OS_UNIX
#include <signal.h> #include <signal.h>
#include <complex> #endif
static QApplication *app; static QApplication *app;
static AppWindow *window; static AppWindow *window;
void sig_handler(int s) { #ifdef Q_OS_UNIX
static void tryExitGracefully(int s) {
Q_UNUSED(s) Q_UNUSED(s)
window->close(); window->close();
app->quit(); app->quit();
} }
#endif
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
app = new QApplication(argc, argv); app = new QApplication(argc, argv);
@ -24,7 +22,10 @@ int main(int argc, char *argv[]) {
window = new AppWindow; window = new AppWindow;
QCoreApplication::setApplicationVersion(window->getAppVersion() + "-" + QCoreApplication::setApplicationVersion(window->getAppVersion() + "-" +
window->getAppGitHash().left(9)); window->getAppGitHash().left(9));
signal(SIGINT, sig_handler);
#ifdef Q_OS_UNIX
signal(SIGINT, tryExitGracefully);
#endif
auto rc = app->exec(); auto rc = app->exec();
return rc; return rc;
} }