Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

STAB

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-02-05 14:42:16 +03:00
parent 7b82fcbf07
commit 8ab4238537
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LibServer/serverlmswidget.cpp
View File

@@ -17,10 +17,10 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::ServerLMSWidget), ui(new Ui::ServerLMSWidget),
waitAnimationWidget(nullptr), waitAnimationWidget(nullptr),
server(nullptr),
updateThread(nullptr), updateThread(nullptr),
loggerThread(nullptr), loggerThread(nullptr),
mutex(nullptr), mutex(nullptr),
server(nullptr),
dataParser(nullptr), dataParser(nullptr),
processingSystem(nullptr), processingSystem(nullptr),
updateController(nullptr), updateController(nullptr),
@@ -56,8 +56,6 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
waitAnimationWidget->setParent(this); waitAnimationWidget->setParent(this);
waitAnimationWidget->initialize(movie,this); waitAnimationWidget->initialize(movie,this);
//waitAnimationWidget->showWithPlay();
updateStateOnlyVersion(); updateStateOnlyVersion();
} }
@@ -231,7 +229,7 @@ void ServerLMSWidget::on_btnStartServer_clicked()
{ {
if(server->startServer()) if(server->startServer())
{ {
QApplication::setOverrideCursor(Qt::WaitCursor); //QApplication::setOverrideCursor(Qt::WaitCursor);
ui->btnStartServer->setEnabled(false); ui->btnStartServer->setEnabled(false);
ui->btnStopServer->setEnabled(true); ui->btnStopServer->setEnabled(true);
@@ -241,7 +239,7 @@ void ServerLMSWidget::on_btnStartServer_clicked()
emit signal_Tray_ShowMessage(tr("Server is started!")); emit signal_Tray_ShowMessage(tr("Server is started!"));
QApplication::restoreOverrideCursor(); //QApplication::restoreOverrideCursor();
} }
} }
@@ -249,7 +247,7 @@ void ServerLMSWidget::on_btnStopServer_clicked()
{ {
if(server->stopServer()) if(server->stopServer())
{ {
QApplication::setOverrideCursor(Qt::WaitCursor); //QApplication::setOverrideCursor(Qt::WaitCursor);
ui->btnStopServer->setEnabled(false); ui->btnStopServer->setEnabled(false);
ui->btnStartServer->setEnabled(true); ui->btnStartServer->setEnabled(true);
@@ -259,7 +257,7 @@ void ServerLMSWidget::on_btnStopServer_clicked()
emit signal_Tray_ShowMessage(tr("Server is stoped!")); emit signal_Tray_ShowMessage(tr("Server is stoped!"));
QApplication::restoreOverrideCursor(); //QApplication::restoreOverrideCursor();
} }
} }

14
LibServer/serverlmswidget.h
View File

@@ -170,20 +170,23 @@ private:
private: private:
WaitAnimationWidget *waitAnimationWidget; WaitAnimationWidget *waitAnimationWidget;
MultiThreadServer *server;
QThread *updateThread; QThread *updateThread;
QThread *loggerThread; QThread *loggerThread;
QMutex *mutex; QMutex *mutex;
MultiThreadServer *server;
DataParser *dataParser; DataParser *dataParser;
ProcessingSystem *processingSystem; ProcessingSystem *processingSystem;
UpdateController *updateController; UpdateController *updateController; //updateThread
AssetsManager *assetsManager; AssetsManager *assetsManager; //updateThread
CommonClientHandler *commonClientHandler; CommonClientHandler *commonClientHandler;
ChatSystem *chatSystem; ChatSystem *chatSystem;
DocsUpdater* docsUpdater; DocsUpdater* docsUpdater; //updateThread
CfiController* cfiController; CfiController* cfiController; //updateThread
ProviderDBLMS* providerDBLMS; ProviderDBLMS* providerDBLMS;
bool first = true; // для тестов Unity bool first = true; // для тестов Unity
@@ -191,7 +194,6 @@ private:
QTranslator qtLanguageTranslator; QTranslator qtLanguageTranslator;
QString language; QString language;
int errorCode; int errorCode;
QString versionStr; QString versionStr;
bool flStartInitialization; bool flStartInitialization;