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();