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
+6
-6
@@ -602,15 +602,15 @@ void BuildingViewerDdsController::handleMountingPoint(const InfrastructureManage
|
||||
QString strAssetType;
|
||||
switch (mp.type().underlying())
|
||||
{
|
||||
case InfrastructureManagement::MountingPointType_def::AnnouncementUnit:
|
||||
case InfrastructureManagement::MountingPointType::AnnouncementUnit:
|
||||
assetType = BuildingViewer::AssetTypes::AnnouncementUnit;
|
||||
strAssetType = QStringLiteral("AnnouncementUnit");
|
||||
break;
|
||||
case InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit:
|
||||
case InfrastructureManagement::MountingPointType::EffectGenerationControlUnit:
|
||||
assetType = BuildingViewer::AssetTypes::EffectGenerationUnit;
|
||||
strAssetType = QStringLiteral("EffectGenerationControlUnit");
|
||||
break;
|
||||
case InfrastructureManagement::MountingPointType_def::IndoorCamera: {
|
||||
case InfrastructureManagement::MountingPointType::IndoorCamera: {
|
||||
bool hasSpeaker = false;
|
||||
QJsonParseError jError;
|
||||
const QJsonDocument doc(QJsonDocument::fromJson(mp.properties(), &jError));
|
||||
@@ -741,7 +741,7 @@ bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement
|
||||
return false;
|
||||
|
||||
ParticipantManagement::TypeClass tc = m_ppmDtc->type(participant.typeId()).typeClass();
|
||||
if (tc == ParticipantManagement::TypeClass_def::SupportUnit || tc == ParticipantManagement::TypeClass_def::Unit)
|
||||
if (tc == ParticipantManagement::TypeClass::SupportUnit || tc == ParticipantManagement::TypeClass::Unit)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
|
||||
<< participant.id() << " since its type is 'SupportUnit', 'Unit' or 'Structure'";
|
||||
@@ -1337,9 +1337,9 @@ void BuildingViewerDdsController::updateBuildingRoomNames(
|
||||
QString featureID = BuildingViewer::databaseId2FeatureId(buildingDatabaseId);
|
||||
for (const auto& se : vecElements)
|
||||
{
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Building)
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
|
||||
m_connection->excSetBuildingDisplayName(featureID, QString::fromStdString(se.displayName()));
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Room)
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room)
|
||||
m_connection->excSetRoomDisplayName(featureID, QString::number(se.mountingPointId()),
|
||||
QString::fromStdString(se.displayName()));
|
||||
}
|
||||
|
||||
+1
-1
@@ -288,7 +288,7 @@ void BuildingEdit::onDestroyElement()
|
||||
std::vector<int32_t> structureElementIds;
|
||||
getStructureElementIds(m_model->privateData(selIndex), structureElementIds);
|
||||
|
||||
sendBuildingStateRequest(ProjectDataManagement::VulnerabilityState_def::CatastrophicKill, structureElementIds);
|
||||
sendBuildingStateRequest(ProjectDataManagement::VulnerabilityState::CatastrophicKill, structureElementIds);
|
||||
}
|
||||
|
||||
void BuildingEdit::getStructureElementIds(NGLTreeItem* item, std::vector<int32_t>& structureElementIds)
|
||||
|
||||
+2
-2
@@ -141,7 +141,7 @@ bool BuildingEditModel::init(int32_t mseId)
|
||||
for (const auto& se : vecElements)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "se: =" << se;
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Floor)
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Floor)
|
||||
{
|
||||
BuildingViewer::TreeItem itemRoom(se);
|
||||
itemRoom.setSuperior(rootId);
|
||||
@@ -162,7 +162,7 @@ bool BuildingEditModel::init(int32_t mseId)
|
||||
|
||||
for (const auto& se : vecElements)
|
||||
{
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Room)
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room)
|
||||
{
|
||||
|
||||
double fortifyFactor = 1.0;
|
||||
|
||||
Reference in new issue
Block a user