Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+18
-18
@@ -23,7 +23,7 @@ ElokaDialog::ElokaDialog(LtsSession::LtsSession* session, AvaSession* avaSession
|
||||
m_elokaListCollector(m_avaSession->control()->comm(),
|
||||
[this](QVector<AvaEloka>&& eloka) { onQueryElokaResponse(std::move(eloka)); }),
|
||||
m_streamNameMapping(streamNameMapping), m_avmDtc(avmDtc), m_avaSessionEstablished(false), m_usedCnr(),
|
||||
m_usedTvc(), m_usedAnnouncement()
|
||||
m_usedTvc(), m_usedAnnouncement(), m_logger(getLogger("ElokaDialog"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
Q_ASSERT(avaSession);
|
||||
@@ -172,14 +172,14 @@ void ElokaDialog::onQueryElokaResponse(const QVector<AvaEloka>&& eloka)
|
||||
|
||||
for (const auto& cnrTvcProfile : cnrTvcProfiles)
|
||||
{
|
||||
if (cnrTvcProfile.exerciseId() == exerciseId && cnrTvcProfile.operatorId() == operatorId)
|
||||
if (cnrTvcProfile.exerciseId == exerciseId && cnrTvcProfile.operatorId == operatorId)
|
||||
{
|
||||
for (const auto& cnrTvcProfileData : cnrTvcProfile.data())
|
||||
for (const auto& cnrTvcProfileData : cnrTvcProfile.data)
|
||||
{
|
||||
if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr)
|
||||
userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Cnr);
|
||||
if (cnrTvcProfileData.radioSystemId == RadioSystem::Cnr)
|
||||
userProfile.insert(cnrTvcProfileData.radioCircuitId, ElokaCircuitType::Cnr);
|
||||
else
|
||||
userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Tvc);
|
||||
userProfile.insert(cnrTvcProfileData.radioCircuitId, ElokaCircuitType::Tvc);
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -212,12 +212,12 @@ bool ElokaDialog::isCnr(ElokaData& data, const QMultiMap<qint32, ElokaCircuitTyp
|
||||
|
||||
for (const auto& cnr : cnrs)
|
||||
{
|
||||
if ((QString::fromStdString(cnr.radioCircuit()) == data.internalName) &&
|
||||
(userProfile.contains(cnr.id(), ElokaCircuitType::Cnr)))
|
||||
if ((QString::fromStdString(cnr.radioCircuit) == data.internalName) &&
|
||||
(userProfile.contains(cnr.id, ElokaCircuitType::Cnr)))
|
||||
{
|
||||
data.circuitType = ElokaCircuitType::Cnr;
|
||||
data.party = cnr.partyId();
|
||||
data.id = cnr.id();
|
||||
data.party = cnr.partyId;
|
||||
data.id = cnr.id;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -230,14 +230,14 @@ bool ElokaDialog::isTvc(ElokaData& data, const QMultiMap<qint32, ElokaCircuitTyp
|
||||
|
||||
for (const auto& tvc : tvcs)
|
||||
{
|
||||
if (tvc.exerciseId() != m_session->exerciseId())
|
||||
if (tvc.exerciseId.value() != m_session->exerciseId())
|
||||
continue;
|
||||
if ((QString::fromStdString(tvc.radioCircuit()) == data.internalName) &&
|
||||
(userProfile.contains(tvc.id(), ElokaCircuitType::Tvc)))
|
||||
if ((QString::fromStdString(tvc.radioCircuit) == data.internalName) &&
|
||||
(userProfile.contains(tvc.id, ElokaCircuitType::Tvc)))
|
||||
{
|
||||
data.circuitType = ElokaCircuitType::Tvc;
|
||||
data.party = 0;
|
||||
data.id = tvc.id();
|
||||
data.id = tvc.id;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -250,17 +250,17 @@ bool ElokaDialog::isAnnouncement(ElokaData& data)
|
||||
QMap<qint32, Stream> streams = m_avmDtc->streams();
|
||||
for (const Stream& stream : std::as_const(streams))
|
||||
{
|
||||
if ((stream.type() == StreamType::AudioOut) || (stream.type() == StreamType::AudioInOut))
|
||||
announcements.insert(stream.id(), stream);
|
||||
if ((stream.type == StreamType::AudioOut) || (stream.type == StreamType::AudioInOut))
|
||||
announcements.insert(stream.id, stream);
|
||||
}
|
||||
|
||||
for (const auto& announcement : announcements)
|
||||
{
|
||||
if (QString::fromStdString(announcement.name()) == data.internalName)
|
||||
if (QString::fromStdString(announcement.name) == data.internalName)
|
||||
{
|
||||
data.circuitType = ElokaCircuitType::Announcement;
|
||||
data.party = -1;
|
||||
data.id = announcement.id();
|
||||
data.id = announcement.id;
|
||||
data.exerciseId = m_session->exerciseId();
|
||||
data.displayName = m_streamNameMapping->displayName(data.internalName);
|
||||
return true;
|
||||
|
||||
+29
-28
@@ -92,7 +92,8 @@ ElokaEditDialog::ElokaEditDialog(LtsSession::LtsSession* session, AvaSession* av
|
||||
StreamNameMapping* streamNameMapping, const ElokaData& data, QWidget* parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ui(new Ui::ElokaEditDialog),
|
||||
m_session(session), m_streamNameMapping(streamNameMapping), m_avaCtrl(avaSession->control()), m_avmDtc(avmDtc),
|
||||
m_elokaData(data), m_cnrConfigMap(), m_tvcConfigMap(), m_announcementMap(), m_userProfile()
|
||||
m_elokaData(data), m_cnrConfigMap(), m_tvcConfigMap(), m_announcementMap(), m_userProfile(),
|
||||
m_logger(getLogger("ElokaEditDialog"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
Q_ASSERT(avaSession);
|
||||
@@ -160,8 +161,8 @@ bool ElokaEditDialog::init(const std::vector<qint32>& usedCnr, const std::vector
|
||||
const QMap<qint32, Stream> streams = m_avmDtc->streams();
|
||||
for (const Stream& stream : streams)
|
||||
{
|
||||
if ((stream.type() == StreamType::AudioOut) || (stream.type() == StreamType::AudioInOut))
|
||||
m_announcementMap.insert(stream.id(), stream);
|
||||
if ((stream.type == StreamType::AudioOut) || (stream.type == StreamType::AudioInOut))
|
||||
m_announcementMap.insert(stream.id, stream);
|
||||
}
|
||||
|
||||
if (m_elokaData.internalName.isEmpty())
|
||||
@@ -266,7 +267,7 @@ bool ElokaEditDialog::apply()
|
||||
data.startTime = m_session->partitionTime();
|
||||
|
||||
if (userData.circuitType == ElokaCircuitType::Cnr)
|
||||
data.party = m_cnrConfigMap.value(userData.id).partyId();
|
||||
data.party = m_cnrConfigMap.value(userData.id).partyId;
|
||||
|
||||
if (m_elokaData.internalName.isEmpty())
|
||||
m_avaCtrl->chooseEloka(data.internalName, data.action, data.mode);
|
||||
@@ -310,8 +311,8 @@ void ElokaEditDialog::getActiveCnrs()
|
||||
const QMap<qint32, CnrConfig> cnrs = m_avmDtc->cnrConfigs();
|
||||
for (const CnrConfig& cnr : cnrs)
|
||||
{
|
||||
if (cnr.isActive() == true)
|
||||
m_cnrConfigMap.insert(cnr.id(), cnr);
|
||||
if (cnr.isActive == true)
|
||||
m_cnrConfigMap.insert(cnr.id, cnr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -322,11 +323,11 @@ void ElokaEditDialog::onCnrConfigChanged(const CnrConfig& data, DataModification
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified: {
|
||||
m_cnrConfigMap.insert(data.id(), data);
|
||||
m_cnrConfigMap.insert(data.id, data);
|
||||
break;
|
||||
}
|
||||
case DataModification::eRemoved: {
|
||||
m_cnrConfigMap.remove(data.id());
|
||||
m_cnrConfigMap.remove(data.id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -343,11 +344,11 @@ void ElokaEditDialog::onTvcConfigChanged(const TvcConfig& data, DataModification
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified: {
|
||||
m_tvcConfigMap.insert(data.id(), data);
|
||||
m_tvcConfigMap.insert(data.id, data);
|
||||
break;
|
||||
}
|
||||
case DataModification::eRemoved: {
|
||||
m_tvcConfigMap.remove(data.id());
|
||||
m_tvcConfigMap.remove(data.id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -360,18 +361,18 @@ void ElokaEditDialog::onStreamChanged(const Stream& data, DataModification modTy
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStreamChanged";
|
||||
|
||||
if ((data.type() != StreamType::AudioOut) && (data.type() != StreamType::AudioInOut))
|
||||
if ((data.type != StreamType::AudioOut) && (data.type != StreamType::AudioInOut))
|
||||
return;
|
||||
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified: {
|
||||
m_announcementMap.insert(data.id(), data);
|
||||
m_announcementMap.insert(data.id, data);
|
||||
break;
|
||||
}
|
||||
case DataModification::eRemoved: {
|
||||
m_announcementMap.remove(data.id());
|
||||
m_announcementMap.remove(data.id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -385,8 +386,8 @@ void ElokaEditDialog::onCnrTvcProfileChanged(const CnrTvcProfile& data, DataModi
|
||||
Q_UNUSED(modType);
|
||||
DEBUG_LOG(m_logger) << "onCnrTvcProfileChanged";
|
||||
|
||||
if (data.exerciseId() != m_session->exerciseId() ||
|
||||
data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
|
||||
if (data.exerciseId != m_session->exerciseId() ||
|
||||
data.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
|
||||
return;
|
||||
|
||||
getUserProfile();
|
||||
@@ -407,13 +408,13 @@ void ElokaEditDialog::getUserProfile()
|
||||
|
||||
for (const auto& cnrTvcProfile : cnrTvcProfiles)
|
||||
{
|
||||
if (cnrTvcProfile.exerciseId() == exerciseId && cnrTvcProfile.operatorId() == operatorId)
|
||||
if (cnrTvcProfile.exerciseId == exerciseId && cnrTvcProfile.operatorId == operatorId)
|
||||
{
|
||||
for (const auto& cnrTvcProfileData : cnrTvcProfile.data())
|
||||
if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr)
|
||||
m_userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Cnr);
|
||||
for (const auto& cnrTvcProfileData : cnrTvcProfile.data)
|
||||
if (cnrTvcProfileData.radioSystemId == RadioSystem::Cnr)
|
||||
m_userProfile.insert(cnrTvcProfileData.radioCircuitId, ElokaCircuitType::Cnr);
|
||||
else
|
||||
m_userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Tvc);
|
||||
m_userProfile.insert(cnrTvcProfileData.radioCircuitId, ElokaCircuitType::Tvc);
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -430,12 +431,12 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
|
||||
case ElokaCircuitType::Cnr: {
|
||||
for (const CnrConfig& cnr : std::as_const(m_cnrConfigMap))
|
||||
{
|
||||
if (!m_userProfile.contains(cnr.id(), ElokaCircuitType::Cnr))
|
||||
if (!m_userProfile.contains(cnr.id, ElokaCircuitType::Cnr))
|
||||
continue;
|
||||
|
||||
QString internalName = QString::fromStdString(cnr.radioCircuit());
|
||||
QString internalName = QString::fromStdString(cnr.radioCircuit);
|
||||
QVariant userData =
|
||||
QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Cnr, cnr.id()});
|
||||
QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Cnr, cnr.id});
|
||||
m_ui->cmbCircuit->addItem(internalName, userData);
|
||||
}
|
||||
break;
|
||||
@@ -443,12 +444,12 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
|
||||
case ElokaCircuitType::Tvc: {
|
||||
for (const TvcConfig& tvc : std::as_const(m_tvcConfigMap))
|
||||
{
|
||||
if (!m_userProfile.contains(tvc.id(), ElokaCircuitType::Tvc))
|
||||
if (!m_userProfile.contains(tvc.id, ElokaCircuitType::Tvc))
|
||||
continue;
|
||||
|
||||
QString internalName = QString::fromStdString(tvc.radioCircuit());
|
||||
QString internalName = QString::fromStdString(tvc.radioCircuit);
|
||||
QVariant userData =
|
||||
QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Tvc, tvc.id()});
|
||||
QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Tvc, tvc.id});
|
||||
m_ui->cmbCircuit->addItem(internalName, userData);
|
||||
}
|
||||
break;
|
||||
@@ -456,10 +457,10 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
|
||||
case ElokaCircuitType::Announcement: {
|
||||
for (const Stream& stream : std::as_const(m_announcementMap))
|
||||
{
|
||||
QString internalName = QString::fromStdString(stream.name());
|
||||
QString internalName = QString::fromStdString(stream.name);
|
||||
QString displayName = m_streamNameMapping->displayName(internalName);
|
||||
QVariant userData =
|
||||
QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Announcement, stream.id()});
|
||||
QVariant::fromValue(ComboBoxUserData{internalName, ElokaCircuitType::Announcement, stream.id});
|
||||
m_ui->cmbCircuit->addItem(displayName, userData);
|
||||
}
|
||||
break;
|
||||
|
||||
+4
-3
@@ -19,10 +19,11 @@ ElokaModel::ElokaModel(LtsSession::LtsSession *session, QObject *parent)
|
||||
tr("Endless Playback"),
|
||||
tr("Start Time")
|
||||
},
|
||||
parent)
|
||||
parent),
|
||||
m_logger(getLogger("ElokaModel"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
|
||||
|
||||
session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc);
|
||||
}
|
||||
|
||||
@@ -42,7 +43,7 @@ QVariant ElokaModel::data(const QModelIndex &index,
|
||||
return QString::number(data.party);
|
||||
|
||||
if (data.party >= 0)
|
||||
return ParticipantManagement::trPartyName(m_ppmDtc->party(data.party).name());
|
||||
return ParticipantManagement::trPartyName(m_ppmDtc->party(data.party).name);
|
||||
return QVariant(QLatin1Char('-'));
|
||||
}
|
||||
case RadioCircuit:
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <AudioVideoManagement/avm_data_plugin_interface.h>
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
#include <AudioVideoManagement/ava_types.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user