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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp
+23 -23
View File
@@ -217,9 +217,9 @@ QString CameraVideoFilter::getDisplayName(const QString &internalName)
m_avmDtc->streamNames(static_cast<std::function<bool(const AudioVideoManagement::StreamName &)>>([&result, internalName](const AudioVideoManagement::StreamName &streamName)
{
if (QString::fromStdString(streamName.internalName()) == internalName)
if (QString::fromStdString(streamName.internalName) == internalName)
{
result = QString::fromStdString(streamName.displayName());
result = QString::fromStdString(streamName.displayName);
return true;
}
@@ -246,23 +246,23 @@ void CameraVideoFilter::updateMenuStreams()
QVector<QString> outdor;
QVector<QString> indoor;
for (auto it = menuStruct.menuEntries().begin(); it != menuStruct.menuEntries().end(); ++it)
for (auto it = menuStruct.menuEntries.begin(); it != menuStruct.menuEntries.end(); ++it)
{
if (!(it->mountingPointId().is_set() && it->name().is_set()))
if (!(it->mountingPointId.has_value() && it->name.has_value()))
continue;
int32_t mountingPointId = it->mountingPointId().get();
int32_t mountingPointId = it->mountingPointId.get();
QString streamDisplayName = QStringLiteral("");
if(streamNameMapping)
streamDisplayName = streamNameMapping->displayName(QString::fromStdString(it->name().get()));
streamDisplayName = streamNameMapping->displayName(QString::fromStdString(it->name.get()));
if (mountingPointId < 0)
{
m_avmDtc->videoTeams([&streamDisplayName, mountingPointId](const AudioVideoManagement::VideoTeam &data)
{
if (data.id() == -mountingPointId)
if (data.id == -mountingPointId)
{
streamDisplayName = QString::fromStdString(data.streamName());
streamDisplayName = QString::fromStdString(data.streamName);
}
});
mvs.append(streamDisplayName);
@@ -270,7 +270,7 @@ void CameraVideoFilter::updateMenuStreams()
{
InfrastructureManagement::StructureElement mpiE;
m_ismDtc->getStructureElementById(mountingPointId,mpiE);
if(mpiE.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera)
if(mpiE.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera)
{
outdor.append(streamDisplayName);
}
@@ -408,13 +408,13 @@ QStringList CameraVideoFilter::getInternalStreamNamesBySelectedStreams() const
m_avmDtc->streamNames([this, &result, &displayNames](const AudioVideoManagement::StreamName &streamName)
{
if (displayNames.contains(QStringLiteral("'%1'").arg(QString::fromStdString(streamName.displayName()))))
result.append(QStringLiteral("'%1'").arg(QString::fromStdString(streamName.internalName())));
if (displayNames.contains(QStringLiteral("'%1'").arg(QString::fromStdString(streamName.displayName))))
result.append(QStringLiteral("'%1'").arg(QString::fromStdString(streamName.internalName)));
});
m_avmDtc->videoTeams([this, &result, &displayNames](const AudioVideoManagement::VideoTeam &data)
{
const QString streamName = QStringLiteral("'%1'").arg(QString::fromStdString(data.streamName()));
const QString streamName = QStringLiteral("'%1'").arg(QString::fromStdString(data.streamName));
if (displayNames.contains(streamName) && !result.contains(streamName))
result.append(streamName);
@@ -443,12 +443,12 @@ void CameraVideoFilter::onStreamChanged(const AudioVideoManagement::StreamName &
void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
{
QJsonParseError parseError;
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties()), &parseError);
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties), &parseError);
if (parseError.error != QJsonParseError::NoError)
{
INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
<< data.id()
<< data.id
<< ". Reason: "
<< parseError.errorString()
<< "; JSON: "
@@ -470,8 +470,8 @@ void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManage
}
}
if (m_mainStructureElements.contains(data.id()) && !inExercise)
m_mainStructureElements.remove(data.id());
if (m_mainStructureElements.contains(data.id) && !inExercise)
m_mainStructureElements.remove(data.id);
if (!inExercise)
return;
@@ -480,12 +480,12 @@ void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManage
{
case DataModification::eAdded:
case DataModification::eModified:
m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id())
: QString::fromStdString(data.description());
m_mainStructureElements[data.id] = data.structureElementTypeId == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id)
: QString::fromStdString(data.description);
break;
case DataModification::eRemoved:
m_mainStructureElements.remove(data.id());
m_mainStructureElements.remove(data.id);
break;
}
}
@@ -512,9 +512,9 @@ void CameraVideoFilter::onStreamListReceived(const QMap<QString, QString> &mapIn
for (auto strm : m_avmDtc->streamNames())
{
if (strm.displayName() == stream.toStdString())
if (strm.displayName == stream.toStdString())
{
mpi = strm.mountingPointId();
mpi = strm.mountingPointId;
break;
}
}
@@ -524,7 +524,7 @@ void CameraVideoFilter::onStreamListReceived(const QMap<QString, QString> &mapIn
InfrastructureManagement::StructureElement mpiE;
m_ismDtc->getStructureElementById(mpi,mpiE);
if(mpiE.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera)
if(mpiE.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera)
{
outdor.append(stream);
}
@@ -542,7 +542,7 @@ void CameraVideoFilter::onStreamListReceived(const QMap<QString, QString> &mapIn
{
if (isMVS)
break;
if (mvsTeam.streamName() == stream.toStdString())
if (mvsTeam.streamName == stream.toStdString())
{
isMVS= true;
mvs.append(stream);
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp
+9 -9
View File
@@ -144,31 +144,31 @@ void FireEventFilter::updateFilterString()
void FireEventFilter::onGearTypeChanged(const ProjectDataManagement::GearType &data, DataModification modType)
{
if (data.gearClassId() != ProjectDataManagement::GearClass::DuelSim || data.name() == "N/A")
if (data.gearClassId != ProjectDataManagement::GearClass::GearClass_DuelSim || data.name == "N/A")
return;
switch (modType)
{
case DataModification::eAdded:
case DataModification::eModified:
m_gearTypes[data.id()] = QString::fromStdString(data.name());
m_gearTypes[data.id] = QString::fromStdString(data.name);
break;
case DataModification::eRemoved:
m_gearTypes.remove(data.id());
m_gearTypes.remove(data.id);
break;
}
}
void FireEventFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
{
if (data.id() < 1)
if (data.id < 1)
return;
if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim)
if (m_pdmDtc->gearClassFromChargeTypeId(data.id) != ProjectDataManagement::GearClass::GearClass_DuelSim)
return;
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
return;
@@ -177,12 +177,12 @@ void FireEventFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeTyp
case DataModification::eAdded:
case DataModification::eModified:
{
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
break;
}
case DataModification::eRemoved:
m_chargeTypes.remove(data.id());
m_chargeTypes.remove(data.id);
break;
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp
+27 -27
View File
@@ -75,25 +75,25 @@ bool HitFilter::init(
if (m_vulnerabilityStates.isEmpty())
{
using VulnerabilityState = ProjectDataManagement::VulnerabilityState;
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CombatReady, ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CombatReady));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_LightDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_LightDamage));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_MediumDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MediumDamage));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_HeavyDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HeavyDamage));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_MobilityKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MobilityKill));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_VisibleMobilityKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleMobilityKill));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_WeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_WeaponSystemDamage));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_TemporarySeverance, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_TemporarySeverance));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_NearMiss, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_NearMiss));
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_HitWithNoEffect, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HitWithNoEffect));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_CombatReady), ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_LightDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_LightDamage));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_MediumDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MediumDamage));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_HeavyDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HeavyDamage));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_MobilityKill), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MobilityKill));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_VisibleMobilityKill), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleMobilityKill));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_WeaponSystemDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_WeaponSystemDamage));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_CatastrophicKill), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_TemporarySeverance), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_TemporarySeverance));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_NearMiss), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_NearMiss));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_HitWithNoEffect), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HitWithNoEffect));
}
if (m_partys.isEmpty())
{
QMap<qint32, ParticipantManagement::Party> partys = m_ppmDtc->partys();
for (auto it = partys.constBegin(); it != partys.constEnd(); ++it)
m_partys.insert(static_cast<int>(it.value().id()), ParticipantManagement::trPartyName(it.value().name()));
m_partys.insert(static_cast<int>(it.value().id), ParticipantManagement::trPartyName(it.value().name));
connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::partyChanged,
this, &HitFilter::onPartyChanged);
}
@@ -101,8 +101,8 @@ bool HitFilter::init(
if (m_originatorEquipmentNumbers.isEmpty())
{
for (const ParticipantManagement::Participant &participant : m_ppmDtc->participants())
if (participant.equipmentNumber().is_set())
m_originatorEquipmentNumbers.insert(participant.id(), participant.equipmentNumber().get());
if (participant.equipmentNumber.has_value())
m_originatorEquipmentNumbers.insert(participant.id, participant.equipmentNumber.get());
connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
this, &HitFilter::onParticipantChanged);
}
@@ -195,7 +195,7 @@ void HitFilter::addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *layout,
connect(selectionDialog, &ParticipantManagement::ParticipantSelection::selectedParticipants, this, [this, spinBox](const QVector<int> &participantIds)
{
if (!participantIds.isEmpty())
spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber().get());
spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber.get());
});
selectionDialog->show();
});
@@ -217,7 +217,7 @@ void HitFilter::addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *layout,
connect(selectionDialog, &ParticipantManagement::ParticipantSelection::selectedParticipants, this, [this, spinBox](const QVector<int> &participantIds)
{
if (!participantIds.isEmpty())
spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber().get());
spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber.get());
});
selectionDialog->show();
});
@@ -269,13 +269,13 @@ void HitFilter::updateFilterString()
void HitFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
{
if (data.id() < 1)
if (data.id < 1)
return;
if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim)
if (m_pdmDtc->gearClassFromChargeTypeId(data.id) != ProjectDataManagement::GearClass::GearClass_DuelSim)
return;
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
return;
@@ -284,12 +284,12 @@ void HitFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &dat
case DataModification::eAdded:
case DataModification::eModified:
{
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
break;
}
case DataModification::eRemoved:
m_chargeTypes.remove(data.id());
m_chargeTypes.remove(data.id);
break;
}
}
@@ -300,11 +300,11 @@ void HitFilter::onPartyChanged(const ParticipantManagement::Party &data, DataMod
{
case DataModification::eAdded:
case DataModification::eModified:
m_partys[data.id()] = ParticipantManagement::trPartyName(data.name());
m_partys[data.id] = ParticipantManagement::trPartyName(data.name);
break;
case DataModification::eRemoved:
m_partys.remove(data.id());
m_partys.remove(data.id);
break;
}
}
@@ -317,11 +317,11 @@ void HitFilter::onParticipantChanged(const ParticipantManagement::Participant &d
{
case DataModification::eAdded:
case DataModification::eModified:
m_originatorEquipmentNumbers[data.id()] = data.equipmentNumber().get();
m_originatorEquipmentNumbers[data.id] = data.equipmentNumber.get();
break;
case DataModification::eRemoved:
m_originatorEquipmentNumbers.remove(data.id());
m_originatorEquipmentNumbers.remove(data.id);
break;
}
} catch (...) {}
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h
+1 -1
View File
@@ -42,7 +42,7 @@ public:
int originatorEquipmentNumber(int id) const { return m_originatorEquipmentNumbers.value(id, 0); }
QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast<ProjectDataManagement::VulnerabilityState>(id)); }
QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); }
QString party(int id) const { return ParticipantManagement::trPartyName(m_ppmDtc->party(id).name()); }
QString party(int id) const { return ParticipantManagement::trPartyName(m_ppmDtc->party(id).name); }
private:
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp
+18 -18
View File
@@ -124,7 +124,7 @@ bool HitBuildingFilter::init(
if (m_vulnerabilityStates.isEmpty())
{
using VulnerabilityState = ProjectDataManagement::VulnerabilityState;
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CombatReady, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CombatReady));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_CombatReady), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CombatReady));
@@ -132,7 +132,7 @@ bool HitBuildingFilter::init(
m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
m_vulnerabilityStates.insert(static_cast<int>(VulnerabilityState::VulnerabilityState_CatastrophicKill), ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
@@ -260,7 +260,7 @@ void HitBuildingFilter::addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *
try
{
if (!participantIds.isEmpty())
spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber().get());
spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber.get());
} catch (...) {}
});
selectionDialog->show();
@@ -287,7 +287,7 @@ void HitBuildingFilter::addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *
try
{
if (!participantIds.isEmpty())
spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber().get());
spinBox->setValue(m_ppmDtc->participant(participantIds.first()).equipmentNumber.get());
} catch (...) {}
});
selectionDialog->show();
@@ -348,10 +348,10 @@ void HitBuildingFilter::updateFilterString()
void HitBuildingFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
{
if (data.id() < 1)
if (data.id < 1)
return;
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
return;
@@ -360,12 +360,12 @@ void HitBuildingFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeT
case DataModification::eAdded:
case DataModification::eModified:
{
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
break;
}
case DataModification::eRemoved:
m_chargeTypes.remove(data.id());
m_chargeTypes.remove(data.id);
break;
}
}
@@ -373,12 +373,12 @@ void HitBuildingFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeT
void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
{
QJsonParseError parseError;
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties()), &parseError);
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties), &parseError);
if (parseError.error != QJsonParseError::NoError)
{
INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
<< data.id()
<< data.id
<< ". Reason: "
<< parseError.errorString()
<< "; JSON: "
@@ -400,17 +400,17 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage
}
}
if (m_mainStructureElements.contains(data.id()) && !inExercise)
m_mainStructureElements.remove(data.id());
if (m_mainStructureElements.contains(data.id) && !inExercise)
m_mainStructureElements.remove(data.id);
if (!inExercise)
return;
bool isOutdoor = true;
for (const InfrastructureManagement::StructureElement &structureElement : std::as_const(data.elements()))
for (const InfrastructureManagement::StructureElement &structureElement : std::as_const(data.elements))
{
if (structureElement.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorCamera)
if (structureElement.mountingPointTypeId != InfrastructureManagement::MountingPointType::OutdoorCamera)
{
isOutdoor = false;
break;
@@ -423,12 +423,12 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage
{
case DataModification::eAdded:
case DataModification::eModified:
m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id())
: QString::fromStdString(data.description());
m_mainStructureElements[data.id] = data.structureElementTypeId == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id)
: QString::fromStdString(data.description);
break;
case DataModification::eRemoved:
m_mainStructureElements.remove(data.id());
m_mainStructureElements.remove(data.id);
break;
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp
+6 -6
View File
@@ -187,13 +187,13 @@ void HitEffectSimulationFilter::updateFilterString()
void HitEffectSimulationFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
{
if (data.id() < 1)
if (data.id < 1)
return;
if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) == ProjectDataManagement::GearClass::DuelSim)
if (m_pdmDtc->gearClassFromChargeTypeId(data.id) == ProjectDataManagement::GearClass::GearClass_DuelSim)
return;
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
return;
@@ -202,12 +202,12 @@ void HitEffectSimulationFilter::onChargeTypeChanged(const ProjectDataManagement:
case DataModification::eAdded:
case DataModification::eModified:
{
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
break;
}
case DataModification::eRemoved:
m_chargeTypes.remove(data.id());
m_chargeTypes.remove(data.id);
break;
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.cpp
+3 -3
View File
@@ -46,7 +46,7 @@ bool MarkerFilter::init(std::shared_ptr<OperatorManagement::Interface::Dtc> opmD
QMap<qint32, OperatorManagement::User> users = opmDtc->users();
m_users.clear();
for (auto it = users.constBegin(); it != users.constEnd(); ++it)
m_users.insert(static_cast<int>(it.value().id()), QString::fromStdString(it.value().name()));
m_users.insert(static_cast<int>(it.value().id), QString::fromStdString(it.value().name));
connect(opmDtc.get(), &OperatorManagement::Interface::Dtc::userChanged,
this, &MarkerFilter::onUserChanged);
}
@@ -151,11 +151,11 @@ void MarkerFilter::onUserChanged(const OperatorManagement::User &data, DataModif
{
case DataModification::eAdded:
case DataModification::eModified:
m_users[data.id()] = QString::fromStdString(data.name());
m_users[data.id] = QString::fromStdString(data.name);
break;
case DataModification::eRemoved:
m_users.remove(data.id());
m_users.remove(data.id);
break;
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.cpp
+12 -12
View File
@@ -46,7 +46,7 @@ bool RadioCnrFilter::init(const std::shared_ptr<AudioVideoManagement::Interface:
std::function<bool(const AudioVideoManagement::CnrTvcProfile &data)> cb = [this](const AudioVideoManagement::CnrTvcProfile &data)
{
if (data.exerciseId() == m_exerciseId && data.operatorId() == m_operatorId)
if (data.exerciseId == m_exerciseId && data.operatorId == m_operatorId)
{
onCnrTvcProfileChanged(data, DataModification::eAdded);
return true;
@@ -153,7 +153,7 @@ void RadioCnrFilter::updateFilterString()
void RadioCnrFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcProfile &data, DataModification modType)
{
if (data.exerciseId() != m_exerciseId || data.operatorId() != m_operatorId)
if (data.exerciseId != m_exerciseId || data.operatorId != m_operatorId)
return;
switch (modType)
@@ -189,12 +189,12 @@ void RadioCnrFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcPr
m_avmDtc->cnrConfigs([this, data](const AudioVideoManagement::CnrConfig &cnrConfig)
{
for (const AudioVideoManagement::CnrTvcProfileData &current : data.data())
for (const AudioVideoManagement::CnrTvcProfileData &current : data.data)
{
if (current.radioSystemId() != AudioVideoManagement::RadioSystem::Cnr || cnrConfig.id() != current.radioCircuitId())
if (current.radioSystemId != AudioVideoManagement::RadioSystem::Cnr || cnrConfig.id != current.radioCircuitId)
continue;
m_streams.insert(current.radioCircuitId(), QString::fromStdString(cnrConfig.radioCircuit()));
m_streams.insert(current.radioCircuitId, QString::fromStdString(cnrConfig.radioCircuit));
break;
}
@@ -212,7 +212,7 @@ void RadioCnrFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcPr
{
AudioVideoManagement::CnrConfig dummy;
dummy.id(currentKey);
dummy.id = currentKey;
onCnrConfigChanged(dummy, DataModification::eRemoved);
}
@@ -229,13 +229,13 @@ void RadioCnrFilter::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &d
{
case DataModification::eModified:
{
if (!m_streams.contains(data.id()))
if (!m_streams.contains(data.id))
return;
QString temp = m_streams.value(data.id());
QString temp = m_streams.value(data.id);
QVariantList attributeValues = attribute(RadioCnrEventFactory::s_radioCircuit).values();
m_streams[data.id()] = QString::fromStdString(data.radioCircuit());
m_streams[data.id] = QString::fromStdString(data.radioCircuit);
for (const QVariant &attributeValue : attributeValues)
{
@@ -243,7 +243,7 @@ void RadioCnrFilter::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &d
continue;
removeAttributeValue(RadioCnrEventFactory::s_radioCircuit, attributeValue);
insertAttributeValue(RadioCnrEventFactory::s_radioCircuit, QVariant::fromValue(m_streams.value(data.id())));
insertAttributeValue(RadioCnrEventFactory::s_radioCircuit, QVariant::fromValue(m_streams.value(data.id)));
break;
}
@@ -254,10 +254,10 @@ void RadioCnrFilter::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &d
}
case DataModification::eRemoved:
{
if (!m_streams.contains(data.id()))
if (!m_streams.contains(data.id))
return;
QString temp = m_streams.take(data.id());
QString temp = m_streams.take(data.id);
QVariantList attributeValues = attribute(RadioCnrEventFactory::s_radioCircuit).values();
for (const QVariant &attributeValue : attributeValues)
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.cpp
+12 -12
View File
@@ -44,7 +44,7 @@ bool RadioTvcFilter::init(std::shared_ptr<AudioVideoManagement::Interface::Dtc>
std::function<bool(const AudioVideoManagement::CnrTvcProfile &data)> cb = [this](const AudioVideoManagement::CnrTvcProfile &data)
{
if (data.exerciseId() == m_exerciseId && data.operatorId() == m_operatorId)
if (data.exerciseId == m_exerciseId && data.operatorId == m_operatorId)
{
onCnrTvcProfileChanged(data, DataModification::eAdded);
return true;
@@ -147,7 +147,7 @@ void RadioTvcFilter::updateFilterString()
void RadioTvcFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcProfile &data, DataModification modType)
{
if (data.exerciseId() != m_exerciseId || data.operatorId() != m_operatorId)
if (data.exerciseId != m_exerciseId || data.operatorId != m_operatorId)
return;
switch (modType)
@@ -183,12 +183,12 @@ void RadioTvcFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcPr
m_avmDtc->tvcConfigs([this, data](const AudioVideoManagement::TvcConfig &tvcConfig)
{
for (const AudioVideoManagement::CnrTvcProfileData &current : data.data())
for (const AudioVideoManagement::CnrTvcProfileData &current : data.data)
{
if (current.radioSystemId() != AudioVideoManagement::RadioSystem::Tvc || tvcConfig.id() != current.radioCircuitId())
if (current.radioSystemId != AudioVideoManagement::RadioSystem::Tvc || tvcConfig.id != current.radioCircuitId)
continue;
m_streams.insert(current.radioCircuitId(), QString::fromStdString(tvcConfig.radioCircuit()));
m_streams.insert(current.radioCircuitId, QString::fromStdString(tvcConfig.radioCircuit));
break;
}
@@ -206,7 +206,7 @@ void RadioTvcFilter::onCnrTvcProfileChanged(const AudioVideoManagement::CnrTvcPr
{
AudioVideoManagement::TvcConfig dummy;
dummy.id(currentKey);
dummy.id = currentKey;
onTvcConfigChanged(dummy, DataModification::eRemoved);
}
@@ -223,13 +223,13 @@ void RadioTvcFilter::onTvcConfigChanged(const AudioVideoManagement::TvcConfig &d
{
case DataModification::eModified:
{
if (!m_streams.contains(data.id()))
if (!m_streams.contains(data.id))
return;
QString temp = m_streams.value(data.id());
QString temp = m_streams.value(data.id);
QVariantList attributeValues = attribute(RadioTvcEventFactory::s_radioCircuit).values();
m_streams[data.id()] = QString::fromStdString(data.radioCircuit());
m_streams[data.id] = QString::fromStdString(data.radioCircuit);
for (const QVariant &attributeValue : attributeValues)
{
@@ -237,7 +237,7 @@ void RadioTvcFilter::onTvcConfigChanged(const AudioVideoManagement::TvcConfig &d
continue;
removeAttributeValue(RadioTvcEventFactory::s_radioCircuit, attributeValue);
insertAttributeValue(RadioTvcEventFactory::s_radioCircuit, QVariant::fromValue(m_streams.value(data.id())));
insertAttributeValue(RadioTvcEventFactory::s_radioCircuit, QVariant::fromValue(m_streams.value(data.id)));
break;
}
@@ -248,10 +248,10 @@ void RadioTvcFilter::onTvcConfigChanged(const AudioVideoManagement::TvcConfig &d
}
case DataModification::eRemoved:
{
if (!m_streams.contains(data.id()))
if (!m_streams.contains(data.id))
return;
QString temp = m_streams.take(data.id());
QString temp = m_streams.take(data.id);
QVariantList attributeValues = attribute(RadioTvcEventFactory::s_radioCircuit).values();
for (const QVariant &attributeValue : attributeValues)
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp
+9 -9
View File
@@ -162,31 +162,31 @@ void WeaponAssignmentFilter::updateFilterString()
void WeaponAssignmentFilter::onGearTypeChanged(const ProjectDataManagement::GearType &data, DataModification modType)
{
if (data.gearClassId() != ProjectDataManagement::GearClass::DuelSim || data.name() == "N/A")
if (data.gearClassId != ProjectDataManagement::GearClass::GearClass_DuelSim || data.name == "N/A")
return;
switch (modType)
{
case DataModification::eAdded:
case DataModification::eModified:
m_gearTypes[data.id()] = QString::fromStdString(data.name());
m_gearTypes[data.id] = QString::fromStdString(data.name);
break;
case DataModification::eRemoved:
m_gearTypes.remove(data.id());
m_gearTypes.remove(data.id);
break;
}
}
void WeaponAssignmentFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType)
{
if (data.id() < 1)
if (data.id < 1)
return;
if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim)
if (m_pdmDtc->gearClassFromChargeTypeId(data.id) != ProjectDataManagement::GearClass::GearClass_DuelSim)
return;
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();
const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties).toUtf8()).object();
if (properties.contains(QStringLiteral("isDummy")) && properties.value(QStringLiteral("isDummy")).toBool())
return;
@@ -195,12 +195,12 @@ void WeaponAssignmentFilter::onChargeTypeChanged(const ProjectDataManagement::Ch
case DataModification::eAdded:
case DataModification::eModified:
{
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id());
m_chargeTypes[data.id()] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id()) : shortName;
const QString shortName = m_pdmDtc->trChargeTypeShortName(data.id);
m_chargeTypes[data.id] = shortName.isEmpty() ? m_pdmDtc->trChargeTypeName(data.id) : shortName;
break;
}
case DataModification::eRemoved:
m_chargeTypes.remove(data.id());
m_chargeTypes.remove(data.id);
break;
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.h
+1 -2
View File
@@ -33,8 +33,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
FilterDialog *m_dialog { nullptr };
QPushButton *m_button { nullptr };
@@ -87,6 +85,7 @@ private:
QString m_menuGroup;
Ui::FilterDialog *m_ui { nullptr };
NGL::INGLLogger &m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.h
+2 -2
View File
@@ -58,8 +58,6 @@ public:
int row() const { return m_parent ? m_parent->m_children.indexOf(const_cast<FilterModelItem *>(this)) : 0; }
private:
NGL::INGLLogger &m_logger;
EventType m_eventType;
FilterAttribute::Type m_attributeType;
QString m_name;
@@ -113,6 +111,8 @@ private:
private:
QHash<EventType, AbstractEventFilter *> m_filter;
FilterModelItem *m_rootItem { nullptr };
NGL::INGLLogger &m_logger;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.cpp
+6 -5
View File
@@ -10,7 +10,7 @@
#include <LtsSession/lts_session_data.h>
#include <ProjectDataManagement/pdm_translation.h>
#include <AudioVideoManagement/stream_name_mapping.h>
#include <MarkerManagement/Common/mrk_apply_filter.h>
#include <Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h>
#include <MarkerManagement/mrk_data_plugin_interface.h>
#include <SituationReplay/srp_gui_plugin_interface.h>
#include <PluginInterfaces/gui_plugin_interface.h>
@@ -29,6 +29,7 @@ namespace Timeline
ItemInfoDialog::ItemInfoDialog(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
, m_ui(new Ui::ItemInfoDialog)
, m_logger(getLogger("TimelineItemInfoDialog"))
{
setOnlineHelpFilename(QStringLiteral("Timeline-Items"));
@@ -459,9 +460,9 @@ void ItemInfoDialog::updateMarker(const MarkerManagement::Marker &data, DataModi
QJsonObject obj = m_item->properties();
QJsonValue val;
DEBUG_LOG(m_logger) << "ShowDetailsDialog::updateMarker"
<< " id=" << data.id()
<< " id=" << data.id
<< " id Marke=" << m_item->markerDbId()
<< " note=" << data.note();
<< " note=" << data.note;
for(int i=0 ; i < obj.keys().length() ; i++)
{
@@ -469,9 +470,9 @@ void ItemInfoDialog::updateMarker(const MarkerManagement::Marker &data, DataModi
<< " " << (obj.keys().at(i))
<< " value=" << obj[obj.keys().at(i)].toString();
}
if ( data.id() == m_item->markerDbId())
if ( data.id == m_item->markerDbId())
{
QString str = QString::fromStdString (data.note());
QString str = QString::fromStdString (data.note);
val = QJsonValue(str);
obj.insert (QStringLiteral("MarkerNote"), QJsonValue(val));
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.cpp
+1
View File
@@ -32,6 +32,7 @@ ItemListDialog::ItemListDialog(
, m_menuGroup(menuGroup)
, m_model(new ItemListModel(model, m_session, ppmDtc, pdmDtc, ismDtc, opmDtc, avmDtc, this))
, m_ui(new Ui::ItemListDialog)
, m_logger(getLogger("ItemListDialog"))
{
m_ui->setupUi(this);
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp
+11 -10
View File
@@ -70,6 +70,7 @@ ItemListModel::ItemListModel(TimelineModel *model,
, m_ismDtc(ismDtc)
, m_opmDtc(opmDtc)
, m_avmDtc(avmDtc)
, m_logger(getLogger("ItemListModel"))
{}
@@ -105,9 +106,9 @@ QString ItemListModel::getDisplayName(const QString &internalName) const
QString result(internalName);
m_avmDtc->streamNames(static_cast<std::function<bool(const AudioVideoManagement::StreamName &)>>([&result, internalName](const AudioVideoManagement::StreamName &streamName)
{
if (QString::fromStdString(streamName.internalName()) == internalName)
if (QString::fromStdString(streamName.internalName) == internalName)
{
result = QString::fromStdString(streamName.displayName());
result = QString::fromStdString(streamName.displayName);
return true;
}
return false;
@@ -165,16 +166,16 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
return {};
else if (participantItem->isPartyIdSet())
{
if (item->type() == EventType::HitBuilding && m_ppmDtc->party(participantItem->partyId()).id() == 0)
if (item->type() == EventType::HitBuilding && m_ppmDtc->party(participantItem->partyId()).id == 0)
return {};
return ParticipantManagement::trPartyName(m_ppmDtc->party(participantItem->partyId()).name());
return ParticipantManagement::trPartyName(m_ppmDtc->party(participantItem->partyId()).name);
}
try
{
if (item->type() == EventType::HitBuilding)
return {};
int partyId = static_cast<const ParticipantTrack &>(m_model->track(item->parentTrackId())).partyId();
return ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name());
return ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name);
}
catch (const QString &str) { DEBUG_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
catch (...) { DEBUG_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << item->id(); }
@@ -331,7 +332,7 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
}
case Columns::Operator:
{
const auto ele = QString::fromStdString(m_opmDtc->user(obj.value(QStringLiteral("Operator")).toInt()).name());
const auto ele = QString::fromStdString(m_opmDtc->user(obj.value(QStringLiteral("Operator")).toInt()).name);
if (ele.length() <= 0)
return tr("unknown");
return ele;
@@ -411,17 +412,17 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
void ItemListModel::updateMarker(const MarkerManagement::Marker &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "ShowDetailsDialog::updateMarker"
<< " id=" << data.id()
<< " note=" << data.note();
<< " id=" << data.id
<< " note=" << data.note;
for (EventItemPtr &itemPtr : m_items)
{
DEBUG_LOG(m_logger) << "id=" << itemPtr.get()->id()
<< " dbId=" << itemPtr.get()->markerDbId();
if ( itemPtr.get()->markerDbId() == data.id())
if ( itemPtr.get()->markerDbId() == data.id)
{
QJsonObject properties = itemPtr.get()->properties();
QString str = QString::fromStdString (data.note());
QString str = QString::fromStdString (data.note);
QJsonValue val = QJsonValue(str);
properties.insert (QStringLiteral("MarkerNote"), QJsonValue(val));
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.cpp
+1
View File
@@ -97,6 +97,7 @@ QVector<EventType> TimelineLegend::possibleEvents()
TimelineLegend::TimelineLegend(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
, m_ui(new Ui::TimelineLegend)
, m_logger(getLogger("TimelineLegend"))
{
m_ui->setupUi(this);
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp
+15 -14
View File
@@ -89,6 +89,7 @@ TimelineDialog::TimelineDialog(
, m_srmIfc(srmIfc)
, m_liveTimer(new QTimer(this))
, m_ui(new Ui::TimelineDialog)
, m_logger(getLogger("TimelineDialog"))
{
INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
@@ -115,19 +116,19 @@ TimelineDialog::TimelineDialog(
throw "EXM-DTC unavailable";
ExerciseManagement::Exercise exc = exmDtc->exercise(session->exerciseId());
if (exc.id() == 0)
if (exc.id == 0)
throw "exercise not found";
m_exerciseStart = exc.startTime() > 0 ? exc.startTime() : exc.beginTime();
m_exerciseEnd = exc.stopTime() > 0 ? exc.stopTime() : exc.endTime();
m_exerciseStart = exc.startTime > 0 ? exc.startTime : exc.beginTime;
m_exerciseEnd = exc.stopTime > 0 ? exc.stopTime : exc.endTime;
m_range.minStartMSecs = m_exerciseStart;
m_range.minStartSecs = m_range.minStartMSecs / 1000LL;
if (m_exerciseEnd == 0)
throw QStringLiteral("both end time and stop time of exercise %1 are unknown").arg(exc.id());
throw QStringLiteral("both end time and stop time of exercise %1 are unknown").arg(exc.id);
if (m_session->app() == LtsAppDescriptor::App::ThpSituationReplay ||
exc.state() == ExerciseManagement::ExerciseState::Paused ||
exc.state() == ExerciseManagement::ExerciseState::Stopped)
exc.state == ExerciseManagement::ExerciseState::Paused ||
exc.state == ExerciseManagement::ExerciseState::Stopped)
{
m_range.maxEndSecs = m_exerciseEnd / 1000LL;
m_range.maxEndMSecs = static_cast<qint64>(m_range.maxEndSecs) * 1000LL;
@@ -181,7 +182,7 @@ TimelineDialog::TimelineDialog(
resizeTimelineProgress();
if (!static_cast<CameraVideoFilter *>(m_model->filter(EventType::CameraVideo))->init(m_avmDtc, m_ismDtc, m_avmDataIfc, m_avmIfc, exc.id()))
if (!static_cast<CameraVideoFilter *>(m_model->filter(EventType::CameraVideo))->init(m_avmDtc, m_ismDtc, m_avmDataIfc, m_avmIfc, exc.id))
WARNING_LOG(m_logger) << "initializing CameraVideoFilter failed";
if (!static_cast<FireEventFilter *>(m_model->filter(EventType::FireEvent))->init(m_pdmDtc))
WARNING_LOG(m_logger) << "initializing FireEventFilter failed";
@@ -193,16 +194,16 @@ TimelineDialog::TimelineDialog(
WARNING_LOG(m_logger) <<"initializing HitEffectSimulationFilter failed";
if (!static_cast<MarkerFilter *>(m_model->filter(EventType::Marker))->init(m_opmDtc))
WARNING_LOG(m_logger) << "initializing MarkerFilter failed";
if (!static_cast<RadioCnrFilter *>(m_model->filter(EventType::RadioCnr))->init(m_avmDtc, exc.id(), m_model))
if (!static_cast<RadioCnrFilter *>(m_model->filter(EventType::RadioCnr))->init(m_avmDtc, exc.id, m_model))
WARNING_LOG(m_logger) << "initializing RadioCnrFilter failed";
if (!static_cast<RadioTvcFilter *>(m_model->filter(EventType::RadioTvc))->init(m_avmDtc, exc.id(), m_model))
if (!static_cast<RadioTvcFilter *>(m_model->filter(EventType::RadioTvc))->init(m_avmDtc, exc.id, m_model))
WARNING_LOG(m_logger) << "initializing RadioTvcFilter failed";
if (!static_cast<WeaponAssignmentFilter *>(m_model->filter(EventType::WeaponAssignment))->init(m_pdmDtc))
WARNING_LOG(m_logger) << "initializing WeaponAssignmentFilter failed";
if (!static_cast<CameraVideoFilter *>(m_model->tempFilter(EventType::CameraVideo))->init(m_avmDtc, m_ismDtc, m_avmDataIfc, m_avmIfc, exc.id()))
if (!static_cast<CameraVideoFilter *>(m_model->tempFilter(EventType::CameraVideo))->init(m_avmDtc, m_ismDtc, m_avmDataIfc, m_avmIfc, exc.id))
WARNING_LOG(m_logger) << "initializing CameraVideoFilter failed";
if (!static_cast<FireEventFilter *>(m_model->tempFilter(EventType::FireEvent))->init(m_pdmDtc))
WARNING_LOG(m_logger) << "initializing FireEventFilter failed";
@@ -214,9 +215,9 @@ TimelineDialog::TimelineDialog(
WARNING_LOG(m_logger) <<"initializing HitEffectSimulationFilter failed";
if (!static_cast<MarkerFilter *>(m_model->tempFilter(EventType::Marker))->init(m_opmDtc))
WARNING_LOG(m_logger) << "initializing MarkerFilter failed";
if (!static_cast<RadioCnrFilter *>(m_model->tempFilter(EventType::RadioCnr))->init(m_avmDtc, exc.id(), m_model))
if (!static_cast<RadioCnrFilter *>(m_model->tempFilter(EventType::RadioCnr))->init(m_avmDtc, exc.id, m_model))
WARNING_LOG(m_logger) << "initializing RadioCnrFilter failed";
if (!static_cast<RadioTvcFilter *>(m_model->tempFilter(EventType::RadioTvc))->init(m_avmDtc, exc.id(), m_model))
if (!static_cast<RadioTvcFilter *>(m_model->tempFilter(EventType::RadioTvc))->init(m_avmDtc, exc.id, m_model))
WARNING_LOG(m_logger) << "initializing RadioTvcFilter failed";
if (!static_cast<WeaponAssignmentFilter *>(m_model->tempFilter(EventType::WeaponAssignment))->init(m_pdmDtc))
WARNING_LOG(m_logger) << "initializing WeaponAssignmentFilter failed";
@@ -733,7 +734,7 @@ void TimelineDialog::onStartReplay()
{
rp = m_coreDtc->replayPartition(replayId);
if (rp.id() == replayId)
if (rp.id == replayId)
{
found = true;
break;
@@ -783,7 +784,7 @@ void TimelineDialog::onStartReplay()
return;
}
LtsSession::LtsSession *replayAppSession = m_replayApp->m_sessionManager->getSession(IDL::PartitionType::Replay, rp.id());
LtsSession::LtsSession *replayAppSession = m_replayApp->m_sessionManager->getSession(IDL::PartitionType::Replay, rp.id);
if (replayAppSession == nullptr)
{
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session"));
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp
+85 -85
View File
@@ -400,10 +400,10 @@ void TimelineModel::getParticipantTracks()
for (ParticipantManagement::Party party : m_ppmDtc->partys())
{
DEBUG_LOG(m_logger) << "party id: " << party.id() << ", name: " << party.name();
DEBUG_LOG(m_logger) << "party id: " << party.id << ", name: " << party.name;
try
{
m_modelState.partys.insert(party.id(), Party(party.id(), addTrack(rootTrack().id(), PartyTrack(ParticipantManagement::trPartyName(party.name()), party.id()))));
m_modelState.partys.insert(party.id, Party(party.id, addTrack(rootTrack().id(), PartyTrack(ParticipantManagement::trPartyName(party.name), party.id))));
}
catch (const QString &msg)
{
@@ -417,33 +417,33 @@ void TimelineModel::getParticipantTracks()
QVector<int> superiorIds;
auto cb = [this, &superiorIds](const ParticipantManagement::Participant &participant)
{
Q_ASSERT(participant.id() != 0);
Q_ASSERT(participant.id != 0);
if (participant.isDeleted())
if (participant.isDeleted)
return;
int equipmentNumber = participant.equipmentNumber().is_set() ? participant.equipmentNumber().get() : 0;
int equipmentNumber = participant.equipmentNumber.has_value() ? participant.equipmentNumber.get() : 0;
if (QString::fromStdString(participant.designator()).contains(QStringLiteral("Ausb")))
DEBUG_LOG(m_logger) << "FOUND Ausb! " << participant.id();
if (QString::fromStdString(participant.designator).contains(QStringLiteral("Ausb")))
DEBUG_LOG(m_logger) << "FOUND Ausb! " << participant.id;
QVector<int> inferiorIds;
std::transform(participant.inferiorIds().cbegin(), participant.inferiorIds().cend(), std::back_inserter(inferiorIds),
std::transform(participant.inferiorIds.cbegin(), participant.inferiorIds.cend(), std::back_inserter(inferiorIds),
[](int32_t id) { return (int)id; });
m_modelState.participants.insert(
participant.id(),
Participant(participant.id(), equipmentNumber, participant.partyId(), QString::fromStdString(participant.designator()),
0, participant.superiorId(), std::move(inferiorIds))
participant.id,
Participant(participant.id, equipmentNumber, participant.partyId, QString::fromStdString(participant.designator),
0, participant.superiorId, std::move(inferiorIds))
);
if (participant.superiorId() == 0)
if (participant.superiorId == 0)
{
QStringList infs;
std::transform(participant.inferiorIds().cbegin(), participant.inferiorIds().cend(), std::back_inserter(infs),
std::transform(participant.inferiorIds.cbegin(), participant.inferiorIds.cend(), std::back_inserter(infs),
[](int32_t id) { return QString::number(id); });
DEBUG_LOG(m_logger) << "sup " << participant.id() << " has infs: " << infs.join(QStringLiteral(", "));
superiorIds += participant.id();
DEBUG_LOG(m_logger) << "sup " << participant.id << " has infs: " << infs.join(QStringLiteral(", "));
superiorIds += participant.id;
}
};
m_ppmDtc->participants(cb);
@@ -516,7 +516,7 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
if (m_isCurrentlyUpdating)
return;
qint64 time = marker.timeStamp() - marker.timeStampOffset();
qint64 time = marker.timeStamp - marker.timeStampOffset;
try
{
@@ -550,13 +550,13 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
}
catch (const QString &errMsg)
{
ERROR_LOG(m_logger) << "Marker " << marker.id() << " has invalid properties: " << errMsg;
ERROR_LOG(m_logger) << "Marker " << marker.id << " has invalid properties: " << errMsg;
}
EventItemPtr markerEvent = factory->createItem(time, 0, properties, LtsUtils::QPoint3D(marker.position().lon(), marker.position().lat(), marker.position().z()));
markerEvent->m_markerDbId = marker.id();
EventItemPtr markerEvent = factory->createItem(time, 0, properties, LtsUtils::QPoint3D(marker.position.lon, marker.position.lat, marker.position.z));
markerEvent->m_markerDbId = marker.id;
m_modelState.markerTimes += time;
if (!filter->check(*markerEvent.get()))
@@ -566,12 +566,12 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
}
else if (mod == DataModification::eModified)
{
MarkerItem &mi = dynamic_cast<MarkerItem &>(itemWithMarkerDbId(marker.id()));
MarkerItem &mi = dynamic_cast<MarkerItem &>(itemWithMarkerDbId(marker.id));
std::replace(m_modelState.markerTimes.begin(), m_modelState.markerTimes.end(), mi.startTime(), time);
mi.setStartTime(marker.timeStamp() - marker.timeStampOffset());
mi.setStartTime(marker.timeStamp - marker.timeStampOffset);
mi.setProperties(eventPropertiesFromMarker(marker));
@@ -579,7 +579,7 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
}
catch (const QString &msg)
{
ERROR_LOG(m_logger) << "cannot add/modify ("<<(int)mod<<") marker with id "<<marker.id()<<": " << msg;
ERROR_LOG(m_logger) << "cannot add/modify ("<<(int)mod<<") marker with id "<<marker.id<<": " << msg;
return;
}
@@ -597,7 +597,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
try
{
properties = objectFromStdString(eemEvent.properties());
properties = objectFromStdString(eemEvent.properties);
}
catch (const QString &errMsg)
{
@@ -607,10 +607,10 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
auto updateItem = [this, &properties, &eemEvent](Item &i, Track &t)
{
int type = (int)eemEvent.eventTypeId().underlying();
if (type == ProjectDataManagement::PdmEventType::EventType_CameraVideo
|| type == ProjectDataManagement::PdmEventType::EventType_RadioTvc
|| type == ProjectDataManagement::PdmEventType::EventType_RadioCnr)
int type = (int)eemEvent.eventTypeId;
if (type == static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CameraVideo)
|| type == static_cast<int>(ProjectDataManagement::PdmEventType::EventType_RadioTvc)
|| type == static_cast<int>(ProjectDataManagement::PdmEventType::EventType_RadioCnr))
{
int duration = properties[QStringLiteral("duration")].toInt(0);
@@ -626,7 +626,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
try
{
const QVector<int> itemIds(findItemIdsForDbId(eemEvent.id()));
const QVector<int> itemIds(findItemIdsForDbId(eemEvent.id));
for (int id : itemIds)
{
@@ -668,7 +668,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
for (ItemPtr &itemPtr : bi.items())
{
EventItem &ei2 = static_cast<EventItem &>(*itemPtr.get());
if (ei2.dbId() == eemEvent.id())
if (ei2.dbId() == eemEvent.id)
{
updateItem(ei2, track(bi.parentTrackId()));
DEBUG_LOG(m_logger) << "done2";
@@ -717,13 +717,13 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
}
qint64 start = eemEvent.sampleTime();
qint64 start = eemEvent.sampleTime;
DEBUG_LOG(m_logger) << "start = " << start;
EventType eventType = static_cast<EventType>(static_cast<int>(eemEvent.eventTypeId().underlying()));
if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline ||
eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline)
EventType eventType = static_cast<EventType>(static_cast<int>(eemEvent.eventTypeId));
if (eemEvent.eventTypeId == ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline ||
eemEvent.eventTypeId == ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline)
eventType = EventType::CrossBorderline;
EventItemPtr eventItem;
@@ -734,7 +734,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
auto const & evt = eemEvent;
eventItem = createItem(evt.id(), evt.sampleTime(), properties, (int)eemEvent.eventTypeId().underlying(), evt.participantId(), evt.partyId(), evt.equipmentNumber(), evt.position().lon(), evt.position().lat(), evt.position().z());
eventItem = createItem(evt.id, evt.sampleTime, properties, (int)eemEvent.eventTypeId, evt.participantId, evt.partyId, evt.equipmentNumber, evt.position.lon, evt.position.lat, evt.position.z);
if (!eventFilter->check(*eventItem.get()))
{
@@ -782,9 +782,9 @@ void TimelineModel::onStreamListReceived(const QMap<QString, QString> &streamLis
const auto streamsDtc = m_avmDtc->streams();
for(auto value : streamsDtc.values())
{
if(streamList.values().contains(QString::fromStdString(value.name())))
if(streamList.values().contains(QString::fromStdString(value.name)))
continue;
addTrack(m_videosRootTrackId, VideoTrack(QString::fromStdString(value.name())));
addTrack(m_videosRootTrackId, VideoTrack(QString::fromStdString(value.name)));
}
}
@@ -1340,9 +1340,9 @@ QJsonObject TimelineModel::eventPropertiesFromMarker(const MarkerManagement::Mar
bool isSfx = false;
QStringList streamNames;
for (const MarkerManagement::MarkerDescription &md : marker.descriptions())
for (const MarkerManagement::MarkerDescription &md : marker.descriptions)
{
switch (md.markerType().underlying())
switch (md.markerType)
{
case MarkerManagement::MarkerType::Situation:
{
@@ -1353,30 +1353,30 @@ QJsonObject TimelineModel::eventPropertiesFromMarker(const MarkerManagement::Mar
{
isGfx = true;
streamNames += QString::fromStdString(md.content());
streamNames += QString::fromStdString(md.content);
break;
}
case MarkerManagement::MarkerType::Audio:
{
isSfx = true;
streamNames += QString::fromStdString(md.content());
streamNames += QString::fromStdString(md.content);
break;
}
default:
{
WARNING_LOG(m_logger) << "Marker " << marker.id() << "'s description has an invalid marker type: " << (int)md.markerType().underlying();
WARNING_LOG(m_logger) << "Marker " << marker.id << "'s description has an invalid marker type: " << (int)md.markerType;
break;
}
}
}
return QJsonObject({
{ QStringLiteral("MarkerName"), QString::fromStdString(marker.name()) }
, { QStringLiteral("MarkerNote"), QString::fromStdString(marker.note()) }
, { QStringLiteral("Operator"), marker.operatorId() }
, { QStringLiteral("MarkerOffset"), marker.timeStampOffset() }
, { QStringLiteral("MapSettings"), QString::fromStdString(marker.mapSettings()) }
, { QStringLiteral("Filter"), QString::fromStdString(marker.filter()) }
{ QStringLiteral("MarkerName"), QString::fromStdString(marker.name) }
, { QStringLiteral("MarkerNote"), QString::fromStdString(marker.note) }
, { QStringLiteral("Operator"), marker.operatorId }
, { QStringLiteral("MarkerOffset"), QJsonValue(static_cast<double>(marker.timeStampOffset)) }
, { QStringLiteral("MapSettings"), QString::fromStdString(marker.mapSettings) }
, { QStringLiteral("Filter"), QString::fromStdString(marker.filter) }
, { QStringLiteral("IsSituationType"), isSit }
, { QStringLiteral("IsVideoType"), isGfx }
, { QStringLiteral("IsAudioType"), isSfx }
@@ -1415,7 +1415,7 @@ std::vector<EventItemPtr> TimelineModel::getMarkerItems(const Filters &filters,
if (limit != -1 && count > limit)
return;
qint64 time = data.timeStamp() - data.timeStampOffset();
qint64 time = data.timeStamp - data.timeStampOffset;
if (rangeOnly && (time < m_view->startTime() || time > m_view->endTime()))
return;
@@ -1426,17 +1426,17 @@ std::vector<EventItemPtr> TimelineModel::getMarkerItems(const Filters &filters,
}
catch (const QString &errMsg)
{
ERROR_LOG(m_logger) << "Marker " << data.id() << " has invalid properties: " << errMsg;
ERROR_LOG(m_logger) << "Marker " << data.id << " has invalid properties: " << errMsg;
}
EventItemPtr markerEvent = factory->createItem(time, 0, properties, LtsUtils::QPoint3D(data.position().lon(),
data.position().lat(),
data.position().z()));
EventItemPtr markerEvent = factory->createItem(time, 0, properties, LtsUtils::QPoint3D(data.position.lon,
data.position.lat,
data.position.z));
if (filter->check(*markerEvent.get()))
{
markerEvent->m_markerDbId = data.id();
markerEvent->m_markerDbId = data.id;
ret.push_back(std::move(markerEvent));
count++;
}
@@ -1472,8 +1472,8 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
int msei = cameraVideoItem.mainStructureElementId();
const QString &streamName = cameraVideoItem.internalStreamName();
InfrastructureManagement::StructureElement structureElement;
m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId(), structureElement);
bool isOutdoorCameraEvent = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera;
m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId, structureElement);
bool isOutdoorCameraEvent = structureElement.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera;
if (!m_mainStructureElements.contains(msei) && msei != 0 )
throw QStringLiteral("camera video event with msei %1 is not inside msei list (maybe building not mapped into current exercise)").arg(msei);
@@ -1993,9 +1993,9 @@ void TimelineModel::getOfflineVideoTracks()
QStringList streamNames;
QStringList mvsNames;
for(auto s : streamsDtc)
streamNames.append(QString::fromStdString(s.name()));
streamNames.append(QString::fromStdString(s.name));
for(auto s : streamsMvs)
mvsNames.append(QString::fromStdString(s.streamName()));
mvsNames.append(QString::fromStdString(s.streamName));
QMapIterator<QString, QString> it(streamList);
while (it.hasNext())
@@ -2053,7 +2053,7 @@ void TimelineModel::getBuildings()
if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building
if (mse.structureElementTypeId != InfrastructureManagement::StructureElementType::Building
|| !m_ismDtc->isElementAssignedToExercise(mse, m_session->exerciseId()))
continue;
@@ -2071,7 +2071,7 @@ void TimelineModel::getBuildings()
int msei = mse.id();
int msei = mse.id;
QString name(m_ismDtc->getBuildingDisplayName(msei));
try
@@ -2092,18 +2092,18 @@ void TimelineModel::getBuildings()
int mappingCounter = 0;
for (const InfrastructureManagement::StructureElement &se : std::as_const(mse.elements()))
for (const InfrastructureManagement::StructureElement &se : std::as_const(mse.elements))
{
if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::MountingPoint
&& se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorCamera
&& se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorCamera)
if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::MountingPoint
&& se.mountingPointTypeId != InfrastructureManagement::MountingPointType::OutdoorCamera
&& se.mountingPointTypeId != InfrastructureManagement::MountingPointType::IndoorCamera)
continue;
m_mountingPointsToMainStructureElementMapping.insert(se.id(), msei);
m_mountingPointsToMainStructureElementMapping.insert(se.id, msei);
mappingCounter++;
}
DEBUG_LOG(m_logger) << "added building " << mse.id() << " '"<<name<<"'" << " with " << mappingCounter << " mpi-to-msei mappings";
DEBUG_LOG(m_logger) << "added building " << mse.id << " '"<<name<<"'" << " with " << mappingCounter << " mpi-to-msei mappings";
}
@@ -2125,12 +2125,12 @@ void TimelineModel::getRadioTracks()
m_avmDtc->waitForHistoricalDataCnrConfig(8000);
for (const AudioVideoManagement::CnrConfig &config : m_avmDtc->cnrConfigs())
{
if (config.exerciseId() == m_session->exerciseId())
if (config.exerciseId == m_session->exerciseId())
{
m_cnrChannelDisplayNames.insert(config.cnrChannelId(), QString::fromStdString(config.radioCircuit()));
m_cnrChannelDisplayNames.insert(config.cnrChannelId, QString::fromStdString(config.radioCircuit));
DEBUG_LOG(m_logger) << "!!!!!!!!!! config => id: " << config.id() << ", circuit: " << QString::fromStdString(config.radioCircuit())
<< ", channelId: " << config.cnrChannelId();
DEBUG_LOG(m_logger) << "!!!!!!!!!! config => id: " << config.id << ", circuit: " << QString::fromStdString(config.radioCircuit)
<< ", channelId: " << config.cnrChannelId;
}
}
@@ -2139,8 +2139,8 @@ void TimelineModel::getRadioTracks()
for (const AudioVideoManagement::CnrChannel &channel : channels)
{
const int channelId = channel.id();
const QString internalChannelName(QString::fromStdString(channel.name()));
const int channelId = channel.id;
const QString internalChannelName(QString::fromStdString(channel.name));
QString displayName;
try
@@ -2172,13 +2172,13 @@ void TimelineModel::getRadioTracks()
m_avmDtc->waitForHistoricalDataTvcConfig(8000);
for (const AudioVideoManagement::TvcConfig &config : m_avmDtc->tvcConfigs())
{
if (config.exerciseId() == m_session->exerciseId())
if (config.exerciseId == m_session->exerciseId())
{
m_tvcStreams.insert(config.tetraChannelId(), QString::fromStdString(config.radioCircuit()));
m_tvcChannelDisplayNames.insert(config.tetraChannelId(), QString::fromStdString(config.radioCircuit()));
m_tvcStreams.insert(config.tetraChannelId, QString::fromStdString(config.radioCircuit));
m_tvcChannelDisplayNames.insert(config.tetraChannelId, QString::fromStdString(config.radioCircuit));
DEBUG_LOG(m_logger) << "!!!!!!!!!! TETRA config => id: " << config.id() << ", circuit: " << QString::fromStdString(config.radioCircuit())
<< ", channelId: " << config.tetraChannelId();
DEBUG_LOG(m_logger) << "!!!!!!!!!! TETRA config => id: " << config.id << ", circuit: " << QString::fromStdString(config.radioCircuit)
<< ", channelId: " << config.tetraChannelId;
}
}
}
@@ -2188,8 +2188,8 @@ void TimelineModel::getRadioTracks()
for (const AudioVideoManagement::TvcChannel &channel : channels)
{
const int channelId = channel.id();
const QString internalChannelName(QString::fromStdString(channel.name()));
const int channelId = channel.id;
const QString internalChannelName(QString::fromStdString(channel.name));
QString displayName;
try
@@ -2230,11 +2230,11 @@ void TimelineModel::getBuildingVideoStreams()
for (auto it1 = streams.constBegin(); it1 != streams.constEnd(); ++it1)
{
if (it1->type() != AudioVideoManagement::StreamType::Video)
if (it1->type != AudioVideoManagement::StreamType::Video)
continue;
int32_t mountingPointId = it1->mountingPointId();
QString internalStreamName(QString::fromStdString(it1->name()));
int32_t mountingPointId = it1->mountingPointId;
QString internalStreamName(QString::fromStdString(it1->name));
QString streamDisplayName;
if (mountingPointId >= 0)
@@ -2247,9 +2247,9 @@ void TimelineModel::getBuildingVideoStreams()
[&streamDisplayName, mountingPointId](const AudioVideoManagement::VideoTeam &data) -> bool
{
if (data.id() == -mountingPointId)
if (data.id == -mountingPointId)
{
streamDisplayName = QString::fromStdString(data.streamName());
streamDisplayName = QString::fromStdString(data.streamName);
return true;
}
@@ -2272,8 +2272,8 @@ void TimelineModel::getBuildingVideoStreams()
int msei = it2.value();
InfrastructureManagement::StructureElement structureElement;
m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId(), structureElement);
bool isOutdoorCameraStream = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera;
m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId, structureElement);
bool isOutdoorCameraStream = structureElement.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera;
if (isOutdoorCameraStream)
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.h
-2
View File
@@ -78,8 +78,6 @@ public:
const QStringList &tableNames() const { return m_tableNames; }
private:
NGL::INGLLogger &m_logger;
friend struct TimelineTableInfosHandler;
QStringList m_tableNames;
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.cpp
+1
View File
@@ -1,4 +1,5 @@
#include "tln_timeline_progress.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_tln_timeline_progress.h"
#include "tln_item_list_model.h"
#include "tln_item_info_dialog.h"
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp
+2 -2
View File
@@ -191,8 +191,8 @@ EventType toEventType(int eventType)
case EventType::LeaveMineArea:
return EventType::LeaveMineArea;
case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline:
case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline:
case static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline):
case static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline):
return EventType::CrossBorderline;
case EventType::EnterFunctionalArea:
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h
+38 -38
View File
@@ -10,46 +10,46 @@ namespace Timeline
enum EventType
{
Unknown = ProjectDataManagement::PdmEventType::EventType_Unknown,
Hit = ProjectDataManagement::PdmEventType::EventType_Hit,
WeaponAssignment = ProjectDataManagement::PdmEventType::EventType_WeaponAssignment,
BiteMessage = ProjectDataManagement::PdmEventType::EventType_BiteMessage,
FireEvent = ProjectDataManagement::PdmEventType::EventType_FireEvent,
HitBuilding = ProjectDataManagement::PdmEventType::EventType_HitBuilding,
Manipulation = ProjectDataManagement::PdmEventType::EventType_Manipulation,
CameraVideo = ProjectDataManagement::PdmEventType::EventType_CameraVideo,
RadioCnr = ProjectDataManagement::PdmEventType::EventType_RadioCnr,
RadioTvc = ProjectDataManagement::PdmEventType::EventType_RadioTvc,
HitEffectSimulation = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation,
HitMine = ProjectDataManagement::PdmEventType::EventType_HitMine,
HitN = ProjectDataManagement::PdmEventType::EventType_HitN,
HitC = ProjectDataManagement::PdmEventType::EventType_HitC,
EnterDangerArea = ProjectDataManagement::PdmEventType::EventType_EnterDangerArea,
LeaveDangerArea = ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea,
EnterMineArea = ProjectDataManagement::PdmEventType::EventType_EnterMineArea,
LeaveMineArea = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea,
CrossBorderline = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline,
Unknown = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Unknown),
Hit = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Hit),
WeaponAssignment = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_WeaponAssignment),
BiteMessage = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_BiteMessage),
FireEvent = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_FireEvent),
HitBuilding = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitBuilding),
Manipulation = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Manipulation),
CameraVideo = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CameraVideo),
RadioCnr = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_RadioCnr),
RadioTvc = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_RadioTvc),
HitEffectSimulation = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation),
HitMine = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitMine),
HitN = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitN),
HitC = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitC),
EnterDangerArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EnterDangerArea),
LeaveDangerArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea),
EnterMineArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EnterMineArea),
LeaveMineArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_LeaveMineArea),
CrossBorderline = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline),
EnterFunctionalArea = ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea,
LeaveFunctionalArea = ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea,
EnterNuclear = ProjectDataManagement::PdmEventType::EventType_EnterNuclear,
LeaveNuclear = ProjectDataManagement::PdmEventType::EventType_LeaveNuclear,
EnterFunctionalArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea),
LeaveFunctionalArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea),
EnterNuclear = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EnterNuclear),
LeaveNuclear = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_LeaveNuclear),
HitB = ProjectDataManagement::PdmEventType::EventType_HitB,
FriendlyFire = ProjectDataManagement::PdmEventType::EventType_FriendlyFire,
HitGasPipe = ProjectDataManagement::PdmEventType::EventType_HitGasPipe,
MineArea = ProjectDataManagement::PdmEventType::EventType_MineArea,
NContamination = ProjectDataManagement::PdmEventType::EventType_NContamination,
BCContamination = ProjectDataManagement::PdmEventType::EventType_BCContamination,
DangerArea = ProjectDataManagement::PdmEventType::EventType_DangerArea,
FunctionalArea = ProjectDataManagement::PdmEventType::EventType_FunctionalArea,
MineCorridor = ProjectDataManagement::PdmEventType::EventType_MineCorridor,
Borderline = ProjectDataManagement::PdmEventType::EventType_Borderline,
TechnicalArea = ProjectDataManagement::PdmEventType::EventType_TechnicalArea,
GasPipe = ProjectDataManagement::PdmEventType::EventType_GasPipe,
Sanitation = ProjectDataManagement::PdmEventType::EventType_Sanitation,
EquipmentErrorReport = ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport,
EmergencyCall = ProjectDataManagement::PdmEventType::EventType_EmergencyCall,
HitB = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitB),
FriendlyFire = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_FriendlyFire),
HitGasPipe = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitGasPipe),
MineArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_MineArea),
NContamination = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_NContamination),
BCContamination = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_BCContamination),
DangerArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_DangerArea),
FunctionalArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_FunctionalArea),
MineCorridor = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_MineCorridor),
Borderline = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Borderline),
TechnicalArea = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_TechnicalArea),
GasPipe = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_GasPipe),
Sanitation = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Sanitation),
EquipmentErrorReport = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport),
EmergencyCall = static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EmergencyCall),
Marker = 666,
Block = 999,
};