Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+44
-45
@@ -67,7 +67,6 @@ WebSocketAvs::WebSocketAvs(MainHandler *mainHandler,
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_lastUpdate(0)
|
||||
, m_bWebSocketDisconnectedWarnedOnce(false)
|
||||
, m_logger(getLogger("WebSocketAvs"))
|
||||
{
|
||||
connect(m_wsReconnectTimer, &QTimer::timeout,
|
||||
this, &WebSocketAvs::openWebSocket);
|
||||
@@ -78,12 +77,12 @@ WebSocketAvs::WebSocketAvs(MainHandler *mainHandler,
|
||||
//if there is a positive time start it
|
||||
//if not: don't do it!
|
||||
int cleanupTimeout = Settings::getCleanupTimeout();
|
||||
INFO_LOG(m_logger) << "cleanup Timer Interval: " << cleanupTimeout;
|
||||
INFO_LOG() << "cleanup Timer Interval: " << cleanupTimeout;
|
||||
if (cleanupTimeout > 0)
|
||||
{
|
||||
m_cleanupTimer->setInterval(cleanupTimeout);
|
||||
m_cleanupTimer->start();
|
||||
INFO_LOG(m_logger) << "Started cleanup Timer with Interval: " << cleanupTimeout;
|
||||
INFO_LOG() << "Started cleanup Timer with Interval: " << cleanupTimeout;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -94,14 +93,14 @@ WebSocketAvs::~WebSocketAvs()
|
||||
|
||||
void WebSocketAvs::init()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "WebSocketAvs::init";
|
||||
DEBUG_LOG() << "WebSocketAvs::init";
|
||||
m_wsReconnectTimer->start(1000);
|
||||
//onCleanUpDbInternal();
|
||||
}
|
||||
|
||||
void WebSocketAvs::setWsUrl(const QString &url)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Url: " << url;
|
||||
DEBUG_LOG() << "Url: " << url;
|
||||
m_wsUrl = url;
|
||||
}
|
||||
|
||||
@@ -129,7 +128,7 @@ AvsData WebSocketAvs::jsonObjectToAvsData(const QJsonObject &obj)
|
||||
break;
|
||||
default:
|
||||
eventType = ProjectDataManagement::EventType::Unknown;
|
||||
ERROR_LOG(m_logger) << "Unknown avsEventType: " << avsEventType;
|
||||
ERROR_LOG() << "Unknown avsEventType: " << avsEventType;
|
||||
break;
|
||||
}
|
||||
data.eventType = eventType.underlying();
|
||||
@@ -189,7 +188,7 @@ ExerciseEventManagement::Event WebSocketAvs::avsDataToEvent(const AvsData &data)
|
||||
|
||||
void WebSocketAvs::onTextMessageReceived(const QString &message)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got message from AVS control process: " << message;
|
||||
INFO_LOG() << "Got message from AVS control process: " << message;
|
||||
|
||||
const QJsonDocument doc(QJsonDocument::fromJson(message.toUtf8()));
|
||||
const QJsonObject obj = doc.object();
|
||||
@@ -203,41 +202,41 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
|
||||
{
|
||||
QString streamName = data.streamName;
|
||||
|
||||
DEBUG_LOG(m_logger) << "handleAvsData for stream: " << streamName;
|
||||
DEBUG_LOG() << "handleAvsData for stream: " << streamName;
|
||||
|
||||
auto it = m_avsDataMap.find(streamName);
|
||||
|
||||
// existing stream ..........................................................
|
||||
if (it != m_avsDataMap.end())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "handleAvsData for stream 1: " << streamName;
|
||||
DEBUG_LOG() << "handleAvsData for stream 1: " << streamName;
|
||||
AvsData &avsData = m_avsDataMap[streamName];
|
||||
if ( (avsData.endTime == -1) && (data.endTime == -1))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && (data.endTime == -1)";
|
||||
DEBUG_LOG() << "kein Publish (avsData.endTime == -1) && (data.endTime == -1)";
|
||||
return;
|
||||
}
|
||||
if ( (data.endTime == -1) && (data.eventType == ProjectDataManagement::EventType::RadioCnr))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && RadioCnr";
|
||||
DEBUG_LOG() << "kein Publish (avsData.endTime == -1) && RadioCnr";
|
||||
return;
|
||||
}
|
||||
|
||||
if (avsData.eventTime != data.eventTime) // new range -> close old range
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "handleAvsData for stream 2: " << streamName;
|
||||
DEBUG_LOG() << "handleAvsData for stream 2: " << streamName;
|
||||
if (avsData.eventTime == -1) // missing end time -> set artificial end time
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Missing end time for stream: " << streamName << " -> setting artificial end time: " << avsData.eventTime + 1000;
|
||||
WARNING_LOG() << "Missing end time for stream: " << streamName << " -> setting artificial end time: " << avsData.eventTime + 1000;
|
||||
avsData.eventTime = avsData.eventTime + 1000;
|
||||
publishData(streamName);
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "handleAvsData for stream remove: " << streamName;
|
||||
DEBUG_LOG() << "handleAvsData for stream remove: " << streamName;
|
||||
m_avsDataMap.remove(streamName);
|
||||
}
|
||||
else // update range
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "handleAvsData update range publish" << streamName;
|
||||
DEBUG_LOG() << "handleAvsData update range publish" << streamName;
|
||||
|
||||
avsData.endTime = data.endTime;
|
||||
publishData(streamName);
|
||||
@@ -248,20 +247,20 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
|
||||
}
|
||||
|
||||
// new range ................................................................
|
||||
DEBUG_LOG(m_logger) << "m_avsDataMap.insert(streamName";
|
||||
DEBUG_LOG() << "m_avsDataMap.insert(streamName";
|
||||
m_avsDataMap.insert(streamName, data);
|
||||
AvsData &avsData = m_avsDataMap[streamName];
|
||||
if (!lastRangeClosed)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "!lastRangeClosed";
|
||||
DEBUG_LOG() << "!lastRangeClosed";
|
||||
avsData.endTime = -1;
|
||||
}
|
||||
else if (avsData.endTime == -1) // range is closed but end time is missing
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "avsData.endTime == -1";
|
||||
DEBUG_LOG() << "avsData.endTime == -1";
|
||||
avsData.endTime = avsData.eventTime + 1000; // -> set artificial end time
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "publishData";
|
||||
DEBUG_LOG() << "publishData";
|
||||
avsData.id = publishData(streamName);
|
||||
// if (lastRangeClosed)
|
||||
// m_avsDataMap.remove(streamName);
|
||||
@@ -269,7 +268,7 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
|
||||
// // new stream ...............................................................
|
||||
// if (it == m_avsDataMap.end())
|
||||
// {
|
||||
// DEBUG_LOG(m_logger) << "received event on new stream: " << streamName;
|
||||
// DEBUG_LOG() << "received event on new stream: " << streamName;
|
||||
// AvsData avsData = data;
|
||||
// if (!lastRangeClosed) // waiting for end time
|
||||
// avsData.endTime = -1;
|
||||
@@ -289,12 +288,12 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
|
||||
|
||||
// if (avsData.eventTime != data.eventTime) // same stream, different time -> new event received
|
||||
// {
|
||||
// DEBUG_LOG(m_logger) << "new event on stream: " << streamName;
|
||||
// DEBUG_LOG() << "new event on stream: " << streamName;
|
||||
|
||||
// // close old event ........................................................
|
||||
// if (avsData.endTime == -1) // last event on the same stream was not closed
|
||||
// {
|
||||
// WARNING_LOG(m_logger) << "Missing end time for stream: " << streamName << ". Setting artificial end time.";
|
||||
// WARNING_LOG() << "Missing end time for stream: " << streamName << ". Setting artificial end time.";
|
||||
// avsData.endTime = avsData.eventTime + 1000;
|
||||
// publishData(streamName);
|
||||
// }
|
||||
@@ -312,7 +311,7 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
|
||||
// else // same event
|
||||
// {
|
||||
// avsData.endTime = data.endTime;
|
||||
// DEBUG_LOG(m_logger) << "received new end time: " << data.endTime << " for stream: " << streamName;
|
||||
// DEBUG_LOG() << "received new end time: " << data.endTime << " for stream: " << streamName;
|
||||
// if (lastRangeClosed)
|
||||
// {
|
||||
// publishData(streamName);
|
||||
@@ -323,10 +322,10 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
|
||||
|
||||
int WebSocketAvs::publishData(const QString &streamName)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "WebSocketAvs::publishData";
|
||||
DEBUG_LOG() << "WebSocketAvs::publishData";
|
||||
if (streamName.isEmpty())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Ignoring empty stream name";
|
||||
WARNING_LOG() << "Ignoring empty stream name";
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -356,7 +355,7 @@ int WebSocketAvs::publishData(const QString &streamName)
|
||||
{
|
||||
if (isAlreadyInDb)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Ignoring existing event at " << dbData.sampleTime;
|
||||
WARNING_LOG() << "Ignoring existing event at " << dbData.sampleTime;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -365,17 +364,17 @@ int WebSocketAvs::publishData(const QString &streamName)
|
||||
if (dbData.id > 0)
|
||||
{
|
||||
if (!m_dbHandler->db()->update(dbData))
|
||||
ERROR_LOG(m_logger) << "Error while updating dbData with id : " << data.id;
|
||||
ERROR_LOG() << "Error while updating dbData with id : " << data.id;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!m_dbHandler->db()->insert(dbData))
|
||||
ERROR_LOG(m_logger) << "Error while inserting avsData in db: streamName: " << data.streamName;
|
||||
ERROR_LOG() << "Error while inserting avsData in db: streamName: " << data.streamName;
|
||||
ddsEvent.id(dbData.id);
|
||||
}
|
||||
|
||||
// publish data
|
||||
INFO_LOG(m_logger) << "Publish data for stream: " << streamName << " and database id=" << dbData.id;
|
||||
INFO_LOG() << "Publish data for stream: " << streamName << " and database id=" << dbData.id;
|
||||
m_eventServer->sendEvent(Database::toJson(dbData));
|
||||
m_ddsHandler->dts()->publish(ddsEvent);
|
||||
m_mainHandler->addEventIdToRemove(dbData.id); // take data from dds-bus after 10s, we need just to make sure the recording service got it
|
||||
@@ -386,7 +385,7 @@ int WebSocketAvs::publishData(const QString &streamName)
|
||||
|
||||
void WebSocketAvs::openWebSocket()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "openWebSocket";
|
||||
DEBUG_LOG() << "openWebSocket";
|
||||
closeWebSocket();
|
||||
m_wsSocket = new QWebSocket;
|
||||
connect(m_wsSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
|
||||
@@ -403,7 +402,7 @@ void WebSocketAvs::openWebSocket()
|
||||
|
||||
void WebSocketAvs::closeWebSocket()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "closeWebSocket";
|
||||
DEBUG_LOG() << "closeWebSocket";
|
||||
if (m_wsSocket)
|
||||
{
|
||||
m_wsSocket->disconnect(this);
|
||||
@@ -418,14 +417,14 @@ void WebSocketAvs::onWebSocketError(QAbstractSocket::SocketError error)
|
||||
{
|
||||
if (!m_wsSocket)
|
||||
return;
|
||||
WARNING_LOG(m_logger) << "Error connecting to " << m_wsSocket->peerAddress().toString() << ": " << error;
|
||||
WARNING_LOG() << "Error connecting to " << m_wsSocket->peerAddress().toString() << ": " << error;
|
||||
closeWebSocket();
|
||||
m_wsReconnectTimer->start(1000);
|
||||
}
|
||||
|
||||
void WebSocketAvs::onWebSocketConnected()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "connected to via websockets";
|
||||
DEBUG_LOG() << "connected to via websockets";
|
||||
m_wsReconnectTimer->stop();
|
||||
m_bWebSocketDisconnectedWarnedOnce = false;
|
||||
|
||||
@@ -434,11 +433,11 @@ void WebSocketAvs::onWebSocketConnected()
|
||||
|
||||
void WebSocketAvs::onWebSocketDisconnected()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "WebSocketAvs::onWebSocketDisconnected()";
|
||||
DEBUG_LOG() << "WebSocketAvs::onWebSocketDisconnected()";
|
||||
if (!m_bWebSocketDisconnectedWarnedOnce)
|
||||
{
|
||||
m_bWebSocketDisconnectedWarnedOnce = true;
|
||||
WARNING_LOG(m_logger) << "Websocket to " << m_wsUrl << " closed - trying to reconnect in 1 sec";
|
||||
WARNING_LOG() << "Websocket to " << m_wsUrl << " closed - trying to reconnect in 1 sec";
|
||||
}
|
||||
|
||||
closeWebSocket();
|
||||
@@ -447,7 +446,7 @@ void WebSocketAvs::onWebSocketDisconnected()
|
||||
|
||||
void WebSocketAvs::onSendExerciseId()
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Send exerciseId: ";
|
||||
ERROR_LOG() << "Send exerciseId: ";
|
||||
|
||||
QJsonObject obj;
|
||||
|
||||
@@ -485,7 +484,7 @@ void WebSocketAvs::onCleanUpDbInternal()
|
||||
{
|
||||
ntpRangeSortLocal.insert(avItem.eventTime, avItem);
|
||||
}
|
||||
DEBUG_LOG(m_logger) <<" Start with key: '" << stream << "' external = " << externalData.size() << " internal: " << ntpRangeSortLocal.size();
|
||||
DEBUG_LOG() <<" Start with key: '" << stream << "' external = " << externalData.size() << " internal: " << ntpRangeSortLocal.size();
|
||||
QVector<qint64> itemsToRemoveFromInternal;
|
||||
QMap<qint64, AvsData> collection;
|
||||
QVector<AvsData> toAdd;
|
||||
@@ -513,7 +512,7 @@ void WebSocketAvs::onCleanUpDbInternal()
|
||||
if (m_ismDtc->getBuildingId(mountingPointId, mainStructureElementId))
|
||||
add.mainStructureElementId = mainStructureElementId;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "need to add: " << add.eventType << " st: " << add.streamName << " mpi:" << add.mainStructureElementId;
|
||||
DEBUG_LOG() << "need to add: " << add.eventType << " st: " << add.streamName << " mpi:" << add.mainStructureElementId;
|
||||
toAdd.append(add);
|
||||
collection.insert(add.eventTime, add);
|
||||
}
|
||||
@@ -596,11 +595,11 @@ void WebSocketAvs::onCleanUpDbInternal()
|
||||
dbDataAdd.id = 0;
|
||||
m_dbHandler->db()->insert(dbDataAdd);
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "DONE Sync wite remote DB "<< stream << " to Ignore" << toIgnore.size()<< " to Add" << toAdd.size() << " to Update:" << toUpdate.size()<< " to remove:" << itemsToRemoveFromInternal.size();
|
||||
DEBUG_LOG() << "DONE Sync wite remote DB "<< stream << " to Ignore" << toIgnore.size()<< " to Add" << toAdd.size() << " to Update:" << toUpdate.size()<< " to remove:" << itemsToRemoveFromInternal.size();
|
||||
}
|
||||
m_cleanupTimer->start();
|
||||
m_lastUpdate = QDateTime::currentMSecsSinceEpoch()-2*60*1000;
|
||||
DEBUG_LOG(m_logger) << "DONE Sync wite remote DB next check starts at: " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
|
||||
DEBUG_LOG() << "DONE Sync wite remote DB next check starts at: " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
|
||||
}
|
||||
|
||||
QMap<QString, QVector<AvsData> > WebSocketAvs::getAllAvsData()
|
||||
@@ -617,11 +616,11 @@ QMap<QString, QVector<AvsData> > WebSocketAvs::getAllAvsData()
|
||||
QLatin1String(" WHERE context_id = :context"));
|
||||
if (m_lastUpdate > 0)
|
||||
stmt += QLatin1String(" and time_start_msec > ") + QString::number(m_lastUpdate);
|
||||
DEBUG_LOG(m_logger) << "START Sync read remote DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
|
||||
DEBUG_LOG() << "START Sync read remote DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
|
||||
NSqlQuery q(m_dbHandler->db()->database());
|
||||
if (!q.prepare(stmt))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not prepare statement" << stmt << q.lastError().text() << q.lastError().databaseText();
|
||||
WARNING_LOG() << "Could not prepare statement" << stmt << q.lastError().text() << q.lastError().databaseText();
|
||||
return retu;
|
||||
} // if
|
||||
q.setForwardOnly(true);
|
||||
@@ -633,7 +632,7 @@ QMap<QString, QVector<AvsData> > WebSocketAvs::getAllAvsData()
|
||||
|
||||
if (!q.exec())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Could not execute" << stmt << q.lastError().text() << q.lastError().databaseText();
|
||||
DEBUG_LOG() << "Could not execute" << stmt << q.lastError().text() << q.lastError().databaseText();
|
||||
return retu;
|
||||
} // if
|
||||
|
||||
@@ -679,7 +678,7 @@ QMap<QString, QVector<AvsData>> WebSocketAvs::getAllInternalDbData()
|
||||
|
||||
// m_dbHandler->db()->select(dataVec);
|
||||
//qCritical() << "END select reading internal db ";
|
||||
DEBUG_LOG(m_logger) << "START Sync read local DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
|
||||
DEBUG_LOG() << "START Sync read local DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
|
||||
int j = 0;
|
||||
for (const auto &dataI : std::as_const(dataVec))
|
||||
{
|
||||
@@ -688,7 +687,7 @@ QMap<QString, QVector<AvsData>> WebSocketAvs::getAllInternalDbData()
|
||||
QJsonDocument job = QJsonDocument::fromJson(dataI.properties.toUtf8());
|
||||
if(!job.isObject())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "ERROR Parsing Json";
|
||||
WARNING_LOG() << "ERROR Parsing Json";
|
||||
}
|
||||
|
||||
QJsonObject obj = job.object();
|
||||
|
||||
Reference in new issue
Block a user