Migrates EffectShow and AssetManagement to generated rtiddsgen API
Converts accessor calls to plain member access across esc and asm services.
This commit is contained in:
39 files changed
+818
-818
No files matched your search
+12
-12
@@ -18,8 +18,8 @@ namespace ConvertFromTab
|
||||
//=============================================================================
|
||||
RxTelegram_e isTelegram(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
Q_ASSERT(data.payload().size() > 0);
|
||||
switch (data.payload().at(0))
|
||||
Q_ASSERT(data.payload.size() > 0);
|
||||
switch (data.payload.at(0))
|
||||
{
|
||||
case 120: return RxTelegram_e::OrderConfirmation;
|
||||
case 121: return RxTelegram_e::VehicleStatus;
|
||||
@@ -29,10 +29,10 @@ RxTelegram_e isTelegram(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
//=============================================================================
|
||||
OrderConfirmation_t getOrderConfirmation(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
Q_ASSERT(data.payload().size() >= 5);
|
||||
Q_ASSERT(data.payload.size() >= 5);
|
||||
const QByteArray tele(QByteArray::fromRawData(
|
||||
reinterpret_cast<const char *>(&data.payload().at(0)),
|
||||
data.payload().size()));
|
||||
reinterpret_cast<const char *>(&data.payload.at(0)),
|
||||
data.payload.size()));
|
||||
OrderConfirmation_t res;
|
||||
|
||||
size_t k = 1;
|
||||
@@ -45,9 +45,9 @@ OrderConfirmation_t getOrderConfirmation(const TrainingAreaBase::FireSmokeMarker
|
||||
res.confirmation = EffectShowManagement::OrderConfirmation_e::inner_enum(byte);
|
||||
|
||||
QByteArray qbArr;
|
||||
int ie = data.payload().size() - 5;
|
||||
int ie = data.payload.size() - 5;
|
||||
for (int i = 0; i < ie; ++i)
|
||||
qbArr.append(data.payload().at(5 + i)); // rationale (text)
|
||||
qbArr.append(data.payload.at(5 + i)); // rationale (text)
|
||||
|
||||
res.answerText = QString::fromUtf8(qbArr);
|
||||
|
||||
@@ -56,14 +56,14 @@ OrderConfirmation_t getOrderConfirmation(const TrainingAreaBase::FireSmokeMarker
|
||||
//=============================================================================
|
||||
VehicleStatus_t getVehicleStatus(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
Q_ASSERT(data.payload().size() == 5);
|
||||
Q_ASSERT(data.payload.size() == 5);
|
||||
const QByteArray tele(QByteArray::fromRawData(
|
||||
reinterpret_cast<const char *>(&data.payload().at(0)),
|
||||
data.payload().size()));
|
||||
reinterpret_cast<const char *>(&data.payload.at(0)),
|
||||
data.payload.size()));
|
||||
VehicleStatus_t res;
|
||||
|
||||
res.equipmentNumber = data.equipmentNumber();
|
||||
res.timestamp = data.sampleTime();
|
||||
res.equipmentNumber = data.equipmentNumber;
|
||||
res.timestamp = data.sampleTime;
|
||||
|
||||
size_t k = 1;
|
||||
quint8 byte;
|
||||
|
||||
Reference in new issue
Block a user