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

Merge branch 'bugfix-update-diff' into merge-test

Browse Source 
# Conflicts:
#	ServerLMS/Systems/tools.h
#	ServerLMS/Systems/updatecontroller.h
This commit is contained in:
semenov
2025-01-20 09:31:15 +03:00
parent 1950690f82 91a4b04f05
commit 364a0d6217
20 changed files with 247 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ServerLMS/serverlmswidget.cpp
View File

@@ -14,7 +14,7 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
tcpServer(nullptr),
hostPort(6000),
stateServer(stoped),
stateBlockAutorization(blocked),
stateBlockAutorization(unblocked),
updateThread(nullptr),
loggerThread(nullptr),
dataParser(nullptr),
@@ -44,11 +44,13 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
loggerThread = new QThread;
providerDBLMS = new ProviderDBLMS(this);
connect(providerDBLMS, &ProviderDBLMS::signal_BlockAutorization, this, &ServerLMSWidget::slot_BlockAutorization);
providerDBLMS->ConnectionToDB();
logger = new Logger(ui->listWidgetLogger);
connect(logger,&Logger::sigSendTextToLogger,this,&ServerLMSWidget::slotAddToLog,Qt::QueuedConnection);
connect(providerDBLMS, &ProviderDBLMS::signal_BlockAutorization, this, &ServerLMSWidget::slot_BlockAutorization);
connect(logger,&Logger::sigSendTextToLogger,this,&ServerLMSWidget::slotAddToLog,Qt::AutoConnection);
logger->moveToThread(loggerThread);
assetsManager = new AssetsManager;
@@ -68,7 +70,7 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
updateThread->start();
commonClientHandler->initialize(&clientsMap,processingSystem,dataParser,logger);
processingSystem->initialize(this,dataParser,commonClientHandler,logger);
processingSystem->initialize(this,dataParser,commonClientHandler,logger,updateController);
logger->setTypeLog("widget");
@@ -194,7 +196,7 @@ void ServerLMSWidget::slotUpdateListClients()
}
int countClients = clientsMap.count();
logger->addTextToLogger("SERVER: countClients = " + QString::number(countClients));
emit sigLog("SERVER: countClients = " + QString::number(countClients));
}
void ServerLMSWidget::slot_BlockAutorization(bool block)