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
+13
-12
@@ -8,7 +8,8 @@ namespace WarehouseManagement
|
||||
{
|
||||
|
||||
ExercisesHandler::ExercisesHandler(const std::shared_ptr<DdsHandler> &ddsHandler)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
: m_logger(getLogger("ExercisesHandler"))
|
||||
, m_ddsHandler(ddsHandler)
|
||||
{}
|
||||
|
||||
ExercisesHandler::~ExercisesHandler()
|
||||
@@ -23,7 +24,7 @@ bool ExercisesHandler::init()
|
||||
|
||||
auto cb = [this](const ExerciseManagement::Exercise &exercise)
|
||||
{
|
||||
exerciseAdded(exercise.id());
|
||||
exerciseAdded(exercise.id);
|
||||
};
|
||||
m_ddsHandler->exmDtc()->exercises(cb);
|
||||
|
||||
@@ -50,9 +51,9 @@ ParticipantManagement::TypeClass ExercisesHandler::typeClassIdFromEquipmentTypeI
|
||||
std::function<bool(const ParticipantManagement::Type &data)> cb =
|
||||
[equipTypeId, &ret](const ParticipantManagement::Type &t) -> bool
|
||||
{
|
||||
if (t.equipmentTypeId() != equipTypeId)
|
||||
if (t.equipmentTypeId != equipTypeId)
|
||||
return false;
|
||||
ret = t.typeClass();
|
||||
ret = t.typeClass;
|
||||
return true;
|
||||
};
|
||||
m_ddsHandler->ppmDtc()->types(cb);
|
||||
@@ -132,7 +133,7 @@ bool ExercisesHandler::unregisterParticipant(int exerciseId, qint32 equipNo)
|
||||
return false;
|
||||
|
||||
|
||||
ParticipantManagement::ParticipantAssignState assignState = ParticipantManagement::ParticipantAssignState_def::NotAssigned;
|
||||
ParticipantManagement::ParticipantAssignState assignState = ParticipantManagement::ParticipantAssignState::NotAssigned;
|
||||
|
||||
m_exerciseHandler.value(exerciseId)->registerParticipant(participantId, assignState, 0, {}, {});
|
||||
return true;
|
||||
@@ -142,8 +143,8 @@ bool ExercisesHandler::modifyEquipmentTypes(const std::vector<ParticipantManagem
|
||||
{
|
||||
ParticipantManagement::ModifyEquipmentTypeDataRequest req;
|
||||
|
||||
req.data(vectorEquipTypes);
|
||||
req.deleteAll(true);
|
||||
req.data = vectorEquipTypes;
|
||||
req.deleteAll = true;
|
||||
return m_ddsHandler->ppmFtc()->modifyEquipmentTypeDataRequest(req, this);
|
||||
}
|
||||
|
||||
@@ -254,19 +255,19 @@ QMultiHash<int, ParticipantInfoStruct>::iterator ExercisesHandler::findParticipa
|
||||
|
||||
void ExercisesHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
|
||||
{
|
||||
if (!data.sendToWMS())
|
||||
if (!data.sendToWMS)
|
||||
{
|
||||
if (m_exerciseHandler.contains(data.id()))
|
||||
exerciseRemoved(data.id());
|
||||
if (m_exerciseHandler.contains(data.id))
|
||||
exerciseRemoved(data.id);
|
||||
|
||||
emit exerciseChanged(data, DataModification::eRemoved);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!m_exerciseHandler.contains(data.id()))
|
||||
if (!m_exerciseHandler.contains(data.id))
|
||||
{
|
||||
modType = DataModification::eAdded;
|
||||
exerciseAdded(data.id());
|
||||
exerciseAdded(data.id);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user