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
@@ -30,7 +30,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# Generate nme_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcNmeCommon SHARED ${SRCS_common})
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcNmeCommon SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcNmeCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -57,7 +57,7 @@ SET(SRCS_client
|
||||
# generate nme_[d|f]tc.h, nme_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcNmeClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcNmeClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcNmeClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -87,7 +87,7 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
# Generate nme_db_impl.cpp/.h, nme_db.h
|
||||
CODEGEN_DATABASE(SRCS_server ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV svcNmeServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY2(AAR SV svcNmeServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcNmeServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
|
||||
@@ -19,9 +19,8 @@ namespace NmeaManagement
|
||||
|
||||
DdsHandler::DdsHandler(int domainId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
DdsHandler::~DdsHandler()
|
||||
@@ -31,7 +30,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -47,36 +46,36 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
if (!m_ddsDts->enableBatteryAlarm())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableBatteryAlarm data topic server";
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enableBatteryAlarm data topic server";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ddsDts->enableServiceControl())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableServiceControl data topic server";
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enableServiceControl data topic server";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ddsDts->enableBatteryState())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableBatteryState data topic server";
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enableBatteryState data topic server";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ddsDts->enablePositionExcon())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enablePositionExcon data topic server";
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enablePositionExcon data topic server";
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << "Dts initialised";
|
||||
INFO_LOG() << "Dts initialised";
|
||||
|
||||
|
||||
if (!m_ddsFts->enableAll())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableAll function topic";
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enableAll function topic";
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << "Fts initialised";
|
||||
INFO_LOG() << "Fts initialised";
|
||||
|
||||
// TODO: call at the end of main_handler init:
|
||||
this->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
|
||||
@@ -49,8 +49,6 @@ private:
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
std::shared_ptr<NmeaManagement::Interface::Dts> m_ddsDts;
|
||||
std::shared_ptr<NmeaManagement::Interface::Fts> m_ddsFts;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
} // namespace NmeaManagement
|
||||
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include "nme_export.h"
|
||||
#include "svcnmecommon_export.h"
|
||||
|
||||
namespace NmeaManagement
|
||||
{
|
||||
|
||||
@@ -16,7 +16,6 @@ namespace NmeaManagement
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
@@ -33,10 +32,10 @@ bool MainHandler::init(int domainId)
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
|
||||
DEBUG_LOG() << "Initialisation ddsHandler succesful.";
|
||||
|
||||
m_nmeaHandler = std::make_shared<NmeaHandler>(m_ddsHandler, this);
|
||||
m_nmeaHandler->init();
|
||||
|
||||
@@ -32,7 +32,5 @@ private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<SocketHandler> m_socketHandler;
|
||||
std::shared_ptr<NmeaHandler> m_nmeaHandler;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
} // namespace NmeaManagement
|
||||
@@ -14,7 +14,6 @@ NmeaHandler::NmeaHandler(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_logger(getLogger("NmeaHandler"))
|
||||
{
|
||||
|
||||
}
|
||||
@@ -66,29 +65,29 @@ void NmeaHandler::IIXDR(QString package)
|
||||
NmeaManagement::ServiceControl serviceControl;
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
INFO_LOG(m_logger) << "----------------------------------------------------";
|
||||
INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
|
||||
INFO_LOG() << "----------------------------------------------------";
|
||||
INFO_LOG() << "batteryState pkt_data.size=" << pkt_data.size();
|
||||
for (int i = 0; i < pkt_data.size(); i++)
|
||||
INFO_LOG(m_logger) << "i=" << i << "Value=" << pkt_data[i];
|
||||
INFO_LOG() << "i=" << i << "Value=" << pkt_data[i];
|
||||
|
||||
|
||||
int index = pkt_data.indexOf(QLatin1String("S")) + 1;
|
||||
if ( index >= 1)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Ausschalten!!!";
|
||||
INFO_LOG() << "Ausschalten!!!";
|
||||
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_PRESHUTDOWN"))
|
||||
{
|
||||
INFO_LOG(m_logger) << "SERVICE_CONTROL_PRESHUTDOWN";
|
||||
INFO_LOG() << "SERVICE_CONTROL_PRESHUTDOWN";
|
||||
serviceControl.ServiceControlState(ServiceControlEnum_def::PRESHUTDOWN);
|
||||
}
|
||||
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_SHUTDOWN"))
|
||||
{
|
||||
INFO_LOG(m_logger) << "SERVICE_CONTROL_SHUTDOWN";
|
||||
INFO_LOG() << "SERVICE_CONTROL_SHUTDOWN";
|
||||
serviceControl.ServiceControlState(ServiceControlEnum_def::SHUTDOWN);
|
||||
}
|
||||
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_STOP"))
|
||||
{
|
||||
INFO_LOG(m_logger) << "SERVICE_CONTROL_STOP";
|
||||
INFO_LOG() << "SERVICE_CONTROL_STOP";
|
||||
serviceControl.ServiceControlState(ServiceControlEnum_def::STOP);
|
||||
}
|
||||
m_ddsHandler->dts()->publish(serviceControl);
|
||||
@@ -161,7 +160,7 @@ void NmeaHandler::IIXDR(QString package)
|
||||
batteryState.voltage(voltage);
|
||||
|
||||
batteryState.serialNumber(serialNumber.toStdString()) ;
|
||||
INFO_LOG(m_logger) << "publish batteryState serialNumber=" << serialNumber;
|
||||
INFO_LOG() << "publish batteryState serialNumber=" << serialNumber;
|
||||
m_ddsHandler->dts()->publish(batteryState);
|
||||
}
|
||||
|
||||
@@ -188,10 +187,10 @@ void NmeaHandler::IIALR(QString package)
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
alarm_state packageData;
|
||||
INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
|
||||
INFO_LOG() << "pkt_data.size=" << pkt_data.size();
|
||||
// for ( int i = 0; i < pkt_data.size(); i++)
|
||||
// {
|
||||
// INFO_LOG(m_logger)<< "i=" << i << "Value=" << pkt_data[i];
|
||||
// INFO_LOG()<< "i=" << i << "Value=" << pkt_data[i];
|
||||
// }
|
||||
packageData.time = pkt_data[1];
|
||||
packageData.number = pkt_data[2].toInt();
|
||||
@@ -207,7 +206,7 @@ void NmeaHandler::IIALR(QString package)
|
||||
|
||||
qint64 timeAlarm = getDateTime(packageData.time);
|
||||
|
||||
INFO_LOG(m_logger) << "time=" << packageData.time
|
||||
INFO_LOG() << "time=" << packageData.time
|
||||
<< " timeAlarm=" << timeAlarm
|
||||
<< " number=" << packageData.number
|
||||
<< " condition=" << packageData.condition
|
||||
@@ -277,10 +276,10 @@ void NmeaHandler::GPGGA(QString package)
|
||||
|
||||
if (packageData.C_latitude_dir == 'S' || packageData.C_latitude_dir == 's')
|
||||
latDecimal = ((real / 60) + inteiro) * -1;
|
||||
//INFO_LOG(m_logger) << QString::number(((real / 60) + inteiro) * -1, 'g', 9);
|
||||
//INFO_LOG() << QString::number(((real / 60) + inteiro) * -1, 'g', 9);
|
||||
else
|
||||
latDecimal = ((real / 60) + inteiro);
|
||||
//INFO_LOG(m_logger) << "latitude=" << QString::number(((real / 60) + inteiro), 'g', 9);
|
||||
//INFO_LOG() << "latitude=" << QString::number(((real / 60) + inteiro), 'g', 9);
|
||||
|
||||
|
||||
while (packageData.D_longitude[0] == QStringLiteral("0"))
|
||||
@@ -301,7 +300,7 @@ void NmeaHandler::GPGGA(QString package)
|
||||
lonDecimal = ((real / 60) + inteiro);
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "longitude=" << lonDecimal
|
||||
INFO_LOG() << "longitude=" << lonDecimal
|
||||
<< " latitude=" << latDecimal;
|
||||
|
||||
|
||||
@@ -333,7 +332,7 @@ void NmeaHandler::GPRMC(QString package)
|
||||
packageData.K_variacao_magnetica_coord = pkt_data[11].toStdString()[0];
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
|
||||
INFO_LOG() << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
|
||||
|
||||
}
|
||||
|
||||
@@ -358,7 +357,7 @@ void NmeaHandler::decode(QString nmeaPackage)
|
||||
nmeaPackage.remove(0, startingPoint);
|
||||
|
||||
nmeaType = nmeaPackage.mid(1, 5);
|
||||
INFO_LOG(m_logger) << "nmeaType=" << nmeaType;
|
||||
INFO_LOG() << "nmeaType=" << nmeaType;
|
||||
|
||||
if (nmeaType == QStringLiteral("IIXDR"))
|
||||
{
|
||||
@@ -367,10 +366,10 @@ void NmeaHandler::decode(QString nmeaPackage)
|
||||
|
||||
if (nmeaType == QStringLiteral("GPGGA"))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Eigenposition";
|
||||
INFO_LOG() << "Eigenposition";
|
||||
if (checksum(nmeaPackage))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Eigenposition checksum ok";
|
||||
INFO_LOG() << "Eigenposition checksum ok";
|
||||
GPGGA(nmeaPackage);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@ SocketHandler::SocketHandler(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
, TurnRadioMasterOffRequestHandler(ddsHandler->fts())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_nmeaHandler(nmeaHandler)
|
||||
, m_logger(getLogger("SocketHandler"))
|
||||
{
|
||||
// create a timer
|
||||
m_reconnectTimer = new QTimer(this);
|
||||
@@ -45,8 +44,8 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
|
||||
|
||||
connect(socket, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWritten(qint64)));
|
||||
|
||||
INFO_LOG(m_logger) << "Connecting,..";
|
||||
INFO_LOG(m_logger) << nmeaHost << " port: " << nmeaPort;
|
||||
INFO_LOG() << "Connecting,..";
|
||||
INFO_LOG() << nmeaHost << " port: " << nmeaPort;
|
||||
//socket->connectToHost(QHostAddress::LocalHost, nmeaPort);
|
||||
//socket->connectToHost(nmeaHost, nmeaPort);
|
||||
reconnect();
|
||||
@@ -55,12 +54,12 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
|
||||
|
||||
void SocketHandler::reconnect()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Connecting,.." << " host = " << m_nmeaHost
|
||||
INFO_LOG() << "Connecting,.." << " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;;
|
||||
|
||||
if(!socket->bind(m_nmeaPort, QAbstractSocket::BindFlag::ShareAddress))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error from Socket: " << socket->errorString();
|
||||
ERROR_LOG() << "Error from Socket: " << socket->errorString();
|
||||
m_reconnectTimer->start(10000);
|
||||
}
|
||||
|
||||
@@ -70,24 +69,24 @@ void SocketHandler::connected()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
|
||||
INFO_LOG(m_logger) << "Connected!";
|
||||
INFO_LOG() << "Connected!";
|
||||
}
|
||||
|
||||
|
||||
void SocketHandler::disconnected()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Disconnected!";
|
||||
INFO_LOG() << "Disconnected!";
|
||||
}
|
||||
|
||||
void SocketHandler::bytesWritten(qint64 bytes)
|
||||
{
|
||||
TRACE_LOG(m_logger) << "We wrote: " << bytes;
|
||||
TRACE_LOG() << "We wrote: " << bytes;
|
||||
}
|
||||
|
||||
void SocketHandler::reconnectTimerSlot()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
INFO_LOG(m_logger) << "Reconnect NMEA-Socket "
|
||||
INFO_LOG() << "Reconnect NMEA-Socket "
|
||||
<< " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;
|
||||
reconnect();
|
||||
@@ -97,7 +96,7 @@ void SocketHandler::reconnectTimerSlot()
|
||||
void SocketHandler::readyRead()
|
||||
{
|
||||
bool hasData = true;
|
||||
INFO_LOG(m_logger) << "Reading...";
|
||||
INFO_LOG() << "Reading...";
|
||||
// QByteArray ba = socket->readDatagram();
|
||||
|
||||
QByteArray ba;
|
||||
@@ -107,18 +106,18 @@ void SocketHandler::readyRead()
|
||||
|
||||
ba.resize(int(socket->pendingDatagramSize()));
|
||||
socket->readDatagram(ba.data(), ba.size());
|
||||
INFO_LOG(m_logger) << ba;
|
||||
INFO_LOG() << ba;
|
||||
QByteArray nmeaDataBa = ba; // ba.mid(startNmeaData, endNmeaData);
|
||||
std::string nmeaDataStd = nmeaDataBa.toStdString() ;
|
||||
QString nmeaData = QString::fromLocal8Bit(nmeaDataStd.c_str());
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << "nmeaDecoder :" << nmeaData;
|
||||
INFO_LOG() << "nmeaDecoder :" << nmeaData;
|
||||
//ba = ba.mid(endNmeaData, ba.length());
|
||||
m_nmeaHandler->decode(nmeaData);
|
||||
|
||||
INFO_LOG(m_logger) << "NMEA-Data=" << nmeaData;
|
||||
INFO_LOG(m_logger) << "NMEA-Data ba=" << ba;
|
||||
INFO_LOG() << "NMEA-Data=" << nmeaData;
|
||||
INFO_LOG() << "NMEA-Data ba=" << ba;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,7 +127,7 @@ void SocketHandler::onTurnRadioMasterOffRequest(const rti::core::SampleIdentity
|
||||
|
||||
Core::FunctionReplyObject reply;
|
||||
if (reply.error())
|
||||
WARNING_LOG(m_logger) << "onTurnRadioMasterOffReply: " << reply();
|
||||
WARNING_LOG() << "onTurnRadioMasterOffReply: " << reply();
|
||||
|
||||
m_ddsHandler->fts()->turnRadioMasterOffReply(cookie, reply);
|
||||
|
||||
|
||||
Reference in new issue
Block a user