Server. Начальная загрузка. Крутилка.

This commit is contained in:
2025-11-24 10:30:20 +03:00
parent b6c0f6aa57
commit 770a705281
5 changed files with 328 additions and 312 deletions

View File

@@ -142,16 +142,36 @@ void ServerLMSWidget::slot_UpdateDocs()
QApplication::restoreOverrideCursor();
}
void ServerLMSWidget::start()
void ServerLMSWidget::slot_startInitialization_step1()
{
startInitialization();
Logger::instance().log("Update docs.xml...");
slot_UpdateDocs();
Logger::instance().log("Update docs.xml completed!");
ui->btnStopServer->setEnabled(false);
ui->btnStartServer->setEnabled(true);
flStartInitialization = true;
updateStateServer();
QApplication::restoreOverrideCursor();
if(hasError() == 100)
return;
Logger::instance().log("Try connection to DB...");
tryConnectionToDB();
waitAnimationWidget->hideWithStop();
}
void ServerLMSWidget::start()
{
startInitialization_step0();
}
void ServerLMSWidget::slot_BlockAutorization(bool block)
{
if(block)
@@ -301,7 +321,7 @@ QString ServerLMSWidget::loadStyleSheet()
}
}
void ServerLMSWidget::startInitialization()
void ServerLMSWidget::startInitialization_step0()
{
QApplication::setOverrideCursor(Qt::WaitCursor);
@@ -322,7 +342,8 @@ void ServerLMSWidget::startInitialization()
updateController = new UpdateController;
updateController->moveToThread(updateThread);
docsUpdater = new DocsUpdater(updateController, this);
docsUpdater = new DocsUpdater(updateController/*, this*/);
docsUpdater->moveToThread(updateThread);
processingSystem = new ProcessingSystem(providerDBLMS, updateController, docsUpdater);
@@ -344,24 +365,16 @@ void ServerLMSWidget::startInitialization()
Logger::instance().setLoggingType(LoggingType::WIDGET);
Logger::instance().setLogToFile(true);
connect(this,&ServerLMSWidget::sigUpdateController,updateController,&UpdateController::initialize,Qt::DirectConnection);
connect(this,&ServerLMSWidget::sigUpdateControllerInitialize,updateController,&UpdateController::initialize/*,Qt::DirectConnection*/);
connect(updateController,&UpdateController::sigInitializeFinished, this,&ServerLMSWidget::slot_startInitialization_step1/*,Qt::DirectConnection*/);
connect(this,&ServerLMSWidget::sigCalculateFullHash,updateController,&UpdateController::calculateFullHash,Qt::AutoConnection);
connect(updateController,&UpdateController::sigErrorRequired,this,&ServerLMSWidget::setError);
connect(updateController,&UpdateController::sigUpdateDocs,this,&ServerLMSWidget::slot_UpdateDocs,Qt::AutoConnection);
connect(&Logger::instance(),&Logger::sigLogToWidget,this, &ServerLMSWidget::slot_AddMessageToLog,Qt::QueuedConnection);
emit sigUpdateController(commonClientHandler,dataParser,assetsManager);
emit sigUpdateControllerInitialize(commonClientHandler,dataParser,assetsManager);
slot_UpdateDocs();
ui->btnStopServer->setEnabled(false);
ui->btnStartServer->setEnabled(true);
flStartInitialization = true;
updateStateServer();
QApplication::restoreOverrideCursor();
}
void ServerLMSWidget::tryConnectionToDB()
@@ -387,6 +400,8 @@ void ServerLMSWidget::tryConnectionToDB()
dbSettings.dbHostName,
QString::number(dbSettings.dbPort));
Logger::instance().log("Connection to DB completed!");
emit signal_Tray_ShowMessage(tr("Database connection OK!") + "\n" + strDBsettings);
on_btnStartServer_clicked();