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
-4
@@ -727,9 +727,9 @@ bool ExerciseManagementEditDialog::apply()
|
||||
|
||||
if (m_exerciseId > 0)
|
||||
{
|
||||
ExerciseState state = static_cast<ExerciseState::type>(m_ui->cbState->currentData().toInt());
|
||||
ExerciseState state = static_cast<ExerciseState>(m_ui->cbState->currentData().toInt());
|
||||
ExerciseManagement::Exercise data = m_dtc->exercise(m_exerciseId);
|
||||
if (state == ExerciseState_def::Stopped && data.state() != ExerciseState_def::Stopped)
|
||||
if (state == ExerciseState::Stopped && data.state() != ExerciseState::Stopped)
|
||||
{
|
||||
if (LtsWidgets::LtsMessageDialog::showMessage(
|
||||
this, QString(), tr("Are you sure you want to stop the exercise?"), LtsWidgets::Behaviour::Modal,
|
||||
@@ -737,7 +737,7 @@ bool ExerciseManagementEditDialog::apply()
|
||||
|
||||
retVal = false;
|
||||
}
|
||||
else if (state == ExerciseState_def::Terminated && data.state() != ExerciseState_def::Terminated)
|
||||
else if (state == ExerciseState::Terminated && data.state() != ExerciseState::Terminated)
|
||||
{
|
||||
if (LtsWidgets::LtsMessageDialog::showMessage(
|
||||
this, QString(), tr("Are you sure you want to terminate the exercise?"),
|
||||
@@ -771,7 +771,7 @@ bool ExerciseManagementEditDialog::apply()
|
||||
request.forces(m_ui->pteForces->toPlainText().toStdString());
|
||||
request.description(m_ui->pteDescription->toPlainText().toStdString());
|
||||
request.hasHlaInterface(m_ui->cbStartHlaInterface->isChecked());
|
||||
request.newState(static_cast<ExerciseState::type>(m_ui->cbState->currentData().toInt()));
|
||||
request.newState(static_cast<ExerciseState>(m_ui->cbState->currentData().toInt()));
|
||||
request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
request.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
|
||||
|
||||
|
||||
+3
-3
@@ -145,8 +145,8 @@ void ExerciseManagementStateEdit::retranslate()
|
||||
|
||||
bool ExerciseManagementStateEdit::apply()
|
||||
{
|
||||
ExerciseState exState = static_cast<ExerciseState::type>(m_ui->cbState->currentData().toInt());
|
||||
if (exState.underlying() == ExerciseState_def::Stopped &&
|
||||
ExerciseState exState = static_cast<ExerciseState>(m_ui->cbState->currentData().toInt());
|
||||
if (exState.underlying() == ExerciseState::Stopped &&
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this,
|
||||
tr("Are you sure you want to stop the exercise?"),
|
||||
tr("Stop Exercise"),
|
||||
@@ -177,7 +177,7 @@ bool ExerciseManagementStateEdit::apply()
|
||||
request.defaultTimeZone(m_exercise.defaultTimeZone());
|
||||
request.forces(m_exercise.forces());
|
||||
request.description(m_exercise.description());
|
||||
request.newState(static_cast<ExerciseState::type>(m_ui->cbState->currentData().toInt()));
|
||||
request.newState(static_cast<ExerciseState>(m_ui->cbState->currentData().toInt()));
|
||||
|
||||
if(!m_requestHelper->startSingleRequest(
|
||||
[this, request]() {
|
||||
|
||||
Reference in new issue
Block a user