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
+9
-9
@@ -152,8 +152,8 @@ bool PartyEdit::apply()
|
||||
{
|
||||
if (!m_partiallyUnchangeable)
|
||||
{
|
||||
ParticipantManagement::Role role = static_cast<ParticipantManagement::Role_def::type>(m_ui->cbRole->currentData().toInt());
|
||||
ParticipantManagement::HlaForceIdentifierEnum hlaIdentfier = static_cast<ParticipantManagement::HlaForceIdentifierEnum_def::type>(m_ui->cbHlaForceIdentifier->currentData().toInt());
|
||||
ParticipantManagement::Role role = static_cast<ParticipantManagement::Role>(m_ui->cbRole->currentData().toInt());
|
||||
ParticipantManagement::HlaForceIdentifierEnum hlaIdentfier = static_cast<ParticipantManagement::HlaForceIdentifierEnum>(m_ui->cbHlaForceIdentifier->currentData().toInt());
|
||||
Party req;
|
||||
|
||||
req.id(m_partyId);
|
||||
@@ -283,7 +283,7 @@ void PartyEdit::fillJsonSuppressNotifications( QJsonArray ¬if, NotificationMa
|
||||
{
|
||||
QJsonObject suppNotif;
|
||||
suppNotif[QStringLiteral("partyId")] = m_partyId;
|
||||
suppNotif[QStringLiteral("AddressType")] = NotificationManagement::AddressType_def::Service;
|
||||
suppNotif[QStringLiteral("AddressType")] = NotificationManagement::AddressType::Service;
|
||||
suppNotif[QStringLiteral("Address")] = AreaEffectSimulation::Offset;
|
||||
|
||||
QCheckBox *cbNotif = findCheckBoxByNotificationType(notifType);
|
||||
@@ -339,8 +339,8 @@ void PartyEdit::fillOpmProperties( QJsonObject &opmProperties)
|
||||
int indexToReplace = -1;
|
||||
if (arrExercises.isEmpty())
|
||||
{
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::AdlerNotification);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::CombatOrder);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::AdlerNotification);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::CombatOrder);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -350,8 +350,8 @@ void PartyEdit::fillOpmProperties( QJsonObject &opmProperties)
|
||||
if (objExe[QStringLiteral("exerciseId")] == m_session->exerciseId())
|
||||
{
|
||||
notif = objExe[QStringLiteral("suppressNotifications")].toArray();
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::AdlerNotification);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::CombatOrder);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::AdlerNotification);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::CombatOrder);
|
||||
indexToReplace = i;
|
||||
break;
|
||||
}
|
||||
@@ -390,8 +390,8 @@ void PartyEdit::notificationCheck()
|
||||
|
||||
// Here add another NotificationType, everything else will happen automatically
|
||||
// CheckBox insert in Ui
|
||||
const QList<NotificationManagement::NotificationType> notifTypes { NotificationManagement::NotificationType_def::AdlerNotification,
|
||||
NotificationManagement::NotificationType_def::CombatOrder};
|
||||
const QList<NotificationManagement::NotificationType> notifTypes { NotificationManagement::NotificationType::AdlerNotification,
|
||||
NotificationManagement::NotificationType::CombatOrder};
|
||||
|
||||
for (int i=0; i < arrExercises.size(); ++i)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user