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
@@ -3,12 +3,14 @@
|
||||
|
||||
#include "exm_handler.h"
|
||||
#include "main_handler.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
|
||||
ExmHandler::ExmHandler(MainHandler *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
, m_mainHandler(mainHandler)
|
||||
{}
|
||||
|
||||
bool ExmHandler::init()
|
||||
@@ -35,7 +37,7 @@ ExerciseManagement::Exercise ExmHandler::exercise(int exerciseId)
|
||||
|
||||
void ExmHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
|
||||
{
|
||||
if (!data.radioGroupId().is_set() || data.radioGroupId().get() == 0)
|
||||
if (!data.radioGroupId.is_set() || data.radioGroupId.get() == 0)
|
||||
modType = DataModification::eRemoved;
|
||||
|
||||
bool bExercise2RadioGroupChanged = false;
|
||||
@@ -44,17 +46,17 @@ void ExmHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Dat
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
auto &val = m_exercise2RadioGroup[data.id()];
|
||||
if (val != data.radioGroupId().get())
|
||||
auto &val = m_exercise2RadioGroup[data.id];
|
||||
if (val != data.radioGroupId.get())
|
||||
{
|
||||
bExercise2RadioGroupChanged = true;
|
||||
val = data.radioGroupId().get();
|
||||
val = data.radioGroupId.get();
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DataModification::eRemoved:
|
||||
{
|
||||
auto it = m_exercise2RadioGroup.find(data.id());
|
||||
auto it = m_exercise2RadioGroup.find(data.id);
|
||||
if (it != m_exercise2RadioGroup.end())
|
||||
{
|
||||
bExercise2RadioGroupChanged = true;
|
||||
|
||||
Reference in new issue
Block a user