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
@@ -4,12 +4,14 @@
|
||||
#include "ppm_handler.h"
|
||||
#include "main_handler.h"
|
||||
#include "send_to_tab.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
PpmHandler::PpmHandler(MainHandler *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_equipExerciseMappingTimer(new QTimer(this))
|
||||
{
|
||||
m_equipExerciseMappingTimer->setSingleShot(true);
|
||||
@@ -46,10 +48,10 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
ParticipantManagement::Participant participant = m_ppmDtc->participant(data.participantId());
|
||||
ParticipantManagement::Participant participant = m_ppmDtc->participant(data.participantId);
|
||||
int equipNo = 0;
|
||||
if (participant.equipmentNumber().is_set())
|
||||
equipNo = participant.equipmentNumber().get();
|
||||
if (participant.equipmentNumber.is_set())
|
||||
equipNo = participant.equipmentNumber.get();
|
||||
|
||||
if (equipNo > 0)
|
||||
emit position(equipNo, data);
|
||||
@@ -64,15 +66,15 @@ void PpmHandler::onEquipmentExerciseMappingChanged(const ParticipantManagement::
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
std::unordered_set<int> &equipmentNumbers = m_exerciseEquipmentAssignments[data.exerciseId()];
|
||||
std::unordered_set<int> &equipmentNumbers = m_exerciseEquipmentAssignments[data.exerciseId];
|
||||
equipmentNumbers.clear();
|
||||
for (const ParticipantManagement::Equipment2ParticipantId &e2p : data.mapping())
|
||||
equipmentNumbers.insert(e2p.equipmentNumber());
|
||||
for (const ParticipantManagement::Equipment2ParticipantId &e2p : data.mapping)
|
||||
equipmentNumbers.insert(e2p.equipmentNumber);
|
||||
break;
|
||||
}
|
||||
case DataModification::eRemoved:
|
||||
{
|
||||
auto it = m_exerciseEquipmentAssignments.find(data.exerciseId());
|
||||
auto it = m_exerciseEquipmentAssignments.find(data.exerciseId);
|
||||
if (it != m_exerciseEquipmentAssignments.end())
|
||||
m_exerciseEquipmentAssignments.erase(it);
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user