Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+21
-21
@@ -208,7 +208,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
qint64 DdsHandler::currentPartitionTime() const
|
||||
{
|
||||
return m_dtcCore->partitionTime().timeStamp();
|
||||
return m_dtcCore->partitionTime().timeStamp;
|
||||
}
|
||||
|
||||
int DdsHandler::participantId2EquipNo(const int participantId) const
|
||||
@@ -227,116 +227,116 @@ int DdsHandler::equipNo2ParticipantId(const int equipmentNumber) const
|
||||
// ///////////////////////////////////
|
||||
double DdsHandler::chargeTypeRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const double radius = m_dtcPdm->impactRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
const double radius = m_dtcPdm->impactRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
DEBUG_LOG(m_logger) << "chargeTypeRadius = " << radius;
|
||||
return radius;
|
||||
} // getRadiusOfMunition
|
||||
|
||||
double DdsHandler::chargeHeight(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const double height = m_dtcPdm->height(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
const double height = m_dtcPdm->height(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
DEBUG_LOG(m_logger) << "chargeHeight = " << height;
|
||||
return height;
|
||||
}
|
||||
|
||||
bool DdsHandler::isSmartChargeType(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const bool isSmart = m_dtcPdm->isSmart(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
const bool isSmart = m_dtcPdm->isSmart(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
DEBUG_LOG(m_logger) << "isSmartChargeType = " << isSmart;
|
||||
return isSmart;
|
||||
} // isSmartType
|
||||
|
||||
bool DdsHandler::isSmoke(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const bool isSmoke = m_dtcPdm->isSmoke(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
const bool isSmoke = m_dtcPdm->isSmoke(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
DEBUG_LOG(m_logger) << "isSmoke = " << isSmoke;
|
||||
return isSmoke;
|
||||
} // isSmoke
|
||||
|
||||
bool DdsHandler::isLaserGuidable(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const bool isLaserGuidable = m_dtcPdm->isLaserGuidable(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
const bool isLaserGuidable = m_dtcPdm->isLaserGuidable(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
DEBUG_LOG(m_logger) << "isLaserGuidable = " << isLaserGuidable;
|
||||
return isLaserGuidable;
|
||||
}
|
||||
|
||||
bool DdsHandler::isJamming(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const bool isJamming = m_dtcPdm->isJamming(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
const bool isJamming = m_dtcPdm->isJamming(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
DEBUG_LOG(m_logger) << "isJamming = " << isJamming;
|
||||
return isJamming;
|
||||
}
|
||||
|
||||
bool DdsHandler::isDus(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const bool isDus = m_dtcPdm->mineClass(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId())== AreaEffectSimulation::MineClass::Concrete;
|
||||
const bool isDus = m_dtcPdm->mineClass(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId)== AreaEffectSimulation::MineClass::Concrete;
|
||||
DEBUG_LOG(m_logger) << "isDus = " << isDus;
|
||||
return isDus;
|
||||
}
|
||||
|
||||
bool DdsHandler::isAtMine(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const bool isAtMine = m_dtcPdm->isAtMine(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
const bool isAtMine = m_dtcPdm->isAtMine(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
DEBUG_LOG(m_logger) << "isAtMine = " << isAtMine;
|
||||
return isAtMine;
|
||||
}
|
||||
|
||||
ProjectDataManagement::VolatilityType DdsHandler::volatilityTypeId(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const ProjectDataManagement::VolatilityType volatilityType= m_dtcPdm->volatilityTypeId(chargeStruct.chargeTypeId(),
|
||||
chargeStruct.igniterTypeId(),
|
||||
chargeStruct.igniterFunctionId());
|
||||
const ProjectDataManagement::VolatilityType volatilityType= m_dtcPdm->volatilityTypeId(chargeStruct.chargeTypeId,
|
||||
chargeStruct.igniterTypeId,
|
||||
chargeStruct.igniterFunctionId);
|
||||
DEBUG_LOG(m_logger) << "volatilityType=" << volatilityType;
|
||||
return volatilityType;
|
||||
}
|
||||
|
||||
int DdsHandler::remainingTasCode(const AreaEffectSimulation::ChargeStruct &chargeStruct) const
|
||||
{
|
||||
return m_dtcPdm->remainingTasCode(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
return m_dtcPdm->remainingTasCode(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
}
|
||||
|
||||
int DdsHandler::secondaryRemainingTasCode(const AreaEffectSimulation::ChargeStruct &chargeStruct) const
|
||||
{
|
||||
return m_dtcPdm->secondaryRemainingTasCode(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
return m_dtcPdm->secondaryRemainingTasCode(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
}
|
||||
|
||||
int DdsHandler::getLethalRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct) const
|
||||
{
|
||||
return m_dtcPdm->getLethalRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
return m_dtcPdm->getLethalRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
}
|
||||
|
||||
int DdsHandler::getNonLethalRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct) const
|
||||
{
|
||||
return m_dtcPdm->getNonLethalRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
return m_dtcPdm->getNonLethalRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
}
|
||||
|
||||
int DdsHandler::getHazardDistance(const AreaEffectSimulation::ChargeStruct &chargeStruct) const
|
||||
{
|
||||
return m_dtcPdm->hazardDistance(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
return m_dtcPdm->hazardDistance(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
}
|
||||
|
||||
ProjectDataManagement::IgniterFunctionBase DdsHandler::getIgniterFunctionBaseFromChargeTypeId(int chargeTypeId, int igniterTypeId, int igniterFunctionId)
|
||||
{
|
||||
return m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeTypeId, igniterTypeId, igniterFunctionId).igniterFunctionBaseId();
|
||||
return m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeTypeId, igniterTypeId, igniterFunctionId).igniterFunctionBaseId;
|
||||
}
|
||||
|
||||
QVector<ProjectDataManagement::CasEffect> DdsHandler::getCasEffects(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
return m_dtcPdm->casEffects(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
return m_dtcPdm->casEffects(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
}
|
||||
|
||||
|
||||
int32_t DdsHandler::getLegacyIdFromChargeTypeId(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
int32_t legacyId = 0;
|
||||
legacyId = m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()).chargeLegacyId();
|
||||
legacyId = m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId).chargeLegacyId;
|
||||
DEBUG_LOG(m_logger) << "legacyId = " << legacyId;
|
||||
return legacyId;
|
||||
}
|
||||
|
||||
int DdsHandler::searchRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct)
|
||||
{
|
||||
const int searchRadius = m_dtcPdm->searchRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
|
||||
const int searchRadius = m_dtcPdm->searchRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId);
|
||||
DEBUG_LOG(m_logger) << "searchRadius = " << searchRadius;
|
||||
return searchRadius;
|
||||
} // searchRadius
|
||||
|
||||
Reference in new issue
Block a user