From 543fe7b3d0a93b400fd3d5fe29443d9d71060a5f Mon Sep 17 00:00:00 2001 From: krivoshein Date: Fri, 25 Jul 2025 16:06:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20hash=20ready=20=D0=BD=D0=B0=20GUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connectorToServer/Core/recognizesystem.cpp | 3 +-- .../connectorToServer/Core/recognizesystem.h | 1 + .../connectorToServer/connectortoserver.cpp | 8 ++++++++ .../connectorToServer/connectortoserver.h | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index e6b7531..360f4dd 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -267,8 +267,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket) if(packetType == PacketType::HASH_READY) { - //connectorToServer->sendQueryTasksXML("fim"); - //connectorToServer->sendQueryTasksXML("amm"); + emit sigHashReady(); } //xml-ответы на запросы к БД diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h index 55d910a..126288f 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h @@ -56,6 +56,7 @@ signals: void sigSetVersion(StreamingVersionData* serverVersion); void sigNotify(QString text); void sigAnimationActivated(bool flag); + void sigHashReady(); private: QList *folderList; diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 921f5f3..596c764 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -384,6 +384,12 @@ void ConnectorToServer::showServerList(QList *serverList versionSelectWidget->fillView(serverList); } +void ConnectorToServer::slot_HashReady() +{ + //sendQueryTasksXML("fim"); + sendQueryTasksXML("amm"); +} + void ConnectorToServer::initialize() { createObjects(); @@ -426,6 +432,8 @@ void ConnectorToServer::bindConnection() connect(client,&TCPClient::signal_ConnectedToServer,this,&ConnectorToServer::signal_ConnectedToServer,Qt::AutoConnection); connect(recognizeSystem,&RecognizeSystem::sigNotify,notifyController,&NotifyController::showWarning,Qt::AutoConnection); + + connect(recognizeSystem,&RecognizeSystem::sigHashReady,this,&ConnectorToServer::slot_HashReady); } void ConnectorToServer::createObjects() diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index bb4bef2..1fe2499 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -82,6 +82,8 @@ public slots: void slot_msgToClientReady(QString login, QString text); void showServerList(QList *serverList); + void slot_HashReady(); + signals: void sigSetConnect(ServerSettings* serverSettings,QThread *thread); void sigStopConnect();