Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+21
-22
@@ -127,8 +127,7 @@ static inline rpr2::SpatialStruct spatialStructFromWorldLocation(const rpr2::Wor
|
||||
|
||||
|
||||
|
||||
NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
|
||||
: m_ngsHandler(ngsHandler)
|
||||
NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_ngsHandler(ngsHandler)
|
||||
, m_fedName(fedName)
|
||||
, m_swadmin(&ngs::SimulatedWorldAPI::getSimulatedWorldAdmin())
|
||||
, m_master(nullptr)
|
||||
@@ -144,8 +143,8 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
|
||||
, m_iaWeaponFireCallback(new ObserverWeaponFireCBNotifier())
|
||||
, m_bInitialized(false)
|
||||
, m_bCanPublishData(false)
|
||||
, m_timer(new QTimer(this))
|
||||
{
|
||||
, m_timer(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
connect(m_timer, &QTimer::timeout,
|
||||
this, &NgsConnector::go);
|
||||
connect(m_playerCallback, &PlayerCallback::firstTick,
|
||||
@@ -212,7 +211,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
|
||||
}
|
||||
catch (const ngs::NGSSimWorldException &e)
|
||||
{
|
||||
ERROR_LOG() << "caught exception during init (getIFederationMaster): " << e.print();
|
||||
ERROR_LOG(m_logger) << "caught exception during init (getIFederationMaster): " << e.print();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -227,7 +226,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
|
||||
}
|
||||
catch (const NGSException &e)
|
||||
{
|
||||
ERROR_LOG() << "caught exception during init (createFederation): " << e.print();
|
||||
ERROR_LOG(m_logger) << "caught exception during init (createFederation): " << e.print();
|
||||
return false;
|
||||
}
|
||||
player = &m_swadmin->getIPlayer(m_fedName.toStdString(), playerName.toStdString(), *m_playerCallback, Settings::swConfFileName().toLatin1().data(), Settings::fomIdentifier().toStdString(), Settings::rtiIdentifier().toStdString());
|
||||
@@ -277,22 +276,22 @@ void NgsConnector::subscribeAtNgs()
|
||||
m_enitityNumberCounter = 1;
|
||||
m_eventCount = 1;
|
||||
|
||||
INFO_LOG() << "Subscribe at NGS - Human Objects";
|
||||
INFO_LOG(m_logger) << "Subscribe at NGS - Human Objects";
|
||||
rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
|
||||
humanObjClass.subscribeAllAttributes();
|
||||
humanObjClass.subscribe();
|
||||
|
||||
INFO_LOG() << "Subscribe at NGS - GroundVehicle Objects";
|
||||
INFO_LOG(m_logger) << "Subscribe at NGS - GroundVehicle Objects";
|
||||
rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
|
||||
groundVehicleObjClass.subscribeAllAttributes();
|
||||
groundVehicleObjClass.subscribe();
|
||||
|
||||
INFO_LOG() << "Subscribe at NGS - LongBowApache Objects";
|
||||
INFO_LOG(m_logger) << "Subscribe at NGS - LongBowApache Objects";
|
||||
rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
|
||||
longBowApacheObjClass.subscribeAllAttributes();
|
||||
longBowApacheObjClass.subscribe();
|
||||
|
||||
INFO_LOG() << "Subscribe at NGS - Designator Objects";
|
||||
INFO_LOG(m_logger) << "Subscribe at NGS - Designator Objects";
|
||||
rpr2::IObserverDesignatorObjClass &designatorObjClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
|
||||
designatorObjClass.subscribeAllAttributes();
|
||||
designatorObjClass.subscribe();
|
||||
@@ -321,35 +320,35 @@ void NgsConnector::unsubscribeFromNgs()
|
||||
|
||||
if (m_somPlayer)
|
||||
{
|
||||
INFO_LOG() << "Unsubscribe at NGS - Human Objects";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Human Objects";
|
||||
rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
|
||||
humanObjClass.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - GroundVehicle Objects";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - GroundVehicle Objects";
|
||||
rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
|
||||
groundVehicleObjClass.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - LongBowApache Objects";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - LongBowApache Objects";
|
||||
rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
|
||||
longBowApacheObjClass.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Designator Objects";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Designator Objects";
|
||||
rpr2::IObserverDesignatorObjClass &designatorObjectClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
|
||||
designatorObjectClass.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Engagement Reply Interaction";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Engagement Reply Interaction";
|
||||
rpr2::IObserverEngagementReplyIntClass &enr = m_somPlayer->getObserverEngagementReplyIntClass(*m_iaEngagementReplyCallback);
|
||||
enr.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Event Report Interaction";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Event Report Interaction";
|
||||
rpr2::IObserverEventReportIntClass &evr = m_somPlayer->getObserverEventReportIntClass(*m_iaEventReportCallback);
|
||||
evr.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Munition Detonation Interaction";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Munition Detonation Interaction";
|
||||
rpr2::IObserverMunitionDetonationIntClass &md = m_somPlayer->getObserverMunitionDetonationIntClass(*m_iaMunitionDetonationCallback);
|
||||
md.unsubscribe();
|
||||
|
||||
INFO_LOG() << "Unsubscribe at NGS - Weapon Fire Interaction";
|
||||
INFO_LOG(m_logger) << "Unsubscribe at NGS - Weapon Fire Interaction";
|
||||
rpr2::IObserverWeaponFireIntClass &wf = m_somPlayer->getObserverWeaponFireIntClass(*m_iaWeaponFireCallback);
|
||||
wf.unsubscribe();
|
||||
}
|
||||
@@ -515,7 +514,7 @@ bool NgsConnector::sendData(int eqNo, const QByteArray& data, int requestIdentif
|
||||
vds.NumberOfLongLongs__A__Padding__A__DatumValue.resize(data.size() / 8 + 1);
|
||||
vds.DatumLengthInBits = 8 * data.size();
|
||||
|
||||
TRACE_LOG() << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
|
||||
TRACE_LOG(m_logger) << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
|
||||
|
||||
for (unsigned int i=0; i< vds.NumberOfLongLongs__A__Padding__A__DatumValue.size(); ++i)
|
||||
{
|
||||
@@ -682,11 +681,11 @@ void NgsConnector::go()
|
||||
}
|
||||
catch (const NGSException &ex)
|
||||
{
|
||||
ERROR_LOG() << "NGS Exception caught in Event Loop" << ex.print();
|
||||
ERROR_LOG(m_logger) << "NGS Exception caught in Event Loop" << ex.print();
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
ERROR_LOG() << "Standard Exception caught in Event Loop: " << e.what();
|
||||
ERROR_LOG(m_logger) << "Standard Exception caught in Event Loop: " << e.what();
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
@@ -1499,7 +1498,7 @@ void NgsConnector::onNewMunitionDetonation(const rpr2::IObserverMunitionDetonati
|
||||
|
||||
const auto &objectIdentifier = interaction.getEventIdentifier().IssuingObjectIdentifier;
|
||||
int eqId = getEquipmentNoByRTIObjectId(objectIdentifier.ID);
|
||||
DEBUG_LOG() << "Engagement Reply, Issuer: " << eqId;
|
||||
DEBUG_LOG(m_logger) << "Engagement Reply, Issuer: " << eqId;
|
||||
if (m_playerMap.contains(eqId) || objectIdentifier.ID == std::to_string(IdentifierStruct(0).toInt64()))
|
||||
return;
|
||||
|
||||
|
||||
Reference in new issue
Block a user