Complete Qt6/rtiddsgen migration of residual Lts service sources
This commit is contained in:
86 files changed
+1235
-1128
No files matched your search
+1
-1
@@ -40,7 +40,7 @@ bool ConnectionHandlerTcp::init()
|
||||
|
||||
connect(m_socket, &QTcpSocket::readyRead, this, &ConnectionHandlerTcp::read);
|
||||
connect(m_socket, &QTcpSocket::disconnected, this, &ConnectionHandlerTcp::open);
|
||||
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), this, &ConnectionHandlerTcp::handleError);
|
||||
connect(m_socket, &QAbstractSocket::errorOccurred, this, &ConnectionHandlerTcp::handleError);
|
||||
connect(m_socket, &QTcpSocket::connected, this, &ConnectionHandlerTcp::connectedToSerialConverter);
|
||||
open(); //open it and start regardless
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
qint64 DdsHandler::currentPartitionTime() const
|
||||
{
|
||||
return m_dtcCore->partitionTime().timeStamp();
|
||||
return m_dtcCore->partitionTime().timeStamp;
|
||||
}
|
||||
|
||||
|
||||
|
||||
+36
-36
@@ -18,10 +18,10 @@ namespace ConvertFromTab
|
||||
//=============================================================================
|
||||
RxTelegram_e isTelegram(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
if (data.payload().size() == 0)
|
||||
if (data.payload.size() == 0)
|
||||
return RxTelegram_e::unknown;
|
||||
|
||||
switch (data.payload().at(0))
|
||||
switch (data.payload.at(0))
|
||||
{
|
||||
case 150: return RxTelegram_e::EffectShowOrder;
|
||||
case 155: return RxTelegram_e::RelocationOrder;
|
||||
@@ -46,14 +46,14 @@ static inline Core::GeoPosition2D convertGeoPos(const QByteArray &tele, size_t &
|
||||
EffectShowOrder_t convertEffectShowOrder(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
EffectShowOrder_t effectShowOrder;
|
||||
if (data.payload().size() == 0)
|
||||
if (data.payload.size() == 0)
|
||||
return effectShowOrder;
|
||||
|
||||
Q_ASSERT(data.payload().size() != 48);
|
||||
Q_ASSERT(data.payload.size() != 48);
|
||||
|
||||
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()));
|
||||
|
||||
size_t k = 1;
|
||||
LtsUtils::get2Byte(tele, k, effectShowOrder.idEffectShow);
|
||||
@@ -93,14 +93,14 @@ EffectShowOrder_t convertEffectShowOrder(const TrainingAreaBase::FireSmokeMarker
|
||||
RelocationOrder_t convertRelocationOrder(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
RelocationOrder_t relocationOrder;
|
||||
if (data.payload().size() == 0)
|
||||
if (data.payload.size() == 0)
|
||||
return relocationOrder;
|
||||
|
||||
Q_ASSERT(data.payload().size() >= 7);
|
||||
Q_ASSERT(data.payload.size() >= 7);
|
||||
|
||||
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()));
|
||||
|
||||
size_t k = 1;
|
||||
LtsUtils::get2Byte(tele, k, relocationOrder.idRelocation);
|
||||
@@ -122,14 +122,14 @@ RelocationOrder_t convertRelocationOrder(const TrainingAreaBase::FireSmokeMarker
|
||||
int convertEffectShowStop(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
int idEffectShow = 0;
|
||||
if (data.payload().size() == 0)
|
||||
if (data.payload.size() == 0)
|
||||
return idEffectShow;
|
||||
|
||||
Q_ASSERT(data.payload().size() != 3);
|
||||
Q_ASSERT(data.payload.size() != 3);
|
||||
|
||||
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()));
|
||||
|
||||
size_t k = 1;
|
||||
LtsUtils::get2Byte(tele, k, idEffectShow);
|
||||
@@ -140,14 +140,14 @@ int convertEffectShowStop(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
EffectShowContinue_t convertEffectShowContinue(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
EffectShowContinue_t effectShowContinue;
|
||||
if (data.payload().size() == 0)
|
||||
if (data.payload.size() == 0)
|
||||
return effectShowContinue;
|
||||
|
||||
Q_ASSERT(data.payload().size() != 7);
|
||||
Q_ASSERT(data.payload.size() != 7);
|
||||
|
||||
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()));
|
||||
|
||||
size_t k = 1;
|
||||
LtsUtils::get2Byte(tele, k, effectShowContinue.idEffectShow);
|
||||
@@ -161,14 +161,14 @@ EffectShowContinue_t convertEffectShowContinue(const TrainingAreaBase::FireSmoke
|
||||
OrderRetract_t convertOrderRetract(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
OrderRetract_t orderRetract;
|
||||
if (data.payload().size() == 0)
|
||||
if (data.payload.size() == 0)
|
||||
return orderRetract;
|
||||
|
||||
Q_ASSERT(data.payload().size() != 4);
|
||||
Q_ASSERT(data.payload.size() != 4);
|
||||
|
||||
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()));
|
||||
|
||||
size_t k = 1;
|
||||
LtsUtils::get1Byte(tele, k, orderRetract.orderType);
|
||||
@@ -179,11 +179,11 @@ OrderRetract_t convertOrderRetract(const TrainingAreaBase::FireSmokeMarkerData &
|
||||
//=============================================================================
|
||||
bool convertStatusRequest(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
if (data.payload().size() <2)
|
||||
if (data.payload.size() <2)
|
||||
return false;
|
||||
|
||||
Q_ASSERT(data.payload().size() != 2);
|
||||
const std::vector<uint8_t> &tele = data.payload();
|
||||
Q_ASSERT(data.payload.size() != 2);
|
||||
const std::vector<uint8_t> &tele = data.payload;
|
||||
|
||||
return (tele.at(1) == 154);
|
||||
|
||||
@@ -192,37 +192,37 @@ bool convertStatusRequest(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
EffectShowClient::MeteoNearVehicle convertMeteoData(const TrainingAreaBase::FireSmokeMarkerData &data)
|
||||
{
|
||||
EffectShowClient::MeteoNearVehicle meteoData;
|
||||
if (data.payload().size() == 0)
|
||||
if (data.payload.size() == 0)
|
||||
{
|
||||
meteoData.isValid(false);
|
||||
meteoData.isValid = false;
|
||||
return meteoData;
|
||||
}
|
||||
|
||||
Q_ASSERT(data.payload().size() != 11);
|
||||
Q_ASSERT(data.payload.size() != 11);
|
||||
|
||||
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()));
|
||||
|
||||
qint16 word = 0;
|
||||
|
||||
size_t k = 1;
|
||||
LtsUtils::get2Byte(tele, k, word);
|
||||
meteoData.temperature(double(word) / 10.0);
|
||||
meteoData.temperature = double(word) / 10.0;
|
||||
|
||||
LtsUtils::get2Byte(tele, k, word);
|
||||
meteoData.humidity(double(word));
|
||||
meteoData.humidity = double(word);
|
||||
|
||||
LtsUtils::get2Byte(tele, k, word);
|
||||
meteoData.pressure(double(word));
|
||||
meteoData.pressure = double(word);
|
||||
|
||||
LtsUtils::get2Byte(tele, k, word);
|
||||
meteoData.windDirection(double(word) * 0.01);
|
||||
meteoData.windDirection = double(word) * 0.01;
|
||||
|
||||
LtsUtils::get2Byte(tele, k, word);
|
||||
meteoData.windSpeed(double(word));
|
||||
meteoData.windSpeed = double(word);
|
||||
|
||||
meteoData.isValid(true);
|
||||
meteoData.isValid = true;
|
||||
return meteoData;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ std::vector<uint8_t> convertOrderConfirmation(const OrderConfirmation_t &orderCo
|
||||
LtsUtils::set1Byte(120, ba);
|
||||
LtsUtils::set1Byte(int(orderConfirmation.orderType), ba);
|
||||
LtsUtils::set2Byte(orderConfirmation.orderId, ba);
|
||||
LtsUtils::set1Byte(orderConfirmation.confirmation.underlying(), ba);
|
||||
LtsUtils::set1Byte(static_cast<int>(orderConfirmation.confirmation), ba);
|
||||
|
||||
const QByteArray txt = orderConfirmation.answerText.toUtf8();
|
||||
const int len = txt.length() > 39 ? 39 : txt.length();
|
||||
|
||||
+91
-91
@@ -64,13 +64,13 @@ void HandlerFiringExplosion::setFiringClearanceDuration()
|
||||
qint64 pre = m_firingExplosionEntity.firingClearanceTime.get();
|
||||
qint64 post = pre;
|
||||
pre -= PRE_START_TIME;
|
||||
post += m_firingExplosionEntity.duration() + POST_END_TIME; //as we already start "duration" earlier
|
||||
m_firingExplosionEntity.firingClearanceTime().set(pre);
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime().set(post);
|
||||
// m_firingExplosionEntity.firingClearanceTime().set(m_firingExplosionEntity.firingClearanceTime.get() - (2 * m_firingClearanceDuration));
|
||||
post += m_firingExplosionEntity.duration + POST_END_TIME; //as we already start "duration" earlier
|
||||
m_firingExplosionEntity.firingClearanceTime.set(pre);
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime.set(post);
|
||||
// m_firingExplosionEntity.firingClearanceTime.set(m_firingExplosionEntity.firingClearanceTime.get() - (2 * m_firingClearanceDuration));
|
||||
}
|
||||
else
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime().reset();
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime.reset();
|
||||
|
||||
m_mainHandler->dds()->dts()->publish(m_firingExplosionEntity);
|
||||
}
|
||||
@@ -85,41 +85,41 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
|
||||
return;
|
||||
|
||||
//we are interrupted
|
||||
m_firingExplosionEntity.idEffectShow(escOrder.id);
|
||||
m_firingExplosionEntity.fireEnabled(false);
|
||||
m_firingExplosionEntity.carriedOutEnabled(false);
|
||||
m_firingExplosionEntity.idOrder(escOrder.idOrder);
|
||||
m_firingExplosionEntity.idEffectShow = escOrder.id;
|
||||
m_firingExplosionEntity.fireEnabled = false;
|
||||
m_firingExplosionEntity.carriedOutEnabled = false;
|
||||
m_firingExplosionEntity.idOrder = escOrder.idOrder;
|
||||
if (m_isNew)
|
||||
{
|
||||
m_firingExplosionEntity.numberOfVolley(escOrder.numOfVolley);
|
||||
m_firingExplosionEntity.numberOfShot(escOrder.shotsPerVolley);
|
||||
m_firingExplosionEntity.remainingVolleys(escOrder.numOfVolley);
|
||||
m_firingExplosionEntity.remainingShots(m_firingExplosionEntity.numberOfShot());
|
||||
DEBUG_LOG(m_logger) << "Changed number of Shots Remain: " << m_firingExplosionEntity.numberOfShot();
|
||||
m_firingExplosionEntity.numberOfVolley = escOrder.numOfVolley;
|
||||
m_firingExplosionEntity.numberOfShot = escOrder.shotsPerVolley;
|
||||
m_firingExplosionEntity.remainingVolleys = escOrder.numOfVolley;
|
||||
m_firingExplosionEntity.remainingShots = m_firingExplosionEntity.numberOfShot;
|
||||
DEBUG_LOG(m_logger) << "Changed number of Shots Remain: " << m_firingExplosionEntity.numberOfShot;
|
||||
m_isNew = false;
|
||||
}
|
||||
m_firingExplosionEntity.duration(escOrder.duration * 1000);
|
||||
m_firingExplosionEntity.remainingTime(escOrder.duration * 1000); //here to avoid traffic?
|
||||
m_firingExplosionEntity.duration = escOrder.duration * 1000;
|
||||
m_firingExplosionEntity.remainingTime = escOrder.duration * 1000; //here to avoid traffic?
|
||||
if (escOrder.startTime > 0)
|
||||
m_firingExplosionEntity.firingClearanceTime().set(escOrder.startTime);
|
||||
m_firingExplosionEntity.firingClearanceTime.set(escOrder.startTime);
|
||||
else
|
||||
{
|
||||
WARNING_LOG(m_logger) << "reset clearance time";
|
||||
m_firingExplosionEntity.firingClearanceTime().reset();
|
||||
m_firingExplosionEntity.firingClearanceTime.reset();
|
||||
}
|
||||
|
||||
if (m_firingExplosionEntity.duration() <= 0 ||
|
||||
m_firingExplosionEntity.numberOfShot() <= 0 ||
|
||||
m_firingExplosionEntity.numberOfVolley() <= 0)
|
||||
if (m_firingExplosionEntity.duration <= 0 ||
|
||||
m_firingExplosionEntity.numberOfShot <= 0 ||
|
||||
m_firingExplosionEntity.numberOfVolley <= 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Won't start Explosion ";
|
||||
return;
|
||||
}
|
||||
|
||||
setFiringClearanceDuration();
|
||||
m_mainHandler->handlerVehicle()->setExplosionParameter(m_firingExplosionEntity.remainingVolleys(),
|
||||
m_firingExplosionEntity.remainingShots(),
|
||||
m_firingExplosionEntity.remainingTime());
|
||||
m_mainHandler->handlerVehicle()->setExplosionParameter(m_firingExplosionEntity.remainingVolleys,
|
||||
m_firingExplosionEntity.remainingShots,
|
||||
m_firingExplosionEntity.remainingTime);
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringExplosion::onEndHandlerFiring(const Database::EscOrder &escOrder)
|
||||
@@ -128,23 +128,23 @@ void HandlerFiringExplosion::onEndHandlerFiring(const Database::EscOrder &escOrd
|
||||
DEBUG_LOG(m_logger) << "numOfVolley: " << escOrder.numOfVolley
|
||||
<< "shotsInTotal: " << escOrder.shotsPerVolley
|
||||
<< "duration: " << escOrder.duration;
|
||||
if (escOrder.numOfVolley < 0 || escOrder.idOrder != m_firingExplosionEntity.idOrder())
|
||||
if (escOrder.numOfVolley < 0 || escOrder.idOrder != m_firingExplosionEntity.idOrder)
|
||||
return;
|
||||
|
||||
m_firingExplosionEntity.idEffectShow(0);
|
||||
m_firingExplosionEntity.fireEnabled(false);
|
||||
m_firingExplosionEntity.isActive(false);
|
||||
m_firingExplosionEntity.idOrder(0);
|
||||
m_firingExplosionEntity.numberOfVolley(0);
|
||||
m_firingExplosionEntity.numberOfShot(0);
|
||||
m_firingExplosionEntity.remainingShots(0);
|
||||
m_firingExplosionEntity.remainingVolleys(0);
|
||||
m_firingExplosionEntity.duration(0);
|
||||
m_firingExplosionEntity.firingClearanceTime(dds::core::optional<rti::core::int64>());
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime(dds::core::optional<rti::core::int64>());
|
||||
m_firingExplosionEntity.fireEnabled(false);
|
||||
m_firingExplosionEntity.carriedOutEnabled(false);
|
||||
m_firingExplosionEntity.remainingTime(0); //here to avoid traffic?
|
||||
m_firingExplosionEntity.idEffectShow = 0;
|
||||
m_firingExplosionEntity.fireEnabled = false;
|
||||
m_firingExplosionEntity.isActive = false;
|
||||
m_firingExplosionEntity.idOrder = 0;
|
||||
m_firingExplosionEntity.numberOfVolley = 0;
|
||||
m_firingExplosionEntity.numberOfShot = 0;
|
||||
m_firingExplosionEntity.remainingShots = 0;
|
||||
m_firingExplosionEntity.remainingVolleys = 0;
|
||||
m_firingExplosionEntity.duration = 0;
|
||||
m_firingExplosionEntity.firingClearanceTime = dds::core::optional<rti::core::int64>();
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime = dds::core::optional<rti::core::int64>();
|
||||
m_firingExplosionEntity.fireEnabled = false;
|
||||
m_firingExplosionEntity.carriedOutEnabled = false;
|
||||
m_firingExplosionEntity.remainingTime = 0; //here to avoid traffic?
|
||||
m_mainHandler->dds()->dts()->publish(m_firingExplosionEntity);
|
||||
m_isNew = true;
|
||||
//reset effect show
|
||||
@@ -153,34 +153,34 @@ void HandlerFiringExplosion::onEndHandlerFiring(const Database::EscOrder &escOrd
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringExplosion::onEffectShowStopped(qint16 idEffectShow)
|
||||
{
|
||||
if (idEffectShow != m_firingExplosionEntity.idEffectShow())
|
||||
if (idEffectShow != m_firingExplosionEntity.idEffectShow)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingExplosionEntity.idEffectShow;
|
||||
return;
|
||||
}
|
||||
m_firingExplosionEntity.isActive(false);
|
||||
m_firingExplosionEntity.isActive = false;
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringExplosion::onEffectShowContinued(const ConvertFromTab::EffectShowContinue_t &effectShowContinue)
|
||||
{
|
||||
if (effectShowContinue.idEffectShow != m_firingExplosionEntity.idEffectShow())
|
||||
if (effectShowContinue.idEffectShow != m_firingExplosionEntity.idEffectShow)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingExplosionEntity.idEffectShow;
|
||||
return;
|
||||
}
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringExplosion::onSafetyConfirmation(const SafetyConfirmation_e &safetyConfirmation)
|
||||
{
|
||||
m_firingExplosionEntity.safetyConfirmation(safetyConfirmation);
|
||||
m_firingExplosionEntity.safetyConfirmation = safetyConfirmation;
|
||||
if (m_lastState == SafetyConfirmation_e::SafetyConfirmed && safetyConfirmation == SafetyConfirmation_e::SafetyNotConfirmed)
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::StopTimer);
|
||||
|
||||
if (m_lastState != safetyConfirmation && m_firingExplosionEntity.safetyConfirmation() == EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed &&
|
||||
m_firingExplosionEntity.isActive() && !m_firingExplosionEntity.carriedOutEnabled())
|
||||
if (m_lastState != safetyConfirmation && m_firingExplosionEntity.safetyConfirmation == EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed &&
|
||||
m_firingExplosionEntity.isActive && !m_firingExplosionEntity.carriedOutEnabled)
|
||||
{
|
||||
if (m_firingExplosionEntity.idEffectShow() > 0)
|
||||
m_mainHandler->handlerOrder()->updateOrderWithId(m_firingExplosionEntity.idEffectShow(), QString(), EffectShowManagement::OrderConfirmation_e::InterruptExecution);
|
||||
if (m_firingExplosionEntity.idEffectShow > 0)
|
||||
m_mainHandler->handlerOrder()->updateOrderWithId(m_firingExplosionEntity.idEffectShow, QString(), EffectShowManagement::OrderConfirmation_e::InterruptExecution);
|
||||
|
||||
onEffectShowInterrupted();
|
||||
}
|
||||
@@ -191,16 +191,16 @@ void HandlerFiringExplosion::onSafetyConfirmation(const SafetyConfirmation_e &sa
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringExplosion::onReadyForExplosionFiring(bool ready)
|
||||
{
|
||||
m_firingExplosionEntity.fireEnabled(ready);
|
||||
m_firingExplosionEntity.fireEnabled = ready;
|
||||
m_mainHandler->dds()->dts()->publish(m_firingExplosionEntity);
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringExplosion::onStatusExplosionFiring(const StatusExplosionFiring_t &statusExplosionFiring)
|
||||
{
|
||||
m_firingExplosionEntity.remainingTime(statusExplosionFiring.remainingTime_s);
|
||||
m_firingExplosionEntity.remainingShots(statusExplosionFiring.remainingShots);
|
||||
m_firingExplosionEntity.carriedOutEnabled(m_firingExplosionEntity.isActive() && (m_isInterrupted || statusExplosionFiring.remainingTime_s <= 0));
|
||||
m_firingExplosionEntity.remainingVolleys(statusExplosionFiring.remainingVolley);
|
||||
m_firingExplosionEntity.remainingTime = statusExplosionFiring.remainingTime_s;
|
||||
m_firingExplosionEntity.remainingShots = statusExplosionFiring.remainingShots;
|
||||
m_firingExplosionEntity.carriedOutEnabled = m_firingExplosionEntity.isActive && (m_isInterrupted || statusExplosionFiring.remainingTime_s <= 0);
|
||||
m_firingExplosionEntity.remainingVolleys = statusExplosionFiring.remainingVolley;
|
||||
m_mainHandler->dds()->dts()->publish(m_firingExplosionEntity);
|
||||
}
|
||||
|
||||
@@ -208,14 +208,14 @@ void HandlerFiringExplosion::onEffectShowStarted()
|
||||
{
|
||||
|
||||
DEBUG_LOG(m_logger) << "onEffectShowStarted";
|
||||
m_mainHandler->handlerVehicle()->setExplosionParameter(m_firingExplosionEntity.remainingVolleys(),
|
||||
m_firingExplosionEntity.remainingShots(),
|
||||
m_firingExplosionEntity.remainingTime());
|
||||
m_mainHandler->handlerVehicle()->setExplosionParameter(m_firingExplosionEntity.remainingVolleys,
|
||||
m_firingExplosionEntity.remainingShots,
|
||||
m_firingExplosionEntity.remainingTime);
|
||||
|
||||
m_isInterrupted = false;
|
||||
m_firingExplosionEntity.isActive(true);
|
||||
m_firingExplosionEntity.fireEnabled(false);
|
||||
m_firingExplosionEntity.carriedOutEnabled(false);
|
||||
m_firingExplosionEntity.isActive = true;
|
||||
m_firingExplosionEntity.fireEnabled = false;
|
||||
m_firingExplosionEntity.carriedOutEnabled = false;
|
||||
|
||||
m_mainHandler->dds()->dts()->publish(m_firingExplosionEntity);
|
||||
}
|
||||
@@ -226,7 +226,7 @@ bool HandlerFiringExplosion::onEffectShowInterrupted()
|
||||
if (m_isInterrupted == true)
|
||||
return false;
|
||||
|
||||
if (!m_firingExplosionEntity.isActive() && m_isInterrupted == false)
|
||||
if (!m_firingExplosionEntity.isActive && m_isInterrupted == false)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEffectShowInterrupted is active so return";
|
||||
return false;
|
||||
@@ -236,9 +236,9 @@ bool HandlerFiringExplosion::onEffectShowInterrupted()
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::StopTimer);
|
||||
|
||||
m_isInterrupted = true;
|
||||
m_firingExplosionEntity.isActive(true);
|
||||
m_firingExplosionEntity.fireEnabled(true);
|
||||
m_firingExplosionEntity.carriedOutEnabled(true);
|
||||
m_firingExplosionEntity.isActive = true;
|
||||
m_firingExplosionEntity.fireEnabled = true;
|
||||
m_firingExplosionEntity.carriedOutEnabled = true;
|
||||
m_mainHandler->dds()->dts()->publish(m_firingExplosionEntity);
|
||||
return true;
|
||||
}
|
||||
@@ -249,53 +249,53 @@ void HandlerFiringExplosion::onManuallyExplosionRequest(const rti::core::SampleI
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onManuallyExplosionRequest ";
|
||||
//override order!
|
||||
if (m_firingExplosionEntity.idEffectShow() == 0)
|
||||
if (m_firingExplosionEntity.idEffectShow == 0)
|
||||
{
|
||||
m_firingExplosionEntity.firingClearanceTime().reset();
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime().reset();
|
||||
m_firingExplosionEntity.fireEnabled(false);
|
||||
m_firingExplosionEntity.carriedOutEnabled(false);
|
||||
m_firingExplosionEntity.firingClearanceTime.reset();
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime.reset();
|
||||
m_firingExplosionEntity.fireEnabled = false;
|
||||
m_firingExplosionEntity.carriedOutEnabled = false;
|
||||
}
|
||||
m_isInterrupted = false;
|
||||
m_mainHandler->dds()->fts()->manuallyExplosionReply(cookie, Core::FunctionReplyObject());
|
||||
if (request.pbInterrupt())
|
||||
if (request.pbInterrupt)
|
||||
{
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Stop);
|
||||
onEffectShowInterrupted();
|
||||
}
|
||||
if (!request.pbFire() && !request.pbAbort() && !request.pbCarriedOut())
|
||||
m_mainHandler->handlerVehicle()->setExplosionParameter(request.numberOfVolley(), request.numberOfShot(), request.duration());
|
||||
if (!request.pbFire && !request.pbAbort && !request.pbCarriedOut)
|
||||
m_mainHandler->handlerVehicle()->setExplosionParameter(request.numberOfVolley, request.numberOfShot, request.duration);
|
||||
|
||||
if (request.pbAbort() || request.pbCarriedOut())
|
||||
if (request.pbAbort || request.pbCarriedOut)
|
||||
{
|
||||
m_firingExplosionEntity.isActive(false);
|
||||
m_firingExplosionEntity.carriedOutEnabled(false);
|
||||
if (request.pbAbort())
|
||||
m_firingExplosionEntity.isActive = false;
|
||||
m_firingExplosionEntity.carriedOutEnabled = false;
|
||||
if (request.pbAbort)
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Abort);
|
||||
// m_firingExplosionEntity.numberOfVolley(0);
|
||||
// m_firingExplosionEntity.numberOfShot(0);
|
||||
m_firingExplosionEntity.remainingShots(0);
|
||||
m_firingExplosionEntity.remainingShots(0);
|
||||
m_firingExplosionEntity.remainingVolleys(0);
|
||||
m_firingExplosionEntity.remainingShots = 0;
|
||||
m_firingExplosionEntity.remainingShots = 0;
|
||||
m_firingExplosionEntity.remainingVolleys = 0;
|
||||
// m_firingExplosionEntity.duration(0);
|
||||
m_firingExplosionEntity.remainingTime(0);
|
||||
m_firingExplosionEntity.firingClearanceTime().reset();
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime().reset();
|
||||
m_firingExplosionEntity.remainingTime = 0;
|
||||
m_firingExplosionEntity.firingClearanceTime.reset();
|
||||
m_firingExplosionEntity.endOfFiringClearanceTime.reset();
|
||||
}
|
||||
else if (!request.pbInterrupt())
|
||||
else if (!request.pbInterrupt)
|
||||
{
|
||||
// m_firingExplosionEntity.idOrder(0);
|
||||
m_firingExplosionEntity.numberOfVolley(request.numberOfVolley());
|
||||
m_firingExplosionEntity.numberOfShot(request.numberOfShot());
|
||||
m_firingExplosionEntity.remainingShots(request.numberOfShot());
|
||||
m_firingExplosionEntity.remainingVolleys(request.numberOfVolley());
|
||||
m_firingExplosionEntity.duration(request.duration());
|
||||
m_firingExplosionEntity.remainingTime(request.duration());
|
||||
m_firingExplosionEntity.numberOfVolley = request.numberOfVolley;
|
||||
m_firingExplosionEntity.numberOfShot = request.numberOfShot;
|
||||
m_firingExplosionEntity.remainingShots = request.numberOfShot;
|
||||
m_firingExplosionEntity.remainingVolleys = request.numberOfVolley;
|
||||
m_firingExplosionEntity.duration = request.duration;
|
||||
m_firingExplosionEntity.remainingTime = request.duration;
|
||||
}
|
||||
if (request.pbFire())
|
||||
if (request.pbFire)
|
||||
{
|
||||
m_mainHandler->handlerVehicle()->recalcEverything();
|
||||
m_firingExplosionEntity.isActive(true);
|
||||
m_firingExplosionEntity.isActive = true;
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Start);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -42,7 +42,7 @@ public:
|
||||
|
||||
void setFiringClearanceDuration();
|
||||
bool onEffectShowInterrupted();
|
||||
int getCurrentorderId() { return m_firingExplosionEntity.idOrder(); }
|
||||
int getCurrentorderId() { return m_firingExplosionEntity.idOrder; }
|
||||
private Q_SLOTS:
|
||||
void onStartHandlerFiring(const Database::EscOrder &escOrder);
|
||||
void onEndHandlerFiring(const Database::EscOrder &escOrder);
|
||||
|
||||
+42
-42
@@ -57,30 +57,30 @@ void HandlerFiringSmoke::setFiringClearanceDuration()
|
||||
qint64 pre = m_firingSmokeEntity.firingClearanceTime.get();
|
||||
qint64 post = pre;
|
||||
pre -= PRE_START_TIME;
|
||||
post += m_firingSmokeEntity.duration() + POST_END_TIME;
|
||||
m_firingSmokeEntity.firingClearanceTime().set(pre);
|
||||
m_firingSmokeEntity.endOfFiringClearanceTime().set(post);
|
||||
post += m_firingSmokeEntity.duration + POST_END_TIME;
|
||||
m_firingSmokeEntity.firingClearanceTime.set(pre);
|
||||
m_firingSmokeEntity.endOfFiringClearanceTime.set(post);
|
||||
}
|
||||
else
|
||||
m_firingSmokeEntity.endOfFiringClearanceTime().reset();
|
||||
m_firingSmokeEntity.endOfFiringClearanceTime.reset();
|
||||
|
||||
m_mainHandler->dds()->dts()->publish(m_firingSmokeEntity);
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringSmoke::onStartHandlerFiring(const Database::EscOrder &escOrder)
|
||||
{
|
||||
m_firingSmokeEntity.idEffectShow(escOrder.idOrder);
|
||||
m_firingSmokeEntity.lengthOfFogZone(escOrder.areaWidth);
|
||||
m_firingSmokeEntity.duration(escOrder.duration * 1000);
|
||||
m_firingSmokeEntity.idOrder(escOrder.id);
|
||||
m_firingSmokeEntity.idEffectShow = escOrder.idOrder;
|
||||
m_firingSmokeEntity.lengthOfFogZone = escOrder.areaWidth;
|
||||
m_firingSmokeEntity.duration = escOrder.duration * 1000;
|
||||
m_firingSmokeEntity.idOrder = escOrder.id;
|
||||
if (escOrder.startTime > 0)
|
||||
m_firingSmokeEntity.firingClearanceTime().set(escOrder.startTime);
|
||||
m_firingSmokeEntity.firingClearanceTime.set(escOrder.startTime);
|
||||
else
|
||||
m_firingSmokeEntity.firingClearanceTime().reset();
|
||||
m_firingSmokeEntity.firingClearanceTime.reset();
|
||||
|
||||
|
||||
if (m_firingSmokeEntity.lengthOfFogZone() <= 0 ||
|
||||
m_firingSmokeEntity.duration() <= 0)
|
||||
if (m_firingSmokeEntity.lengthOfFogZone <= 0 ||
|
||||
m_firingSmokeEntity.duration <= 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Won't start Smoke ";
|
||||
DEBUG_LOG(m_logger) << "areaWidth: " << escOrder.areaWidth
|
||||
@@ -95,57 +95,57 @@ void HandlerFiringSmoke::onEndHandlerFiring(const Database::EscOrder &escOrder)
|
||||
{
|
||||
Q_UNUSED(escOrder)
|
||||
|
||||
m_firingSmokeEntity.remainingDistance(0);
|
||||
m_firingSmokeEntity.remainingTime(0);
|
||||
m_firingSmokeEntity.carriedOutEnabled(false);
|
||||
m_firingSmokeEntity.directionOfFogZone(0);
|
||||
m_firingSmokeEntity.endOfFiringClearanceTime().reset();
|
||||
m_firingSmokeEntity.idOrder(0);
|
||||
m_firingSmokeEntity.idEffectShow(0);
|
||||
m_firingSmokeEntity.firingClearanceTime().reset();
|
||||
m_firingSmokeEntity.remainingDistance = 0;
|
||||
m_firingSmokeEntity.remainingTime = 0;
|
||||
m_firingSmokeEntity.carriedOutEnabled = false;
|
||||
m_firingSmokeEntity.directionOfFogZone = 0;
|
||||
m_firingSmokeEntity.endOfFiringClearanceTime.reset();
|
||||
m_firingSmokeEntity.idOrder = 0;
|
||||
m_firingSmokeEntity.idEffectShow = 0;
|
||||
m_firingSmokeEntity.firingClearanceTime.reset();
|
||||
|
||||
m_mainHandler->dds()->dts()->publish(m_firingSmokeEntity);
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringSmoke::onEffectShowStopped(qint16 idEffectShow)
|
||||
{
|
||||
if (idEffectShow != m_firingSmokeEntity.idEffectShow())
|
||||
if (idEffectShow != m_firingSmokeEntity.idEffectShow)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingSmokeEntity.idEffectShow;
|
||||
return;
|
||||
}
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringSmoke::onEffectShowContinued(const ConvertFromTab::EffectShowContinue_t &effectShowContinue)
|
||||
{
|
||||
if (effectShowContinue.idEffectShow != m_firingSmokeEntity.idEffectShow())
|
||||
if (effectShowContinue.idEffectShow != m_firingSmokeEntity.idEffectShow)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingSmokeEntity.idEffectShow;
|
||||
return;
|
||||
}
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringSmoke::onSafetyConfirmation(const SafetyConfirmation_e &safetyConfirmation)
|
||||
{
|
||||
m_firingSmokeEntity.safetyConfirmation(safetyConfirmation);
|
||||
m_firingSmokeEntity.safetyConfirmation = safetyConfirmation;
|
||||
|
||||
m_mainHandler->dds()->dts()->publish(m_firingSmokeEntity);
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerFiringSmoke::onStatusSmokeFiring(const StatusSmokeFiring_t &statusSmokeFiring)
|
||||
{
|
||||
m_firingSmokeEntity.remainingDistance(statusSmokeFiring.remainingDistance_m);
|
||||
m_firingSmokeEntity.remainingTime(statusSmokeFiring.remainingTime_s);
|
||||
m_firingSmokeEntity.carriedOutEnabled(statusSmokeFiring.remainingTime_s <= 0);
|
||||
m_firingSmokeEntity.remainingDistance = statusSmokeFiring.remainingDistance_m;
|
||||
m_firingSmokeEntity.remainingTime = statusSmokeFiring.remainingTime_s;
|
||||
m_firingSmokeEntity.carriedOutEnabled = statusSmokeFiring.remainingTime_s <= 0;
|
||||
|
||||
m_mainHandler->dds()->dts()->publish(m_firingSmokeEntity);
|
||||
}
|
||||
|
||||
void HandlerFiringSmoke::setSmoking()
|
||||
{
|
||||
if (m_firingSmokeEntity.idOrder() > 0) //send new order change into execution
|
||||
if (m_firingSmokeEntity.idOrder > 0) //send new order change into execution
|
||||
{
|
||||
m_mainHandler->handlerOrder()->updateOrderWithId(m_firingSmokeEntity.idOrder(), QStringLiteral(""), EffectShowManagement::OrderConfirmation_e::Execution);
|
||||
m_mainHandler->handlerOrder()->updateOrderWithId(m_firingSmokeEntity.idOrder, QStringLiteral(""), EffectShowManagement::OrderConfirmation_e::Execution);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -157,25 +157,25 @@ void HandlerFiringSmoke::onManuallySmokeRequest(const rti::core::SampleIdentity
|
||||
DEBUG_LOG(m_logger) << "onManuallySmokeRequest";
|
||||
|
||||
//override order!
|
||||
if (m_firingSmokeEntity.idOrder() == 0)
|
||||
if (m_firingSmokeEntity.idOrder == 0)
|
||||
{
|
||||
m_firingSmokeEntity.firingClearanceTime().reset();
|
||||
m_firingSmokeEntity.endOfFiringClearanceTime().reset();
|
||||
m_firingSmokeEntity.carriedOutEnabled(false);
|
||||
m_firingSmokeEntity.firingClearanceTime.reset();
|
||||
m_firingSmokeEntity.endOfFiringClearanceTime.reset();
|
||||
m_firingSmokeEntity.carriedOutEnabled = false;
|
||||
}
|
||||
|
||||
m_firingSmokeEntity.lengthOfFogZone(request.lengthOfFogZone());
|
||||
m_firingSmokeEntity.directionOfFogZone(request.directionOfFogZone());
|
||||
m_firingSmokeEntity.remainingDistance(request.lengthOfFogZone());
|
||||
m_firingSmokeEntity.duration(m_mainHandler->handlerVehicle()->burningTimeSmokeCartridge_s());
|
||||
m_firingSmokeEntity.remainingTime(m_firingSmokeEntity.duration());
|
||||
m_firingSmokeEntity.lengthOfFogZone = request.lengthOfFogZone;
|
||||
m_firingSmokeEntity.directionOfFogZone = request.directionOfFogZone;
|
||||
m_firingSmokeEntity.remainingDistance = request.lengthOfFogZone;
|
||||
m_firingSmokeEntity.duration = m_mainHandler->handlerVehicle()->burningTimeSmokeCartridge_s();
|
||||
m_firingSmokeEntity.remainingTime = m_firingSmokeEntity.duration;
|
||||
|
||||
m_mainHandler->dds()->fts()->manuallySmokeReply(cookie, Core::FunctionReplyObject());
|
||||
|
||||
if (!request.pbAbort() && !request.pbCarriedOut())
|
||||
m_mainHandler->handlerVehicle()->setSmokeParameter(request.lengthOfFogZone(), request.directionOfFogZone());
|
||||
if (!request.pbAbort && !request.pbCarriedOut)
|
||||
m_mainHandler->handlerVehicle()->setSmokeParameter(request.lengthOfFogZone, request.directionOfFogZone);
|
||||
|
||||
if (request.pbAbort())
|
||||
if (request.pbAbort)
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Abort);
|
||||
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ public:
|
||||
bool init();
|
||||
|
||||
void setFiringClearanceDuration();
|
||||
int getCurrentorderId() { return m_firingSmokeEntity.idOrder(); }
|
||||
int getCurrentorderId() { return m_firingSmokeEntity.idOrder; }
|
||||
void setSmoking();
|
||||
|
||||
private Q_SLOTS:
|
||||
|
||||
+55
-55
@@ -41,7 +41,7 @@ HandlerOperatingCondition::~HandlerOperatingCondition()
|
||||
//=============================================================================
|
||||
bool HandlerOperatingCondition::init()
|
||||
{
|
||||
m_operatingCondition.readiness(m_isOperational);
|
||||
m_operatingCondition.readiness = m_isOperational;
|
||||
connect(m_mainHandler->handlerVehicle().get(), &HandlerVehicle::vehicleBattery,
|
||||
this, &HandlerOperatingCondition::onVehicleBattery);
|
||||
connect(m_mainHandler->handlerVehicle().get(), &HandlerVehicle::vehicleSmokeCardridgesFireStatus,
|
||||
@@ -75,7 +75,7 @@ bool HandlerOperatingCondition::init()
|
||||
|
||||
void HandlerOperatingCondition::onVehicleBattery(double battery)
|
||||
{
|
||||
m_operatingCondition.batteryVoltage(battery);
|
||||
m_operatingCondition.batteryVoltage = battery;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data Battery to dds";
|
||||
}
|
||||
@@ -96,8 +96,8 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRid
|
||||
int count = numberOfSmokingCardridgesNew - numberOfSmokingCardridgesOld;
|
||||
if (count > 0)
|
||||
{
|
||||
m_operatingCondition.ammunitionAvailable(std::max(0, m_operatingCondition.ammunitionAvailable() - count));
|
||||
m_operatingCondition.ammunitionMagazine(std::max(0, m_operatingCondition.ammunitionMagazine() - count));
|
||||
m_operatingCondition.ammunitionAvailable = std::max(0, m_operatingCondition.ammunitionAvailable - count);
|
||||
m_operatingCondition.ammunitionMagazine = std::max(0, m_operatingCondition.ammunitionMagazine - count);
|
||||
//we are burning now
|
||||
ConvertToTab::VehicleStatus_t vehicleStatus;
|
||||
getVehicleStatus(vehicleStatus);
|
||||
@@ -106,15 +106,15 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRid
|
||||
} // if
|
||||
|
||||
if (fireStatus.cardrige1)
|
||||
m_operatingCondition.smokeCartridge1(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge1 = StatusSmokeCartridge_e::Smoking;
|
||||
if (fireStatus.cardrige2)
|
||||
m_operatingCondition.smokeCartridge2(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge2 = StatusSmokeCartridge_e::Smoking;
|
||||
if (fireStatus.cardrige3)
|
||||
m_operatingCondition.smokeCartridge3(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge3 = StatusSmokeCartridge_e::Smoking;
|
||||
if (fireStatus.cardrige4)
|
||||
m_operatingCondition.smokeCartridge4(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge4 = StatusSmokeCartridge_e::Smoking;
|
||||
if (fireStatus.cardrige5)
|
||||
m_operatingCondition.smokeCartridge5(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge5 = StatusSmokeCartridge_e::Smoking;
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (Somoking) to dds";
|
||||
@@ -124,15 +124,15 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges
|
||||
{
|
||||
m_readyCardridges = fireStatus;
|
||||
if (!m_smokingCardridges.cardrige1)
|
||||
m_operatingCondition.smokeCartridge1(m_readyCardridges.cardrige1 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge1 = m_readyCardridges.cardrige1 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
if (!m_smokingCardridges.cardrige2)
|
||||
m_operatingCondition.smokeCartridge2(m_readyCardridges.cardrige2 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge2 = m_readyCardridges.cardrige2 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
if (!m_smokingCardridges.cardrige3)
|
||||
m_operatingCondition.smokeCartridge3(m_readyCardridges.cardrige3 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge3 = m_readyCardridges.cardrige3 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
if (!m_smokingCardridges.cardrige4)
|
||||
m_operatingCondition.smokeCartridge4(m_readyCardridges.cardrige4 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge4 = m_readyCardridges.cardrige4 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
if (!m_smokingCardridges.cardrige5)
|
||||
m_operatingCondition.smokeCartridge5(m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge5 = m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data to dds";
|
||||
@@ -140,21 +140,21 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges
|
||||
|
||||
void HandlerOperatingCondition::onVehicleFireUnits(const CardRidges &fireStatus)
|
||||
{
|
||||
m_operatingCondition.firingUnitReadyFwdLh(fireStatus.cardrige1);
|
||||
m_operatingCondition.firingUnitReadyFwdRh(fireStatus.cardrige2);
|
||||
m_operatingCondition.firingUnitReadyAftRh(fireStatus.cardrige3);
|
||||
m_operatingCondition.firingUnitReadyAftLh(fireStatus.cardrige4);
|
||||
m_operatingCondition.firingUnitReadyFwdLh = fireStatus.cardrige1;
|
||||
m_operatingCondition.firingUnitReadyFwdRh = fireStatus.cardrige2;
|
||||
m_operatingCondition.firingUnitReadyAftRh = fireStatus.cardrige3;
|
||||
m_operatingCondition.firingUnitReadyAftLh = fireStatus.cardrige4;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (fireStatus) to dds";
|
||||
}
|
||||
|
||||
void HandlerOperatingCondition::onVehicleErrorStatus(const CardRidges &errorStatus)
|
||||
{
|
||||
m_operatingCondition.errorSmoke(errorStatus.cardrige1);
|
||||
m_operatingCondition.errorFireUnit(errorStatus.cardrige2);
|
||||
m_operatingCondition.errorPanel(errorStatus.cardrige3);
|
||||
m_operatingCondition.errorEquipment(errorStatus.cardrige4);
|
||||
m_operatingCondition.errorGeneral(errorStatus.cardrige5);
|
||||
m_operatingCondition.errorSmoke = errorStatus.cardrige1;
|
||||
m_operatingCondition.errorFireUnit = errorStatus.cardrige2;
|
||||
m_operatingCondition.errorPanel = errorStatus.cardrige3;
|
||||
m_operatingCondition.errorEquipment = errorStatus.cardrige4;
|
||||
m_operatingCondition.errorGeneral = errorStatus.cardrige5;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (errorStatus) to dds";
|
||||
|
||||
@@ -171,40 +171,40 @@ void HandlerOperatingCondition::onOperationalStatusTimeout()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Operational status timeout. Setting operational status to: not operational.";
|
||||
m_isOperational = false;
|
||||
m_operatingCondition.readiness(m_isOperational);
|
||||
m_operatingCondition.readiness = m_isOperational;
|
||||
|
||||
sendStatus();
|
||||
}
|
||||
|
||||
bool HandlerOperatingCondition::isErrorDmf()
|
||||
{
|
||||
return (m_operatingCondition.errorSmoke() ||
|
||||
m_operatingCondition.errorFireUnit() ||
|
||||
m_operatingCondition.errorPanel() ||
|
||||
m_operatingCondition.errorEquipment() ||
|
||||
m_operatingCondition.errorGeneral()
|
||||
return (m_operatingCondition.errorSmoke ||
|
||||
m_operatingCondition.errorFireUnit ||
|
||||
m_operatingCondition.errorPanel ||
|
||||
m_operatingCondition.errorEquipment ||
|
||||
m_operatingCondition.errorGeneral
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
void HandlerOperatingCondition::onConnectionToSerial()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Connected to Serial: send ammunition Magazine to Control Unit Count: " << m_operatingCondition.ammunitionMagazine();
|
||||
m_mainHandler->handlerVehicle()->setAmmunitionParameter(m_operatingCondition.ammunitionMagazine());
|
||||
DEBUG_LOG(m_logger) << "Connected to Serial: send ammunition Magazine to Control Unit Count: " << m_operatingCondition.ammunitionMagazine;
|
||||
m_mainHandler->handlerVehicle()->setAmmunitionParameter(m_operatingCondition.ammunitionMagazine);
|
||||
}
|
||||
|
||||
void HandlerOperatingCondition::onVehicleType(const EffectShowManagement::Feature_e &type)
|
||||
{
|
||||
m_operatingCondition.vehicleFeature(type);
|
||||
m_operatingCondition.vehicleFeature = type;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (vehicle type) to dds";
|
||||
}
|
||||
|
||||
void HandlerOperatingCondition::onSafetyStatus(const SafetyStatus &status)
|
||||
{
|
||||
m_operatingCondition.temperatureWarning(status.temperaturWarning);
|
||||
m_operatingCondition.loadingBoardWall(status.loadingBoardWall);
|
||||
m_operatingCondition.emergencyStop(status.emergencyStop);
|
||||
m_operatingCondition.temperatureWarning = status.temperaturWarning;
|
||||
m_operatingCondition.loadingBoardWall = status.loadingBoardWall;
|
||||
m_operatingCondition.emergencyStop = status.emergencyStop;
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (SafetyStatus) to dds";
|
||||
@@ -213,7 +213,7 @@ void HandlerOperatingCondition::onSafetyStatus(const SafetyStatus &status)
|
||||
void HandlerOperatingCondition::onVehicleRoundCount(int loadedRounds)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got RoundCount Reply from Unit " << loadedRounds;
|
||||
m_operatingCondition.ammunitionMagazine(loadedRounds);
|
||||
m_operatingCondition.ammunitionMagazine = loadedRounds;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (ammunition magazine) to dds";
|
||||
}
|
||||
@@ -221,12 +221,12 @@ void HandlerOperatingCondition::onVehicleRoundCount(int loadedRounds)
|
||||
void HandlerOperatingCondition::onVolleyRounds(int usedRounds)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got used rounds " << usedRounds;
|
||||
m_operatingCondition.ammunitionMagazine(m_operatingCondition.ammunitionMagazine() - usedRounds);
|
||||
if (m_operatingCondition.ammunitionMagazine() < 0)
|
||||
m_operatingCondition.ammunitionMagazine(0);
|
||||
m_operatingCondition.ammunitionAvailable(m_operatingCondition.ammunitionAvailable() - usedRounds);
|
||||
if (m_operatingCondition.ammunitionAvailable() < 0)
|
||||
m_operatingCondition.ammunitionAvailable(0);
|
||||
m_operatingCondition.ammunitionMagazine = m_operatingCondition.ammunitionMagazine - usedRounds;
|
||||
if (m_operatingCondition.ammunitionMagazine < 0)
|
||||
m_operatingCondition.ammunitionMagazine = 0;
|
||||
m_operatingCondition.ammunitionAvailable = m_operatingCondition.ammunitionAvailable - usedRounds;
|
||||
if (m_operatingCondition.ammunitionAvailable < 0)
|
||||
m_operatingCondition.ammunitionAvailable = 0;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (ammunition magazine used) to dds";
|
||||
}
|
||||
@@ -240,12 +240,12 @@ void HandlerOperatingCondition::sendStatus()
|
||||
|
||||
void HandlerOperatingCondition::getVehicleStatus(ConvertToTab::VehicleStatus_t &vehicleStatus)
|
||||
{
|
||||
vehicleStatus.ammunitionAvailable = m_operatingCondition.ammunitionAvailable();
|
||||
vehicleStatus.ammunitionMagazine = m_operatingCondition.ammunitionMagazine();
|
||||
vehicleStatus.feature = static_cast<int>(m_operatingCondition.vehicleFeature().underlying());
|
||||
vehicleStatus.operational = (!m_operatingCondition.errorGeneral() && m_isOperational);
|
||||
vehicleStatus.ammunitionAvailable = m_operatingCondition.ammunitionAvailable;
|
||||
vehicleStatus.ammunitionMagazine = m_operatingCondition.ammunitionMagazine;
|
||||
vehicleStatus.feature = static_cast<int>(m_operatingCondition.vehicleFeature);
|
||||
vehicleStatus.operational = (!m_operatingCondition.errorGeneral && m_isOperational);
|
||||
vehicleStatus.magazineFail = m_oldErrorState;
|
||||
vehicleStatus.controlComputerFail = m_operatingCondition.errorPanel();
|
||||
vehicleStatus.controlComputerFail = m_operatingCondition.errorPanel;
|
||||
}
|
||||
|
||||
|
||||
@@ -256,20 +256,20 @@ void HandlerOperatingCondition::onSendAmmunitionRequest(const rti::core::SampleI
|
||||
DEBUG_LOG(m_logger) << "onSendAmmunitionRequest";
|
||||
//take available ammo and send excon
|
||||
//then wait for reply from unit
|
||||
m_operatingCondition.ammunitionAvailable(request.ammunitionAvailable());
|
||||
m_operatingCondition.ammunitionAvailable = request.ammunitionAvailable;
|
||||
|
||||
m_mainHandler->dds()->fts()->sendAmmunitionReply(cookie, Core::FunctionReplyObject());
|
||||
|
||||
// provision of the control computer with the equipped shots
|
||||
m_mainHandler->handlerVehicle()->setAmmunitionParameter(request.ammunitionMagazine());
|
||||
m_mainHandler->handlerVehicle()->setAmmunitionParameter(request.ammunitionMagazine);
|
||||
|
||||
// Sending of telegram: DMF-Einsatzbereitschafts-Status to the operating application
|
||||
ConvertToTab::VehicleStatus_t vehicleStatus;
|
||||
getVehicleStatus(vehicleStatus);
|
||||
if (vehicleStatus.feature == EffectShowManagement::Feature_e::Smoke)
|
||||
if (vehicleStatus.feature == static_cast<int>(EffectShowManagement::Feature_e::Smoke))
|
||||
{
|
||||
//as smoke did not answer
|
||||
vehicleStatus.ammunitionMagazine = request.ammunitionMagazine();
|
||||
vehicleStatus.ammunitionMagazine = request.ammunitionMagazine;
|
||||
}
|
||||
m_mainHandler->handlerTabData()->vehicleStatus(vehicleStatus);
|
||||
}
|
||||
@@ -277,9 +277,9 @@ void HandlerOperatingCondition::onSendAmmunitionRequest(const rti::core::SampleI
|
||||
void HandlerOperatingCondition::onSendSafetyRevokeRequest(const rti::core::SampleIdentity &cookie,
|
||||
const SendSafetyRevokeRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onSendSafetyRevokeRequest with " << request.revoke();
|
||||
DEBUG_LOG(m_logger) << "onSendSafetyRevokeRequest with " << request.revoke;
|
||||
m_mainHandler->dds()->fts()->sendSafetyRevokeReply(cookie, Core::FunctionReplyObject());
|
||||
if (request.revoke())
|
||||
if (request.revoke)
|
||||
{
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::StopTimer);
|
||||
m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SICHERHEIT_WIDERRUFEN);
|
||||
@@ -293,7 +293,7 @@ void HandlerOperatingCondition::onSendReadinessRequest(const rti::core::SampleId
|
||||
DEBUG_LOG(m_logger) << "onSendReadinessRequest";
|
||||
//Confirm or Revoke Readiness
|
||||
//send to EXCON
|
||||
m_isOperational = request.readiness();
|
||||
m_isOperational = request.readiness;
|
||||
m_mainHandler->dds()->fts()->sendReadinessReply(cookie, Core::FunctionReplyObject());
|
||||
|
||||
// Sending of telegram: DMF-Einsatzbereitschafts-Status to the operating application
|
||||
@@ -303,7 +303,7 @@ void HandlerOperatingCondition::onSendReadinessRequest(const rti::core::SampleId
|
||||
m_mainHandler->handlerTabData()->vehicleStatus(vehicleStatus);
|
||||
|
||||
//now change operating condition in hope that tetra worked
|
||||
m_operatingCondition.readiness(m_isOperational);
|
||||
m_operatingCondition.readiness = m_isOperational;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data readiness) to dds";
|
||||
|
||||
|
||||
@@ -70,9 +70,9 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh
|
||||
if (it.value()->getData().idOrder == effectShowOrder.idEffectShow)
|
||||
data = it.value()->getData();
|
||||
}
|
||||
bool sendStart = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness)
|
||||
|| (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution)
|
||||
|| (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::InterruptExecution));
|
||||
bool sendStart = ((data.orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness))
|
||||
|| (data.orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution))
|
||||
|| (data.orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptExecution)));
|
||||
|
||||
data.typeOfOrder = 1;
|
||||
data.idOrder = effectShowOrder.idEffectShow;
|
||||
@@ -80,8 +80,8 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh
|
||||
data.duration = effectShowOrder.duration;
|
||||
if (data.duration < 5)
|
||||
data.duration = 5;
|
||||
data.lowerLeftPosition = QPointF(effectShowOrder.lowerLeftPosition.lon(), effectShowOrder.lowerLeftPosition.lat());
|
||||
data.centerPosition = QPointF(effectShowOrder.centerPosition.lon(), effectShowOrder.centerPosition.lat());
|
||||
data.lowerLeftPosition = QPointF(effectShowOrder.lowerLeftPosition.lon, effectShowOrder.lowerLeftPosition.lat);
|
||||
data.centerPosition = QPointF(effectShowOrder.centerPosition.lon, effectShowOrder.centerPosition.lat);
|
||||
data.areaWidth = effectShowOrder.areaWidth;
|
||||
data.areaDepth = effectShowOrder.areaDepth;
|
||||
data.areaRotation = effectShowOrder.rotation;
|
||||
@@ -100,13 +100,13 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh
|
||||
return;
|
||||
}
|
||||
m_orderObjMap.insert(ifs->getId(), ifs);
|
||||
if (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution && data.startTime == 0)
|
||||
if (data.orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution) && data.startTime == 0)
|
||||
{
|
||||
m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SICHERHEIT_WIDERRUFEN);
|
||||
m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SALVE_UNTERBRECHEN);
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Stop);
|
||||
}
|
||||
bool orignalIsTimeout = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution) && data.startTime > 0 && (data.startTime + data.duration < QDateTime::currentMSecsSinceEpoch())) ;
|
||||
bool orignalIsTimeout = ((data.orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution)) && data.startTime > 0 && (data.startTime + data.duration < QDateTime::currentMSecsSinceEpoch())) ;
|
||||
if (sendStart && !orignalIsTimeout)
|
||||
emit startHandlerFiring(data);
|
||||
}
|
||||
@@ -117,8 +117,8 @@ void HandlerOrder::createOrder(const ConvertFromTab::RelocationOrder_t &relocati
|
||||
data.typeOfOrder = 0;
|
||||
data.idOrder = relocationOrder.idRelocation;
|
||||
data.startTime = relocationOrder.executionTime * 1000; // s -> msec
|
||||
data.centerPosition = QPointF(relocationOrder.centerPosition.lon(), relocationOrder.centerPosition.lat());
|
||||
data.orderConfirmation = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance;
|
||||
data.centerPosition = QPointF(relocationOrder.centerPosition.lon, relocationOrder.centerPosition.lat);
|
||||
data.orderConfirmation = static_cast<int>(EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance);
|
||||
data.info = relocationOrder.infoText;
|
||||
|
||||
ObjectOrder *ifs(new ObjectOrder(m_mainHandler, this));
|
||||
@@ -148,9 +148,9 @@ void HandlerOrder::removeOrder(const ConvertFromTab::OrderRetract_t &orderRetrac
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << ret();
|
||||
else
|
||||
{
|
||||
if (def == EffectShowManagement::OrderConfirmation_e::Execution ||
|
||||
def == EffectShowManagement::OrderConfirmation_e::InterruptExecution ||
|
||||
def == EffectShowManagement::OrderConfirmation_e::FiringReadiness)
|
||||
if (def == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution) ||
|
||||
def == static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptExecution) ||
|
||||
def == static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "EndFireHandler from Remove";
|
||||
|
||||
@@ -180,17 +180,17 @@ void HandlerOrder::sendOrderConfirmation(const ConvertToTab::OrderConfirmation_t
|
||||
void HandlerOrder::onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const OrderModifyRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Order: " << request.id() << " Order: " << request.orderConfirmation();
|
||||
DEBUG_LOG(m_logger) << "Order: " << request.id << " Order: " << request.orderConfirmation;
|
||||
|
||||
if (request.id() > 0)
|
||||
if (request.id > 0)
|
||||
{
|
||||
ObjectOrder *ifs = m_orderObjMap.value(request.id());
|
||||
ObjectOrder *ifs = m_orderObjMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id(), tr_lts("dds", "Order with id %1 not found")).arg(request.id()));
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id, tr_lts("dds", "Order with id %1 not found")).arg(request.id));
|
||||
else
|
||||
{
|
||||
|
||||
ifs->setOrderConfirmation(request.orderConfirmation().underlying());
|
||||
ifs->setOrderConfirmation(static_cast<int>(request.orderConfirmation));
|
||||
auto ret = ifs->updateObject();
|
||||
if (ret.error())
|
||||
{
|
||||
@@ -199,15 +199,15 @@ void HandlerOrder::onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
return;
|
||||
}
|
||||
|
||||
if (updateOrder(ifs, QString::fromStdString(request.answerText()), request.orderConfirmation()))
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id()));
|
||||
if (updateOrder(ifs, QString::fromStdString(request.answerText), request.orderConfirmation))
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id));
|
||||
else
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id(), tr_lts("dds", "Order with id %1 not found")).arg(request.id()));
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id, tr_lts("dds", "Order with id %1 not found")).arg(request.id));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id()));
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id));
|
||||
ERROR_LOG(m_logger) << "Illegal Order ID";
|
||||
}
|
||||
}
|
||||
@@ -220,11 +220,11 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
|
||||
const Database::EscOrder &escOrder = order->getData();
|
||||
oc.orderId = escOrder.idOrder;
|
||||
oc.orderType = ConvertToTab::OrderType_e(escOrder.typeOfOrder);
|
||||
oc.confirmation = orderConf.underlying();
|
||||
oc.confirmation = orderConf;
|
||||
oc.answerText = answerText;
|
||||
sendOrderConfirmation(oc);
|
||||
ERROR_LOG(m_logger) << "Update Order " << oc.orderId << " / ";
|
||||
switch (orderConf.underlying())
|
||||
switch (orderConf)
|
||||
{
|
||||
case EffectShowManagement::OrderConfirmation_e::FiringReadiness:
|
||||
emit startHandlerFiring(order->getData());
|
||||
@@ -252,7 +252,7 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
|
||||
case EffectShowManagement::OrderConfirmation_e::OrderCarriedOut:
|
||||
case EffectShowManagement::OrderConfirmation_e::PositionReached:
|
||||
{
|
||||
if (orderConf.underlying() == EffectShowManagement::OrderConfirmation_e::PositionReached &&
|
||||
if (orderConf == EffectShowManagement::OrderConfirmation_e::PositionReached &&
|
||||
oc.orderType != ConvertToTab::OrderType_e::Relocation)
|
||||
return true;
|
||||
emit endHandlerFiring(order->getData());
|
||||
@@ -277,7 +277,7 @@ void HandlerOrder::updateOrderWithId(int orderId, const QString &answerText, Eff
|
||||
|
||||
if (ifs == nullptr)
|
||||
return;
|
||||
ifs->setOrderConfirmation(orderConf.underlying());
|
||||
ifs->setOrderConfirmation(static_cast<int>(orderConf));
|
||||
auto ret = ifs->updateObject();
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << "Error Updating Order " << orderId << " / ";
|
||||
|
||||
@@ -57,7 +57,7 @@ void HandlerTabData::orderConfirmation(const ConvertToTab::OrderConfirmation_t &
|
||||
DEBUG_LOG(m_logger) << "Trigger Sending of Order Confirmation ";
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.payload(ConvertToTab::convertOrderConfirmation(orderConfirmation));
|
||||
out.payload = ConvertToTab::convertOrderConfirmation(orderConfirmation);
|
||||
m_mainHandler->dds()->ftcTab()->sendFireSmokeMarkerDataRequest(out, this);
|
||||
|
||||
}
|
||||
@@ -67,7 +67,7 @@ void HandlerTabData::vehicleStatus(const ConvertToTab::VehicleStatus_t &vehicleS
|
||||
DEBUG_LOG(m_logger) << "Trigger Sending of Vehicle Status ";
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.payload(ConvertToTab::convertVehicleStatus(vehicleStatus));
|
||||
out.payload = ConvertToTab::convertVehicleStatus(vehicleStatus);
|
||||
m_mainHandler->dds()->ftcTab()->sendFireSmokeMarkerDataRequest(out, this);
|
||||
}
|
||||
//=============================================================================
|
||||
@@ -84,7 +84,7 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Got Fire Smoke Marker " << data.sampleTime();
|
||||
DEBUG_LOG(m_logger) << "Got Fire Smoke Marker " << data.sampleTime;
|
||||
|
||||
switch (ConvertFromTab::isTelegram(data))
|
||||
{
|
||||
|
||||
@@ -77,21 +77,21 @@ void ObjectOrder::onPublishData()
|
||||
|
||||
EffectShowClient::Order ddsData;
|
||||
|
||||
ddsData.id(m_data.id);
|
||||
ddsData.areaDepth(m_data.areaDepth);
|
||||
ddsData.areaWidth(m_data.areaWidth);
|
||||
ddsData.areaRotation(m_data.areaRotation);
|
||||
ddsData.duration(m_data.duration);
|
||||
ddsData.idOrder(m_data.idOrder);
|
||||
ddsData.numOfVolley(m_data.numOfVolley);
|
||||
ddsData.shotsPerVolley(m_data.shotsPerVolley);
|
||||
ddsData.id = m_data.id;
|
||||
ddsData.areaDepth = m_data.areaDepth;
|
||||
ddsData.areaWidth = m_data.areaWidth;
|
||||
ddsData.areaRotation = m_data.areaRotation;
|
||||
ddsData.duration = m_data.duration;
|
||||
ddsData.idOrder = m_data.idOrder;
|
||||
ddsData.numOfVolley = m_data.numOfVolley;
|
||||
ddsData.shotsPerVolley = m_data.shotsPerVolley;
|
||||
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e(m_data.orderConfirmation);
|
||||
ddsData.orderConfirmation(oc);
|
||||
ddsData.position(Core::GeoPosition2D(m_data.centerPosition.x(), m_data.centerPosition.y()));
|
||||
ddsData.lowerLeftPosition(Core::GeoPosition2D(m_data.lowerLeftPosition.x(), m_data.lowerLeftPosition.y()));
|
||||
ddsData.startTime(m_data.startTime);
|
||||
ddsData.typeOfOrder(m_data.typeOfOrder);
|
||||
ddsData.info(m_data.info.toStdString());
|
||||
ddsData.orderConfirmation = oc;
|
||||
ddsData.position = Core::GeoPosition2D(m_data.centerPosition.x(), m_data.centerPosition.y());
|
||||
ddsData.lowerLeftPosition = Core::GeoPosition2D(m_data.lowerLeftPosition.x(), m_data.lowerLeftPosition.y());
|
||||
ddsData.startTime = m_data.startTime;
|
||||
ddsData.typeOfOrder = m_data.typeOfOrder;
|
||||
ddsData.info = m_data.info.toStdString();
|
||||
INFO_LOG(m_logger) << "Publish EscOrder-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
if (oc == EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance)
|
||||
@@ -116,12 +116,12 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat
|
||||
if ( m_data.typeOfOrder == 1)
|
||||
{
|
||||
QString title = QString::fromUtf8(tr_lts("Notification", "DMF Order")); // deutsch Wirkdarstellungen
|
||||
notif.title(title.toStdString());
|
||||
notif.title = title.toStdString();
|
||||
}
|
||||
else
|
||||
{
|
||||
QString title = QString::fromUtf8(tr_lts("Notification", "Relocation Order")); // deutsch Stellungswechsel
|
||||
notif.title(title.toStdString());
|
||||
notif.title = title.toStdString();
|
||||
}
|
||||
|
||||
QString content = QString::fromUtf8(tr_lts("Notification","<a href='lts://escOrderList/%1'>Open Dialog</a>"));
|
||||
@@ -131,32 +131,32 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat
|
||||
const QString str = QString::number(m_data.typeOfOrder);
|
||||
args.emplace_back(str.toStdString());
|
||||
|
||||
notif.content(content.toStdString());
|
||||
notif.contentArgs(args);
|
||||
notif.timeStamp(m_mainHandler->dds()->currentPartitionTime());
|
||||
notif.expiryTime(expiryTime);
|
||||
notif.priority(NotificationManagement::Priority::High);
|
||||
notif.processedPriority(NotificationManagement::Priority::Low);
|
||||
notif.messageType(NotificationManagement::MessageType::Info);
|
||||
notif.exerciseId(m_mainHandler->dds()->getExerciseId());
|
||||
notif.content = content.toStdString();
|
||||
notif.contentArgs = args;
|
||||
notif.timeStamp = m_mainHandler->dds()->currentPartitionTime();
|
||||
notif.expiryTime = expiryTime;
|
||||
notif.priority = NotificationManagement::Priority::High;
|
||||
notif.processedPriority = NotificationManagement::Priority::Low;
|
||||
notif.messageType = NotificationManagement::MessageType::Info;
|
||||
notif.exerciseId = m_mainHandler->dds()->getExerciseId();
|
||||
|
||||
NotificationManagement::Address wsAddr;
|
||||
wsAddr.addressId(addressId);
|
||||
wsAddr.isRead(false);
|
||||
wsAddr.addressId = addressId;
|
||||
wsAddr.isRead = false;
|
||||
QString name = localHostName;
|
||||
wsAddr.name(name.toStdString());
|
||||
wsAddr.addressType(NotificationManagement::AddressType::Workstation);
|
||||
wsAddr.name = name.toStdString();
|
||||
wsAddr.addressType = NotificationManagement::AddressType::Workstation;
|
||||
|
||||
notif.recipientIds().reserve(1);
|
||||
notif.recipientIds().push_back(wsAddr);
|
||||
notif.recipientIds.reserve(1);
|
||||
notif.recipientIds.push_back(wsAddr);
|
||||
|
||||
NotificationManagement::Address addrSender;
|
||||
addrSender.addressId(EffectShowClient::Offset);
|
||||
addrSender.name(QStringLiteral("svcEffectShowClient").toStdString());
|
||||
addrSender.addressType(NotificationManagement::AddressType::Service);
|
||||
notif.sender(addrSender);
|
||||
addrSender.addressId = EffectShowClient::Offset;
|
||||
addrSender.name = QStringLiteral("svcEffectShowClient").toStdString();
|
||||
addrSender.addressType = NotificationManagement::AddressType::Service;
|
||||
notif.sender = addrSender;
|
||||
|
||||
data.notification(notif);
|
||||
data.notification = notif;
|
||||
} // end of getCreateNotificationRequestData()
|
||||
|
||||
void ObjectOrder::createNotificationRequest()
|
||||
|
||||
Reference in new issue
Block a user