lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.cpp
+23 -21
View File
@@ -7,6 +7,7 @@
#include "tgt_telegrams.h"
#include <LtsSession/lts_session_data.h>
#include <FileManagement/flm_translation.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <TargetManagement/tgt_data_plugin_interface.h>
@@ -28,6 +29,7 @@ AreaDialog::AreaDialog(const QString &menuGroup, LtsSession::LtsSession *session
, m_ui(new Ui::AreaDialog)
, m_menuGroup(menuGroup)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
@@ -158,7 +160,7 @@ void AreaDialog::onRemoveArea()
for (const auto &mi : selectedRows)
{
Core::RemoveElementRequest req;
req.id(m_areaModel->getRowData(mi.row()).id());
req.id = m_areaModel->getRowData(mi.row()).id;
m_requestHelper->addRequest([req, this]()
{
return m_ftc->shootbackAreaRemoveRequest(req, this);
@@ -206,11 +208,11 @@ QByteArray AreaDialog::toJson() const
for (const TargetManagement::ShootbackArea &area : modelData)
{
ShootbackAreaData sbad;
sbad.id = area.id();
sbad.name = QString::fromStdString(area.name());
sbad.position = GeoPosition2D(area.position());
sbad.width = area.width();
sbad.height = area.height();
sbad.id = area.id;
sbad.name = QString::fromStdString(area.name);
sbad.position = GeoPosition2D(area.position);
sbad.width = area.width;
sbad.height = area.height;
jArray.append(sbad.toJson());
}
obj[QStringLiteral("ShootbackAreas")] = jArray;
@@ -239,11 +241,11 @@ QVector<ShootbackArea> AreaDialog::fromJson(const QByteArray &content)
{
const ShootbackAreaData &sbad = ShootbackAreaData::fromJson(item.toObject());
TargetManagement::ShootbackArea area;
area.id(sbad.id);
area.name(sbad.name.toStdString());
area.position({sbad.position.lon, sbad.position.lat});
area.width(sbad.width);
area.height(sbad.height);
area.id = sbad.id;
area.name = sbad.name.toStdString();
area.position = {sbad.position.lon, sbad.position.lat};
area.width = sbad.width;
area.height = sbad.height;
vecData.push_back(std::move(area));
}
return vecData;
@@ -307,7 +309,7 @@ void AreaDialog::onImport()
const QVector<ShootbackArea> &curData = m_areaModel->getData();
for (auto item : curData)
{
Core::RemoveElementRequest req(item.id());
Core::RemoveElementRequest req(item.id);
m_requestHelper->addRequest([this, req]()
{
return m_ftc->shootbackAreaRemoveRequest(req, this);
@@ -320,7 +322,7 @@ void AreaDialog::onImport()
{
DEBUG_LOG(m_logger) << "area " <<area;
area.id(0);
area.id = 0;
m_requestHelper->addRequest([this, area]()
{
return m_ftc->shootbackAreaModifyRequest(area, this);
@@ -344,7 +346,7 @@ void AreaDialog::onAssignTargetButtonClicked()
if (!curIdx.isValid())
return;
const int areaId = m_areaModel->getRowData(curIdx.row()).id();
const int areaId = m_areaModel->getRowData(curIdx.row()).id;
@@ -371,7 +373,7 @@ void AreaDialog::onMapCenterClicked()
if (!curIdx.isValid())
return;
const int id = m_areaModel->getRowData(curIdx.row()).id();
const int id = m_areaModel->getRowData(curIdx.row()).id;
m_sitMapGuiIfc->centerMapToMapObject(SituationMap::MapObjectType::MOT_ShootbackArea, id);
}
@@ -387,7 +389,7 @@ void AreaDialog::onMapZoomToClicked()
if (!m_areaModel || !m_sitMapGuiIfc)
return;
int areaId = m_areaModel->getRowData(index.row()).id();
int areaId = m_areaModel->getRowData(index.row()).id;
if (areaId<=0)
return;
@@ -395,8 +397,8 @@ void AreaDialog::onMapZoomToClicked()
QVector<int> assignedTargets;
auto cb = [areaId, &assignedTargets](const TargetManagement::TargetAreaAssignment &assignment)
{
if (assignment.areaId() == areaId)
assignedTargets.push_back(assignment.targetParticipantId());
if (assignment.areaId == areaId)
assignedTargets.push_back(assignment.targetParticipantId);
};
m_dtc->targetAreaAssignments(cb);
@@ -421,7 +423,7 @@ void AreaDialog::onObjectEntered(const QModelIndex &index)
m_sitMapGuiIfc->removeObjectIndicator();
return;
}
int areaId = m_areaModel->getRowData(index.row()).id();
int areaId = m_areaModel->getRowData(index.row()).id;
if (areaId>0)
{
@@ -431,8 +433,8 @@ void AreaDialog::onObjectEntered(const QModelIndex &index)
QVector<int> assignedTargets;
auto cb = [areaId, &assignedTargets](const TargetManagement::TargetAreaAssignment &assignment)
{
if (assignment.areaId() == areaId)
assignedTargets.push_back(assignment.targetParticipantId());
if (assignment.areaId == areaId)
assignedTargets.push_back(assignment.targetParticipantId);
};
m_dtc->targetAreaAssignments(cb);
m_sitMapGuiIfc->setMapObjectSelected(SituationMap::MapObjectType::MOT_Participant, assignedTargets, true);
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.h
+1 -1
View File
@@ -8,7 +8,7 @@
#include <TargetManagement/tgt_ftc.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <TargetManagement/logger.h>
#include <TargetManagement/ShootbackTargetConfiguration/tgt_area_model.h>
#include <Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_edit.cpp
+10 -9
View File
@@ -15,6 +15,7 @@ AreaEdit::AreaEdit(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::AreaEdit)
, m_logger(getLogger("AreaEdit"))
{
m_ui->setupUi(this);
@@ -85,11 +86,11 @@ void AreaEdit::enaDisa()
bool AreaEdit::apply()
{
m_area.name(m_ui->leName->text().toStdString());
m_area.name = m_ui->leName->text().toStdString();
const QPointF &coord = m_ui->positionEdit->coordinate();
m_area.position({coord.x(), coord.y()});
m_area.width(m_ui->sbWidth->value());
m_area.height(m_ui->sbHeight->value());
m_area.position = {coord.x(), coord.y()};
m_area.width = m_ui->sbWidth->value();
m_area.height = m_ui->sbHeight->value();
m_requestHelper->addRequest([this]()
{
@@ -155,12 +156,12 @@ void AreaEdit::setData(const ShootbackArea &area)
{
m_area = area;
if (m_area.id() > 0)
if (m_area.id > 0)
{
m_ui->leName->setText(QString::fromStdString(m_area.name()));
m_ui->positionEdit->setCoordinate(m_area.position().lon(), m_area.position().lat());
m_ui->sbWidth->setValue(m_area.width());
m_ui->sbHeight->setValue(m_area.height());
m_ui->leName->setText(QString::fromStdString(m_area.name));
m_ui->positionEdit->setCoordinate(m_area.position.lon, m_area.position.lat);
m_ui->sbWidth->setValue(m_area.width);
m_ui->sbHeight->setValue(m_area.height);
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp
+18 -17
View File
@@ -30,6 +30,7 @@ AreaModel::AreaModel(QObject *parent)
tr("Height"),
},
parent)
, m_logger(getLogger("AreaModel"))
{}
@@ -105,11 +106,11 @@ QVariant AreaModel::data(const QModelIndex &index, int role) const
if (role == Qt::BackgroundRole)
{
if ((index.column() == Center) &&
((shootbackArea.position().lat() <= 0) || (shootbackArea.position().lon() <= 0)))
return getWarningBackgroundRole();
if (index.column() == Width && shootbackArea.width() <= 0)
return getWarningBackgroundRole();
if (index.column() == Height && shootbackArea.height() <= 0)
((shootbackArea.position.lat <= 0) || (shootbackArea.position.lon <= 0)))
return getWarningBackgroundRole();
if (index.column() == Width && shootbackArea.width <= 0)
return getWarningBackgroundRole();
if (index.column() == Height && shootbackArea.height <= 0)
return getWarningBackgroundRole();
}
else
@@ -117,24 +118,24 @@ QVariant AreaModel::data(const QModelIndex &index, int role) const
if (role == LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole)
{
if (index.column() == Name)
return QString::fromStdString(shootbackArea.name());
return QString::fromStdString(shootbackArea.name);
}
switch (index.column())
{
case Id:
return shootbackArea.id();
return shootbackArea.id;
case Name:
return QString::fromStdString(shootbackArea.name());
return QString::fromStdString(shootbackArea.name);
case Center:
{
const Core::GeoPosition2D &pos = shootbackArea.position();
return LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
const Core::GeoPosition2D &pos = shootbackArea.position;
return LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
}
case Width:
return shootbackArea.width();
return shootbackArea.width;
case Height:
return shootbackArea.height();
return shootbackArea.height;
}
return QVariant();
@@ -151,7 +152,7 @@ void AreaModel::updateColumnFilter()
{
m_usedNames.clear();
for (const ShootbackArea &item : std::as_const(m_vecData))
m_usedNames.insert(QString::fromStdString(item.name()));
m_usedNames.insert(QString::fromStdString(item.name));
}
@@ -178,13 +179,13 @@ bool AreaProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex
switch (source_left.column())
{
case AreaModel::Columns::Id:
return left.id() < right.id();
return left.id < right.id;
case AreaModel::Columns::Name:
return left.name() < right.name();
return left.name < right.name;
case AreaModel::Columns::Width:
return left.width() < right.width();
return left.width < right.width;
case AreaModel::Columns::Height:
return left.height() < right.height();
return left.height < right.height;
case AreaModel::Columns::Center:
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp
+80 -79
View File
@@ -18,12 +18,12 @@ namespace TargetManagement
bool isEqual(const ShootbackConfiguration &c1, const ShootbackConfiguration &c2)
{
return (
(c1.interval1() == c2.interval1()) &&
(c1.flash1() == c2.flash1()) &&
(c1.effect1() == c2.effect1()) &&
(c1.interval2() == c2.interval2()) &&
(c1.flash2() == c2.flash2()) &&
(c1.effect2() == c2.effect2())
(c1.interval1 == c2.interval1) &&
(c1.flash1 == c2.flash1) &&
(c1.effect1 == c2.effect1) &&
(c1.interval2 == c2.interval2) &&
(c1.flash2 == c2.flash2) &&
(c1.effect2 == c2.effect2)
);
}
@@ -32,12 +32,12 @@ bool isDefault(const ShootbackConfiguration &c) { return isEqual(c, ShootbackCo
bool isEqual(const TargetAreaAssignment &a1, const TargetAreaAssignment &a2, bool ignoringAreaIdAndParticipantId)
{
return (
(a1.id() == a2.id()) &&
(a1.name() == a2.name()) &&
(ignoringAreaIdAndParticipantId || (a1.areaId() == a2.areaId())) &&
(ignoringAreaIdAndParticipantId || (a1.targetParticipantId() == a2.targetParticipantId())) &&
(a1.isActive() == a2.isActive()) &&
isEqual(a1.configuration(), a2.configuration())
(a1.id == a2.id) &&
(a1.name == a2.name) &&
(ignoringAreaIdAndParticipantId || (a1.areaId == a2.areaId)) &&
(ignoringAreaIdAndParticipantId || (a1.targetParticipantId == a2.targetParticipantId)) &&
(a1.isActive == a2.isActive) &&
isEqual(a1.configuration, a2.configuration)
);
}
@@ -73,6 +73,7 @@ AssignmentParticipantModel::AssignmentParticipantModel(QObject *parent)
tr("Effect_2")
},
parent)
, m_logger(getLogger("AssignmentParticipantModel"))
{}
@@ -202,7 +203,7 @@ QVariant AssignmentParticipantModel::headerData(int section, Qt::Orientation ori
template <typename T>
QVariant handleIsDefault(const TargetManagement::TargetAreaAssignment &assignment, const T &value)
{
if (isDefault(assignment.configuration()))
if (isDefault(assignment.configuration))
return QStringLiteral("-");
return value;
}
@@ -232,54 +233,54 @@ QVariant AssignmentParticipantModel::data(const QModelIndex &index, int role) co
if (!flags(index).testFlag(Qt::ItemIsUserCheckable))
return QVariant();
return assignment.isActive() ? Qt::Checked : Qt::Unchecked;
return assignment.isActive ? Qt::Checked : Qt::Unchecked;
}
else if (role == Qt::DecorationRole)
{
if (index.column() == Participant)
{
static const int pmSize = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
const QPixmap &pm = m_participantHandler->getParticipantDecoration(assignment.targetParticipantId());
const QPixmap &pm = m_participantHandler->getParticipantDecoration(assignment.targetParticipantId);
if (!pm.isNull())
return pm.scaled(pmSize, pmSize);
}
else if ((index.column() == Flash_1))
return assignment.configuration().flash1() ? m_yes : m_no;
return assignment.configuration.flash1 ? m_yes : m_no;
else if ((index.column() == Flash_2))
return assignment.configuration().flash2() ? m_yes : m_no;
return assignment.configuration.flash2 ? m_yes : m_no;
return QVariant();
}
else if (role == Qt::BackgroundRole)
{
if ((index.column() == TargetId) || (index.column() == TargetName))
{
int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId());
int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId);
if (targetId <= 0)
return getNoParticipantColor();
}
else if ((index.column() == AreaId) || (index.column() == AreaName))
{
if (m_tgt_dtc->shootbackArea(assignment.areaId()).id()<=0)
if (m_tgt_dtc->shootbackArea(assignment.areaId).id<=0)
return getNoParticipantColor();
}
else if ((index.column() == TargetPartipantId) && (assignment.targetParticipantId() <= 0))
else if ((index.column() == TargetPartipantId) && (assignment.targetParticipantId <= 0))
return getNoParticipantColor();
else if (index.column() == TargetPartipantEquipmentNumber)
{
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId());
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId);
if (eqNo <= 0)
return getNoParticipantColor();
}
if (assignment.isActive() && isDefault(assignment.configuration()))
if (assignment.isActive && isDefault(assignment.configuration))
return getAssignedButNoConfigurationColor();
}
else if (role == Qt::ForegroundRole)
{
if (!assignment.isActive() && (index.column() != Participant))
if (!assignment.isActive && (index.column() != Participant))
return QColor(Qt::gray);
}
else if (role == Qt::ToolTipRole)
@@ -288,7 +289,7 @@ QVariant AssignmentParticipantModel::data(const QModelIndex &index, int role) co
{
QString tooltip(QStringLiteral("<html>"));
const QPixmap &img = m_participantHandler->getParticipantDecoration(assignment.targetParticipantId());
const QPixmap &img = m_participantHandler->getParticipantDecoration(assignment.targetParticipantId);
if (!img.isNull())
{
@@ -298,10 +299,10 @@ QVariant AssignmentParticipantModel::data(const QModelIndex &index, int role) co
tooltip.append(QStringLiteral("<center><img src='data:image/png;base64,%1'></center>").arg(QString::fromLatin1(data.toBase64())));
QString hdr = this->headerData(AssignmentName, Qt::Horizontal, Qt::DisplayRole).toString();
tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(assignment.name())));
tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(assignment.name)));
hdr = this->headerData(Participant, Qt::Horizontal, Qt::DisplayRole).toString();
const QString &val = m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId());
const QString &val = m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId);
tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, val));
tooltip.append(QStringLiteral("</html>"));
@@ -313,73 +314,73 @@ QVariant AssignmentParticipantModel::data(const QModelIndex &index, int role) co
{
if (index.column() == IsActive)
return static_cast<int>(assignment.isActive());
return static_cast<int>(assignment.isActive);
if (index.column() == AreaId)
return assignment.areaId();
return assignment.areaId;
if (index.column() == TargetPartipantId)
return assignment.targetParticipantId();
return assignment.targetParticipantId;
}
switch (index.column())
{
case Id:
return assignment.id();
return assignment.id;
case AssignmentName:
return QString::fromStdString(assignment.name());
return QString::fromStdString(assignment.name);
case IsActive:
return assignment.isActive() ? tr("Yes") : tr("No");
return assignment.isActive ? tr("Yes") : tr("No");
case TargetId:
{
int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId());
int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId);
return targetId;
}
case TargetName:
{
int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId());
int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId);
if (targetId <= 0)
return QStringLiteral("-");
const ShootbackTarget &st = m_tgt_dtc->shootbackTarget(targetId);
if (st.id() != targetId)
if (st.id != targetId)
return QStringLiteral("-");
return QString::fromStdString(st.name());
return QString::fromStdString(st.name);
}
case TargetPartipantId:
return assignment.targetParticipantId();
return assignment.targetParticipantId;
case TargetPartipantEquipmentNumber:
{
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId());
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId);
if (eqNo <= 0)
return QStringLiteral("-");
return eqNo;
}
case Participant:
return m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId());
return m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId);
case AreaId:
return assignment.areaId();
return assignment.areaId;
case AreaName:
return QString::fromStdString(m_tgt_dtc->shootbackArea(assignment.areaId()).name());
return QString::fromStdString(m_tgt_dtc->shootbackArea(assignment.areaId).name);
case Interval_1:
return handleIsDefault(assignment, assignment.configuration().interval1());
return handleIsDefault(assignment, assignment.configuration.interval1);
case Flash_1:
return handleIsDefault(assignment, assignment.configuration().flash1());
return handleIsDefault(assignment, assignment.configuration.flash1);
case Effect_1:
return handleIsDefault(assignment, effectToString(assignment.configuration().effect1()));
return handleIsDefault(assignment, effectToString(assignment.configuration.effect1));
case Interval_2:
return handleIsDefault(assignment, assignment.configuration().interval2());
return handleIsDefault(assignment, assignment.configuration.interval2);
case Flash_2:
return handleIsDefault(assignment, assignment.configuration().flash2());
return handleIsDefault(assignment, assignment.configuration.flash2);
case Effect_2:
return handleIsDefault(assignment, effectToString(assignment.configuration().effect2()));
return handleIsDefault(assignment, effectToString(assignment.configuration.effect2));
}
@@ -400,9 +401,9 @@ bool AssignmentParticipantModel::setData(const QModelIndex &index, const QVarian
bool bVal = value.toBool();
TargetAreaAssignment &data = m_vecData[index.row()];
if (data.isActive() != bVal)
if (data.isActive != bVal)
{
data.isActive(bVal);
data.isActive = bVal;
emit dataChanged(index, index);
emit signalEditableItemChanged();
}
@@ -428,7 +429,7 @@ QSet<int> AssignmentParticipantModel::getAssociatedParticipantIds() const
QSet<int> ret;
ret.reserve(m_vecData.size());
for (const TargetManagement::TargetAreaAssignment &data : m_vecData)
ret += data.targetParticipantId();
ret += data.targetParticipantId;
return ret;
}
@@ -437,8 +438,8 @@ QSet<int> AssignmentParticipantModel::getAssociatedParticipantIdsForArea(int are
QSet<int> ret;
ret.reserve(m_vecData.size());
for (const TargetManagement::TargetAreaAssignment &data : m_vecData)
if (data.areaId() == areaId)
ret += data.targetParticipantId();
if (data.areaId == areaId)
ret += data.targetParticipantId;
return ret;
}
@@ -447,8 +448,8 @@ QSet<int> AssignmentParticipantModel::getAssociatedAreasIdsForParticipantId(int
QSet<int> ret;
ret.reserve(m_vecData.size());
for (const TargetManagement::TargetAreaAssignment &data : m_vecData)
if (data.targetParticipantId() == participantId)
ret += data.areaId();
if (data.targetParticipantId == participantId)
ret += data.areaId;
return ret;
}
@@ -457,7 +458,7 @@ int AssignmentParticipantModel::findRowForAreaTargetParticipantId(int areaId, in
for (int i = 0; i < m_vecData.size(); ++i)
{
const TargetAreaAssignment &curAssignment = m_vecData.at(i);
if ((curAssignment.areaId() == areaId) && (curAssignment.targetParticipantId() == targetParticipantId))
if ((curAssignment.areaId == areaId) && (curAssignment.targetParticipantId == targetParticipantId))
return i;
}
return -1;
@@ -481,9 +482,9 @@ void AssignmentParticipantModel::addGapFillerForArea(int areaId)
if (!associatedParticipantIds.contains(pId))
{
TargetManagement::TargetAreaAssignment gapFiller;
gapFiller.areaId(areaId);
gapFiller.targetParticipantId(pId);
gapFiller.isActive(false);
gapFiller.areaId = areaId;
gapFiller.targetParticipantId = pId;
gapFiller.isActive = false;
gapFillers.push_back(gapFiller);
}
}
@@ -523,12 +524,12 @@ void AssignmentParticipantModel::addGapFillerForTargetParticipantId(int targetPa
auto cb = [associatedAreaIds, targetParticipantId, &gapFillers](const TargetManagement::ShootbackArea & area)
{
if (!associatedAreaIds.contains(area.id()))
if (!associatedAreaIds.contains(area.id))
{
TargetManagement::TargetAreaAssignment gapFiller;
gapFiller.areaId(area.id());
gapFiller.targetParticipantId(targetParticipantId);
gapFiller.isActive(false);
gapFiller.areaId = area.id;
gapFiller.targetParticipantId = targetParticipantId;
gapFiller.isActive = false;
gapFillers.push_back(gapFiller);
}
};
@@ -546,7 +547,7 @@ void AssignmentParticipantModel::onTargetAreaAssignmentChanged(const TargetManag
if (modType == DataModification::eAdded)
{
int row = findRowForAreaTargetParticipantId(data.areaId(), data.targetParticipantId());
int row = findRowForAreaTargetParticipantId(data.areaId, data.targetParticipantId);
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " row=" << row;
if (row >= 0)
{
@@ -580,25 +581,25 @@ void AssignmentParticipantModel::updateColumnFilter()
{
++row;
m_usedIsActive.insert(assignment.isActive());
m_usedIsActive.insert(assignment.isActive);
m_usedAreaIds.insert(assignment.areaId());
m_usedAreas.insert( QString::fromStdString(m_tgt_dtc->shootbackArea(assignment.areaId()).name()) );
m_usedAreaIds.insert(assignment.areaId);
m_usedAreas.insert( QString::fromStdString(m_tgt_dtc->shootbackArea(assignment.areaId).name) );
int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId());
int targetId = m_participantHandler->getParticipantIdToTargetId(assignment.targetParticipantId);
m_usedTargetIds.insert(targetId);
m_usedTargets.insert(this->data(index(row, TargetName), Qt::DisplayRole).toString());
m_usedTargetParticipantIds.insert(assignment.targetParticipantId());
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId());
m_usedTargetParticipantIds.insert(assignment.targetParticipantId);
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(assignment.targetParticipantId);
m_usedParticipantEqNo.insert(eqNo);
m_usedParticipants.insert(m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId()));
m_usedParticipants.insert(m_participantHandler->getParticipantHierarchie(assignment.targetParticipantId));
}
}
QString AssignmentParticipantModel::effectToString(const Effect &effect) const
{
switch (effect.underlying())
switch (effect)
{
case TargetManagement::Effect::NearMiss:
return tr("NearMiss");
@@ -648,12 +649,12 @@ bool AssignmentParticipantProxyModel::filterAcceptsRow(int source_row, const QMo
if (m_areaId > 0)
{
const TargetManagement::TargetAreaAssignment &item = m_sourceModel->m_vecData.at(source_row);
return (item.areaId() == m_areaId) && BaseClass::filterAcceptsRow(source_row, source_parent);
return (item.areaId == m_areaId) && BaseClass::filterAcceptsRow(source_row, source_parent);
}
else if ((m_targetParticipantId > 0))
{
const TargetManagement::TargetAreaAssignment &item = m_sourceModel->m_vecData.at(source_row);
return (item.targetParticipantId() == m_targetParticipantId) && BaseClass::filterAcceptsRow(source_row, source_parent);;
return (item.targetParticipantId == m_targetParticipantId) && BaseClass::filterAcceptsRow(source_row, source_parent);;
}
return BaseClass::filterAcceptsRow(source_row, source_parent);
}
@@ -673,19 +674,19 @@ bool AssignmentParticipantProxyModel::lessThan(const QModelIndex &source_left, c
switch (source_left.column())
{
case AssignmentParticipantModel::Columns::Id:
return left.id() < right.id();
return left.id < right.id;
case AssignmentParticipantModel::Columns::AssignmentName:
return left.name() < right.name();
return left.name < right.name;
case AssignmentParticipantModel::Columns::TargetPartipantId:
return left.targetParticipantId() < right.targetParticipantId();
return left.targetParticipantId < right.targetParticipantId;
case AssignmentParticipantModel::Columns::TargetPartipantEquipmentNumber:
{
const int eqNoLeft = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId());
const int eqNoRight = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(right.targetParticipantId());
const int eqNoLeft = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId);
const int eqNoRight = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(right.targetParticipantId);
return eqNoLeft < eqNoRight;
}
case AssignmentParticipantModel::Columns::AreaId:
return left.areaId() < right.areaId();
return left.areaId < right.areaId;
case AssignmentParticipantModel::Columns::Participant:
case AssignmentParticipantModel::Columns::AreaName:
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp
+25 -24
View File
@@ -17,6 +17,7 @@ namespace TargetManagement
ParticipantHandler::ParticipantHandler(QObject *parent)
: BaseClass(parent)
, m_logger(getLogger("ParticipantHandler"))
{}
@@ -70,7 +71,7 @@ QString ParticipantHandler::getParticipantHierarchie(int participantId) const
QString ParticipantHandler::target_wmsTypeClassToString(const ParticipantManagement::WmsTypeClass &wmsTypeClass)
{
switch (wmsTypeClass.underlying())
switch (wmsTypeClass)
{
case ParticipantManagement::WmsTypeClass::TargetHuman:
return QStringLiteral("Human");
@@ -92,11 +93,11 @@ void ParticipantHandler::onShootbackTargetChanged(const TargetManagement::Shootb
switch (modType)
{
case DataModification::eRemoved:
m_participantIdToTargetId.remove(data.targetParticipantId());
m_participantIdToTargetId.remove(data.targetParticipantId);
break;
case DataModification::eModified:
case DataModification::eAdded:
m_participantIdToTargetId.insert(data.targetParticipantId(), data.id());
m_participantIdToTargetId.insert(data.targetParticipantId, data.id);
break;
}
}
@@ -109,11 +110,11 @@ void ParticipantHandler::onTypeChanged(const ParticipantManagement::Type &data,
switch (modType)
{
case DataModification::eRemoved:
m_typeToTypeClass.remove(data.id());
m_typeToTypeClass.remove(data.id);
break;
case DataModification::eModified:
case DataModification::eAdded:
m_typeToTypeClass.insert(data.id(), data.typeClass());
m_typeToTypeClass.insert(data.id, data.typeClass);
break;
}
}
@@ -123,10 +124,10 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
{
TRACE_LOG(m_logger) << "onParticipantChanged: " << data << ", " << modType;
if (data.isDeleted())
if (data.isDeleted)
modType = DataModification::eRemoved;
const int dataId = data.id();
const int dataId = data.id;
switch (modType)
{
case DataModification::eRemoved:
@@ -139,22 +140,22 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
{
DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
<< " Id=" << dataId
<< " TypeId=" << data.typeId()
<< " eqId=" << (data.equipmentNumber().is_set() ? data.equipmentNumber().get() : -1)
<< " " << data.name();
<< " TypeId=" << data.typeId
<< " eqId=" << (data.equipmentNumber.has_value() ? data.equipmentNumber.get() : -1)
<< " " << data.name;
const int typeId = data.typeId();
const int typeId = data.typeId;
const ParticipantManagement::Type &type = m_ppm_dtc->type(typeId);
if (type.id() != typeId)
if (type.id != typeId)
return;
const int equipmentTypeId = type.equipmentTypeId();
const int equipmentTypeId = type.equipmentTypeId;
const ParticipantManagement::EquipmentType &eqType = m_ppm_dtc->equipmentType(equipmentTypeId);
if (eqType.id() != equipmentTypeId)
if (eqType.id != equipmentTypeId)
return;
m_participantIdToWmsTypeClass.insert(dataId, eqType.wmsTypeClass());
m_participantIdToWmsTypeClass.insert(dataId, eqType.wmsTypeClass);
bool bIsTarget{false};
switch (eqType.wmsTypeClass().underlying())
switch (eqType.wmsTypeClass)
{
case ParticipantManagement::WmsTypeClass::None:
case ParticipantManagement::WmsTypeClass::Building:
@@ -177,8 +178,8 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
int eqId = -1;
if (data.equipmentNumber().is_set())
eqId = data.equipmentNumber().get();
if (data.equipmentNumber.has_value())
eqId = data.equipmentNumber.get();
if (eqId >= 0)
m_participantIdToEq[dataId] = eqId;
else
@@ -187,8 +188,8 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(dataId);
if (data.equipmentNumber().is_set())
m_participantHierarchies.insert(dataId, hierarchy + QString(QStringLiteral(" (%1)")).arg(data.equipmentNumber().get()));
if (data.equipmentNumber.has_value())
m_participantHierarchies.insert(dataId, hierarchy + QString(QStringLiteral(" (%1)")).arg(data.equipmentNumber.get()));
else
m_participantHierarchies.insert(dataId, hierarchy);
if (m_ppmGuiCbxIfc)
@@ -200,12 +201,12 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
if (!m_participantDecorations.contains(dataId))
{
const auto party = m_ppm_dtc->party(data.partyId());
const QRgb col = QRgb(party.color());
const auto party = m_ppm_dtc->party(data.partyId);
const QRgb col = QRgb(party.color);
m_participantDecorations.insert(dataId, m_ppmGuiCbxIfc->pixmapFromParty(col));
AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(data.symbol()));
symDataToRender.fillColor = m_ppm_dtc->party(data.partyId()).color();
AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(data.symbol));
symDataToRender.fillColor = m_ppm_dtc->party(data.partyId).color;
symDataToRender.fillColorReplace = true;
AdvancedSymbology::SymbolResultWatcher *srw =
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include <TargetManagement/tgt_dtc.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <LtsWidgets/lts_abstract_table_model.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_shootback_target_edit.cpp
+17 -16
View File
@@ -16,6 +16,7 @@ ShootbackTargetEdit::ShootbackTargetEdit(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::ShootbackTargetEdit)
, m_logger(getLogger("ShootbackTargetEdit"))
{
m_ui->setupUi(this);
}
@@ -79,7 +80,7 @@ void ShootbackTargetEdit::initCmbParticipants()
const int participantId = it.key();
const QString hierarchy(it.value());
if (!m_targetParticipantModel->getAssociatedParticipantIds().contains(participantId) || m_target.targetParticipantId() == participantId)
if (!m_targetParticipantModel->getAssociatedParticipantIds().contains(participantId) || m_target.targetParticipantId == participantId)
{
const QPixmap &pm = decorations.value(participantId);
@@ -104,7 +105,7 @@ void ShootbackTargetEdit::initCmbParticipants()
}
}
int newIdx = m_ui->cmbParticipants->findData(m_target.targetParticipantId());
int newIdx = m_ui->cmbParticipants->findData(m_target.targetParticipantId);
if (newIdx >= 0)
m_ui->cmbParticipants->setCurrentIndex(newIdx);
m_ui->cmbParticipants->model()->sort(0);
@@ -148,17 +149,17 @@ void ShootbackTargetEdit::onCmbParticipantsChanged()
bool ShootbackTargetEdit::apply()
{
m_target.name(m_ui->leName->text().toStdString());
m_target.name = m_ui->leName->text().toStdString();
m_target.activateLaserDesignation(m_ui->cb_activateLaserDetection->isChecked());
m_target.activateLights(m_ui->cb_activateLights->isChecked());
m_target.activatePopupAutomatic(m_ui->cb_activatePopupAutomatic->isChecked());
m_target.permanentInstalledTarget(m_ui->cb_permanentInstalledTarget->isChecked());
m_target.hitsToKill(m_ui->sp_hitsToKill->value());
m_target.activateLaserDesignation = m_ui->cb_activateLaserDetection->isChecked();
m_target.activateLights = m_ui->cb_activateLights->isChecked();
m_target.activatePopupAutomatic = m_ui->cb_activatePopupAutomatic->isChecked();
m_target.permanentInstalledTarget = m_ui->cb_permanentInstalledTarget->isChecked();
m_target.hitsToKill = m_ui->sp_hitsToKill->value();
int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
m_target.targetParticipantId(participantId);
m_target.targetParticipantId = participantId;
m_requestHelper->addRequest([this]()
{
@@ -175,16 +176,16 @@ void ShootbackTargetEdit::setData(const ShootbackTarget &target)
{
m_target = target;
m_ui->leName->setText(QString::fromStdString(m_target.name()));
m_ui->leName->setText(QString::fromStdString(m_target.name));
m_ui->cb_activateLaserDetection->setChecked(m_target.activateLaserDesignation());
m_ui->cb_activateLights->setChecked(m_target.activateLights());
m_ui->cb_activatePopupAutomatic->setChecked(m_target.activatePopupAutomatic());
m_ui->cb_permanentInstalledTarget->setChecked(m_target.permanentInstalledTarget());
m_ui->sp_hitsToKill->setValue(m_target.hitsToKill());
m_ui->cb_activateLaserDetection->setChecked(m_target.activateLaserDesignation);
m_ui->cb_activateLights->setChecked(m_target.activateLights);
m_ui->cb_activatePopupAutomatic->setChecked(m_target.activatePopupAutomatic);
m_ui->cb_permanentInstalledTarget->setChecked(m_target.permanentInstalledTarget);
m_ui->sp_hitsToKill->setValue(m_target.hitsToKill);
int newIdx = m_ui->cmbParticipants->findData(m_target.targetParticipantId());
int newIdx = m_ui->cmbParticipants->findData(m_target.targetParticipantId);
if (newIdx >= 0)
m_ui->cmbParticipants->setCurrentIndex(newIdx);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.cpp
+43 -41
View File
@@ -8,6 +8,7 @@
#include "tgt_telegrams.h"
#include <LtsSession/lts_session_data.h>
#include <FileManagement/flm_translation.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <TargetManagement/tgt_data_plugin_interface.h>
@@ -32,6 +33,7 @@ AssignmentDialog::AssignmentDialog(const QString &menuGroup, LtsSession::LtsSess
, m_ui(new Ui::TargetAreaAssignmentsDialog)
, m_menuGroup(menuGroup)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
@@ -203,7 +205,7 @@ void AssignmentDialog::retranslate()
if (areadId > 0)
{
translate(m_ui,
QString::fromStdString(m_dtc->shootbackArea(areadId).name()),
QString::fromStdString(m_dtc->shootbackArea(areadId).name),
false,
tr("Targets assigned to"));
return;
@@ -218,9 +220,9 @@ void AssignmentDialog::retranslate()
m_dtc->shootbackTargets();
for (const TargetManagement::ShootbackTarget &target : std::as_const(shootbackTargets))
{
if (target.targetParticipantId() == targetParticipantId)
if (target.targetParticipantId == targetParticipantId)
{
name = QString::fromStdString(target.name());
name = QString::fromStdString(target.name);
break;
}
}
@@ -268,7 +270,7 @@ void AssignmentDialog::onRemoveAssignment()
for (const auto &mi : selectedRows)
{
Core::RemoveElementRequest req;
req.id(m_assignmentParticipantModel->getRowData(mi.row()).id());
req.id = m_assignmentParticipantModel->getRowData(mi.row()).id;
m_requestHelper->addRequest([req, this]()
{
return m_ftc->targetAreaAssignmentRemoveRequest(req, this);
@@ -290,7 +292,7 @@ void AssignmentDialog::onEditAssignment()
const TargetAreaAssignment &assignment = m_assignmentParticipantModel->getRowData(curIdx.row());
DEBUG_LOG(m_logger) << " onEditTargetArea, row = " << curIdx.row() << ", assignment.id() = " << assignment.id();
DEBUG_LOG(m_logger) << " onEditTargetArea, row = " << curIdx.row() << ", assignment.id() = " << assignment.id;
if (!dialog->init(m_dtc, m_ftc, m_assignmentParticipantModel, assignment))
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << QLatin1String("Can't initialize ShootbackTarget!");
@@ -310,12 +312,12 @@ void AssignmentDialog::onUpdateItem(const TargetAreaAssignment &assignment)
{
INFO_LOG(m_logger) << Q_FUNC_INFO << " got item to update, item=" << assignment;
if (assignment.id()>0)
if (assignment.id>0)
{
QModelIndex mi = m_assignmentParticipantModel->findIndexForId(assignment.id());
QModelIndex mi = m_assignmentParticipantModel->findIndexForId(assignment.id);
int row = mi.row();
INFO_LOG(m_logger) << Q_FUNC_INFO << " got item to update, row=" << row;
if (row < 0)
@@ -338,7 +340,7 @@ void AssignmentDialog::onUpdateItem(const TargetAreaAssignment &assignment)
int row = m_assignmentParticipantModel->findRowForAreaTargetParticipantId(assignment.areaId(), assignment.targetParticipantId());
int row = m_assignmentParticipantModel->findRowForAreaTargetParticipantId(assignment.areaId, assignment.targetParticipantId);
INFO_LOG(m_logger) << Q_FUNC_INFO << " got item to update, row=" << row;
if (row < 0)
{
@@ -373,21 +375,21 @@ QByteArray AssignmentDialog::toJson() const
for (const TargetManagement::TargetAreaAssignment &taa : modelData)
{
TargetAreaAssignmentData taad;
taad.id = taa.id();
taad.name = QString::fromStdString(taa.name());
taad.id = taa.id;
taad.name = QString::fromStdString(taa.name);
taad.areaId = taa.areaId();
taad.targetParticipantId = taa.targetParticipantId();
taad.areaId = taa.areaId;
taad.targetParticipantId = taa.targetParticipantId;
taad.isActive = taa.isActive();
taad.isActive = taa.isActive;
taad.configuration.interval1 = taa.configuration().interval1();
taad.configuration.flash1 = taa.configuration().flash1();
taad.configuration.effect1 = taa.configuration().effect1();
taad.configuration.interval2 = taa.configuration().interval2();
taad.configuration.flash2 = taa.configuration().flash2();
taad.configuration.effect2 = taa.configuration().effect2();
taad.configuration.interval1 = taa.configuration.interval1;
taad.configuration.flash1 = taa.configuration.flash1;
taad.configuration.effect1 = taa.configuration.effect1;
taad.configuration.interval2 = taa.configuration.interval2;
taad.configuration.flash2 = taa.configuration.flash2;
taad.configuration.effect2 = taa.configuration.effect2;
jArray.append(taad.toJson());
@@ -417,21 +419,21 @@ QVector<TargetManagement::TargetAreaAssignment> AssignmentDialog::fromJson(const
{
const TargetAreaAssignmentData &taad = TargetAreaAssignmentData::fromJson(item.toObject());
TargetManagement::TargetAreaAssignment taa;
taa.id(taad.id);
taa.name(taad.name.toStdString());
taa.id = taad.id;
taa.name = taad.name.toStdString();
taa.areaId(taad.areaId);
taa.targetParticipantId(taad.targetParticipantId);
taa.areaId = taad.areaId;
taa.targetParticipantId = taad.targetParticipantId;
taa.isActive(taad.isActive);
taa.isActive = taad.isActive;
taa.configuration().interval1(taad.configuration.interval1);
taa.configuration().flash1(taad.configuration.flash1);
taa.configuration().effect1(taad.configuration.effect1);
taa.configuration().interval2(taad.configuration.interval2);
taa.configuration().flash2(taad.configuration.flash2);
taa.configuration().effect2(taad.configuration.effect2);
taa.configuration.interval1 = taad.configuration.interval1;
taa.configuration.flash1 = taad.configuration.flash1;
taa.configuration.effect1 = taad.configuration.effect1;
taa.configuration.interval2 = taad.configuration.interval2;
taa.configuration.flash2 = taad.configuration.flash2;
taa.configuration.effect2 = taad.configuration.effect2;
vecData.push_back(std::move(taa));
}
@@ -445,10 +447,10 @@ bool AssignmentDialog::apply()
const QVector<TargetAreaAssignment> &assignments = m_assignmentParticipantModel->getData();
for (const TargetAreaAssignment &updateCandidate : std::as_const(assignments))
{
const int assignmentId = updateCandidate.id();
const int assignmentId = updateCandidate.id;
const TargetAreaAssignment &curAssignment = m_dtc->targetAreaAssignment(assignmentId);
if (updateCandidate.isActive() && isDefault(updateCandidate.configuration()))
if (updateCandidate.isActive && isDefault(updateCandidate.configuration))
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " APPLY NOT ALLOWED - Invalid configuration provided for at least one active assignment";
@@ -469,7 +471,7 @@ bool AssignmentDialog::apply()
if (!isEqual(curAssignment, updateCandidate, isGapFiller))
{
INFO_LOG(m_logger) << Q_FUNC_INFO << " add request for: assignmentId:" << assignmentId
<< " name: " << QString::fromStdString(updateCandidate.name());
<< " name: " << QString::fromStdString(updateCandidate.name);
m_requestHelper->addRequest([this, updateCandidate]()
{
return m_ftc->targetAreaAssignmentModifyRequest(updateCandidate, this);
@@ -541,7 +543,7 @@ void AssignmentDialog::onImport()
const QVector<TargetAreaAssignment> &curData = m_assignmentParticipantModel->getData();
for (auto item : curData)
{
Core::RemoveElementRequest req(item.id());
Core::RemoveElementRequest req(item.id);
m_requestHelper->addRequest([this, req]()
{
return m_ftc->targetAreaAssignmentRemoveRequest(req, this);
@@ -552,7 +554,7 @@ void AssignmentDialog::onImport()
const QVector<TargetManagement::TargetAreaAssignment> vecDataCandidate(fromJson(content));
for (TargetAreaAssignment assignment : vecDataCandidate)
{
assignment.id(0);
assignment.id = 0;
m_requestHelper->addRequest([this, assignment]()
{
return m_ftc->targetAreaAssignmentModifyRequest(assignment, this);
@@ -580,12 +582,12 @@ void AssignmentDialog::onMapCenterClicked()
if (m_mode == MODE::FILTERED_TO_SINGLE_TARGET_PARTICPANT)
{
const int areaId = m_assignmentParticipantModel->getRowData(curIdx.row()).areaId();
const int areaId = m_assignmentParticipantModel->getRowData(curIdx.row()).areaId;
if (areaId<=0)
return;
m_sitMapGuiIfc->centerMapToMapObject(SituationMap::MapObjectType::MOT_ShootbackArea, areaId);
} else {
const int pId = m_assignmentParticipantModel->getRowData(curIdx.row()).targetParticipantId();
const int pId = m_assignmentParticipantModel->getRowData(curIdx.row()).targetParticipantId;
if (pId<=0)
return;
m_sitMapGuiIfc->centerMapToMapObject(SituationMap::MapObjectType::MOT_Participant, pId);
@@ -605,8 +607,8 @@ void AssignmentDialog::onMapZoomToClicked()
return;
const TargetAreaAssignment &assignment = m_assignmentParticipantModel->getRowData(index.row());
const int areaId = assignment.areaId();
const int pId = assignment.targetParticipantId();
const int areaId = assignment.areaId;
const int pId = assignment.targetParticipantId;
if ((areaId<=0) || (pId<=0))
return;
@@ -624,8 +626,8 @@ void AssignmentDialog::onObjectEntered(const QModelIndex &index)
return;
}
const TargetAreaAssignment &assignment = m_assignmentParticipantModel->getRowData(index.row());
const int areaId = assignment.areaId();
const int pId = assignment.targetParticipantId();
const int areaId = assignment.areaId;
const int pId = assignment.targetParticipantId;
if ((areaId<=0) || (pId<=0))
return;
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include <TargetManagement/tgt_dtc.h>
#include <TargetManagement/tgt_ftc.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <TargetManagement/logger.h>
#include <TargetManagement/ShootbackTargetConfiguration/tgt_assignment_part_model.h>
#include <Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp
+28 -27
View File
@@ -18,6 +18,7 @@ AssignmentEditDialog::AssignmentEditDialog(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::AssignmentEdit)
, m_logger(getLogger("AssignmentEditDialog"))
{
m_ui->setupUi(this);
}
@@ -127,7 +128,7 @@ void AssignmentEditDialog::initCmbParticipants()
}
}
int newIdx = m_ui->cmbParticipants->findData(m_assignment.targetParticipantId());
int newIdx = m_ui->cmbParticipants->findData(m_assignment.targetParticipantId);
if (newIdx >= 0)
m_ui->cmbParticipants->setCurrentIndex(newIdx);
m_ui->cmbParticipants->model()->sort(0);
@@ -142,9 +143,9 @@ void AssignmentEditDialog::fillCmbEffect(QComboBox *cmb)
{
if (!cmb)
return;
cmb->addItem(tr("Near Miss"), TargetManagement::Effect::NearMiss);
cmb->addItem(tr("Mobility Kill"), TargetManagement::Effect::MobilityKill);
cmb->addItem(tr("WeaponK ill"), TargetManagement::Effect::WeaponKill);
cmb->addItem(tr("Near Miss"), static_cast<int>(TargetManagement::Effect::NearMiss));
cmb->addItem(tr("Mobility Kill"), static_cast<int>(TargetManagement::Effect::MobilityKill));
cmb->addItem(tr("WeaponK ill"), static_cast<int>(TargetManagement::Effect::WeaponKill));
cmb->setCurrentIndex(0);
}
@@ -153,7 +154,7 @@ void AssignmentEditDialog::initCmbPreWarningEffect()
QComboBox *cmb = m_ui->cmb_preWarningEffect;
fillCmbEffect(cmb);
int newIdx = cmb->findData(m_assignment.configuration().effect1().underlying());
int newIdx = cmb->findData(static_cast<int>(m_assignment.configuration.effect1));
if (newIdx >= 0)
cmb->setCurrentIndex(newIdx);
}
@@ -163,7 +164,7 @@ void AssignmentEditDialog::initCmbTimeToEffectEffect()
QComboBox *cmb = m_ui->cmb_timeToEffectEffect;
fillCmbEffect(cmb);
int newIdx = cmb->findData(m_assignment.configuration().effect2().underlying());
int newIdx = cmb->findData(static_cast<int>(m_assignment.configuration.effect2));
if (newIdx >= 0)
cmb->setCurrentIndex(newIdx);
}
@@ -175,7 +176,7 @@ void AssignmentEditDialog::initCmbAreas()
auto cb = [this](const TargetManagement::ShootbackArea & area)
{
m_ui->cmbAreas->addItem(QString::fromStdString(area.name()), area.id());
m_ui->cmbAreas->addItem(QString::fromStdString(area.name), area.id);
};
m_dtc->shootbackAreas(cb);
}
@@ -214,25 +215,25 @@ void AssignmentEditDialog::onCmbParticipantsChanged()
bool AssignmentEditDialog::apply()
{
m_assignment.name(m_ui->leName->text().toStdString());
m_assignment.name = m_ui->leName->text().toStdString();
int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
m_assignment.targetParticipantId(participantId);
m_assignment.targetParticipantId = participantId;
m_assignment.areaId(m_ui->cmbAreas->currentData().toInt());
m_assignment.areaId = m_ui->cmbAreas->currentData().toInt();
{
ShootbackConfiguration &configRef = m_assignment.configuration();
configRef.interval1(m_ui->sb_preWarningInterval->value());
configRef.effect1( static_cast<Effect>(m_ui->cmb_preWarningEffect->currentData().toInt()) );
configRef.flash1(m_ui->cb_flashAfterExpiration_1->isChecked());
ShootbackConfiguration &configRef = m_assignment.configuration;
configRef.interval1 = m_ui->sb_preWarningInterval->value();
configRef.effect1 = static_cast<Effect>(m_ui->cmb_preWarningEffect->currentData().toInt());
configRef.flash1 = m_ui->cb_flashAfterExpiration_1->isChecked();
configRef.interval2(m_ui->sb_timeToEffectInterval->value());
configRef.effect2( static_cast<Effect>(m_ui->cmb_timeToEffectEffect->currentData().toInt()) );
configRef.flash2(m_ui->cb_flashAfterExpiration_2->isChecked());
configRef.interval2 = m_ui->sb_timeToEffectInterval->value();
configRef.effect2 = static_cast<Effect>(m_ui->cmb_timeToEffectEffect->currentData().toInt());
configRef.flash2 = m_ui->cb_flashAfterExpiration_2->isChecked();
}
emit updateItem(m_assignment);
@@ -249,36 +250,36 @@ void AssignmentEditDialog::setData(const TargetAreaAssignment &assignment)
{
m_assignment = assignment;
m_ui->leName->setText(QString::fromStdString(assignment.name()));
m_ui->leName->setText(QString::fromStdString(assignment.name));
{
int newIdx = m_ui->cmbParticipants->findData(m_assignment.targetParticipantId());
int newIdx = m_ui->cmbParticipants->findData(m_assignment.targetParticipantId);
if (newIdx >= 0)
m_ui->cmbParticipants->setCurrentIndex(newIdx);
}
{
int newIdx = m_ui->cmbAreas->findData(m_assignment.areaId());
int newIdx = m_ui->cmbAreas->findData(m_assignment.areaId);
if (newIdx >= 0)
m_ui->cmbAreas->setCurrentIndex(newIdx);
}
const ShootbackConfiguration &config = assignment.configuration();
const ShootbackConfiguration &config = assignment.configuration;
{
m_ui->sb_preWarningInterval->setValue(config.interval1());
m_ui->cb_flashAfterExpiration_1->setChecked(config.flash1());
int newIdx = m_ui->cmb_preWarningEffect->findData(config.effect1().underlying());
m_ui->sb_preWarningInterval->setValue(config.interval1);
m_ui->cb_flashAfterExpiration_1->setChecked(config.flash1);
int newIdx = m_ui->cmb_preWarningEffect->findData(static_cast<int>(config.effect1));
if (newIdx >= 0)
m_ui->cmb_preWarningEffect->setCurrentIndex(newIdx);
}
{
m_ui->sb_timeToEffectInterval->setValue(config.interval2());
m_ui->cb_flashAfterExpiration_2->setChecked(config.flash1());
int newIdx = m_ui->cmb_timeToEffectEffect->findData(config.effect2().underlying());
m_ui->sb_timeToEffectInterval->setValue(config.interval2);
m_ui->cb_flashAfterExpiration_2->setChecked(config.flash1);
int newIdx = m_ui->cmb_timeToEffectEffect->findData(static_cast<int>(config.effect2));
if (newIdx >= 0)
m_ui->cmb_timeToEffectEffect->setCurrentIndex(newIdx);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.cpp
+32 -30
View File
@@ -7,6 +7,7 @@
#include "tgt_telegrams.h"
#include <LtsSession/lts_session_data.h>
#include <FileManagement/flm_translation.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <TargetManagement/tgt_data_plugin_interface.h>
@@ -32,6 +33,7 @@ TargetPartDialog::TargetPartDialog(const QString &menuGroup, LtsSession::LtsSess
, m_ui(new Ui::TargetPartDialog)
, m_menuGroup(menuGroup)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
@@ -208,7 +210,7 @@ void TargetPartDialog::onRemoveTargetPart()
for (const auto &mi : selectedRows)
{
Core::RemoveElementRequest req;
req.id(m_targetParticipantModel->getRowData(mi.row()).id());
req.id = m_targetParticipantModel->getRowData(mi.row()).id;
m_requestHelper->addRequest([req, this]()
{
return m_ftc->shootbackTargetRemoveRequest(req, this);
@@ -259,23 +261,23 @@ QByteArray TargetPartDialog::toJson() const
for (const TargetManagement::ShootbackTarget &sbt : modelData)
{
ShootbackTargetData sbtd;
sbtd.id = sbt.id();
sbtd.name = QString::fromStdString(sbt.name());
sbtd.id = sbt.id;
sbtd.name = QString::fromStdString(sbt.name);
sbtd.targetParticipantEquipmentNumber = -1;
if (m_ppmDtc)
{
const ParticipantManagement::Participant &participant = m_ppmDtc->participant(sbt.targetParticipantId());
if (participant.id() == sbt.targetParticipantId() &&
participant.equipmentNumber().is_set())
sbtd.targetParticipantEquipmentNumber = participant.equipmentNumber().get();
const ParticipantManagement::Participant &participant = m_ppmDtc->participant(sbt.targetParticipantId);
if (participant.id == sbt.targetParticipantId &&
participant.equipmentNumber.has_value())
sbtd.targetParticipantEquipmentNumber = participant.equipmentNumber.get();
}
sbtd.activateLaserDesignation = sbt.activateLaserDesignation();
sbtd.activateLights = sbt.activateLights();
sbtd.activatePopupAutomatic = sbt.activatePopupAutomatic();
sbtd.hitsToKill = sbt.hitsToKill();
sbtd.permanentInstalledTarget = sbt.permanentInstalledTarget();
sbtd.activateLaserDesignation = sbt.activateLaserDesignation;
sbtd.activateLights = sbt.activateLights;
sbtd.activatePopupAutomatic = sbt.activatePopupAutomatic;
sbtd.hitsToKill = sbt.hitsToKill;
sbtd.permanentInstalledTarget = sbt.permanentInstalledTarget;
jArray.append(sbtd.toJson());
}
@@ -304,17 +306,17 @@ QVector<TargetManagement::ShootbackTarget> TargetPartDialog::fromJson(const QByt
{
const ShootbackTargetData &sbtd = ShootbackTargetData::fromJson(item.toObject());
TargetManagement::ShootbackTarget sbt;
sbt.id(sbtd.id);
sbt.name(sbtd.name.toStdString());
sbt.id = sbtd.id;
sbt.name = sbtd.name.toStdString();
if (m_ppmDtc)
sbt.targetParticipantId(m_ppmDtc->participantIdByEquipmentNumber(sbtd.targetParticipantEquipmentNumber));
sbt.targetParticipantId = m_ppmDtc->participantIdByEquipmentNumber(sbtd.targetParticipantEquipmentNumber);
sbt.activateLaserDesignation(sbtd.activateLaserDesignation);
sbt.activateLights(sbtd.activateLights);
sbt.activatePopupAutomatic(sbtd.activatePopupAutomatic);
sbt.hitsToKill(sbtd.hitsToKill);
sbt.permanentInstalledTarget(sbtd.permanentInstalledTarget);
sbt.activateLaserDesignation = sbtd.activateLaserDesignation;
sbt.activateLights = sbtd.activateLights;
sbt.activatePopupAutomatic = sbtd.activatePopupAutomatic;
sbt.hitsToKill = sbtd.hitsToKill;
sbt.permanentInstalledTarget = sbtd.permanentInstalledTarget;
vecData.push_back(std::move(sbt));
}
return vecData;
@@ -378,7 +380,7 @@ void TargetPartDialog::onImport()
const QVector<ShootbackTarget> &curData = m_targetParticipantModel->getData();
for (auto item : curData)
{
Core::RemoveElementRequest req(item.id());
Core::RemoveElementRequest req(item.id);
m_requestHelper->addRequest([this, req]()
{
return m_ftc->shootbackTargetRemoveRequest(req, this);
@@ -389,7 +391,7 @@ void TargetPartDialog::onImport()
const QVector<TargetManagement::ShootbackTarget> vecDataCandidate(fromJson(content));
for (ShootbackTarget shootbackTargetCandidate : vecDataCandidate)
{
shootbackTargetCandidate.id(0);
shootbackTargetCandidate.id = 0;
m_requestHelper->addRequest([this, shootbackTargetCandidate]()
{
return m_ftc->shootbackTargetModifyRequest(shootbackTargetCandidate, this);
@@ -413,7 +415,7 @@ void TargetPartDialog::onAssignAreaClicked()
if (!curIdx.isValid())
return;
const int targetParticipantId = m_targetParticipantModel->getRowData(curIdx.row()).targetParticipantId();
const int targetParticipantId = m_targetParticipantModel->getRowData(curIdx.row()).targetParticipantId;
@@ -441,7 +443,7 @@ void TargetPartDialog::onMapCenterClicked()
if (!curIdx.isValid())
return;
const int pId = m_targetParticipantModel->getRowData(curIdx.row()).targetParticipantId();
const int pId = m_targetParticipantModel->getRowData(curIdx.row()).targetParticipantId;
m_sitMapGuiIfc->centerMapToMapObject(SituationMap::MapObjectType::MOT_Participant, pId);
}
@@ -457,7 +459,7 @@ void TargetPartDialog::onMapZoomToClicked()
if (!m_targetParticipantModel || !m_sitMapGuiIfc)
return;
int pId = m_targetParticipantModel->getRowData(index.row()).targetParticipantId();
int pId = m_targetParticipantModel->getRowData(index.row()).targetParticipantId;
if (pId<=0)
return;
@@ -465,8 +467,8 @@ void TargetPartDialog::onMapZoomToClicked()
QVector<int> assignedAreas;
auto cb = [pId, &assignedAreas](const TargetManagement::TargetAreaAssignment &assignment)
{
if (assignment.targetParticipantId() == pId)
assignedAreas.push_back(assignment.areaId());
if (assignment.targetParticipantId == pId)
assignedAreas.push_back(assignment.areaId);
};
m_dtc->targetAreaAssignments(cb);
@@ -491,7 +493,7 @@ void TargetPartDialog::onObjectEntered(const QModelIndex &index)
m_sitMapGuiIfc->removeObjectIndicator();
return;
}
int pId = m_targetParticipantModel->getRowData(index.row()).targetParticipantId();
int pId = m_targetParticipantModel->getRowData(index.row()).targetParticipantId;
if (pId>0)
{
@@ -501,8 +503,8 @@ void TargetPartDialog::onObjectEntered(const QModelIndex &index)
QVector<int> assignedAreas;
auto cb = [pId, &assignedAreas](const TargetManagement::TargetAreaAssignment &assignment)
{
if (assignment.targetParticipantId() == pId)
assignedAreas.push_back(assignment.areaId());
if (assignment.targetParticipantId == pId)
assignedAreas.push_back(assignment.areaId);
};
m_dtc->targetAreaAssignments(cb);
m_sitMapGuiIfc->setMapObjectSelected(SituationMap::MapObjectType::MOT_ShootbackArea, assignedAreas, true);
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.h
+2 -1
View File
@@ -7,9 +7,10 @@
#include <TargetManagement/tgt_dtc.h>
#include <TargetManagement/tgt_ftc.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <TargetManagement/logger.h>
#include <TargetManagement/ShootbackTargetConfiguration/tgt_target_part_model.h>
#include <Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp
+46 -45
View File
@@ -49,6 +49,7 @@ TargetParticipantModel::TargetParticipantModel(QObject *parent)
},
parent)
, m_logger(getLogger("TargetParticipantModel"))
{}
@@ -169,28 +170,28 @@ QVariant TargetParticipantModel::data(const QModelIndex &index, int role) const
if (index.column() == Participant)
{
static const int pmSize = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
const QPixmap &pm = m_participantHandler->getParticipantDecoration(shootbackTarget.targetParticipantId());
const QPixmap &pm = m_participantHandler->getParticipantDecoration(shootbackTarget.targetParticipantId);
if (!pm.isNull())
return pm.scaled(pmSize, pmSize);
}
else if ((index.column() == ActivateLaserDesignation))
return shootbackTarget.activateLaserDesignation() ? m_yes : m_no;
return shootbackTarget.activateLaserDesignation ? m_yes : m_no;
else if ((index.column() == ActivateLights))
return shootbackTarget.activateLights() ? m_yes : m_no;
return shootbackTarget.activateLights ? m_yes : m_no;
else if ((index.column() == ActivatePopupAutomatic))
return shootbackTarget.activatePopupAutomatic() ? m_yes : m_no;
return shootbackTarget.activatePopupAutomatic ? m_yes : m_no;
else if ((index.column() == PermanentInstalledTarget))
return shootbackTarget.permanentInstalledTarget() ? m_yes : m_no;
return shootbackTarget.permanentInstalledTarget ? m_yes : m_no;
return QVariant();
}
else if (role == Qt::BackgroundRole)
{
if ((index.column() == TargetPartipantId) && (shootbackTarget.targetParticipantId() <= 0))
if ((index.column() == TargetPartipantId) && (shootbackTarget.targetParticipantId <= 0))
return getWarningBackgroundRole();
if (index.column() == TargetPartipantEquipmentNumber)
{
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(shootbackTarget.targetParticipantId());
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(shootbackTarget.targetParticipantId);
if (eqNo <= 0)
return getWarningBackgroundRole();
}
@@ -201,7 +202,7 @@ QVariant TargetParticipantModel::data(const QModelIndex &index, int role) const
{
QString tooltip(QStringLiteral("<html>"));
const QPixmap &img = m_participantHandler->getParticipantDecoration(shootbackTarget.targetParticipantId());
const QPixmap &img = m_participantHandler->getParticipantDecoration(shootbackTarget.targetParticipantId);
if (!img.isNull())
{
@@ -211,10 +212,10 @@ QVariant TargetParticipantModel::data(const QModelIndex &index, int role) const
tooltip.append(QStringLiteral("<center><img src='data:image/png;base64,%1'></center>").arg(QString::fromLatin1(data.toBase64())));
QString hdr = this->headerData(ShootbackTargetName, Qt::Horizontal, Qt::DisplayRole).toString();
tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(shootbackTarget.name())));
tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, QString::fromStdString(shootbackTarget.name)));
hdr = this->headerData(Participant, Qt::Horizontal, Qt::DisplayRole).toString();
const QString &val = m_participantHandler->getParticipantHierarchie(shootbackTarget.targetParticipantId());
const QString &val = m_participantHandler->getParticipantHierarchie(shootbackTarget.targetParticipantId);
tooltip.append(QStringLiteral("<p>%1: %2</p>").arg(hdr, val));
tooltip.append(QStringLiteral("</html>"));
@@ -226,60 +227,60 @@ QVariant TargetParticipantModel::data(const QModelIndex &index, int role) const
{
if (index.column() == ActivateLaserDesignation)
return static_cast<int>(shootbackTarget.activateLaserDesignation());
return static_cast<int>(shootbackTarget.activateLaserDesignation);
if (index.column() == ActivateLights)
return static_cast<int>(shootbackTarget.activateLights());
return static_cast<int>(shootbackTarget.activateLights);
if (index.column() == ActivatePopupAutomatic)
return static_cast<int>(shootbackTarget.activatePopupAutomatic());
return static_cast<int>(shootbackTarget.activatePopupAutomatic);
if (index.column() == HitsToKill)
return shootbackTarget.hitsToKill();
return shootbackTarget.hitsToKill;
}
switch (index.column())
{
case Id:
return shootbackTarget.id();
return shootbackTarget.id;
case ShootbackTargetName:
return QString::fromStdString(shootbackTarget.name());
return QString::fromStdString(shootbackTarget.name);
case TargetPartipantId:
return shootbackTarget.targetParticipantId();
return shootbackTarget.targetParticipantId;
case TargetPartipantEquipmentNumber:
{
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(shootbackTarget.targetParticipantId());
const int eqNo = m_participantHandler->getParticipantIdToEquipmentNumber(shootbackTarget.targetParticipantId);
if (eqNo <= 0)
return QStringLiteral("-");
return eqNo;
}
case TargetPartipantEquipmentType:
{
const auto type = m_participantHandler->getParticipantIdToWmsTypeClass(shootbackTarget.targetParticipantId());
const auto type = m_participantHandler->getParticipantIdToWmsTypeClass(shootbackTarget.targetParticipantId);
return ParticipantHandler::target_wmsTypeClassToString(type);
}
case Participant:
return m_participantHandler->getParticipantHierarchie(shootbackTarget.targetParticipantId());
return m_participantHandler->getParticipantHierarchie(shootbackTarget.targetParticipantId);
case Position:
{
const Core::GeoPosition2D &pos = shootbackTarget.position();
return LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
const Core::GeoPosition2D &pos = shootbackTarget.position;
return LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
}
case ActivateLaserDesignation:
return shootbackTarget.activateLaserDesignation() ? tr("Yes") : tr("No");
return shootbackTarget.activateLaserDesignation ? tr("Yes") : tr("No");
case ActivateLights:
return shootbackTarget.activateLights() ? tr("Yes") : tr("No");
return shootbackTarget.activateLights ? tr("Yes") : tr("No");
case ActivatePopupAutomatic:
return shootbackTarget.activatePopupAutomatic() ? tr("Yes") : tr("No");
return shootbackTarget.activatePopupAutomatic ? tr("Yes") : tr("No");
case HitsToKill:
return shootbackTarget.hitsToKill();
return shootbackTarget.hitsToKill;
case PermanentInstalledTarget:
return shootbackTarget.permanentInstalledTarget() ? tr("Yes") : tr("No");
return shootbackTarget.permanentInstalledTarget ? tr("Yes") : tr("No");
case VisibleParticipants:
return TargetManagement::toString(shootbackTarget.visibleParticipants());
return TargetManagement::toString(shootbackTarget.visibleParticipants);
}
return QVariant();
@@ -290,7 +291,7 @@ QSet<int> TargetParticipantModel::getAssociatedParticipantIds() const
QSet<int> ret;
ret.reserve(m_vecData.size());
for (const TargetManagement::ShootbackTarget &data : m_vecData)
ret += data.targetParticipantId();
ret += data.targetParticipantId;
return ret;
}
@@ -311,11 +312,11 @@ void TargetParticipantModel::updateColumnFilter()
for (const ShootbackTarget &item : std::as_const(m_vecData))
{
m_usedActiveLaserDesignations.insert(item.activateLaserDesignation());
m_usedActivateLights.insert(item.activateLights());
m_usedActivatePopupAutomatic.insert(item.activatePopupAutomatic());
m_usedHitsToKill.insert(item.hitsToKill());
m_usedPermanetTargetInstalled.insert(item.permanentInstalledTarget());
m_usedActiveLaserDesignations.insert(item.activateLaserDesignation);
m_usedActivateLights.insert(item.activateLights);
m_usedActivatePopupAutomatic.insert(item.activatePopupAutomatic);
m_usedHitsToKill.insert(item.hitsToKill);
m_usedPermanetTargetInstalled.insert(item.permanentInstalledTarget);
}
}
@@ -344,32 +345,32 @@ bool TargetParticipantProxyModel::lessThan(const QModelIndex &source_left, const
switch (source_left.column())
{
case TargetParticipantModel::Columns::Id:
return left.id() < right.id();
return left.id < right.id;
case TargetParticipantModel::Columns::ShootbackTargetName:
return left.name() < right.name();
return left.name < right.name;
case TargetParticipantModel::Columns::TargetPartipantId:
return left.targetParticipantId() < right.targetParticipantId();
return left.targetParticipantId < right.targetParticipantId;
case TargetParticipantModel::Columns::TargetPartipantEquipmentNumber:
{
const int eqNoLeft = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId());
const int eqNoRight = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId());
const int eqNoLeft = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId);
const int eqNoRight = m_sourceModel->m_participantHandler->getParticipantIdToEquipmentNumber(left.targetParticipantId);
return eqNoLeft < eqNoRight;
}
case TargetParticipantModel::Columns::ActivateLaserDesignation:
return left.activateLaserDesignation() < right.activateLaserDesignation();
return left.activateLaserDesignation < right.activateLaserDesignation;
case TargetParticipantModel::Columns::ActivateLights:
return left.activateLights() < right.activateLights();
return left.activateLights < right.activateLights;
case TargetParticipantModel::Columns::ActivatePopupAutomatic:
return left.activatePopupAutomatic() < right.activatePopupAutomatic();
return left.activatePopupAutomatic < right.activatePopupAutomatic;
case TargetParticipantModel::Columns::HitsToKill:
return left.hitsToKill() < right.hitsToKill();
return left.hitsToKill < right.hitsToKill;
case TargetParticipantModel::Columns::PermanentInstalledTarget:
return left.permanentInstalledTarget() < right.permanentInstalledTarget();
return left.permanentInstalledTarget < right.permanentInstalledTarget;
case TargetParticipantModel::Columns::VisibleParticipants:
return toString(left.visibleParticipants()) < toString(right.visibleParticipants());
return toString(left.visibleParticipants) < toString(right.visibleParticipants);
case TargetParticipantModel::Columns::Participant:
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp
+2 -2
View File
@@ -211,10 +211,10 @@ QJsonObject ShootbackConfigurationData::toJson() const
{
return QJsonObject({{QStringLiteral("interval1"), interval1},
{QStringLiteral("flash1"), flash1},
{QStringLiteral("effect1"), enumToJson(effect1.underlying())},
{QStringLiteral("effect1"), enumToJson(effect1)},
{QStringLiteral("interval2"), interval2},
{QStringLiteral("flash2"), flash2},
{QStringLiteral("effect2"), enumToJson(effect2.underlying())},
{QStringLiteral("effect2"), enumToJson(effect2)},
});
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h
+1 -1
View File
@@ -52,7 +52,7 @@ struct GeoPosition2D
{
GeoPosition2D() = default;
explicit GeoPosition2D(const Core::GeoPosition2D pos)
: lat(pos.lat()), lon(pos.lon()) {}
: lat(pos.lat), lon(pos.lon) {}
double lat = 0;
double lon = 0;