mirror of
https://github.com/modelec/ihm.git
synced 2026-01-18 16:47:32 +01:00
Rolback
This commit is contained in:
@@ -33,10 +33,6 @@ public:
|
||||
|
||||
void turnOnTheWindow();
|
||||
|
||||
bool shouldStop() const { return _shouldStop; }
|
||||
|
||||
void setShouldStop(bool value) { _shouldStop = value; }
|
||||
|
||||
protected slots:
|
||||
void onHomePressed();
|
||||
|
||||
@@ -75,6 +71,4 @@ private:
|
||||
|
||||
MyTCPClient* tcpClient;
|
||||
QSettings* settings;
|
||||
|
||||
std::atomic<bool> _shouldStop = false;
|
||||
};
|
||||
|
||||
30
main.cpp
30
main.cpp
@@ -2,24 +2,10 @@
|
||||
#include <QApplication>
|
||||
#include <QObject>
|
||||
#include <QThread>
|
||||
#include <atomic>
|
||||
#include <csignal>
|
||||
|
||||
#include "MainWindow.h"
|
||||
|
||||
MainWindow* mainWindowPtr = nullptr;
|
||||
|
||||
void signalHandler(int signum) {
|
||||
if(mainWindowPtr != nullptr){
|
||||
mainWindowPtr->setShouldStop(true);
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
|
||||
signal(SIGINT, signalHandler);
|
||||
signal(SIGTERM, signalHandler);
|
||||
|
||||
QApplication a(argc, argv);
|
||||
|
||||
DisplayMode mode;
|
||||
@@ -45,22 +31,6 @@ int main(int argc, char* argv[]) {
|
||||
}
|
||||
|
||||
auto* main = new MainWindow("127.0.0.1", port);
|
||||
mainWindowPtr = main;
|
||||
|
||||
try{
|
||||
main->setDisplayMode(mode);
|
||||
|
||||
while(!main->shouldStop()){
|
||||
usleep(100'000);
|
||||
}
|
||||
|
||||
delete main;
|
||||
}
|
||||
catch(const std::exception& e){
|
||||
std::cerr << e.what() << std::endl;
|
||||
delete main;
|
||||
return 1;
|
||||
}
|
||||
|
||||
main->setDisplayMode(mode);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user