Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495

No files matched your search

@@ -46,14 +46,14 @@ bool MissionPlanHandler::init()
void MissionPlanHandler::onModifyMissionPlanRequest(const rti::core::SampleIdentity &cookie, const ModifyMissionPlanRequest &request)
{
Core::FunctionReplyObject reply = request.id() == 0 ? createMissionPlanRequest(request)
Core::FunctionReplyObject reply = request.id == 0 ? createMissionPlanRequest(request)
: modifyMissionPlanRequest(request);
m_mainHandler->fts()->modifyMissionPlanReply(cookie, reply);
}
void MissionPlanHandler::onRemoveMissionPlanRequest(const rti::core::SampleIdentity &cookie, const RemoveMissionPlanRequest &request)
{
Core::FunctionReplyObject reply = removeMissionPlanRequest(request.id());
Core::FunctionReplyObject reply = removeMissionPlanRequest(request.id);
m_mainHandler->ddsHandler()->fts()->removeMissionPlanReply(cookie, reply);
}
@@ -94,12 +94,12 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
for (const ParticipantManagement::Database::PpmMissionPlan &data : std::as_const(missionPlanVec))
{
ParticipantManagement::MissionPlan missionPlan;
missionPlan.id(data.id);
missionPlan.name(data.name.toStdString());
missionPlan.participantId(data.participantId);
missionPlan.missionStart(data.missionStart.toMSecsSinceEpoch());
missionPlan.repeat(data.repeat);
missionPlan.jumpToStart(data.jumpToStart);
missionPlan.id = data.id;
missionPlan.name = data.name.toStdString();
missionPlan.participantId = data.participantId;
missionPlan.missionStart = data.missionStart.toMSecsSinceEpoch();
missionPlan.repeat = data.repeat;
missionPlan.jumpToStart = data.jumpToStart;
QMap <int, ParticipantManagement::Database::PpmMissionItem> itemsDbMap; // QMap to get it sorted
@@ -120,14 +120,14 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
}
missionPlan.items().reserve(itemsDbMap.size());
missionPlan.items.reserve(itemsDbMap.size());
for (const ParticipantManagement::Database::PpmMissionItem &item : std::as_const(itemsDbMap))
{
ParticipantManagement::MissionItem msi;
msi.actions().reserve(actionsDbMap.size());
msi.name(item.name.toStdString());
msi.location(Core::GeoPosition(item.location.x(), item.location.y(), item.location.z()));
msi.itemNumber(item.elementNumber);
msi.actions.reserve(actionsDbMap.size());
msi.name = item.name.toStdString();
msi.location = Core::GeoPosition(item.location.x(), item.location.y(), item.location.z());
msi.itemNumber = item.elementNumber;
int actionsFulfilled = 0;
int64_t latestFulfilled = 0;
for (const auto &action : actionsDbMap)
@@ -135,36 +135,36 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
if (action.missionItemId == item.id)
{
ParticipantManagement::MissionAction msa;
msa.planId(missionPlan.id());
msa.actionType(action.missionActionTypeId);
msa.duration(action.duration);
msa.fulfilled(action.fulfilled.toMSecsSinceEpoch());
msa.properties(action.properties.toStdString());
msa.name(action.name.toStdString());
msa.actionNumber(action.elementNumber);
msa.itemNumber(msi.itemNumber());
msi.actions().push_back(msa);
msa.planId = missionPlan.id;
msa.actionType = action.missionActionTypeId;
msa.duration = action.duration;
msa.fulfilled = action.fulfilled.toMSecsSinceEpoch();
msa.properties = action.properties.toStdString();
msa.name = action.name.toStdString();
msa.actionNumber = action.elementNumber;
msa.itemNumber = msi.itemNumber;
msi.actions.push_back(msa);
if (msa.fulfilled() > 0)
if (msa.fulfilled > 0)
actionsFulfilled++;
if (latestFulfilled < msa.fulfilled())
latestFulfilled = msa.fulfilled();
if (latestFulfilled < msa.fulfilled)
latestFulfilled = msa.fulfilled;
}
}
msi.actionsFulfilled(actionsFulfilled);
msi.fulfilled(latestFulfilled);
msi.actionsFulfilled = actionsFulfilled;
msi.fulfilled = latestFulfilled;
missionPlan.items().push_back(msi);
missionPlan.items.push_back(msi);
}
setLatestFulfilledItem(missionPlan); // update mission plan fulfillment count & fulfillemnt latest time
ObjectMissionPlan *obj = new ObjectMissionPlan(m_mainHandler->ddsHandler(), m_mainHandler->db(), missionPlan);
obj->setDbMissionItems(itemsDbMap, actionsDbMap);
m_objMissionPlans.insert(missionPlan.id(), obj);
m_objMissionPlans.insert(missionPlan.id, obj);
// publish mission plan data
m_mainHandler->ddsHandler()->dts()->publish(missionPlan);
@@ -179,15 +179,15 @@ bool MissionPlanHandler::isUasInAutoMode(int participantId)
m_mainHandler->ddsHandler()->dtc()->waitForHistoricalDataUAS(3000);
const auto uas = m_mainHandler->ddsHandler()->dtc()->getUasByParticipantId(participantId, m_mainHandler->exerciseId());
if (uas.id() < 1)
if (uas.id < 1)
{
ERROR_LOG(m_logger) << "no uas for pid " << participantId;
return false;
}
DEBUG_LOG(m_logger) << "uas with pid " << participantId << " is in mode: " << (int)uas.uasState().underlying();
DEBUG_LOG(m_logger) << "uas with pid " << participantId << " is in mode: " << (int)uas.uasState;
return (uas.uasState() == ProjectDataManagement::UasState::UasState_Auto);
return (uas.uasState == ProjectDataManagement::UasState::UasState_Auto);
}
// stolen from Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
@@ -196,53 +196,53 @@ bool MissionPlanHandler::isUasCombatReady(int participantId)
m_mainHandler->ddsHandler()->dtc()->waitForHistoricalDataDynamicParticipantData(3000);
const auto data = m_mainHandler->ddsHandler()->dtc()->dynamicParticipantData(participantId);
if (data.participantId() == 0)
if (data.participantId == 0)
{
return false;
}
//Current State
if (data.stateHistory().empty())
if (data.stateHistory.empty())
{
return false;
}
const auto &history = data.stateHistory();
const auto &history = data.stateHistory;
//LasState is the last "real" state, that has a VBG <=8 (Castastrophic)
//It's not the last state received, as there can be other state changes like Sanitation, or NearMiss
auto lastState = m_mainHandler->ddsHandler()->dtc()->youngestStateInformation(history/*, true*/ /* debug */);
decltype(lastState) youngestState;
youngestState.stateTime(0);
youngestState.stateTime = 0;
for (const auto &si : history)
{
DEBUG_LOG(m_logger) << "StateInformation "
<< " time=" << si.stateTime()
<< " vulnerabilityBits=" << si.vulnerabilityBits()
<< " vulnerabilityKindId=" << si.vulnerabilityKindId();
if (youngestState.stateTime() < si.stateTime())
<< " time=" << si.stateTime
<< " vulnerabilityBits=" << si.vulnerabilityBits
<< " vulnerabilityKindId=" << si.vulnerabilityKindId;
if (youngestState.stateTime < si.stateTime)
youngestState = si;
}
return (youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
return (youngestState.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
}
Core::FunctionReplyObject MissionPlanHandler::createMissionPlanRequest(const ModifyMissionPlanRequest &request)
{
DEBUG_LOG(m_logger) <<" >> -- createMissionPlanRequest -- ";
if (request.participantId() > 0 && !isUasParticipant(request.participantId()))
if (request.participantId > 0 && !isUasParticipant(request.participantId))
{
return Core::FunctionReplyObject(tr_lts("dds", "Participant with id %1 is not a Uas participant.")).arg(request.participantId());
return Core::FunctionReplyObject(tr_lts("dds", "Participant with id %1 is not a Uas participant.")).arg(request.participantId);
}
if (!isUasInAutoMode(request.participantId()))
if (!isUasInAutoMode(request.participantId))
{
return Core::FunctionReplyObject(tr_lts("dds", "Uas with participant id %1 is not in auto mode - maybe the safety tablet is currently engaged.")).arg(request.participantId());
return Core::FunctionReplyObject(tr_lts("dds", "Uas with participant id %1 is not in auto mode - maybe the safety tablet is currently engaged.")).arg(request.participantId);
}
if (!isUasCombatReady(request.participantId()))
if (!isUasCombatReady(request.participantId))
{
return Core::FunctionReplyObject(tr_lts("dds", "Uas with participant id %1 ------ not combat ready.")).arg(request.participantId());
return Core::FunctionReplyObject(tr_lts("dds", "Uas with participant id %1 ------ not combat ready.")).arg(request.participantId);
}
/// 1- insert in DB Mission plan
@@ -254,7 +254,7 @@ Core::FunctionReplyObject MissionPlanHandler::createMissionPlanRequest(const Mod
const MissionPlan missionPlan = ObjectMissionPlan::fillMissionPlanData(request);
ObjectMissionPlan *obj = new ObjectMissionPlan(m_mainHandler->ddsHandler(), m_mainHandler->db(), missionPlan);
Core::FunctionReplyObject ret = obj->createMissionPlan(dbMissionPlan, request.items());
Core::FunctionReplyObject ret = obj->createMissionPlan(dbMissionPlan, request.items);
if (ret.error())
{
delete obj;
@@ -273,13 +273,13 @@ Core::FunctionReplyObject MissionPlanHandler::modifyMissionPlanRequest(const Mod
/// 2- remove first all mission items and their actions
/// 3- add New mission items
/// 4- add new mission actions
ObjectMissionPlan *obj = m_objMissionPlans.value(request.id());
if (!obj || request.id() < 0)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Couldn't remove Mission plan with id %1")).arg(request.id());
ObjectMissionPlan *obj = m_objMissionPlans.value(request.id);
if (!obj || request.id < 0)
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Couldn't remove Mission plan with id %1")).arg(request.id);
const Database::PpmMissionPlan &dbMissionPlan = ObjectMissionPlan::toDbMissionPlan(request);
auto ret = obj->updateMissionPlan(dbMissionPlan, request.items());
auto ret = obj->updateMissionPlan(dbMissionPlan, request.items);
publishMissionPlan(obj->getMissionPlanData()); // publish mission plan
return ret;
}
@@ -308,19 +308,19 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
bool found = false;
for (const auto &missionPlan : m_objMissionPlans.values())
{
if (missionPlan->missionPlan().participantId() == participantId && missionPlan->missionPlan().missionStart() <= m_mainHandler->currentTimeMSec())
if (missionPlan->missionPlan().participantId == participantId && missionPlan->missionPlan().missionStart <= m_mainHandler->currentTimeMSec())
{
// get current action (stolen from Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp)
const std::vector< ParticipantManagement::MissionItem > items = missionPlan->missionPlan().items(); // copy !!
const std::vector< ParticipantManagement::MissionItem > items = missionPlan->missionPlan().items; // copy !!
for (const auto &item : items)
{
for (auto &msa : item.actions())
for (auto &msa : item.actions)
{
const QString thisMissionName(QStringLiteral("%1_%2_%3").arg(missionPlan->missionPlan().id()).arg(QString::fromStdString(missionPlan->missionPlan().name()), QString::fromStdString(item.name())));
const QString thisMissionName(QStringLiteral("%1_%2_%3").arg(missionPlan->missionPlan().id).arg(QString::fromStdString(missionPlan->missionPlan().name), QString::fromStdString(item.name)));
INFO_LOG(m_logger) << ">> mission item: this mission name: " << thisMissionName << ", fulfilled: " << msa.fulfilled();
INFO_LOG(m_logger) << ">> mission item: this mission name: " << thisMissionName << ", fulfilled: " << msa.fulfilled;
if (msa.fulfilled() > 0)
if (msa.fulfilled > 0)
{
continue;
}
@@ -330,12 +330,12 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
continue;
}
DEBUG_LOG(m_logger) << ">> ######### setMissionActionFulfilledRequest !!! item = " << item.itemNumber() << ", name = " << item.name() << ", missionPlan = " << missionPlan->missionPlan().id();
DEBUG_LOG(m_logger) << ">> ######### setMissionActionFulfilledRequest !!! item = " << item.itemNumber << ", name = " << item.name << ", missionPlan = " << missionPlan->missionPlan().id;
SetMissionActionFulfilledRequest req;
req.actionNumber(msa.actionNumber());
req.fulfilled(true);
req.missionId(missionPlan->missionPlan().id());
req.itemNumber(item.itemNumber());
req.actionNumber = msa.actionNumber;
req.fulfilled = true;
req.missionId = missionPlan->missionPlan().id;
req.itemNumber = item.itemNumber;
const auto res = setMissionActionFulfilledRequest(req);
if (res.error())
{
@@ -371,9 +371,9 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
Core::FunctionReplyObject MissionPlanHandler::setMissionActionFulfilledRequest(const SetMissionActionFulfilledRequest &request)
{
DEBUG_LOG(m_logger)<<" -- [setMissionActionFulfilledRequest] req.missionId: "<<request.missionId();
DEBUG_LOG(m_logger)<<" -- [setMissionActionFulfilledRequest] req.missionId: "<<request.missionId;
Core::FunctionReplyObject ret;
ObjectMissionPlan *obj = m_objMissionPlans.value(request.missionId(), nullptr);
ObjectMissionPlan *obj = m_objMissionPlans.value(request.missionId, nullptr);
if (!obj)
return ret;
ret = obj->setMissionActionFulfilled(request, m_mainHandler->currentTimeMSec());
@@ -403,9 +403,9 @@ bool MissionPlanHandler::isUasParticipant(int participantId) const
int MissionPlanHandler::getNumberOfActionFulfilled(const MissionItem &msi) const
{
int count = 0;
for (auto action : msi.actions())
for (auto action : msi.actions)
{
if (action.fulfilled() > 0)
if (action.fulfilled > 0)
count++;
}
return count;
@@ -415,26 +415,26 @@ void MissionPlanHandler::setLatestFulfilledItem(MissionPlan &missionPlan)
{
int count = 0;
int64_t latestTime = 0;
for (auto item : missionPlan.items())
for (auto item : missionPlan.items)
{
if (item.actionsFulfilled() > 0)
if (item.actionsFulfilled > 0)
count++;
if (latestTime < item.fulfilled())
latestTime = item.fulfilled();
if (latestTime < item.fulfilled)
latestTime = item.fulfilled;
missionPlan.itemsFulfilled(count);
missionPlan.fulfilled(latestTime);
missionPlan.itemsFulfilled = count;
missionPlan.fulfilled = latestTime;
}
}
int64_t MissionPlanHandler::getLastestFulfilledAction(const MissionItem &msi) const
{
int64_t latestTime = 0;
for (auto action : msi.actions())
for (auto action : msi.actions)
{
if (action.fulfilled() > latestTime)
latestTime = action.fulfilled();
if (action.fulfilled > latestTime)
latestTime = action.fulfilled;
}
return latestTime;
@@ -25,29 +25,29 @@ ObjectMissionPlan::ObjectMissionPlan(const std::shared_ptr<DdsHandler> &ddsHandl
, m_missionplan(missionPlan)
, m_logger(getLogger("ObjectMissionPlan"))
{
DEBUG_LOG(m_logger)<<" - ctor ObjectMissionPlan: planId: "<<m_missionplan.id();
DEBUG_LOG(m_logger)<<" - ctor ObjectMissionPlan: planId: "<<m_missionplan.id;
}
int32_t ObjectMissionPlan::id() const
{
return m_missionplan.id();
return m_missionplan.id;
}
int32_t ObjectMissionPlan::participantId() const
{
return m_missionplan.participantId();
return m_missionplan.participantId;
}
Database::PpmMissionPlan ObjectMissionPlan::toDbMissionPlan(const ModifyMissionPlanRequest &mp)
{
Database::PpmMissionPlan result;
result.id = mp.id();
result.name = QString::fromStdString(mp.name());
result.missionStart = QDateTime::fromMSecsSinceEpoch(mp.missionStart());
result.repeat = mp.repeat();
result.jumpToStart = mp.jumpToStart();
result.participantId = mp.participantId();
result.id = mp.id;
result.name = QString::fromStdString(mp.name);
result.missionStart = QDateTime::fromMSecsSinceEpoch(mp.missionStart);
result.repeat = mp.repeat;
result.jumpToStart = mp.jumpToStart;
result.participantId = mp.participantId;
return result;
}
@@ -56,14 +56,14 @@ Database::PpmMissionPlan ObjectMissionPlan::toDbMissionPlan(const ModifyMissionP
MissionPlan ObjectMissionPlan::fillMissionPlanData(const ModifyMissionPlanRequest &in)
{
MissionPlan out;
out.id(in.id());
out.name(in.name());
out.missionStart(in.missionStart());
out.properties(in.properties());
out.items(in.items());
out.participantId(in.participantId());
out.jumpToStart(in.jumpToStart());
out.repeat(in.repeat());
out.id = in.id;
out.name = in.name;
out.missionStart = in.missionStart;
out.properties = in.properties;
out.items = in.items;
out.participantId = in.participantId;
out.jumpToStart = in.jumpToStart;
out.repeat = in.repeat;
return out;
}
@@ -74,7 +74,7 @@ MissionPlan ObjectMissionPlan::getMissionPlanData() const
}
void ObjectMissionPlan::setDbMissionItems(const QMap<int, ParticipantManagement::Database::PpmMissionItem> &dbItems,
const QMap<int, Database::PpmMissionAction> &dbActions)
const QMultiMap<int, Database::PpmMissionAction> &dbActions)
{
m_mapMissionItems.clear();
m_dbMissionActions.clear();
@@ -82,24 +82,24 @@ void ObjectMissionPlan::setDbMissionItems(const QMap<int, ParticipantManagement:
for (const ParticipantManagement::Database::PpmMissionItem &item : std::as_const(dbItems))
{
ParticipantManagement::MissionItem msi;
msi.actions().reserve(dbActions.size());
msi.name(item.name.toStdString());
msi.location(Core::GeoPosition(item.location.x(), item.location.y(), item.location.z()));
msi.itemNumber(item.elementNumber);
msi.actions.reserve(dbActions.size());
msi.name = item.name.toStdString();
msi.location = Core::GeoPosition(item.location.x(), item.location.y(), item.location.z());
msi.itemNumber = item.elementNumber;
std::vector<Database::PpmMissionAction> actionsVec;
for (const auto &action : dbActions)
{
if (action.missionItemId == item.id)
{
ParticipantManagement::MissionAction msa;
msa.actionType(action.missionActionTypeId);
msa.duration(action.duration);
msa.fulfilled(action.fulfilled.toMSecsSinceEpoch());
msa.properties(action.properties.toStdString());
msa.name(action.name.toStdString());
msa.actionNumber(action.elementNumber);
msa.planId(item.missionPlanId);
msi.actions().push_back(msa);
msa.actionType = action.missionActionTypeId;
msa.duration = action.duration;
msa.fulfilled = action.fulfilled.toMSecsSinceEpoch();
msa.properties = action.properties.toStdString();
msa.name = action.name.toStdString();
msa.actionNumber = action.elementNumber;
msa.planId = item.missionPlanId;
msi.actions.push_back(msa);
actionsVec.push_back(action);
}
}
@@ -140,26 +140,26 @@ Core::FunctionReplyObject ObjectMissionPlan::createMissionPlan(Database::PpmMiss
{
Database::PpmMissionItem dbItem;
dbItem.missionPlanId = newMissionPlan.id;
dbItem.name = QString::fromStdString(item.name());
dbItem.elementNumber = item.itemNumber();
dbItem.location = LtsUtils::QPoint3D(item.location().lon(),item.location().lat(), item.location().z());
dbItem.name = QString::fromStdString(item.name);
dbItem.elementNumber = item.itemNumber;
dbItem.location = LtsUtils::QPoint3D(item.location.lon,item.location.lat, item.location.z);
if (!m_db->insert(dbItem))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'Mission Item' to database"));
std::vector<Database::PpmMissionAction> actionsVec;
actionsVec.reserve(item.actions().size());
for (auto &action : item.actions())
actionsVec.reserve(item.actions.size());
for (auto &action : item.actions)
{
action.planId(newMissionPlan.id);
action.planId = newMissionPlan.id;
Database::PpmMissionAction dbAction;
dbAction.missionActionTypeId = action.actionType();
dbAction.missionActionTypeId = action.actionType;
dbAction.missionItemId = dbItem.id;
dbAction.duration = action.duration();
dbAction.name = QString::fromStdString(action.name());
dbAction.properties = QString::fromStdString(action.properties());
dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(action.fulfilled());
dbAction.elementNumber = action.actionNumber();
dbAction.duration = action.duration;
dbAction.name = QString::fromStdString(action.name);
dbAction.properties = QString::fromStdString(action.properties);
dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(action.fulfilled);
dbAction.elementNumber = action.actionNumber;
if (!m_db->insert(dbAction))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'Mission Action' to database"));
@@ -169,21 +169,21 @@ Core::FunctionReplyObject ObjectMissionPlan::createMissionPlan(Database::PpmMiss
m_dbMissionActions.push_back(actionsVec); // [elNumber][actionNumber]
}//loop mission items
m_missionplan.id(newMissionPlan.id);
m_missionplan.name(newMissionPlan.name.toStdString());
m_missionplan.missionStart(newMissionPlan.missionStart.toMSecsSinceEpoch());
m_missionplan.participantId(newMissionPlan.participantId);
m_missionplan.jumpToStart(newMissionPlan.jumpToStart);
m_missionplan.repeat(newMissionPlan.repeat);
m_missionplan.items(itemVec);
m_missionplan.fulfilled(0);
m_missionplan.itemsFulfilled(0);
m_missionplan.id = newMissionPlan.id;
m_missionplan.name = newMissionPlan.name.toStdString();
m_missionplan.missionStart = newMissionPlan.missionStart.toMSecsSinceEpoch();
m_missionplan.participantId = newMissionPlan.participantId;
m_missionplan.jumpToStart = newMissionPlan.jumpToStart;
m_missionplan.repeat = newMissionPlan.repeat;
m_missionplan.items = itemVec;
m_missionplan.fulfilled = 0;
m_missionplan.itemsFulfilled = 0;
for (auto &item : m_missionplan.items())
for (auto &item : m_missionplan.items)
{
for (auto &action : item.actions())
DEBUG_LOG(m_logger)<<"[CREATE] itemIdx: "<<item.itemNumber()
<<" act.Num: "<<action.actionNumber()<<" act.ItemNum: "<<action.itemNumber()<<" itemFul:"<<action.fulfilled();
for (auto &action : item.actions)
DEBUG_LOG(m_logger)<<"[CREATE] itemIdx: "<<item.itemNumber
<<" act.Num: "<<action.actionNumber<<" act.ItemNum: "<<action.itemNumber<<" itemFul:"<<action.fulfilled;
}
trans.commit();
DEBUG_LOG(m_logger)<< ">> [NEW] mission plan with id( "<<newMissionPlan.id<<" ) inserted !!";
@@ -231,25 +231,25 @@ Core::FunctionReplyObject ObjectMissionPlan::updateMissionPlan(Database::PpmMiss
{
Database::PpmMissionItem dbItem;
dbItem.missionPlanId = newMissionPlan.id;
dbItem.name = QString::fromStdString(item.name());
dbItem.elementNumber = item.itemNumber();
dbItem.location = LtsUtils::QPoint3D(item.location().lon(),item.location().lat(), item.location().z());
dbItem.name = QString::fromStdString(item.name);
dbItem.elementNumber = item.itemNumber;
dbItem.location = LtsUtils::QPoint3D(item.location.lon,item.location.lat, item.location.z);
if (!m_db->insert(dbItem))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'Mission Item' to database"));
std::vector<Database::PpmMissionAction> actionsVec;
actionsVec.reserve(item.actions().size());
for (auto &action : item.actions())
actionsVec.reserve(item.actions.size());
for (auto &action : item.actions)
{
action.planId(newMissionPlan.id);
action.planId = newMissionPlan.id;
Database::PpmMissionAction dbAction;
dbAction.missionActionTypeId = action.actionType();
dbAction.missionActionTypeId = action.actionType;
dbAction.missionItemId = dbItem.id;
dbAction.duration = action.duration();
dbAction.name = QString::fromStdString(action.name());
dbAction.properties = QString::fromStdString(action.properties());
dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(action.fulfilled());
dbAction.elementNumber = action.actionNumber();
dbAction.duration = action.duration;
dbAction.name = QString::fromStdString(action.name);
dbAction.properties = QString::fromStdString(action.properties);
dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(action.fulfilled);
dbAction.elementNumber = action.actionNumber;
if (!m_db->insert(dbAction))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'Mission Action' to database"));
@@ -260,19 +260,19 @@ Core::FunctionReplyObject ObjectMissionPlan::updateMissionPlan(Database::PpmMiss
}//loop mission items
trans.commit();
m_missionplan.id(newMissionPlan.id);
m_missionplan.name(newMissionPlan.name.toStdString());
m_missionplan.missionStart(newMissionPlan.missionStart.toMSecsSinceEpoch());
m_missionplan.participantId(newMissionPlan.participantId);
m_missionplan.jumpToStart(newMissionPlan.jumpToStart);
m_missionplan.repeat(newMissionPlan.repeat);
m_missionplan.items(itemVec);
m_missionplan.itemsFulfilled(0); // on update items and action entries will be cleared
m_missionplan.fulfilled(0);
m_missionplan.id = newMissionPlan.id;
m_missionplan.name = newMissionPlan.name.toStdString();
m_missionplan.missionStart = newMissionPlan.missionStart.toMSecsSinceEpoch();
m_missionplan.participantId = newMissionPlan.participantId;
m_missionplan.jumpToStart = newMissionPlan.jumpToStart;
m_missionplan.repeat = newMissionPlan.repeat;
m_missionplan.items = itemVec;
m_missionplan.itemsFulfilled = 0; // on update items and action entries will be cleared
m_missionplan.fulfilled = 0;
DEBUG_LOG(m_logger)<< ">> [UPDATE] mission plan with id( "<<m_missionplan.id()<<" ) Updated !!";
DEBUG_LOG(m_logger)<< ">> [UPDATE] mission plan with id( "<<m_missionplan.id<<" ) Updated !!";
return Core::FunctionReplyObject(m_missionplan.id());
return Core::FunctionReplyObject(m_missionplan.id);
}
Core::FunctionReplyObject ObjectMissionPlan::removeMissionPlan(int id)
@@ -305,33 +305,33 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
return Core::FunctionReplyObject("");
}
if (req.missionId() != m_missionplan.id())
if (req.missionId != m_missionplan.id)
{
QString error = QStringLiteral("Wrong missionPlan Object caught Request: %1 / currPlanId: %2").arg(req.missionId()).arg(m_missionplan.id());
QString error = QStringLiteral("Wrong missionPlan Object caught Request: %1 / currPlanId: %2").arg(req.missionId).arg(m_missionplan.id);
ERROR_LOG(m_logger)<< error;
return Core::FunctionReplyObject(error.toStdString().c_str());
}
// Abort in case itemNumb=-1 && actionNumb=-1
if (req.actionNumber() < 0 && req.itemNumber() < 0)
if (req.actionNumber < 0 && req.itemNumber < 0)
{
m_missionplan.aborted(true);
m_missionplan.aborted = true;
return setMissionPlanAborted(true);
}
auto &dbActions = m_dbMissionActions[req.itemNumber()]; //[elemNum][actionNum]
auto &dbActions = m_dbMissionActions[req.itemNumber]; //[elemNum][actionNum]
if (dbActions.empty()
|| req.actionNumber() >= static_cast<int>(dbActions.size())
|| req.actionNumber() < 0
|| req.itemNumber() < 0) // actionNumber start by 0
|| req.actionNumber >= static_cast<int>(dbActions.size())
|| req.actionNumber < 0
|| req.itemNumber < 0) // actionNumber start by 0
{
QString error = QStringLiteral("Could not set mission action with id: %1 ! ").arg(req.actionNumber());
QString error = QStringLiteral("Could not set mission action with id: %1 ! ").arg(req.actionNumber);
ERROR_LOG(m_logger)<< error;
return Core::FunctionReplyObject(error.toStdString().c_str());
}
Database::PpmMissionAction &dbAction = dbActions[req.actionNumber()];
Database::PpmMissionAction &dbAction = dbActions[req.actionNumber];
dbAction.fulfilled = QDateTime::fromMSecsSinceEpoch(currentTimeMSec);
if (!m_db->update(dbAction))
@@ -348,11 +348,11 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
//4- if yes update missioPlan & missionItem fulfilled
MissionItem &msi = m_mapMissionItems[dbAction.missionItemId];
msi.fulfilled(dbAction.fulfilled.toMSecsSinceEpoch());
msi.actionsFulfilled(msi.actionsFulfilled() + 1);
MissionAction &msa = m_mapMissionItems[dbAction.missionItemId].actions()[dbAction.elementNumber];
msa.fulfilled(dbAction.fulfilled.toMSecsSinceEpoch());
m_missionplan.items()[req.itemNumber()] = m_mapMissionItems[dbAction.missionItemId]; // item in MissionPlan updated through elementNumber
msi.fulfilled = dbAction.fulfilled.toMSecsSinceEpoch();
msi.actionsFulfilled = msi.actionsFulfilled + 1;
MissionAction &msa = m_mapMissionItems[dbAction.missionItemId].actions[dbAction.elementNumber];
msa.fulfilled = dbAction.fulfilled.toMSecsSinceEpoch();
m_missionplan.items[req.itemNumber] = m_mapMissionItems[dbAction.missionItemId]; // item in MissionPlan updated through elementNumber
/// update fulfilled time for items and mission plan
/// update fulfilled items count
@@ -360,27 +360,27 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
int numbItemFulfilled = 0;
for(const auto &item : m_mapMissionItems)
{
if (item.actionsFulfilled() == static_cast<int>(item.actions().size()))
if (item.actionsFulfilled == static_cast<int>(item.actions.size()))
numbItemFulfilled++;
}
m_missionplan.itemsFulfilled(numbItemFulfilled);
m_missionplan.fulfilled(dbAction.fulfilled.toMSecsSinceEpoch());
m_missionplan.itemsFulfilled = numbItemFulfilled;
m_missionplan.fulfilled = dbAction.fulfilled.toMSecsSinceEpoch();
return Core::FunctionReplyObject(m_missionplan.id());
return Core::FunctionReplyObject(m_missionplan.id);
}
Core::FunctionReplyObject ObjectMissionPlan::setMissionPlanAborted(bool state)
{
DEBUG_LOG(m_logger)<<" -- [setMissionPlanAborted] abort mission plan: "<<m_missionplan.id();
DEBUG_LOG(m_logger)<<" -- [setMissionPlanAborted] abort mission plan: "<<m_missionplan.id;
Database::PpmMissionPlan dbMissionPlan;
// m_db->selectPpmMissionPlan(m_missionplan.id(),dbMissionPlan);
dbMissionPlan.missionStart = QDateTime::fromMSecsSinceEpoch(m_missionplan.missionStart());
dbMissionPlan.jumpToStart = m_missionplan.jumpToStart();
dbMissionPlan.id = m_missionplan.id();
dbMissionPlan.name = QString::fromStdString(m_missionplan.name());
dbMissionPlan.participantId = m_missionplan.participantId();
dbMissionPlan.repeat = m_missionplan.repeat();
dbMissionPlan.missionStart = QDateTime::fromMSecsSinceEpoch(m_missionplan.missionStart);
dbMissionPlan.jumpToStart = m_missionplan.jumpToStart;
dbMissionPlan.id = m_missionplan.id;
dbMissionPlan.name = QString::fromStdString(m_missionplan.name);
dbMissionPlan.participantId = m_missionplan.participantId;
dbMissionPlan.repeat = m_missionplan.repeat;
dbMissionPlan.aborted = state;
@@ -392,7 +392,7 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionPlanAborted(bool state)
return Core::FunctionReplyObject(error.toStdString().c_str());
}
return Core::FunctionReplyObject(m_missionplan.id());
return Core::FunctionReplyObject(m_missionplan.id);
}
} // namespace UasHandling
@@ -36,7 +36,7 @@ public:
static MissionPlan fillMissionPlanData(const ModifyMissionPlanRequest &in);
MissionPlan getMissionPlanData() const;
void setDbMissionItems( const QMap <int, ParticipantManagement::Database::PpmMissionItem> &dbItems,
const QMap <int, ParticipantManagement::Database::PpmMissionAction> &dbActions);
const QMultiMap <int, ParticipantManagement::Database::PpmMissionAction> &dbActions);
const ParticipantManagement::MissionPlan &missionPlan() const;
Core::FunctionReplyObject createMissionPlan(Database::PpmMissionPlan newMissionPlan, const std::vector<MissionItem> &missionItems);
Core::FunctionReplyObject updateMissionPlan(Database::PpmMissionPlan newMissionPlan, const std::vector<MissionItem> &missionItems);
@@ -15,21 +15,21 @@ namespace UasHandling
bool Uas::hasChanges(const CreateModifyUasRequest &request)
{
bool hasChanges = request.deviceIdentifier() != m_data.deviceIdentifier.toStdString() ||
request.participantId() != m_data.participantId ||
request.exerciseId() != m_data.exerciseId ||
request.hostname() != m_data.hostname.toStdString() ||
request.hostport() != m_data.hostport ||
request.useTcp() != m_data.useTcp;
bool hasChanges = request.deviceIdentifier != m_data.deviceIdentifier.toStdString() ||
request.participantId != m_data.participantId ||
request.exerciseId != m_data.exerciseId ||
request.hostname != m_data.hostname.toStdString() ||
request.hostport != m_data.hostport ||
request.useTcp != m_data.useTcp;
if (hasChanges)
{
m_data.deviceIdentifier = QString::fromStdString(request.deviceIdentifier());
m_data.participantId = request.participantId();
m_data.exerciseId = request.exerciseId();
m_data.hostname = QString::fromStdString(request.hostname());
m_data.hostport = request.hostport();
m_data.useTcp = request.useTcp();
m_data.deviceIdentifier = QString::fromStdString(request.deviceIdentifier);
m_data.participantId = request.participantId;
m_data.exerciseId = request.exerciseId;
m_data.hostname = QString::fromStdString(request.hostname);
m_data.hostport = request.hostport;
m_data.useTcp = request.useTcp;
}
return hasChanges;
@@ -53,7 +53,7 @@ void Uas::unlinkUas()
void Uas::setState(const ProjectDataManagement::UasState &newState)
{
m_data.uasStateId = newState.underlying();
m_data.uasStateId = static_cast<int>(newState);
}
int32_t Uas::id() const
{
@@ -74,15 +74,15 @@ UAS Uas::toDdsUas() const
{
ParticipantManagement::UAS result;
result.id(m_data.id);
result.deviceIdentifier(m_data.deviceIdentifier.toStdString());
result.uasState(static_cast<ProjectDataManagement::UasState>(m_data.uasStateId));
result.participantId(m_data.participantId);
result.exerciseId(m_data.exerciseId);
result.hostname(m_data.hostname.toStdString());
result.hostport(m_data.hostport);
result.sampleTime(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
result.useTcp(m_data.useTcp);
result.id = m_data.id;
result.deviceIdentifier = m_data.deviceIdentifier.toStdString();
result.uasState = static_cast<ProjectDataManagement::UasState>(m_data.uasStateId);
result.participantId = m_data.participantId;
result.exerciseId = m_data.exerciseId;
result.hostname = m_data.hostname.toStdString();
result.hostport = m_data.hostport;
result.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
result.useTcp = m_data.useTcp;
return result;
}
@@ -83,7 +83,7 @@ bool UasHandler::init()
//------------------------------------------------------------------------------------------
void UasHandler::onCreateModifyUasRequest(const rti::core::SampleIdentity &cookie, const CreateModifyUasRequest &request)
{
Core::FunctionReplyObject reply = request.id() == 0 ? createUas(request) : modifyUas(request);
Core::FunctionReplyObject reply = request.id == 0 ? createUas(request) : modifyUas(request);
m_mainHandler->exAnyFts()->createModifyUasReply(cookie, reply);
}
@@ -101,18 +101,18 @@ Core::FunctionReplyObject UasHandler::removeUas(const RemoveUasRequest &request)
{
DEBUG_LOG(m_logger) << "onRemoveUasRequest " << request;
if (request.id() < 0)
if (request.id < 0)
return Core::FunctionReplyObject(tr_lts("dds", "Got request to delete an UAS, but no valid UAS id to delete"));
UasHandling::Uas *uasToDelete = m_uass.value(request.id());
UasHandling::Uas *uasToDelete = m_uass.value(request.id);
if (!uasToDelete)
return Core::FunctionReplyObject(tr_lts("dds", "Could not delete UAS with id %1, because no UAS with that id exists"))
.arg(request.id());
.arg(request.id);
if (uasToDelete->participantId() > 0)
return Core::FunctionReplyObject(tr_lts("dds", "Not possible to delete a UAS in use"));
DEBUG_LOG(m_logger) << "Removing UAS with ID " << request.id();
DEBUG_LOG(m_logger) << "Removing UAS with ID " << request.id;
return removeUas(uasToDelete);
}
@@ -153,13 +153,13 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
Database::PpmUas dbUas;
dbUas.deviceIdentifier = QString::fromStdString(request.deviceIdentifier());
dbUas.uasStateId = ProjectDataManagement::UasState::UasState_Undefined;
dbUas.participantId = request.participantId();
dbUas.exerciseId = request.exerciseId();
dbUas.hostname = QString::fromStdString(request.hostname());
dbUas.hostport = request.hostport();
dbUas.useTcp = request.useTcp();
dbUas.deviceIdentifier = QString::fromStdString(request.deviceIdentifier);
dbUas.uasStateId = static_cast<int>(ProjectDataManagement::UasState::UasState_Undefined);
dbUas.participantId = request.participantId;
dbUas.exerciseId = request.exerciseId;
dbUas.hostname = QString::fromStdString(request.hostname);
dbUas.hostport = request.hostport;
dbUas.useTcp = request.useTcp;
if (hostNameHostPortExists(dbUas.hostname, dbUas.hostport, -1))
return Core::FunctionReplyObject(tr_lts("dds", "Hostname with Port %1:%2 already exists"))
@@ -185,21 +185,21 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
//------------------------------------------------------------------------------------------
Core::FunctionReplyObject UasHandler::modifyUas(const CreateModifyUasRequest &request)
{
if (!m_uass.contains(request.id()))
if (!m_uass.contains(request.id))
{
QString error = QStringLiteral("Uas topic with id %1 not present. Not possible to modify it.").arg(request.id());
QString error = QStringLiteral("Uas topic with id %1 not present. Not possible to modify it.").arg(request.id);
ERROR_LOG(m_logger) << error;
return Core::FunctionReplyObject(error.toStdString().c_str());
}
Uas *uas = m_uass.value(request.id());
Uas *uas = m_uass.value(request.id);
// Check if Hostname and Hostport already existing
if (hostNameHostPortExists(QString::fromStdString(request.hostname()), request.hostport(), uas->id()))
if (hostNameHostPortExists(QString::fromStdString(request.hostname), request.hostport, uas->id()))
return Core::FunctionReplyObject(tr_lts("dds", "Hostname with Port %1:%2 already exists"))
.arg(request.hostname()).arg(request.hostport());
.arg(request.hostname).arg(request.hostport);
if (!uas->hasChanges(request))
{
@@ -248,16 +248,16 @@ void UasHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Dat
{
Q_UNUSED(mod)
if (data.state() != ExerciseManagement::ExerciseState::Stopped &&
data.state() != ExerciseManagement::ExerciseState::Terminated &&
data.state() != ExerciseManagement::ExerciseState::Unknown )
if (data.state != ExerciseManagement::ExerciseState::Stopped &&
data.state != ExerciseManagement::ExerciseState::Terminated &&
data.state != ExerciseManagement::ExerciseState::Unknown )
return;
//Unlink
for (auto uas : m_uass)
{
auto uasData = uas->toDdsUas();
if (uasData.exerciseId() != data.id())
if (uasData.exerciseId != data.id)
continue;
uas->unlinkUas();
@@ -268,16 +268,16 @@ void UasHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Dat
void UasHandler::onUASRadioLinkConnectionStatusChanged(const UASRadioLinkConnectionStatus &data, DataModification mod)
{
if (data.id() <= 0)
if (data.id <= 0)
return;
if (!m_uass.contains(data.id()))
if (!m_uass.contains(data.id))
return;
auto uas = m_uass.value(data.id());
auto uas = m_uass.value(data.id);
if (mod == DataModification::eRemoved)
uas->setState(ProjectDataManagement::UasState::UasState_Undefined);
else
uas->setState(data.uasState());
uas->setState(data.uasState);
m_mainHandler->exAnyDts()->publish(uas->toDdsUas());
m_mainHandler->db()->update(uas->toDbUas());
}