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
@@ -21,23 +21,23 @@ AesItemViewUtm AesItemViewUtm::create(const AreaEffectSimulation::AesItemView &a
|
||||
double lowerOffset)
|
||||
{
|
||||
if (prevData.aesItemId != 0)
|
||||
Q_ASSERT(prevData.aesItemId == aiv.aesItemId());
|
||||
if (aiv.aesTypeId() == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines)
|
||||
Q_ASSERT(prevData.aesItemId == aiv.aesItemId);
|
||||
if (aiv.aesTypeId == AreaEffectSimulation::AesType::AtMineAreaSingleMines)
|
||||
Q_ASSERT(false);
|
||||
|
||||
AesItemViewUtm ret = prevData;
|
||||
//ret.zone;
|
||||
ret.aesItemId = aiv.aesItemId();
|
||||
ret.chargeStruct = aiv.chargeStruct();
|
||||
ret.aesItemId = aiv.aesItemId;
|
||||
ret.chargeStruct = aiv.chargeStruct;
|
||||
ret.partyId = aiv.partyId.is_set() ? aiv.partyId.get() : -1;
|
||||
ret.dusMineId = -1;
|
||||
ret.isSupplyTruck = isSupplyTruck;
|
||||
ret.aesTypeId = aiv.aesTypeId();
|
||||
ret.effectStateId = aiv.effectStateId();
|
||||
ret.effectStart = aiv.effectStart();
|
||||
ret.boundingBoxBottomLeft = CentralEffectSimulation::geographic2Utm(aiv.boundingBoxBottomLeft(), &ret.zone);
|
||||
ret.aesTypeId = aiv.aesTypeId;
|
||||
ret.effectStateId = aiv.effectStateId;
|
||||
ret.effectStart = aiv.effectStart;
|
||||
ret.boundingBoxBottomLeft = CentralEffectSimulation::geographic2Utm(aiv.boundingBoxBottomLeft, &ret.zone);
|
||||
ret.boundingBoxBottomLeft.setX(ret.boundingBoxBottomLeft.x() - impactRadius);
|
||||
ret.boundingBoxTopRight = CentralEffectSimulation::geographic2Utm(aiv.boundingBoxTopRight(), ret.zone);
|
||||
ret.boundingBoxTopRight = CentralEffectSimulation::geographic2Utm(aiv.boundingBoxTopRight, ret.zone);
|
||||
ret.boundingBoxTopRight.setX(ret.boundingBoxTopRight.x() + impactRadius);
|
||||
if ( ret.boundingBoxBottomLeft.y() > ret.boundingBoxTopRight.y())
|
||||
{
|
||||
@@ -61,9 +61,9 @@ AesItemViewUtm AesItemViewUtm::create(const AreaEffectSimulation::AesItemView &a
|
||||
|
||||
ret.form.clear();
|
||||
ret.formGeo.clear();
|
||||
ret.form.reserve(aiv.form().size());
|
||||
ret.formGeo.reserve(aiv.form().size());
|
||||
for (const Core::GeoPosition2D &pointGeo : aiv.form())
|
||||
ret.form.reserve(aiv.form.size());
|
||||
ret.formGeo.reserve(aiv.form.size());
|
||||
for (const Core::GeoPosition2D &pointGeo : aiv.form)
|
||||
{
|
||||
ret.form.push_back(CentralEffectSimulation::geographic2Utm(pointGeo, ret.zone));
|
||||
ret.formGeo.push_back(pointGeo);
|
||||
|
||||
Reference in new issue
Block a user