Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
+30
-23
@@ -1,20 +1,26 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* ParticipantManagement - Party Edit Dialog
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Patric Karwat, SLSE, 2016-11-11
|
||||
*/
|
||||
|
||||
#include "ppm_party_edit.h"
|
||||
#include "NGLLogger/INGLLogger.h"
|
||||
#include "ui_ppm_party_edit.h"
|
||||
|
||||
#include <QtWidgets/QColorDialog>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
#include <QColorDialog>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QMessageBox>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <Plugins/ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <AreaEffectSimulation/aes_operator_rights.h>
|
||||
#include <Services/AreaEffectSimulation/aes_operator_rights.h>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
@@ -34,20 +40,21 @@ PartyEdit::PartyEdit(QWidget *parent)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::PartyEdit)
|
||||
, m_logger(getLogger("PartyEdit"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
PartyEdit::~PartyEdit()
|
||||
{
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
} // end of dtor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void PartyEdit::retranslate()
|
||||
{
|
||||
translate(m_ui, m_dtc->party(m_partyId), tr("Party"));
|
||||
translate(m_ui, m_dtc->party(m_partyId), trPartyName(m_dtc->party(m_partyId).name()), tr("Party"));
|
||||
m_ppmGuiCbxIfc->fillRoleComboBox(m_ui->cbRole);
|
||||
m_ppmGuiCbxIfc->fillHlaForceIdentifierComboBox(m_ui->cbHlaForceIdentifier);
|
||||
}
|
||||
@@ -88,7 +95,7 @@ bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
|
||||
|
||||
m_ppmGuiCbxIfc->fillRoleComboBox(m_ui->cbRole);
|
||||
m_ppmGuiCbxIfc->fillHlaForceIdentifierComboBox(m_ui->cbHlaForceIdentifier);
|
||||
if (m_partyId >= 0)
|
||||
if (m_partyId >= 0) // pool has id 0 so is a valid party
|
||||
{
|
||||
const Party &party = m_dtc->party(m_partyId);
|
||||
if(party.id() >= 0)
|
||||
@@ -107,7 +114,7 @@ bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
|
||||
m_ui->cbHlaForceIdentifier->hide();
|
||||
}
|
||||
|
||||
|
||||
// Could be filled programmatically later
|
||||
m_ui->cbAdlerNotification->setProperty("Notification", NotificationManagement::NotificationType::AdlerNotification);
|
||||
m_ui->cbCombatOrder->setProperty("Notification", NotificationManagement::NotificationType::CombatOrder);
|
||||
|
||||
@@ -132,7 +139,7 @@ bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
|
||||
connect(m_ui->tbResetAdlerConnection, &QToolButton::clicked, this, &PartyEdit::onResetAdlerConnectionClicked);
|
||||
connect(m_dtc.get(), &ParticipantManagement::Interface::Dtc::partyChanged, this, &PartyEdit::onPartyChanged);
|
||||
|
||||
|
||||
// check Notifications
|
||||
notificationCheck();
|
||||
|
||||
setOnlineHelpFilename(QStringLiteral("Situation-Parties"));
|
||||
@@ -140,7 +147,7 @@ bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
//slots
|
||||
bool PartyEdit::apply()
|
||||
{
|
||||
if (!m_partiallyUnchangeable)
|
||||
@@ -253,7 +260,7 @@ void PartyEdit::onPartyChanged(const Party &data, DataModification modType)
|
||||
}
|
||||
|
||||
|
||||
|
||||
//private
|
||||
|
||||
void PartyEdit::setData(const Party &party)
|
||||
{
|
||||
@@ -269,7 +276,7 @@ void PartyEdit::setData(const Party &party)
|
||||
|
||||
void PartyEdit::setColorToButton(QToolButton *button, const QColor &color)
|
||||
{
|
||||
button->setStyleSheet(QStringLiteral("QToolButton{ background: %1; }").arg(color.name()));
|
||||
button->setStyleSheet(QStringLiteral("QToolButton{ background: %1; }").arg(color.name())); // TODO: muss das sein?
|
||||
}
|
||||
|
||||
void PartyEdit::fillJsonSuppressNotifications( QJsonArray ¬if, NotificationManagement::NotificationType notifType)
|
||||
@@ -381,8 +388,8 @@ void PartyEdit::notificationCheck()
|
||||
m_ui->cbAdlerNotification->setCheckState(Qt::Checked);
|
||||
m_ui->cbCombatOrder->setCheckState(Qt::Checked);
|
||||
|
||||
|
||||
|
||||
// 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};
|
||||
|
||||
@@ -407,11 +414,11 @@ void PartyEdit::notificationCheck()
|
||||
|
||||
void PartyEdit::modifyPartyProperties()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
|
||||
ParticipantManagement::Party requestParty;
|
||||
requestParty = m_dtc->party(m_partyId);
|
||||
|
||||
// Get properties and then update them
|
||||
const QJsonObject &origObj = QJsonDocument::fromJson(requestParty.properties().c_str()).object();
|
||||
QJsonObject adlerPropertiesObj = origObj[QStringLiteral("Adler")].toObject();
|
||||
adlerPropertiesObj[QStringLiteral("saaConnectedState")] = ParticipantManagement::ConnectState::Disconnecting;
|
||||
|
||||
+22
-18
@@ -1,20 +1,26 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* HMI Plugin for ParticipantManagement - Party Overview Model
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Patric Karwat, SLSE, 2016-11-11
|
||||
*/
|
||||
|
||||
#include "ppm_party_model.h"
|
||||
#include <OperatorManagement/opm_data_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QColor>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
|
||||
|
||||
//---------------------------------
|
||||
// PartyModel
|
||||
//---------------------------------
|
||||
PartyModel::PartyModel(QObject *parent)
|
||||
: LtsWidgets::LtsAbstractTableModel<ParticipantManagement::Party>({tr("Id"),
|
||||
tr("Name"),
|
||||
@@ -27,6 +33,7 @@ PartyModel::PartyModel(QObject *parent)
|
||||
tr("Szenar Name")},
|
||||
parent)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_logger(getLogger("PartyModel"))
|
||||
{}
|
||||
|
||||
bool PartyModel::initModel(LtsSession::LtsSession *session)
|
||||
@@ -49,7 +56,7 @@ bool PartyModel::initModel(LtsSession::LtsSession *session)
|
||||
m_operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
m_ppmDtc->partys([this](const ParticipantManagement::Party &party)
|
||||
{
|
||||
if (hasParty(party))
|
||||
if (hasParty(party)) // opm_operator_exercise -> visible_parties
|
||||
insertRow(party);
|
||||
});
|
||||
return true;
|
||||
@@ -98,14 +105,11 @@ QVariant PartyModel::data(const QModelIndex &index, int role) const
|
||||
QString connectState;
|
||||
switch (status.underlying())
|
||||
{
|
||||
case ParticipantManagement::ConnectState::Connected:
|
||||
connectState = tr("Connected");
|
||||
break;
|
||||
case ParticipantManagement::ConnectState::NoHeartbeat:
|
||||
connectState = tr("No Heartbeat");
|
||||
case ParticipantManagement::ConnectState::Undefined:
|
||||
connectState = QStringLiteral("");
|
||||
break;
|
||||
default:
|
||||
connectState = QStringLiteral("");
|
||||
connectState = ParticipantManagement::toString(status);
|
||||
break;
|
||||
}
|
||||
return connectState;
|
||||
@@ -150,7 +154,7 @@ bool PartyModel::hasParty(const Party &party) const
|
||||
{
|
||||
if (exerciseParties.exerciseId() != m_session->exerciseId())
|
||||
continue;
|
||||
if (!exerciseParties.visibleParties().is_set())
|
||||
if (!exerciseParties.visibleParties().is_set()) //has_value not support on windows yet so we need depricated is_set
|
||||
return false;
|
||||
for (const auto &partyId : exerciseParties.visibleParties().get())
|
||||
if (partyId == party.id())
|
||||
@@ -167,7 +171,7 @@ bool PartyModel::isPartyHidden(const Party &party) const
|
||||
{
|
||||
if (exerciseParties.exerciseId() != m_session->exerciseId())
|
||||
continue;
|
||||
if (!exerciseParties.hiddenParties().is_set())
|
||||
if (!exerciseParties.hiddenParties().is_set()) //has_value not support on windows yet so we need depricated is_set
|
||||
return false;
|
||||
for (const auto &partyId : exerciseParties.hiddenParties().get())
|
||||
if (partyId == party.id())
|
||||
@@ -176,4 +180,4 @@ bool PartyModel::isPartyHidden(const Party &party) const
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
} // namespace ParticipantManagement
|
||||
Reference in new issue
Block a user