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

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp
+19 -19
View File
@@ -29,16 +29,16 @@ ProjectDataManagement::PdmEventType avsEventTypeToPdmEventType(int avsEventType
case 305: //MVS
case 301: // CAMERA_AUDIO
case 302: // CAMERA_VIDEO
eventType = ProjectDataManagement::PdmEventType::CameraVideo;
eventType = ProjectDataManagement::PdmEventType::EventType_CameraVideo;
break;
case 303: // RADIO_CNR
eventType = ProjectDataManagement::PdmEventType::RadioCnr;
eventType = ProjectDataManagement::PdmEventType::EventType_RadioCnr;
break;
case 304: // RADIO_TVC
eventType = ProjectDataManagement::PdmEventType::RadioTvc;
eventType = ProjectDataManagement::PdmEventType::EventType_RadioTvc;
break;
default:
eventType = ProjectDataManagement::PdmEventType::Unknown;
eventType = ProjectDataManagement::PdmEventType::EventType_Unknown;
break;
}
return eventType;
@@ -118,16 +118,16 @@ AvsData WebSocketAvs::jsonObjectToAvsData(const QJsonObject &obj)
{
case 301: // CAMERA_AUDIO
case 302: // CAMERA_VIDEO
eventType = ProjectDataManagement::PdmEventType::CameraVideo;
eventType = ProjectDataManagement::PdmEventType::EventType_CameraVideo;
break;
case 303: // RADIO_CNR
eventType = ProjectDataManagement::PdmEventType::RadioCnr;
eventType = ProjectDataManagement::PdmEventType::EventType_RadioCnr;
break;
case 304: // RADIO_TVC
eventType = ProjectDataManagement::PdmEventType::RadioTvc;
eventType = ProjectDataManagement::PdmEventType::EventType_RadioTvc;
break;
default:
eventType = ProjectDataManagement::PdmEventType::Unknown;
eventType = ProjectDataManagement::PdmEventType::EventType_Unknown;
ERROR_LOG(m_logger) << "Unknown avsEventType: " << avsEventType;
break;
}
@@ -168,9 +168,9 @@ Database::EemEvent WebSocketAvs::avsDataToEemEvent(const AvsData &data)
ExerciseEventManagement::Event WebSocketAvs::avsDataToEvent(const AvsData &data)
{
ExerciseEventManagement::Event event;
event.id(data.id);
event.sampleTime(data.eventTime);
event.eventTypeId(data.eventType);
event.id = data.id;
event.sampleTime = data.eventTime;
event.eventTypeId = data.eventType;
QJsonObject obj;
obj[QStringLiteral("streamName")] = data.streamName;
@@ -181,7 +181,7 @@ ExerciseEventManagement::Event WebSocketAvs::avsDataToEvent(const AvsData &data)
}
obj[QStringLiteral("endTime")] = data.endTime;
obj[QStringLiteral("MainStructureElementId")] = data.mainStructureElementId;
event.properties(QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString());
event.properties = QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString();
return event;
}
@@ -216,7 +216,7 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && (data.endTime == -1)";
return;
}
if ( (data.endTime == -1) && (data.eventType == ProjectDataManagement::PdmEventType::RadioCnr))
if ( (data.endTime == -1) && (data.eventType == ProjectDataManagement::PdmEventType::EventType_RadioCnr))
{
DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && RadioCnr";
return;
@@ -370,7 +370,7 @@ int WebSocketAvs::publishData(const QString &streamName)
{
if (!m_dbHandler->db()->insert(dbData))
ERROR_LOG(m_logger) << "Error while inserting avsData in db: streamName: " << data.streamName;
ddsEvent.id(dbData.id);
ddsEvent.id = dbData.id;
}
// publish data
@@ -501,7 +501,7 @@ void WebSocketAvs::onCleanUpDbInternal()
if (!collection.contains(eItem.eventTime))
{
AvsData add = eItem;
bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::CameraVideo;
bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::EventType_CameraVideo;
int mountingPointId = 0;
if (checkMsi && m_avmDtc->mountingPointForStreamName(eItem.streamName, mountingPointId))
@@ -520,7 +520,7 @@ void WebSocketAvs::onCleanUpDbInternal()
}
for ( auto item : list)
{
bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::CameraVideo;
bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::EventType_CameraVideo;
if (item.endTime == eItem.endTime )
{
@@ -672,9 +672,9 @@ QMap<QString, QVector<AvsData>> WebSocketAvs::getAllInternalDbData()
QVector<Database::EemEvent> dataVec;
//qCritical() << "START reading internal db ";
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::CameraVideo);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::RadioCnr);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::RadioTvc);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::EventType_CameraVideo);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::EventType_RadioCnr);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::EventType_RadioTvc);
// m_dbHandler->db()->select(dataVec);
//qCritical() << "END select reading internal db ";