feat: stable loading

This commit is contained in:
semenov
2024-09-27 13:01:03 +03:00
parent 4d7590c02d
commit df74b09159
15 changed files with 125 additions and 73 deletions

View File

@@ -76,6 +76,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
}
packetType = PacketType::TYPE_NONE;
emit sigUpdateBytesAvailable();
continue;
}
@@ -164,7 +165,6 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
file.close();
emit sigSendDebugLog(Tools::getTime() + "File loaded");
emit
//ОЧИСТКА ПОСЛЕ ПЕРЕДАЧИ

View File

@@ -14,6 +14,7 @@ void TCPClient::initialize(RecognizeSystem *recognize,ExternalExecuter *external
this->recognizeSystem = recognize;
this->externalExecuter = externalExecuter;
this->sendSystem = sendSystem;
isConnected = false;
emit sigSendDebugLog(Tools::getTime() + " Client started");
}
@@ -31,6 +32,7 @@ void TCPClient::setConnect(ServerSettings *serverSettings,QThread *th)
socket->connectToHost(serverSettings->Address,serverSettings->Port.toShort());
emit sigSendDebugLog("Try connect...");
isConnected = true;
if (socket->waitForConnected(2000))
{
@@ -46,6 +48,7 @@ void TCPClient::setConnect(ServerSettings *serverSettings,QThread *th)
}
else
{
isConnected = false;
emit sigServerDisconnect();
}
}
@@ -54,6 +57,7 @@ void TCPClient::setConnect(ServerSettings *serverSettings,QThread *th)
void TCPClient::setDisconnect()
{
socket->disconnect();
isConnected = false;
emit sigServerDisconnect();
emit sigSendDebugLog("Server disabled");
}
@@ -106,12 +110,14 @@ void TCPClient::slotConnectNotify()
{
if(socket->state() != QTcpSocket::ConnectedState)
{
isConnected = false;
emit sigSendDebugLog("Connect invalid");
emit sigConnectionState(false);
return;
}
else
{
isConnected = true;
emit sigSendDebugLog("Connect complete");
emit sigConnectionState(true);
sendSystem->sendQTConnect();
@@ -128,6 +134,11 @@ void TCPClient::slotReadyRead()
emit sigRecognize(socket);
}
bool TCPClient::getIsConnected() const
{
return isConnected;
}
TCPClient::~TCPClient()
{

View File

@@ -31,6 +31,8 @@ public:
QTcpSocket* getSocket();
~TCPClient();
bool getIsConnected() const;
signals:
void sigSendDebugLog(QString message);
void sigRecognize(QTcpSocket *socket);
@@ -45,11 +47,13 @@ public slots:
private slots:
void slotReadyRead();
private:
SendSystem *sendSystem;
QTcpSocket *socket;
RecognizeSystem *recognizeSystem;
ExternalExecuter * externalExecuter;
bool isConnected;
void setDisconnect();
};