Adds initial intermediate qt6 porting state

This commit is contained in:
torsten committed 2026-08-17 17:54:56 +02:00
1 parent 99136e9460
commit d176b5e0d7
11247 files changed
+1891537

No files matched your search

@@ -0,0 +1,86 @@
#include "pdm_handler.h"
#include <QJsonArray>
#include <QJsonDocument>
namespace ApHlaJson
{
PdmHandler::PdmHandler(QObject *parent)
: QObject(parent)
, m_logger(getLogger("PdmHandler"))
{}
bool PdmHandler::init(MainDispatcher* mainDispatcher)
{
m_dtcPdm = ProjectDataManagement::Interface::Dtc::create(mainDispatcher->ddsHandler()->ddsConnector());
if (!m_dtcPdm->enableChargeType())
{
ERROR_LOG(m_logger) << "Can not read data from Pdm";
return false;
}
m_dtcPdm->waitForHistoricalDataChargeType(5000);
if (m_dtcPdm->chargeTypes().size() <= 0)
FATAL_LOG(m_logger) << "Could not fetch ChargeTypes (yet)!";
return true;
}
void PdmHandler::getChargeTypes()
{
DEBUG_LOG(m_logger) << "Get Charge Types";
QJsonObject obj;
QJsonArray dataArray;
obj[QStringLiteral("type")] = QStringLiteral("ApacheHlaSendChargeTypes");
obj[QStringLiteral("typeId")] = 8005;
QMap<qint32, ProjectDataManagement::ChargeType> chargeTypes = m_dtcPdm->chargeTypes();
QMap<qint32, ProjectDataManagement::GearType> gearTypes = m_dtcPdm->gearTypes();
QMap<qint32, ProjectDataManagement::GearTypeChargeType> gearTypeChargeTypes = m_dtcPdm->gearTypeChargeTypes();
DEBUG_LOG(m_logger) << "Fetched " << chargeTypes.size() << " ChargeTypes to send to WebSocket. Ommiting those without DIS-Entity though.";
for(const ProjectDataManagement::ChargeType &charge : chargeTypes)
{
if (charge.disEntity().empty())
continue;
QJsonObject chargeType;
chargeType[QStringLiteral("id")] = charge.id();
chargeType[QStringLiteral("name")] = QString::fromStdString(charge.name());
chargeType[QStringLiteral("entityTypeStruct")] = QString::fromStdString(charge.disEntity());
int gearTypeId = 0;
for(const ProjectDataManagement::GearTypeChargeType &val : gearTypeChargeTypes)
{
if(val.chargeTypeId() == charge.id())
{
gearTypeId = val.gearTypeId();
break;
}
}
chargeType[QStringLiteral("primaryGearTasCode")] = gearTypes[gearTypeId].tasCode();
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(charge.properties()));
QJsonObject prop = doc.object();
chargeType[QStringLiteral("radius")] = prop[QStringLiteral("impactRadius")];
dataArray.push_back(chargeType);
}
obj[QStringLiteral("data")] = dataArray;
emit sendChargeTypes(obj);
}
}