Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+20
-20
@@ -37,7 +37,7 @@ HandlerTabData::HandlerTabData(Initialization *mainHandler,
|
||||
//=============================================================================
|
||||
bool HandlerTabData::init()
|
||||
{
|
||||
DEBUG_LOG() << "Begin HandlerTabData";
|
||||
DEBUG_LOG(m_logger) << "Begin HandlerTabData";
|
||||
auto dtcTab = m_mainHandler->dds()->dtcTab();
|
||||
connect(dtcTab.get(), &TrainingAreaBase::Interface::Dtc::fireSmokeMarkerDataChanged,
|
||||
this, &HandlerTabData::onFireSmokeMarkerDataChanged);
|
||||
@@ -53,13 +53,13 @@ bool HandlerTabData::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "End HandlerTabData";
|
||||
DEBUG_LOG(m_logger) << "End HandlerTabData";
|
||||
return true;
|
||||
} // end of init()
|
||||
//=============================================================================
|
||||
void HandlerTabData::effectShowVehicleStatusRequest(int equipmentNumber, int participantId)
|
||||
{
|
||||
DEBUG_LOG() << "Trigger Status Request " << equipmentNumber << ' ' << participantId;
|
||||
DEBUG_LOG(m_logger) << "Trigger Status Request " << equipmentNumber << ' ' << participantId;
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.equipmentNumber(equipmentNumber);
|
||||
@@ -71,7 +71,7 @@ void HandlerTabData::effectShowVehicleStatusRequest(int equipmentNumber, int par
|
||||
//=============================================================================
|
||||
void HandlerTabData::relocationOrder(int equipmentNumber, int participantId, const ConvertToTab::RelocationOrder_t &relocationOrder)
|
||||
{
|
||||
DEBUG_LOG() << "Trigger Relocation Order " << equipmentNumber << ' ' << participantId;
|
||||
DEBUG_LOG(m_logger) << "Trigger Relocation Order " << equipmentNumber << ' ' << participantId;
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.equipmentNumber(equipmentNumber);
|
||||
@@ -90,7 +90,7 @@ void HandlerTabData::effectShowOrder(int equipmentNumber, int participantId, con
|
||||
|
||||
Core::GeoPosition2D posCenter = effectShowOrder.centerPosition;
|
||||
Core::GeoPosition2D posLl = effectShowOrder.lowerLeftPosition;
|
||||
DEBUG_LOG() << "Trigger Effect Show Order " << equipmentNumber << ' ' << participantId
|
||||
DEBUG_LOG(m_logger) << "Trigger Effect Show Order " << equipmentNumber << ' ' << participantId
|
||||
<< "\n idEffectShow " << effectShowOrder.idEffectShow
|
||||
<< "\n startTime " << effectShowOrder.startTime
|
||||
<< "\n centerPosition " << LtsCoordTrans::mgrsFromGeographic(posCenter.lon(), posCenter.lat())
|
||||
@@ -110,7 +110,7 @@ void HandlerTabData::effectShowOrder(int equipmentNumber, int participantId, con
|
||||
//=============================================================================
|
||||
void HandlerTabData::effectShowStop(int equipmentNumber, int participantId, const qint16 &idEffectShow)
|
||||
{
|
||||
DEBUG_LOG() << "Trigger Effect Show Stop " << equipmentNumber << ' ' << participantId;
|
||||
DEBUG_LOG(m_logger) << "Trigger Effect Show Stop " << equipmentNumber << ' ' << participantId;
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.equipmentNumber(equipmentNumber);
|
||||
@@ -127,7 +127,7 @@ void HandlerTabData::effectShowContinue(int equipmentNumber, int participantId,
|
||||
out.participantId(participantId);
|
||||
out.payload(ConvertToTab::convertEffectShowContinue(effectShowContinue));
|
||||
|
||||
DEBUG_LOG() << "Trigger Effect Show Continue " << equipmentNumber << ' ' << participantId
|
||||
DEBUG_LOG(m_logger) << "Trigger Effect Show Continue " << equipmentNumber << ' ' << participantId
|
||||
<< "\n idEffectShow " << effectShowContinue.idEffectShow
|
||||
<< "\n executionTime " << effectShowContinue.executionTime
|
||||
<< "\n payload" << plText(out.payload());
|
||||
@@ -143,7 +143,7 @@ void HandlerTabData::retractOrder(int equipmentNumber, int participantId, const
|
||||
out.participantId(participantId);
|
||||
out.payload(ConvertToTab::convertOrderRetract(retractOrder));
|
||||
|
||||
DEBUG_LOG() << "Trigger Retract Order " << equipmentNumber << ' ' << participantId
|
||||
DEBUG_LOG(m_logger) << "Trigger Retract Order " << equipmentNumber << ' ' << participantId
|
||||
<< "\n orderType " << retractOrder.orderType
|
||||
<< "\n id " << retractOrder.id
|
||||
<< "\n payload" << plText(out.payload());
|
||||
@@ -158,7 +158,7 @@ void HandlerTabData::meteoData(int equipmentNumber, int participantId, const Met
|
||||
out.participantId(participantId);
|
||||
out.payload(ConvertToTab::convertMeteoData(meteoData));
|
||||
|
||||
DEBUG_LOG() << "Trigger Meteo data " << equipmentNumber << ' ' << participantId
|
||||
DEBUG_LOG(m_logger) << "Trigger Meteo data " << equipmentNumber << ' ' << participantId
|
||||
<< "\n temperature " << meteoData.temperature()
|
||||
<< "\n humidity " << meteoData.humidity()
|
||||
<< "\n pressure " << meteoData.pressure()
|
||||
@@ -171,9 +171,9 @@ void HandlerTabData::meteoData(int equipmentNumber, int participantId, const Met
|
||||
void HandlerTabData::onSendFireSmokeMarkerDataReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG() << "Fire Smoke Marker Data could not be send: " << reply.str();
|
||||
ERROR_LOG(m_logger) << "Fire Smoke Marker Data could not be send: " << reply.str();
|
||||
else
|
||||
DEBUG_LOG() << "Fire Smoke Marker Data send successfully to TAB!";
|
||||
DEBUG_LOG(m_logger) << "Fire Smoke Marker Data send successfully to TAB!";
|
||||
} // end of onSendFireSmokeMarkerDataReply()
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSmokeMarkerData &data, DataModification modType)
|
||||
@@ -181,18 +181,18 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
DEBUG_LOG() << "Got Fire Smoke Marker " << data.sampleTime();
|
||||
DEBUG_LOG(m_logger) << "Got Fire Smoke Marker " << data.sampleTime();
|
||||
switch (ConvertFromTab::isTelegram(data))
|
||||
{
|
||||
case ConvertFromTab::RxTelegram_e::VehicleStatus:
|
||||
{
|
||||
DEBUG_LOG() << "Got Vehicle Status";
|
||||
DEBUG_LOG(m_logger) << "Got Vehicle Status";
|
||||
m_mainHandler->handlerEffectShowVehicleStatus()->vehicleStatusReceived(ConvertFromTab::getVehicleStatus(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::OrderConfirmation:
|
||||
{
|
||||
DEBUG_LOG() << "Got Order Confirmation ";
|
||||
DEBUG_LOG(m_logger) << "Got Order Confirmation ";
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
@@ -201,12 +201,12 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
|
||||
const ConvertFromTab::OrderConfirmation_t orderConfirmation = ConvertFromTab::getOrderConfirmation(data);
|
||||
if (orderConfirmation.orderType == ConvertFromTab::OrderType_e::Relocation)
|
||||
{
|
||||
DEBUG_LOG() << "relocationOrderConfirmationReceived(orderConfirmation)";
|
||||
DEBUG_LOG(m_logger) << "relocationOrderConfirmationReceived(orderConfirmation)";
|
||||
m_mainHandler->handlerEffectShowActorRelocation()->relocationOrderConfirmationReceived(orderConfirmation);
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG() << "effectShowOrderConfirmationReceived(orderConfirmation)";
|
||||
DEBUG_LOG(m_logger) << "effectShowOrderConfirmationReceived(orderConfirmation)";
|
||||
m_mainHandler->handlerEffectShow()->effectShowOrderConfirmationReceived(orderConfirmation);
|
||||
}
|
||||
break;
|
||||
@@ -224,14 +224,14 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerTabData::publishVehicleStatus(const EffectShowManagement::EffectShowVehicleStatus &vehicleStatus)
|
||||
{
|
||||
DEBUG_LOG() << "Vehicle Status published esmParticipantId: " << vehicleStatus.esmParticipantId() << ' ' << vehicleStatus.operational();
|
||||
DEBUG_LOG(m_logger) << "Vehicle Status published esmParticipantId: " << vehicleStatus.esmParticipantId() << ' ' << vehicleStatus.operational();
|
||||
m_mainHandler->dds()->dts()->publish(vehicleStatus);
|
||||
} // end of publishVehicleStatus()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void HandlerTabData::sendAdlerFqFb(const int aesId)
|
||||
{
|
||||
DEBUG_LOG() << "Send Adler Feuerbereitschaft";
|
||||
DEBUG_LOG(m_logger) << "Send Adler Feuerbereitschaft";
|
||||
TrainingAreaBase::AdlerFqFbRequest out;
|
||||
|
||||
out.aesItemId(aesId);
|
||||
@@ -241,10 +241,10 @@ void HandlerTabData::sendAdlerFqFb(const int aesId)
|
||||
void HandlerTabData::onAdlerFqFbReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG() << "Adler Feuerbereitschaft could not be send: " << reply.str()
|
||||
ERROR_LOG(m_logger) << "Adler Feuerbereitschaft could not be send: " << reply.str()
|
||||
<< ", id:" << reply.id();
|
||||
else
|
||||
DEBUG_LOG() << "Adler Feuerbereitschaft successfully to TAB!";
|
||||
DEBUG_LOG(m_logger) << "Adler Feuerbereitschaft successfully to TAB!";
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user