lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.cpp
+11 -11
View File
@@ -58,25 +58,25 @@ bool WebSocketHandler::sendTelegram(int typeId, const QJsonObject *data, int exe
bool WebSocketHandler::sendTelegram(const int wsId, const QJsonObject *data)
{
DEBUG_LOG() << "Send Telegram esId=" << wsId
DEBUG_LOG(m_logger) << "Send Telegram esId=" << wsId
<< ", m_connections.size=" << m_connections.size();
for (auto it = m_connections.begin(); it != m_connections.end(); it++)
DEBUG_LOG() << "key: " << it.key();
DEBUG_LOG(m_logger) << "key: " << it.key();
const QString jsonStr = QString::fromUtf8(QJsonDocument(*data).toJson(QJsonDocument::Compact));
if(!m_connections.contains(wsId))
{
DEBUG_LOG() << "!m_connections.contains(" << wsId << ") return false;";
DEBUG_LOG(m_logger) << "!m_connections.contains(" << wsId << ") return false;";
return false;
}
std::shared_ptr<WebSocketWrapper> ws = m_connections.value(wsId);
DEBUG_LOG() << "Send Telegram to SAA: " << jsonStr<< " \n LocalPort" << ws->webSocket()->localAddress().toString()
DEBUG_LOG(m_logger) << "Send Telegram to SAA: " << jsonStr<< " \n LocalPort" << ws->webSocket()->localAddress().toString()
<< "." << ws->webSocket()->localPort()
<< " PeerPort " << ws->webSocket()->peerAddress().toString()
<< ":" <<ws->webSocket()->peerPort();
DEBUG_LOG() << "VERSION " << ws->webSocket()->version();
DEBUG_LOG(m_logger) << "VERSION " << ws->webSocket()->version();
return ws->sendTextMessage(jsonStr);
}
@@ -84,7 +84,7 @@ bool WebSocketHandler::disconnectWs(int wsId)
{
if(!m_connections.contains(wsId))
{
DEBUG_LOG() << "!m_connections.contains(" << wsId << ") return false;";
DEBUG_LOG(m_logger) << "!m_connections.contains(" << wsId << ") return false;";
return false;
}
std::shared_ptr<WebSocketWrapper> ws = m_connections.value(wsId);
@@ -124,7 +124,7 @@ int WebSocketHandler::getExerciseId(int wsId) const
void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
{
DEBUG_LOG() << "Receive Telegram from SAA <<<<< " << baJson;
DEBUG_LOG(m_logger) << "Receive Telegram from SAA <<<<< " << baJson;
using namespace TrainingAreaBase::TetraIcd;
WebSocketWrapper *wsw = qobject_cast<WebSocketWrapper *>(sender());
@@ -147,7 +147,7 @@ void WebSocketHandler::onNewConnection()
if (!ws)
return;
DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
auto wsw = std::make_shared<WebSocketWrapper>(ws);
int wsId = m_nextWsId;
@@ -158,7 +158,7 @@ void WebSocketHandler::onNewConnection()
wsw->setWsId(wsId);
emit newConnection( wsId, ws->peerAddress().toString(),ws->peerPort());
m_connections.insert(wsId ,wsw);
DEBUG_LOG() << "m_connections.insert"
DEBUG_LOG(m_logger) << "m_connections.insert"
<< ", wsId :" << wsId;
m_nextWsId++;
@@ -181,10 +181,10 @@ void WebSocketHandler::onWebSocketDisconnected()
for (auto it = copy.begin(); it != copy.end(); ++it)
{
auto wsw = *it;
DEBUG_LOG() << "peerPort :" << wsw->webSocket()->peerPort() << ", localPort :" << wsw->webSocket()->localPort();
DEBUG_LOG(m_logger) << "peerPort :" << wsw->webSocket()->peerPort() << ", localPort :" << wsw->webSocket()->localPort();
if (wsw->webSocket() == ws)
{
DEBUG_LOG() << it.key() << " Emit Disconnect ------------------------------------- esId=" << it.key();
DEBUG_LOG(m_logger) << it.key() << " Emit Disconnect ------------------------------------- esId=" << it.key();
emit wsDisconnected(it.key());
m_connections.remove(it.key());
break;