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
+12
-12
@@ -157,9 +157,9 @@ void NContaminationEdit::onWeatherChanged(int index )
|
||||
{
|
||||
Q_UNUSED(index);
|
||||
|
||||
AreaEffectSimulation::AesWeatherSource weather = static_cast<AreaEffectSimulation::AesWeatherSource::inner_enum>(m_ui->cbWeather->currentData().toInt());
|
||||
if (weather == AreaEffectSimulation::AesWeatherSource_def::AwsDynamic ||
|
||||
weather == AreaEffectSimulation::AesWeatherSource_def::AwsStatic)
|
||||
AreaEffectSimulation::AesWeatherSource weather = static_cast<AreaEffectSimulation::AesWeatherSource>(m_ui->cbWeather->currentData().toInt());
|
||||
if (weather == AreaEffectSimulation::AesWeatherSource::AwsDynamic ||
|
||||
weather == AreaEffectSimulation::AesWeatherSource::AwsStatic)
|
||||
{
|
||||
m_ui->rotationAngleEdit->showSpinbox(1, false);
|
||||
m_ui->stackedWidget->setCurrentWidget(m_ui->lbAngle);
|
||||
@@ -182,9 +182,9 @@ void NContaminationEdit::setRadials(double direction, double spanAngle)
|
||||
double radial1 = direction - (fabs(spanAngle) / 2.0);
|
||||
double radial2 = direction + (fabs(spanAngle) / 2.0);
|
||||
|
||||
AreaEffectSimulation::AesWeatherSource weather = static_cast<AreaEffectSimulation::AesWeatherSource::inner_enum>(m_ui->cbWeather->currentData().toInt());
|
||||
if (weather == AreaEffectSimulation::AesWeatherSource_def::AwsDynamic ||
|
||||
weather == AreaEffectSimulation::AesWeatherSource_def::AwsStatic)
|
||||
AreaEffectSimulation::AesWeatherSource weather = static_cast<AreaEffectSimulation::AesWeatherSource>(m_ui->cbWeather->currentData().toInt());
|
||||
if (weather == AreaEffectSimulation::AesWeatherSource::AwsDynamic ||
|
||||
weather == AreaEffectSimulation::AesWeatherSource::AwsStatic)
|
||||
{
|
||||
radial1 = spanAngle;
|
||||
}
|
||||
@@ -202,7 +202,7 @@ double NContaminationEdit::spanAngle() const
|
||||
double radial2 = m_ui->rotationAngleEdit->getAngleConverted(m_ui->rotationAngleEdit->getAngle(1), LtsAngleEditBase::AngleUnitType::Deg,
|
||||
m_ui->rotationAngleEdit->getAngleCurrentUnit());
|
||||
|
||||
if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource_def::AwsNone)
|
||||
if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource::AwsNone)
|
||||
return radial1;
|
||||
|
||||
double spanAngle = radial2 - radial1;
|
||||
@@ -213,7 +213,7 @@ double NContaminationEdit::spanAngle() const
|
||||
|
||||
double NContaminationEdit::rotatianAngle() const
|
||||
{
|
||||
if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource_def::AwsNone)
|
||||
if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource::AwsNone)
|
||||
return 0.0;
|
||||
|
||||
double radial1 = m_ui->rotationAngleEdit->getAngleConverted(m_ui->rotationAngleEdit->getAngle(0), LtsAngleEditBase::AngleUnitType::Deg,
|
||||
@@ -244,12 +244,12 @@ void NContaminationEdit::enableUiElements(bool enable)
|
||||
m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
|
||||
m_ui->cbWeather->setEnabled(enable);
|
||||
|
||||
if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired)
|
||||
if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
|
||||
{
|
||||
m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
|
||||
__unchange__();
|
||||
}
|
||||
if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated)
|
||||
if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
|
||||
{
|
||||
QString name = m_ui->leIdentifier->text();
|
||||
auto baseData = m_dtc->nContamination(m_aesItem.id());
|
||||
@@ -322,7 +322,7 @@ void NContaminationEdit::setData(const NContamination &contamination, bool copy)
|
||||
if (copy)
|
||||
{
|
||||
m_aesItem.id(0);
|
||||
m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default());
|
||||
m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
|
||||
}
|
||||
|
||||
m_ui->leIdentifier->setText(QString::fromStdString(contamination.name()));
|
||||
@@ -385,7 +385,7 @@ bool NContaminationEdit::apply()
|
||||
int partyId = 0;
|
||||
int playerId = 0;
|
||||
|
||||
AesWeatherSource weatherSourceId = static_cast<AesWeatherSource::inner_enum>(m_ui->cbWeather->currentData().toInt());
|
||||
AesWeatherSource weatherSourceId = static_cast<AesWeatherSource>(m_ui->cbWeather->currentData().toInt());
|
||||
const QPointF p(m_ui->positionEdit->coordinate());
|
||||
const Core::GeoPosition2D pos(p.x(), p.y());
|
||||
const NContaminationModifyRequest req(m_aesItem.id(),
|
||||
|
||||
Reference in new issue
Block a user