Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+6
-6
@@ -40,7 +40,7 @@ T fromJson(const QByteArray &json)
|
||||
QJsonObject frequencyPlanningJson(QJsonObject obj, const QString &name, FrequencyBand freqBand, int radioStationId)
|
||||
{
|
||||
obj.insert(QStringLiteral("Name"), name);
|
||||
obj.insert(QStringLiteral("FrequencyBand"), freqBand);
|
||||
obj.insert(QStringLiteral("FrequencyBand"), static_cast<int>(freqBand));
|
||||
obj.insert(QStringLiteral("RadioStationId"), radioStationId);
|
||||
return obj;
|
||||
}
|
||||
@@ -59,8 +59,8 @@ bool RadioCircuitHF::isValid() const
|
||||
QJsonObject RadioCircuitHF::toJson() const
|
||||
{
|
||||
QJsonObject obj;
|
||||
obj.insert(QStringLiteral("ModulationType"), modulationType);
|
||||
obj.insert(QStringLiteral("ChannelSpacing"), channelSpacing);
|
||||
obj.insert(QStringLiteral("ModulationType"), static_cast<int>(modulationType));
|
||||
obj.insert(QStringLiteral("ChannelSpacing"), static_cast<int>(channelSpacing));
|
||||
obj.insert(QStringLiteral("Frequency"), frequency);
|
||||
obj.insert(QStringLiteral("Squelch"), squelch);
|
||||
|
||||
@@ -94,8 +94,8 @@ bool RadioCircuitUHF::isValid() const
|
||||
QJsonObject RadioCircuitUHF::toJson() const
|
||||
{
|
||||
QJsonObject obj;
|
||||
obj.insert(QStringLiteral("ModulationType"), modulationType);
|
||||
obj.insert(QStringLiteral("ChannelSpacing"), channelSpacing);
|
||||
obj.insert(QStringLiteral("ModulationType"), static_cast<int>(modulationType));
|
||||
obj.insert(QStringLiteral("ChannelSpacing"), static_cast<int>(channelSpacing));
|
||||
obj.insert(QStringLiteral("Frequency"), frequency);
|
||||
obj.insert(QStringLiteral("Squelch"), squelchDB);
|
||||
obj.insert(QStringLiteral("Clipper"), clipper);
|
||||
@@ -128,7 +128,7 @@ RadioCircuitUHF* RadioCircuitUHF::fromJson(const QJsonObject &obj)
|
||||
QJsonObject RadioCircuitVHF::toJson() const
|
||||
{
|
||||
QJsonObject obj;
|
||||
obj.insert(QStringLiteral("OperatingMode"), operatingMode);
|
||||
obj.insert(QStringLiteral("OperatingMode"), static_cast<int>(operatingMode));
|
||||
obj.insert(QStringLiteral("FrequencySetDataId"), freqSetDataId);
|
||||
obj.insert(QStringLiteral("PilotTone"), pilotTone);
|
||||
|
||||
|
||||
+2
-2
@@ -33,7 +33,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuit
|
||||
virtual ~RadioCircuit() = default;
|
||||
|
||||
QString name;
|
||||
FrequencyBand freqBand {FrequencyBand::VHF_v};
|
||||
FrequencyBand freqBand {FrequencyBand::VHF};
|
||||
int radioStationId {0};
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuitUHF: public RadioCircuit
|
||||
|
||||
struct SVCCNRHELPER_EXPORT RadioCircuitVHF: public RadioCircuit
|
||||
{
|
||||
RcOperatingMode operatingMode {RcOperatingMode::FixedFreqEncNone_v};
|
||||
RcOperatingMode operatingMode {RcOperatingMode::FixedFreqEncNone};
|
||||
int freqSetDataId {0};
|
||||
bool pilotTone {false};
|
||||
|
||||
|
||||
@@ -44,19 +44,19 @@ void ActiveExercises::onExerciseChanged(const ExerciseManagement::Exercise &exer
|
||||
break;
|
||||
|
||||
case DataModification::eRemoved:
|
||||
tryDeactivate(exercise.id());
|
||||
tryDeactivate(exercise.id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void ActiveExercises::check(const ExerciseManagement::Exercise &exercise)
|
||||
{
|
||||
Q_ASSERT(exercise.id() > 0);
|
||||
Q_ASSERT(exercise.id > 0);
|
||||
|
||||
if (isActive(exercise.state()))
|
||||
tryActivate(exercise.id());
|
||||
if (isActive(exercise.state))
|
||||
tryActivate(exercise.id);
|
||||
else
|
||||
tryDeactivate(exercise.id());
|
||||
tryDeactivate(exercise.id);
|
||||
}
|
||||
|
||||
void ActiveExercises::tryActivate(int exerciseId)
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "config_cnr.h"
|
||||
#include <utility>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "helper.h"
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
@@ -53,22 +54,22 @@ void ConfigCnr::buildConfigCnrData()
|
||||
return;
|
||||
}
|
||||
|
||||
AudioVideoManagement::FrequencySet frequencySet = m_avmDtc->frequencySet(plan->frequencySetId());
|
||||
AudioVideoManagement::FrequencySet frequencySet = m_avmDtc->frequencySet(plan->frequencySetId);
|
||||
QMap<int, AudioVideoManagement::FrequencySetDataWithId> fsdMap;
|
||||
for (const auto &fsd : std::as_const(frequencySet.data()))
|
||||
fsdMap.insert(fsd.id(), fsd);
|
||||
for (const auto &fsd : std::as_const(frequencySet.data))
|
||||
fsdMap.insert(fsd.id, fsd);
|
||||
|
||||
configCnr.setId = plan->frequencySetId();
|
||||
configCnr.time = QDateTime::fromMSecsSinceEpoch(plan->date()).toString(Qt::ISODate);
|
||||
configCnr.radioCircuit.reserve(plan->data().size());
|
||||
configCnr.setId = plan->frequencySetId;
|
||||
configCnr.time = QDateTime::fromMSecsSinceEpoch(plan->date).toString(Qt::ISODate);
|
||||
configCnr.radioCircuit.reserve(plan->data.size());
|
||||
|
||||
for (const auto ¤tData : plan->data())
|
||||
for (const auto ¤tData : plan->data)
|
||||
{
|
||||
|
||||
WebSocketInterface::Messages::ConfigCnrMessage::RadioCircuit radioCircuit;
|
||||
AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(currentData.cnrConfigId());
|
||||
AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId());
|
||||
QVector<AudioVideoManagement::RadioCircuit*> circuits = AudioVideoManagement::fromJson(currentData.properties());
|
||||
AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(currentData.cnrConfigId);
|
||||
AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId);
|
||||
QVector<AudioVideoManagement::RadioCircuit*> circuits = AudioVideoManagement::fromJson(currentData.properties);
|
||||
|
||||
int subCircuitCount = 0;
|
||||
for (AudioVideoManagement::RadioCircuit* circuit : std::as_const(circuits))
|
||||
@@ -78,9 +79,9 @@ void ConfigCnr::buildConfigCnrData()
|
||||
|
||||
|
||||
WebSocketInterface::Messages::ConfigCnrMessage::SubRadioCircuit subCircuit;
|
||||
switch (circuit->freqBand.underlying())
|
||||
switch (circuit->freqBand)
|
||||
{
|
||||
case AudioVideoManagement::FrequencyBand_def::VHF:
|
||||
case AudioVideoManagement::FrequencyBand::VHF:
|
||||
{
|
||||
AudioVideoManagement::RadioCircuitVHF *rcVhf = dynamic_cast<AudioVideoManagement::RadioCircuitVHF*>(circuit);
|
||||
if (!rcVhf)
|
||||
@@ -88,19 +89,19 @@ void ConfigCnr::buildConfigCnrData()
|
||||
|
||||
AudioVideoManagement::FrequencySetDataWithId &fsd = fsdMap[rcVhf->freqSetDataId];
|
||||
subCircuit.agc = false;
|
||||
subCircuit.akw = fsd.akwBundle().is_set() ? fsd.akwBundle().get() : 0;
|
||||
subCircuit.akw = fsd.akwBundle.is_set() ? fsd.akwBundle.get() : 0;
|
||||
subCircuit.channelSpacing = 0;
|
||||
subCircuit.clipper = false;
|
||||
subCircuit.comsec = fsd.comsec().is_set() ? fsd.comsec().get() : 0;
|
||||
subCircuit.comsec = fsd.comsec.is_set() ? fsd.comsec.get() : 0;
|
||||
subCircuit.crossbeam = 0;
|
||||
subCircuit.frequency = fsd.frequency() * 1000;
|
||||
subCircuit.frequencyBand = fsd.frequencyBand().underlying();
|
||||
subCircuit.fsb = fsd.fsbBundle().is_set() ? fsd.fsbBundle().get() : 0;
|
||||
subCircuit.frequency = fsd.frequency * 1000;
|
||||
subCircuit.frequencyBand = static_cast<int>(fsd.frequencyBand);
|
||||
subCircuit.fsb = fsd.fsbBundle.is_set() ? fsd.fsbBundle.get() : 0;
|
||||
subCircuit.modulationType = 0;
|
||||
subCircuit.orientation = 0;
|
||||
subCircuit.ptSig = rcVhf->pilotTone;
|
||||
subCircuit.rcAkw = fsd.akwRadioCircuit().is_set() ? fsd.akwRadioCircuit().get() : 0;
|
||||
subCircuit.rcMode = rcVhf->operatingMode.underlying();
|
||||
subCircuit.rcAkw = fsd.akwRadioCircuit.is_set() ? fsd.akwRadioCircuit.get() : 0;
|
||||
subCircuit.rcMode = static_cast<int>(rcVhf->operatingMode);
|
||||
subCircuit.rcSubId = toRcIdString(cnrChannel);
|
||||
subCircuit.rcSubName = rcVhf->name;
|
||||
subCircuit.rcType = 2;
|
||||
@@ -109,7 +110,7 @@ void ConfigCnr::buildConfigCnrData()
|
||||
|
||||
break;
|
||||
}
|
||||
case AudioVideoManagement::FrequencyBand_def::UHF:
|
||||
case AudioVideoManagement::FrequencyBand::UHF:
|
||||
{
|
||||
AudioVideoManagement::RadioCircuitUHF *rcUhf = dynamic_cast<AudioVideoManagement::RadioCircuitUHF*>(circuit);
|
||||
if (!rcUhf)
|
||||
@@ -117,14 +118,14 @@ void ConfigCnr::buildConfigCnrData()
|
||||
|
||||
subCircuit.agc = rcUhf->agc;
|
||||
subCircuit.akw = 0;
|
||||
subCircuit.channelSpacing = rcUhf->channelSpacing.underlying();
|
||||
subCircuit.channelSpacing = static_cast<int>(rcUhf->channelSpacing);
|
||||
subCircuit.clipper = rcUhf->clipper;
|
||||
subCircuit.comsec = 0;
|
||||
subCircuit.crossbeam = 0;
|
||||
subCircuit.frequency = rcUhf->frequency;
|
||||
subCircuit.frequencyBand = 0;
|
||||
subCircuit.fsb = 0;
|
||||
subCircuit.modulationType = rcUhf->modulationType.underlying();
|
||||
subCircuit.modulationType = static_cast<int>(rcUhf->modulationType);
|
||||
subCircuit.orientation = 0;
|
||||
subCircuit.ptSig = 0;
|
||||
subCircuit.rcAkw = 0;
|
||||
@@ -136,7 +137,7 @@ void ConfigCnr::buildConfigCnrData()
|
||||
subCircuit.station = stationId(radioStation);
|
||||
break;
|
||||
}
|
||||
case AudioVideoManagement::FrequencyBand_def::HF:
|
||||
case AudioVideoManagement::FrequencyBand::HF:
|
||||
{
|
||||
AudioVideoManagement::RadioCircuitHF *rcHf = dynamic_cast<AudioVideoManagement::RadioCircuitHF*>(circuit);
|
||||
if (!rcHf)
|
||||
@@ -144,14 +145,14 @@ void ConfigCnr::buildConfigCnrData()
|
||||
|
||||
subCircuit.agc = 0;
|
||||
subCircuit.akw = 0;
|
||||
subCircuit.channelSpacing = rcHf->channelSpacing.underlying();
|
||||
subCircuit.channelSpacing = static_cast<int>(rcHf->channelSpacing);
|
||||
subCircuit.clipper = 0;
|
||||
subCircuit.comsec = 0;
|
||||
subCircuit.crossbeam = 0;
|
||||
subCircuit.frequency = rcHf->frequency;
|
||||
subCircuit.frequencyBand = 0;
|
||||
subCircuit.fsb = 0;
|
||||
subCircuit.modulationType = rcHf->modulationType.underlying();
|
||||
subCircuit.modulationType = static_cast<int>(rcHf->modulationType);
|
||||
subCircuit.orientation = 0;
|
||||
subCircuit.ptSig = 0;
|
||||
subCircuit.rcAkw = 0;
|
||||
@@ -173,8 +174,8 @@ void ConfigCnr::buildConfigCnrData()
|
||||
qDeleteAll(circuits);
|
||||
|
||||
radioCircuit.rcId = toRcIdString(cnrChannel);
|
||||
radioCircuit.rcName = QString::fromStdString(cnrConfig.radioCircuit());
|
||||
radioCircuit.ssrc = cnrChannel.ssrc();
|
||||
radioCircuit.rcName = QString::fromStdString(cnrConfig.radioCircuit);
|
||||
radioCircuit.ssrc = cnrChannel.ssrc;
|
||||
|
||||
configCnr.radioCircuit.append(radioCircuit);
|
||||
}
|
||||
@@ -188,10 +189,10 @@ boost::optional<AudioVideoManagement::FrequencyPlanning> ConfigCnr::activePlan()
|
||||
{
|
||||
AudioVideoManagement::ActiveFrequencyPlanning activePlanning = m_avmDtc->activeFrequencyPlanning(m_exerciseId);
|
||||
|
||||
if (activePlanning.exerciseId() != m_exerciseId)
|
||||
if (activePlanning.exerciseId != m_exerciseId)
|
||||
return boost::none;
|
||||
|
||||
AudioVideoManagement::FrequencyPlanning frequencyPlanning = m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId());
|
||||
AudioVideoManagement::FrequencyPlanning frequencyPlanning = m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId);
|
||||
|
||||
return frequencyPlanning;
|
||||
}
|
||||
@@ -201,7 +202,7 @@ void ConfigCnr::onActiveFrequencyPlanningChanged(const AudioVideoManagement::Act
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data;
|
||||
|
||||
Q_UNUSED(modType);
|
||||
if (data.exerciseId() == m_exerciseId)
|
||||
if (data.exerciseId == m_exerciseId)
|
||||
m_timer.start();
|
||||
}
|
||||
|
||||
@@ -215,7 +216,7 @@ void ConfigCnr::onFrequencyPlanningChanged(const AudioVideoManagement::Frequency
|
||||
if (!plan)
|
||||
return;
|
||||
|
||||
if (data.id() == plan->id() || !data.exerciseId().is_set())
|
||||
if (data.id == plan->id || !data.exerciseId.is_set())
|
||||
m_timer.start();
|
||||
}
|
||||
|
||||
@@ -225,8 +226,8 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data,
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data;
|
||||
|
||||
Q_UNUSED(modType);
|
||||
bool isGlobal = !data.exerciseId().is_set();
|
||||
if ((isGlobal || data.exerciseId().get() == m_exerciseId) && modType != DataModification::eAdded && isInActiveFrequencyPlanning(data))
|
||||
bool isGlobal = !data.exerciseId.is_set();
|
||||
if ((isGlobal || data.exerciseId.get() == m_exerciseId) && modType != DataModification::eAdded && isInActiveFrequencyPlanning(data))
|
||||
m_timer.start();
|
||||
}
|
||||
|
||||
@@ -234,17 +235,17 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data,
|
||||
bool ConfigCnr::isInActiveFrequencyPlanning(const AudioVideoManagement::CnrConfig &data)
|
||||
{
|
||||
|
||||
if(!data.exerciseId().is_set())
|
||||
if(!data.exerciseId.is_set())
|
||||
return true;
|
||||
|
||||
const auto activePlans = m_avmDtc->activeFrequencyPlannings();
|
||||
for (const AudioVideoManagement::ActiveFrequencyPlanning &activePlan : activePlans)
|
||||
{
|
||||
const auto frequencyPlannings = m_avmDtc->frequencyPlanning(activePlan.frequencyPlanningId());
|
||||
for(const auto &frequencyPlanningData : frequencyPlannings.data())
|
||||
const auto frequencyPlannings = m_avmDtc->frequencyPlanning(activePlan.frequencyPlanningId);
|
||||
for(const auto &frequencyPlanningData : frequencyPlannings.data)
|
||||
{
|
||||
|
||||
if(frequencyPlanningData.cnrConfigId() == data.id())
|
||||
if(frequencyPlanningData.cnrConfigId == data.id)
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "dds_handler_exercise.h"
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <QtGlobal>
|
||||
|
||||
|
||||
@@ -65,7 +65,8 @@ public:
|
||||
|
||||
|
||||
ExerciseManager::ExerciseManager(ActiveExercises *activeExercises, DdsHandler *ddsHandler)
|
||||
: m_activeExercises(activeExercises)
|
||||
: m_logger(getLogger("ExerciseManager"))
|
||||
, m_activeExercises(activeExercises)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
{
|
||||
Q_ASSERT(activeExercises);
|
||||
@@ -216,15 +217,15 @@ void ExerciseManager::stopPositionsUpdate()
|
||||
void ExerciseManager::onNewClientConnection(qint64 id)
|
||||
{
|
||||
AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request;
|
||||
request.client(id);
|
||||
request.isActive(true);
|
||||
request.client = id;
|
||||
request.isActive = true;
|
||||
m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this);
|
||||
}
|
||||
|
||||
void ExerciseManager::onClientConnectionClosed(qint64 id)
|
||||
{
|
||||
AudioVideoManagement::RemoveFrequencyPlanningStatusByClientRequest request;
|
||||
request.client(id);
|
||||
request.client = id;
|
||||
m_ddsHandler->avmFtc()->removeFrequencyPlanningStatusByClientRequest(request, this);
|
||||
}
|
||||
|
||||
@@ -237,33 +238,33 @@ void ExerciseManager::onClearFrequencyPlanningStatus()
|
||||
void ExerciseManager::onConfigCnrSent(qint64 id, const QString &uuid, const QString &requester, bool isActiveClient)
|
||||
{
|
||||
AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request;
|
||||
request.client(id);
|
||||
request.uuid(uuid.toStdString());
|
||||
request.sent(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
|
||||
request.requester(requester.toStdString());
|
||||
request.isActive(isActiveClient);
|
||||
request.client = id;
|
||||
request.uuid = uuid.toStdString();
|
||||
request.sent = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
|
||||
request.requester = requester.toStdString();
|
||||
request.isActive = isActiveClient;
|
||||
m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this);
|
||||
}
|
||||
|
||||
void ExerciseManager::onConfigCnrReceived(qint64 id, const QString &uuid)
|
||||
{
|
||||
AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request;
|
||||
request.client(id);
|
||||
request.uuid(uuid.toStdString());
|
||||
request.received(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
|
||||
request.client = id;
|
||||
request.uuid = uuid.toStdString();
|
||||
request.received = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
|
||||
m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this);
|
||||
}
|
||||
|
||||
void ExerciseManager::onConfigCnrProcessed(qint64 id, const QString &uuid, const QJsonObject &configCnrData)
|
||||
{
|
||||
AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request;
|
||||
request.client(id);
|
||||
request.uuid(uuid.toStdString());
|
||||
request.activated(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
|
||||
request.content(QJsonDocument(configCnrData).toJson().toStdString());
|
||||
request.requester(QJsonDocument(configCnrData).object()[QStringLiteral("requester")].toString().toStdString());
|
||||
request.reason(static_cast<AudioVideoManagement::TransmissionReason::inner_enum>(QJsonDocument(configCnrData).object()[QStringLiteral("reason")].toInt(0)));
|
||||
request.isActive(true);
|
||||
request.client = id;
|
||||
request.uuid = uuid.toStdString();
|
||||
request.activated = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
|
||||
request.content = QJsonDocument(configCnrData).toJson().toStdString();
|
||||
request.requester = QJsonDocument(configCnrData).object()[QStringLiteral("requester")].toString().toStdString();
|
||||
request.reason = static_cast<AudioVideoManagement::TransmissionReason>(QJsonDocument(configCnrData).object()[QStringLiteral("reason")].toInt(0));
|
||||
request.isActive = true;
|
||||
m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this);
|
||||
}
|
||||
|
||||
@@ -291,7 +292,7 @@ void ExerciseManager::onExerciseActivated(int exerciseId)
|
||||
if (isFirstActiveExercise)
|
||||
{
|
||||
ExerciseManagement::Exercise exercise = m_ddsHandler->exmDtc()->exercise(exerciseId);
|
||||
m_trainingArea.reset(new TrainingArea(exercise.trainingAreaId(), m_ddsHandler->asmDtc(), m_ddsHandler->ismDtc()));
|
||||
m_trainingArea.reset(new TrainingArea(exercise.trainingAreaId, m_ddsHandler->asmDtc(), m_ddsHandler->ismDtc()));
|
||||
}
|
||||
|
||||
emit essentialsUpdate();
|
||||
|
||||
@@ -13,12 +13,12 @@ namespace CombatNetRadio
|
||||
|
||||
int stationId(const InfrastructureManagement::MainStructureElement &radioStation)
|
||||
{
|
||||
return LtsUtils::JsonObject::fromJson(radioStation.properties()).valueOr<int>("stationId", 0);
|
||||
return LtsUtils::JsonObject::fromJson(radioStation.properties).valueOr<int>("stationId", 0);
|
||||
}
|
||||
|
||||
QString toRcIdString(const AudioVideoManagement::CnrChannel &cnrChannel)
|
||||
{
|
||||
QString result = QString::fromStdString(cnrChannel.name());
|
||||
QString result = QString::fromStdString(cnrChannel.name);
|
||||
result.remove(1, 2);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "helper.h"
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
|
||||
#include <QtGlobal>
|
||||
#include <QtCore/QDateTime>
|
||||
@@ -22,13 +23,13 @@ QSet<int> participantIdsFromParty(const QMap<int32_t, ParticipantManagement::Par
|
||||
{
|
||||
ret.reserve(participants.size());
|
||||
for (const auto &p : participants)
|
||||
ret += p.id();
|
||||
ret += p.id;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (const auto &participant : participants)
|
||||
if (participant.partyId() == partyId)
|
||||
ret += participant.id();
|
||||
if (participant.partyId == partyId)
|
||||
ret += participant.id;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
@@ -61,10 +62,10 @@ WebSocketInterface::Messages::PositionsCnrMessage::PositionsCnrMessageData Posit
|
||||
if (!plan)
|
||||
return positionsData;
|
||||
|
||||
for (const auto &entry : plan->data())
|
||||
for (const auto &entry : plan->data)
|
||||
{
|
||||
AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(entry.cnrConfigId());
|
||||
AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId());
|
||||
AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(entry.cnrConfigId);
|
||||
AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId);
|
||||
|
||||
positionsData.radioCircuit.push_back({toRcIdString(cnrChannel), positionsFor(cnrConfig)});
|
||||
}
|
||||
@@ -74,14 +75,14 @@ WebSocketInterface::Messages::PositionsCnrMessage::PositionsCnrMessageData Posit
|
||||
|
||||
QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::positionsForGlobal(const AudioVideoManagement::CnrConfig &config) const
|
||||
{
|
||||
bool isGlobal = !config.exerciseId().is_set();
|
||||
bool isGlobal = !config.exerciseId.is_set();
|
||||
Q_ASSERT(isGlobal);
|
||||
return positionsForLocal(config);
|
||||
}
|
||||
|
||||
QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::positionsFor(const AudioVideoManagement::CnrConfig &config) const
|
||||
{
|
||||
bool isLocal = config.exerciseId().is_set();
|
||||
bool isLocal = config.exerciseId.is_set();
|
||||
if (isLocal)
|
||||
return positionsForLocal(config);
|
||||
else
|
||||
@@ -95,12 +96,12 @@ QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::p
|
||||
auto allParticipants = m_ppmDtc->participants();
|
||||
|
||||
QSet<int> participantIdsInUnit;
|
||||
if (config.unitId().is_set())
|
||||
m_ppmDtc->participantIdsByUnit(config.unitId().get(), allParticipants, participantIdsInUnit);
|
||||
if (config.unitId.is_set())
|
||||
m_ppmDtc->participantIdsByUnit(config.unitId.get(), allParticipants, participantIdsInUnit);
|
||||
else
|
||||
{
|
||||
bool isGlobal = !config.exerciseId().is_set();
|
||||
participantIdsInUnit = participantIdsFromParty(allParticipants, config.partyId(), isGlobal);
|
||||
bool isGlobal = !config.exerciseId.is_set();
|
||||
participantIdsInUnit = participantIdsFromParty(allParticipants, config.partyId, isGlobal);
|
||||
}
|
||||
|
||||
const qint64 now = QDateTime::currentMSecsSinceEpoch();
|
||||
@@ -109,21 +110,24 @@ QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::p
|
||||
for (int participantId : std::as_const(participantIdsInUnit))
|
||||
{
|
||||
const ParticipantManagement::Participant &participant = allParticipants.value(participantId);
|
||||
if (!participant.equipmentNumber().is_set())
|
||||
if (!participant.equipmentNumber.is_set())
|
||||
continue;
|
||||
|
||||
const ParticipantManagement::Type &type = m_ppmDtc->type(participant.typeId());
|
||||
if (type.radioCount() < 1)
|
||||
continue;
|
||||
const ParticipantManagement::Type &type = m_ppmDtc->type(participant.typeId);
|
||||
if (type.radioCount < 1)
|
||||
continue;
|
||||
|
||||
const auto &pos = m_ppmDtc->participantPosition(participantId);
|
||||
if (pos.participantId() != participantId)
|
||||
continue;
|
||||
if (pos.participantId != participantId)
|
||||
continue;
|
||||
|
||||
if (LtsUtils::isPositionTimeOutdated(now, pos.sampleTime()))
|
||||
continue;
|
||||
if (LtsUtils::isPositionTimeOutdated(now, pos.sampleTime))
|
||||
continue;
|
||||
|
||||
positions.push_back({toDeg(pos.pos().lon()), toDeg(pos.pos().lat())});
|
||||
WebSocketInterface::Messages::ReplyMessage::LonLatPoint point;
|
||||
point.lon = toDeg(pos.pos.lon);
|
||||
point.lat = toDeg(pos.pos.lat);
|
||||
positions.push_back(point);
|
||||
}
|
||||
|
||||
return positions;
|
||||
@@ -132,9 +136,9 @@ QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::p
|
||||
boost::optional<AudioVideoManagement::FrequencyPlanning> PositionsCnr::activePlan() const
|
||||
{
|
||||
AudioVideoManagement::ActiveFrequencyPlanning activePlanning = m_avmDtc->activeFrequencyPlanning(m_exerciseId);
|
||||
if (activePlanning.exerciseId() != m_exerciseId)
|
||||
if (activePlanning.exerciseId != m_exerciseId)
|
||||
return boost::none;
|
||||
return m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId());
|
||||
return m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -29,7 +29,7 @@ void TrainingArea::getTrainingArea(int trainingAreaId, AssetManagement::Interfac
|
||||
{
|
||||
AssetManagement::TrainingArea ddsTrainingArea = asmDtc->trainingArea(trainingAreaId);
|
||||
|
||||
m_trainingAreaData.designation = QString::fromStdString(ddsTrainingArea.name());
|
||||
m_trainingAreaData.designation = QString::fromStdString(ddsTrainingArea.name);
|
||||
m_trainingAreaData.id = trainingAreaId;
|
||||
m_trainingAreaData.refPoint.lat = -1.;
|
||||
m_trainingAreaData.refPoint.lon = -1.;
|
||||
@@ -37,25 +37,25 @@ void TrainingArea::getTrainingArea(int trainingAreaId, AssetManagement::Interfac
|
||||
WebSocketInterface::Messages::ReplyMessage::LonLatPoint point;
|
||||
|
||||
|
||||
LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(ddsTrainingArea.bottomLeft().lon(), ddsTrainingArea.bottomLeft().lat());
|
||||
point.lat = toDeg(ddsTrainingArea.bottomLeft().lat());
|
||||
point.lon = toDeg(ddsTrainingArea.bottomLeft().lon());
|
||||
LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(ddsTrainingArea.bottomLeft.lon, ddsTrainingArea.bottomLeft.lat);
|
||||
point.lat = toDeg(ddsTrainingArea.bottomLeft.lat);
|
||||
point.lon = toDeg(ddsTrainingArea.bottomLeft.lon);
|
||||
m_trainingAreaData.path << point;
|
||||
|
||||
|
||||
QPointF coord = utmCoordinate.geographic(ddsTrainingArea.width());
|
||||
QPointF coord = utmCoordinate.geographic(ddsTrainingArea.width);
|
||||
point.lon = toDeg(coord.x());
|
||||
point.lat = toDeg(coord.y());
|
||||
m_trainingAreaData.path << point;
|
||||
|
||||
|
||||
coord = utmCoordinate.geographic(ddsTrainingArea.width(), ddsTrainingArea.height());
|
||||
coord = utmCoordinate.geographic(ddsTrainingArea.width, ddsTrainingArea.height);
|
||||
point.lon = toDeg(coord.x());
|
||||
point.lat = toDeg(coord.y());
|
||||
m_trainingAreaData.path << point;
|
||||
|
||||
|
||||
coord = utmCoordinate.geographic(0, ddsTrainingArea.height());
|
||||
coord = utmCoordinate.geographic(0, ddsTrainingArea.height);
|
||||
point.lon = toDeg(coord.x());
|
||||
point.lat = toDeg(coord.y());
|
||||
m_trainingAreaData.path << point;
|
||||
@@ -65,7 +65,7 @@ void TrainingArea::getRadioStations(InfrastructureManagement::Interface::Dtc *is
|
||||
{
|
||||
auto cb = [this](const InfrastructureManagement::MainStructureElement &mse)
|
||||
{
|
||||
if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::RadioStation || mse.isDeleted())
|
||||
if (mse.structureElementTypeId != InfrastructureManagement::StructureElementType::RadioStation || mse.isDeleted)
|
||||
return;
|
||||
|
||||
WebSocketInterface::Messages::RadioStationMessage::RadioStationData data;
|
||||
@@ -73,13 +73,13 @@ void TrainingArea::getRadioStations(InfrastructureManagement::Interface::Dtc *is
|
||||
if (data.id == 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Got MainStructureElement of type 'RadioStation' but property 'stationId' was not set"
|
||||
<< " - database id: " << mse.id() << " - ignoring!";
|
||||
<< " - database id: " << mse.id << " - ignoring!";
|
||||
return;
|
||||
}
|
||||
data.geoPoint.lon = toDeg(mse.geoPosition().lon());
|
||||
data.geoPoint.lat = toDeg(mse.geoPosition().lat());
|
||||
data.geoPoint.lon = toDeg(mse.geoPosition.lon);
|
||||
data.geoPoint.lat = toDeg(mse.geoPosition.lat);
|
||||
data.trainingAreaId = m_trainingAreaData.id;
|
||||
data.designation = QString::fromStdString(mse.name());
|
||||
data.designation = QString::fromStdString(mse.name);
|
||||
|
||||
m_radioStations.push_back(data);
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user