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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "smo_hgr_and_mine_search_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_smo_hgr_and_mine_search_dialog.h"
|
||||
|
||||
#include "smo_hgr_and_mine_search_model.h"
|
||||
@@ -23,6 +24,7 @@ HgrAndMineSearchDialog::HgrAndMineSearchDialog(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::HgrAndMineSearchDialog)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &HgrAndMineSearchDialog::onPrint);
|
||||
|
||||
+2
-2
@@ -11,9 +11,9 @@
|
||||
#include <ExerciseManagement/exm_data_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
|
||||
#include <ProjectDataManagement/pdm_data_plugin.h>
|
||||
#include <Plugins/ProjectDataManagement/Data/pdm_data_plugin.h>
|
||||
#include <Timeline/tln_data_plugin_interface.h>
|
||||
#include <AreaEffectSimulation/aes_data_plugin.h>
|
||||
#include <Plugins/AreaEffectSimulation/Data/aes_data_plugin.h>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
+44
-42
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "smo_hgr_and_mine_search_model.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <utility>
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
@@ -44,6 +45,7 @@ HgrAndMineSearchModel::HgrAndMineSearchModel(QObject *parent)
|
||||
, m_chunksRequested(0)
|
||||
, m_chunksReceived(0)
|
||||
, m_session(nullptr)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{}
|
||||
|
||||
bool HgrAndMineSearchModel::initModel(LtsSession::LtsSession *session,
|
||||
@@ -181,9 +183,9 @@ QVariant HgrAndMineSearchModel::data(const QModelIndex &index, int role) const
|
||||
case EventType:
|
||||
return ProjectDataManagement::toString(entry.type);
|
||||
case EventPosition:
|
||||
if (entry.pos.lon() == 0 || entry.pos.lat() == 0 || std::isnan(entry.pos.lon()))
|
||||
if (entry.pos.lon == 0 || entry.pos.lat == 0 || std::isnan(entry.pos.lon))
|
||||
return QStringLiteral("---");
|
||||
return LtsCoordTrans::mgrsFromGeographic(entry.pos.lon(), entry.pos.lat());
|
||||
return LtsCoordTrans::mgrsFromGeographic(entry.pos.lon, entry.pos.lat);
|
||||
case EventTime:
|
||||
return QDateTime::fromMSecsSinceEpoch(entry.timeStamp);
|
||||
case EventSource:
|
||||
@@ -199,10 +201,10 @@ QVariant HgrAndMineSearchModel::data(const QModelIndex &index, int role) const
|
||||
QString vulnerabilityState = tr("All Types");
|
||||
if (entry.vbg>=0)
|
||||
{
|
||||
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(m_ppmDtc->participant(entry.participantId).typeId()).typeClass();
|
||||
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(m_ppmDtc->participant(entry.participantId).typeId).typeClass;
|
||||
const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human ?
|
||||
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
|
||||
ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
|
||||
ProjectDataManagement::VulnerabilityState vs = static_cast<ProjectDataManagement::VulnerabilityState>(entry.vbg);
|
||||
vulnerabilityState = ProjectDataManagement::toString(vs, vc);
|
||||
}
|
||||
@@ -216,7 +218,7 @@ QVariant HgrAndMineSearchModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case EventType:
|
||||
return entry.type.underlying();
|
||||
return static_cast<int>(entry.type);
|
||||
case EventParty:
|
||||
return entry.party;
|
||||
default:
|
||||
@@ -235,10 +237,10 @@ QPointF HgrAndMineSearchModel::position(const QModelIndex &index) const
|
||||
|
||||
const Core::GeoPosition pos = m_vecData.at(index.row()).pos;
|
||||
|
||||
if (pos.lon() == 0 || pos.lat() == 0 || std::isnan(pos.lon()))
|
||||
if (pos.lon == 0 || pos.lat == 0 || std::isnan(pos.lon))
|
||||
return QPointF();
|
||||
|
||||
return {pos.lon(), pos.lat()};
|
||||
return {pos.lon, pos.lat};
|
||||
}
|
||||
|
||||
void HgrAndMineSearchModel::onEquipmentSystemEventDataReply(const Core::FunctionReplyObject &replyObject)
|
||||
@@ -249,14 +251,14 @@ void HgrAndMineSearchModel::onEquipmentSystemEventDataReply(const Core::Function
|
||||
{
|
||||
auto cb = [this, &replyObject](const ParticipantManagement::EquipmentSystemEventFtcReply &event)
|
||||
{
|
||||
if (event.filterId() != replyObject.id())
|
||||
if (event.filterId != replyObject.id())
|
||||
return;
|
||||
HgrAndMineSearchEntry entry;
|
||||
|
||||
entry.type = ProjectDataManagement::HgrMineSearchFilterType(ProjectDataManagement::HgrMineSearchFilterType::Handgrenade);
|
||||
entry.pos = event.position();
|
||||
entry.timeStamp = event.timeStamp();
|
||||
entry.source = event.equipmentNumber();
|
||||
entry.pos = event.position;
|
||||
entry.timeStamp = event.timeStamp;
|
||||
entry.source = event.equipmentNumber;
|
||||
entry.participantId = 0;
|
||||
entry.party = 0;
|
||||
entry.vbg = 0;
|
||||
@@ -283,20 +285,20 @@ void HgrAndMineSearchModel::onRequestedDataAvailable(TimeLineManagement::Timelin
|
||||
HgrAndMineSearchEntry entry;
|
||||
for (const auto &event : events)
|
||||
{
|
||||
const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(event.properties().c_str(),
|
||||
event.properties().size())).object();
|
||||
const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(event.properties.c_str(),
|
||||
event.properties.size())).object();
|
||||
entry.type = m_evtFlt.value(obj.value(QStringLiteral("OriginatorChargeTypeId")).toInt());
|
||||
|
||||
if (entry.type == ProjectDataManagement::HgrMineSearchFilterType::Mine)
|
||||
continue;
|
||||
|
||||
entry.pos = event.position();
|
||||
entry.timeStamp = event.sampleTime();
|
||||
entry.source = event.equipmentNumber();
|
||||
entry.participantId = event.participantId();
|
||||
entry.party = event.partyId();
|
||||
entry.pos = event.position;
|
||||
entry.timeStamp = event.sampleTime;
|
||||
entry.source = event.equipmentNumber;
|
||||
entry.participantId = event.participantId;
|
||||
entry.party = event.partyId;
|
||||
entry.vbg = obj.value(QStringLiteral("VulnerabilityState")).toInt();
|
||||
entry.properties = QString::fromUtf8(event.properties().c_str());
|
||||
entry.properties = QString::fromUtf8(event.properties.c_str());
|
||||
|
||||
insertRow(entry);
|
||||
}
|
||||
@@ -307,22 +309,22 @@ void HgrAndMineSearchModel::onRequestedDataAvailable(TimeLineManagement::Timelin
|
||||
void HgrAndMineSearchModel::doEquipmentSystemEventRequests()
|
||||
{
|
||||
ExerciseManagement::Exercise ex = m_exmDtc->exercise(m_session->exerciseId());
|
||||
int64_t start = ex.beginTime();
|
||||
int64_t end = m_session->partitionTime() < ex.endTime() ? m_session->partitionTime() : ex.endTime();
|
||||
int64_t start = ex.beginTime;
|
||||
int64_t end = m_session->partitionTime() < ex.endTime ? m_session->partitionTime() : ex.endTime;
|
||||
|
||||
while (start < end)
|
||||
{
|
||||
ParticipantManagement::EquipmentSystemEventDataRequest req;
|
||||
int64_t reqEnd = ((start + 24 * 60 * 60 * 1000) > end ? end : start + 24 * 60 * 60 * 1000);
|
||||
|
||||
req.startTime(start);
|
||||
req.endTime(reqEnd);
|
||||
req.startTime = start;
|
||||
req.endTime = reqEnd;
|
||||
|
||||
for (const auto &filter : std::as_const(m_equipSysEvtFlt))
|
||||
{
|
||||
req.equipmentFunctionId(filter.equipmentFunctionId());
|
||||
req.subDeviceId(filter.subDeviceId());
|
||||
req.deviceSpecificEventCode(filter.deviceSpecificCode());
|
||||
req.equipmentFunctionId = filter.equipmentFunctionId;
|
||||
req.subDeviceId = filter.subDeviceId;
|
||||
req.deviceSpecificEventCode = filter.deviceSpecificCode;
|
||||
|
||||
m_ppmFtc->equipmentSystemEventDataRequest(req, this);
|
||||
|
||||
@@ -337,8 +339,8 @@ void HgrAndMineSearchModel::doEquipmentSystemEventRequests()
|
||||
void HgrAndMineSearchModel::doEventRequests()
|
||||
{
|
||||
ExerciseManagement::Exercise ex = m_exmDtc->exercise(m_session->partitionId());
|
||||
int64_t startTime = ex.beginTime();
|
||||
const int64_t endTime = ex.stopTime() > 0 ? ex.stopTime() : m_session->partitionTime();
|
||||
int64_t startTime = ex.beginTime;
|
||||
const int64_t endTime = ex.stopTime > 0 ? ex.stopTime : m_session->partitionTime();
|
||||
while (startTime < endTime)
|
||||
{
|
||||
int64_t reqEnd = ((startTime + 24 * 60 * 60 * 1000) > endTime ? endTime : startTime + 24 * 60 * 60 * 1000);
|
||||
@@ -347,9 +349,9 @@ void HgrAndMineSearchModel::doEventRequests()
|
||||
arr += QJsonValue(it.key());
|
||||
const QJsonObject filter({{QStringLiteral("OriginatorChargeTypeId"), arr}});
|
||||
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType::EventType_Hit,
|
||||
ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation,
|
||||
ProjectDataManagement::PdmEventType::EventType_HitMine}, filter);
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {static_cast<int>(ProjectDataManagement::PdmEventType::EventType_Hit),
|
||||
static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation),
|
||||
static_cast<int>(ProjectDataManagement::PdmEventType::EventType_HitMine)}, filter);
|
||||
|
||||
|
||||
startTime += (24 * 60 * 60 * 1000) + 1;
|
||||
@@ -372,16 +374,16 @@ void HgrAndMineSearchModel::doInsertMines()
|
||||
if (!mineAreas.contains(it.key()))
|
||||
mineAreas.insert(it.key(), m_aesDtc->mineArea(it.key()));
|
||||
|
||||
const std::vector<AreaEffectSimulation::DusMine> mines = it.value().mines();
|
||||
entry.party = mineAreas.value(it.key()).partyId().is_set() ? mineAreas.value(it.key()).partyId().get() : 0;
|
||||
const std::vector<AreaEffectSimulation::DusMine> mines = it.value().mines;
|
||||
entry.party = mineAreas.value(it.key()).partyId.has_value() ? mineAreas.value(it.key()).partyId.get() : 0;
|
||||
|
||||
for (const AreaEffectSimulation::DusMine ¤tMine : mines)
|
||||
{
|
||||
properties.insert(tr("Mine-ID"), currentMine.eqId());
|
||||
properties.insert(tr("Mine-ID"), currentMine.eqId);
|
||||
|
||||
entry.properties = QString::fromUtf8(QJsonDocument(properties).toJson(QJsonDocument::Compact));
|
||||
entry.pos.lon(currentMine.position().lon());
|
||||
entry.pos.lat(currentMine.position().lat());
|
||||
entry.pos.lon = currentMine.position.lon;
|
||||
entry.pos.lat = currentMine.position.lat;
|
||||
|
||||
insertRow(entry);
|
||||
}
|
||||
@@ -396,7 +398,7 @@ void HgrAndMineSearchModel::loadFilterSettings()
|
||||
|
||||
auto cb = [this](const ProjectDataManagement::EventFilterHgrMineSearch &filter)
|
||||
{
|
||||
m_evtFlt.insert(filter.chargeTypeId(), filter.hgrMineSearchFilterType());
|
||||
m_evtFlt.insert(filter.chargeTypeId, filter.hgrMineSearchFilterType);
|
||||
};
|
||||
m_pdmDtc->eventFilterHgrMineSearchs(cb);
|
||||
}
|
||||
@@ -457,7 +459,7 @@ QIcon HgrAndMineSearchModel::iconFromPartyId(int partyId) const
|
||||
auto it = m_partyIcons.find(partyId);
|
||||
if (it != m_partyIcons.end())
|
||||
return it.value();
|
||||
const QRgb col = QRgb(m_ppmDtc->party(partyId).color());
|
||||
const QRgb col = QRgb(m_ppmDtc->party(partyId).color);
|
||||
const QIcon icon = m_ppmGuiCbxIfc->pixmapFromParty(col);
|
||||
m_partyIcons.insert(partyId, icon);
|
||||
return icon;
|
||||
@@ -468,7 +470,7 @@ QVariant HgrAndMineSearchModel::stringFromPartyId(int partyId) const
|
||||
auto it = m_partyNames.find(partyId);
|
||||
if (it != m_partyNames.end())
|
||||
return it.value();
|
||||
const QString name = ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name());
|
||||
const QString name = ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name);
|
||||
m_partyNames.insert(partyId, name);
|
||||
return name;
|
||||
}
|
||||
@@ -484,7 +486,7 @@ void HgrAndMineSearchModel::onUpdateComboboxFilterData()
|
||||
cfc.data.reserve(types.size());
|
||||
for (const auto typeId : types)
|
||||
{
|
||||
cfd.data = typeId;
|
||||
cfd.data = static_cast<int>(typeId);
|
||||
cfd.text = ProjectDataManagement::toString(typeId);
|
||||
cfc.data.push_back(cfd);
|
||||
}
|
||||
@@ -499,7 +501,7 @@ void HgrAndMineSearchModel::onUpdateComboboxFilterData()
|
||||
for (const int i : std::as_const(availablePartyIds))
|
||||
{
|
||||
cfd.data = i;
|
||||
cfd.text = ParticipantManagement::trPartyName(m_ppmDtc->party(i).name());
|
||||
cfd.text = ParticipantManagement::trPartyName(m_ppmDtc->party(i).name);
|
||||
cfd.icon = iconFromPartyId(i);
|
||||
cfc.data.push_back(cfd);
|
||||
}
|
||||
|
||||
+4
-4
@@ -3,12 +3,12 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ExerciseManagement/exm_data_plugin.h>
|
||||
#include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
|
||||
#include <ParticipantManagement/Data/ppm_data_plugin.h>
|
||||
#include <ProjectDataManagement/pdm_data_plugin.h>
|
||||
#include <Plugins/ProjectDataManagement/Data/pdm_data_plugin.h>
|
||||
#include <Timeline/tln_data_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
|
||||
#include <AreaEffectSimulation/aes_data_plugin.h>
|
||||
#include <Plugins/AreaEffectSimulation/Data/aes_data_plugin.h>
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
@@ -19,7 +19,7 @@ namespace ServiceMonitor
|
||||
{
|
||||
struct HgrAndMineSearchEntry
|
||||
{
|
||||
ProjectDataManagement::HgrMineSearchFilterType type = ProjectDataManagement::HgrMineSearchFilterType_Unknown;
|
||||
ProjectDataManagement::HgrMineSearchFilterType type = ProjectDataManagement::HgrMineSearchFilterType::HgrMineSearchFilterType_Unknown;
|
||||
Core::GeoPosition pos;
|
||||
int64_t timeStamp = -1;
|
||||
int32_t source = -1;
|
||||
|
||||
Reference in new issue
Block a user