Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
-1
@@ -22,7 +22,6 @@ ParticipantBiteDialog::ParticipantBiteDialog(int ddsId, QWidget *parent)
|
||||
, m_requestHelper(nullptr)
|
||||
, m_layout(nullptr)
|
||||
, m_ui(new Ui::ParticipantBiteDialog)
|
||||
, m_logger(getLogger("ParticipantBiteDialog"))
|
||||
, m_ccsMap()
|
||||
, m_bctMap()
|
||||
{
|
||||
|
||||
-1
@@ -80,7 +80,6 @@ private:
|
||||
QVector<QWidget *> m_internalWidgets;
|
||||
|
||||
Ui::ParticipantBiteDialog *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
QMap<int, ProjectDataManagement::CanComponentString> m_ccsMap;
|
||||
QMap<int, ProjectDataManagement::BiteComponentText> m_bctMap;
|
||||
};
|
||||
|
||||
+1
-2
@@ -33,7 +33,6 @@ ParticipantConfigDialog::ParticipantConfigDialog(int ddsId, DialogType type, QWi
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ParticipantConfigDialog)
|
||||
, m_isTarget(false)
|
||||
, m_logger(getLogger("ParticipantConfigDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
connect(m_ui->cbStatus, &LtsWidgets::LtsComboBox::currentTextChanged, this, &ParticipantConfigDialog::onStateAreaChanged);
|
||||
@@ -347,7 +346,7 @@ void ParticipantConfigDialog::onSelectionChanged()
|
||||
|
||||
for (const QModelIndex &index : currentlySelectedParticipants)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column();
|
||||
DEBUG_LOG() << "setChildrenSelected row =" << index.row() << " column=" << index.column();
|
||||
ParticipantManagement::ParticipantData data = m_model->getParticipantData(index);
|
||||
TypeClass tc = m_dtc->type(data.typeId()).typeClass();
|
||||
if (tc != TypeClass::Human && tc != TypeClass::Unit)
|
||||
|
||||
-2
@@ -109,8 +109,6 @@ private:
|
||||
|
||||
Ui::ParticipantConfigDialog *m_ui;
|
||||
bool m_isTarget;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+5
-5
@@ -370,7 +370,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
|
||||
if (!isUnitType(parentItem->participant.typeId()))
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "can drop on " << row << ", " << column << ", parent: "
|
||||
DEBUG_LOG() << "can drop on " << row << ", " << column << ", parent: "
|
||||
<< parent.row() << "," << parent.column() << ", " << parent.isValid()
|
||||
<< ", action: " << action;
|
||||
|
||||
@@ -399,7 +399,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
|
||||
|
||||
if (idSource != 0 && isParentOf(parentItem, idSource))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "isParentOf() for idSource: " << idSource << " is true - no drop";
|
||||
DEBUG_LOG() << "isParentOf() for idSource: " << idSource << " is true - no drop";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -759,7 +759,7 @@ void ParticipantConfigModel::insertChildrenOf(int parentId,
|
||||
auto it = tmap.constFind(childId);
|
||||
if (it == tmap.constEnd())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Can not find participant with id " << childId << " - ignoring";
|
||||
WARNING_LOG() << "Can not find participant with id " << childId << " - ignoring";
|
||||
continue;
|
||||
}
|
||||
const ParticipantData &data = it.value();
|
||||
@@ -784,7 +784,7 @@ void ParticipantConfigModel::insertChildrenOf(int parentId,
|
||||
childItem->participant = data;
|
||||
childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id()), cs);
|
||||
|
||||
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
|
||||
DEBUG_LOG() << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
|
||||
<< ") to parent " << parent << " at pos " << insertPos;
|
||||
insertRow(insertPos, parentIdx, childItem);
|
||||
tryRenderSymbol(QString::fromStdString(data.symbol()), childItem);
|
||||
@@ -1074,7 +1074,7 @@ void ParticipantConfigModel::onParticipantChanged(const ParticipantManagement::P
|
||||
|
||||
CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
|
||||
childItem->participant = m_dtc->convertParticipantToParticipantData(data);
|
||||
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
|
||||
DEBUG_LOG() << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
|
||||
<< ") to parent " << ctiParent << " at pos " << insertPos;
|
||||
insertRow(insertPos, indexFromItem(ctiParent), childItem);
|
||||
tryRenderSymbol(QString::fromStdString(data.symbol()), childItem);
|
||||
|
||||
-2
@@ -278,8 +278,6 @@ private:
|
||||
SortData m_sortData;
|
||||
|
||||
ParticipantConfigModel *m_sourceModel{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
+11
-12
@@ -21,7 +21,6 @@ ParticipantFollowDialog::ParticipantFollowDialog(QWidget *parent)
|
||||
, m_ui(new Ui::ParticipantFollowDialog)
|
||||
, m_followParticipantId(-1)
|
||||
, m_followEquipmentNo(-1)
|
||||
, m_logger(getLogger("ParticipantFollowDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->leEquipNo->setValidator(new QIntValidator(0, 100000, m_ui->leEquipNo));
|
||||
@@ -56,7 +55,7 @@ bool ParticipantFollowDialog::init(LtsSession::LtsSession *session,
|
||||
const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
const std::shared_ptr<ForeignParticipantInfoGuiInterface> &ppmGuiIfc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ParticipantFollowDialog::init";
|
||||
DEBUG_LOG() << "ParticipantFollowDialog::init";
|
||||
m_dtc = dtc;
|
||||
m_ppmGuiIfc = ppmGuiIfc;
|
||||
enadisa();
|
||||
@@ -228,7 +227,7 @@ void ParticipantFollowDialog::onDoubleClicked()
|
||||
m_followParticipantId = data.id();
|
||||
m_followEquipmentNo = getEquipmentNumber(m_followParticipantId);
|
||||
enadisa();
|
||||
DEBUG_LOG(m_logger) << "onDoubleClicked follow Participant Id =" << m_followParticipantId
|
||||
DEBUG_LOG() << "onDoubleClicked follow Participant Id =" << m_followParticipantId
|
||||
<< " m_followEquipmentNo=" << m_followEquipmentNo;
|
||||
}
|
||||
|
||||
@@ -338,7 +337,7 @@ void ParticipantFollowDialog::fillParticipantMapFromTree(const QModelIndex &pare
|
||||
|
||||
int ParticipantFollowDialog::getEquipmentNumber(const int participantId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "getEquipmentNumber(" << participantId << ")";
|
||||
DEBUG_LOG() << "getEquipmentNumber(" << participantId << ")";
|
||||
int equipmentNumber = 0;
|
||||
|
||||
QMapIterator<int, int> iter(m_participantMap);
|
||||
@@ -346,10 +345,10 @@ int ParticipantFollowDialog::getEquipmentNumber(const int participantId)
|
||||
while (iter.hasNext())
|
||||
{
|
||||
iter.next();
|
||||
DEBUG_LOG(m_logger) << iter.key() << " : " << iter.value();
|
||||
DEBUG_LOG() << iter.key() << " : " << iter.value();
|
||||
if (iter.value() == participantId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "return: " << iter.key();
|
||||
DEBUG_LOG() << "return: " << iter.key();
|
||||
return (iter.key());
|
||||
}
|
||||
}
|
||||
@@ -359,13 +358,13 @@ int ParticipantFollowDialog::getEquipmentNumber(const int participantId)
|
||||
void ParticipantFollowDialog::onStartFollowClicked()
|
||||
{
|
||||
int participantId = m_participantMap.value(m_equipNo);
|
||||
DEBUG_LOG(m_logger) << "Follow Participant id=" << participantId << " on Map";
|
||||
DEBUG_LOG() << "Follow Participant id=" << participantId << " on Map";
|
||||
|
||||
if (!m_ui->cbAll->isChecked())
|
||||
onDoubleClicked();
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Start Follow Participant id=" << participantId << " on Map";
|
||||
DEBUG_LOG() << "Start Follow Participant id=" << participantId << " on Map";
|
||||
m_followParticipantId = participantId;
|
||||
m_followEquipmentNo = m_equipNo;
|
||||
}
|
||||
@@ -374,7 +373,7 @@ void ParticipantFollowDialog::onStartFollowClicked()
|
||||
|
||||
void ParticipantFollowDialog::onStopFollowClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Stop Follow Participant id=" << m_followParticipantId << " on Map";
|
||||
DEBUG_LOG() << "Stop Follow Participant id=" << m_followParticipantId << " on Map";
|
||||
m_followParticipantId = 0;
|
||||
m_followEquipmentNo = 0;
|
||||
enadisa();
|
||||
@@ -409,9 +408,9 @@ void ParticipantFollowDialog::enadisa()
|
||||
labelText.append(QStringLiteral(")"));
|
||||
}
|
||||
m_ui->lbFollow->setText(labelText);
|
||||
DEBUG_LOG(m_logger) << "labelText=" << labelText;
|
||||
DEBUG_LOG(m_logger) << " m_ui->lbFollow->getText()" << m_ui->lbFollow->text();
|
||||
DEBUG_LOG(m_logger) << "newFollowEquipment(" << m_followEquipmentNo << ", "
|
||||
DEBUG_LOG() << "labelText=" << labelText;
|
||||
DEBUG_LOG() << " m_ui->lbFollow->getText()" << m_ui->lbFollow->text();
|
||||
DEBUG_LOG() << "newFollowEquipment(" << m_followEquipmentNo << ", "
|
||||
<< m_followParticipantId << ")";
|
||||
emit newFollowEquipment(m_followEquipmentNo,m_followParticipantId );
|
||||
}
|
||||
|
||||
+3
-4
@@ -21,7 +21,6 @@ ParticipantGearRestock::ParticipantGearRestock(int gearId, int gearTypeId, const
|
||||
, m_participant(participant)
|
||||
, m_dialogMode(dialogMode)
|
||||
, m_ui(new Ui::ParticipantGearRestock)
|
||||
, m_logger(getLogger("ParticipantGearRestock"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -65,13 +64,13 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
|
||||
|
||||
if (!m_pdmDtc->canRestock(m_gearTypeId) && m_dialogMode == DialogMode::DM_Restock)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Not possible to restock gearTypeId = " << m_gearTypeId;
|
||||
WARNING_LOG() << "Not possible to restock gearTypeId = " << m_gearTypeId;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_pdmDtc->canSetDefaults(m_gearTypeId) && m_dialogMode == DialogMode::DM_SetRestockDefaults)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Not possible to set restock defaults gearTypeId = " << m_gearTypeId;
|
||||
WARNING_LOG() << "Not possible to set restock defaults gearTypeId = " << m_gearTypeId;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -108,7 +107,7 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
|
||||
int chargeTypeId = gearType2ChargeType.chargeTypeId();
|
||||
int maxCharge = m_pdmDtc->maxCharge(m_gearTypeId, chargeTypeId);
|
||||
|
||||
DEBUG_LOG(m_logger) << "maxCharge = " << maxCharge;
|
||||
DEBUG_LOG() << "maxCharge = " << maxCharge;
|
||||
|
||||
ParticipantGearRestockCharge* pgrc = new ParticipantGearRestockCharge(m_ui->scrollArea, showAllOptions);
|
||||
pgrc->init(chargeTypeId, m_pdmDtc->trChargeTypeShortName(chargeTypeId, true), m_pdmDtc->factoryDefault(m_gearTypeId, chargeTypeId), maxCharge);
|
||||
|
||||
-1
@@ -69,7 +69,6 @@ private:
|
||||
DialogMode m_dialogMode{DM_SetRestockDefaults};
|
||||
|
||||
Ui::ParticipantGearRestock *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -14,7 +14,6 @@ ParticipantHistoryDialog::ParticipantHistoryDialog(QWidget *parent)
|
||||
, m_proxyModel(new ParticipantHistorySortModel(this))
|
||||
, m_dtc(nullptr)
|
||||
, m_ui(new Ui::ParticipantHistoryDialog)
|
||||
, m_logger(getLogger("ParticipantHistoryDialog"))
|
||||
{
|
||||
m_proxyModel->setSourceModel(m_model);
|
||||
m_ui->setupUi(this);
|
||||
|
||||
-1
@@ -45,6 +45,5 @@ private:
|
||||
std::shared_ptr<Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
|
||||
Ui::ParticipantHistoryDialog *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
-1
@@ -30,7 +30,6 @@ ParticipantHistoryDialogModel::ParticipantHistoryDialogModel(QObject *parent)
|
||||
, m_vulnerabilityClass(ProjectDataManagement::VulnerabilityClass::SoldierInjuries)
|
||||
, m_dtc(nullptr)
|
||||
, m_pdmDtc(nullptr)
|
||||
, m_logger(getLogger("ParticipantHistoryDialogModel"))
|
||||
{}
|
||||
|
||||
bool ParticipantHistoryDialogModel::initModel(int dds_id,
|
||||
|
||||
-3
@@ -52,9 +52,6 @@ private:
|
||||
std::shared_ptr<Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
friend class ParticipantHistorySortModel;
|
||||
};
|
||||
|
||||
|
||||
+3
-4
@@ -22,7 +22,6 @@ HitLineInfoDialog::HitLineInfoDialog(int hitLineId, QWidget *parent)
|
||||
, m_pdmDtc(nullptr)
|
||||
, m_sitMapGuiIfc(nullptr)
|
||||
, m_ui(new Ui::HitLineInfoDialog)
|
||||
, m_logger(getLogger("ParticipantHitLineInfoDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -70,7 +69,7 @@ bool HitLineInfoDialog::init(const std::shared_ptr<ParticipantManagement::Interf
|
||||
{
|
||||
if (data.id() == m_hitLineId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Found HitLine Id: " << data.id();
|
||||
DEBUG_LOG() << "Found HitLine Id: " << data.id();
|
||||
m_hitLineInfo = data;
|
||||
|
||||
|
||||
@@ -82,14 +81,14 @@ bool HitLineInfoDialog::init(const std::shared_ptr<ParticipantManagement::Interf
|
||||
});
|
||||
|
||||
if (!m_isInitialized)
|
||||
WARNING_LOG(m_logger) << "Non HitLineInfo data found for id: " << m_hitLineId;
|
||||
WARNING_LOG() << "Non HitLineInfo data found for id: " << m_hitLineId;
|
||||
return m_isInitialized;
|
||||
}
|
||||
|
||||
|
||||
void HitLineInfoDialog::showHitLineInfos()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id:" << m_hitLineId;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id:" << m_hitLineId;
|
||||
|
||||
if (m_participantOriginator.id() <= 0 || m_participantInjury.id() <= 0)
|
||||
return;
|
||||
|
||||
-1
@@ -63,6 +63,5 @@ private:
|
||||
std::shared_ptr<SituationMap::ForeignGuiInterface> m_sitMapGuiIfc;
|
||||
|
||||
Ui::HitLineInfoDialog *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+32
-33
@@ -60,7 +60,6 @@ ParticipantInfoDialog::ParticipantInfoDialog(int participantId, const QString &m
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ParticipantInfoDialog)
|
||||
, m_isTarget(false)
|
||||
, m_logger(getLogger("ParticipantInfoDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_oldSpacerSize.first = m_ui->vsBottom->maximumSize().width();
|
||||
@@ -145,7 +144,7 @@ bool ParticipantInfoDialog::init(LtsSession::LtsSession *session,
|
||||
const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asbInterface,
|
||||
const std::shared_ptr<ForeignParticipantInfoGuiInterface> &ppmGuiIfc)
|
||||
{
|
||||
DEBUG_LOG(m_logger)<< "ParticipantInfoDialog::init";
|
||||
DEBUG_LOG()<< "ParticipantInfoDialog::init";
|
||||
m_session = session;
|
||||
m_dtc = dtc;
|
||||
m_ftc = ftc;
|
||||
@@ -188,7 +187,7 @@ bool ParticipantInfoDialog::init(LtsSession::LtsSession *session,
|
||||
|
||||
});
|
||||
|
||||
DEBUG_LOG(m_logger)<< "Vor setUiValues";
|
||||
DEBUG_LOG()<< "Vor setUiValues";
|
||||
return setUiValues();
|
||||
}
|
||||
|
||||
@@ -198,7 +197,7 @@ bool ParticipantInfoDialog::setUiValues()
|
||||
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "------------------setUiValues-----------------";
|
||||
DEBUG_LOG() << "------------------setUiValues-----------------";
|
||||
|
||||
if (!m_dtc || !m_ftc || m_participant.id() < 0)
|
||||
return false;
|
||||
@@ -225,7 +224,7 @@ bool ParticipantInfoDialog::setUiValues()
|
||||
|
||||
|
||||
const bool isUas = m_dtc->isTypeUas(participantData.typeId());
|
||||
DEBUG_LOG(m_logger) << "------------------UAS-----------------"
|
||||
DEBUG_LOG() << "------------------UAS-----------------"
|
||||
<< " isTypeUas" << isUas
|
||||
<< " participantId=" <<participantData.id()
|
||||
<< " typeId=" << participantData.typeId();
|
||||
@@ -349,7 +348,7 @@ bool ParticipantInfoDialog::setUiValues()
|
||||
}
|
||||
case TypeClass::Vessel:
|
||||
case TypeClass::Unknown:
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << m_typeClass;
|
||||
ERROR_LOG() << Q_FUNC_INFO << m_typeClass;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -461,7 +460,7 @@ bool ParticipantInfoDialog::setUiValues()
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Unit"));
|
||||
break;
|
||||
case TypeClass::Unknown:
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << m_typeClass;
|
||||
ERROR_LOG() << Q_FUNC_INFO << m_typeClass;
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -521,7 +520,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
youngestState.stateTime(0);
|
||||
for (const StateInformation &si : history)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "StateInformation "
|
||||
DEBUG_LOG() << "StateInformation "
|
||||
<< " time=" << si.stateTime()
|
||||
<< " vulnerabilityBits=" << si.vulnerabilityBits()
|
||||
<< " vulnerabilityKindId=" << si.vulnerabilityKindId();
|
||||
@@ -534,7 +533,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
|
||||
m_ui->lblStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc));
|
||||
|
||||
DEBUG_LOG(m_logger)<<" >>> last state: "<<lastState.vitality() << "last kind: " <<lastState.vulnerabilityKindId();
|
||||
DEBUG_LOG()<<" >>> last state: "<<lastState.vitality() << "last kind: " <<lastState.vulnerabilityKindId();
|
||||
m_ui->lblVitality->setText(QString::number(lastState.vitality()) + QStringLiteral("%"));
|
||||
|
||||
|
||||
@@ -542,7 +541,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
const int BCONTAMINATION = 0x8000;
|
||||
const int CCONTAMINATION = 0x10000;
|
||||
QStringList contaminationList;
|
||||
DEBUG_LOG(m_logger) << "Set Contamination"
|
||||
DEBUG_LOG() << "Set Contamination"
|
||||
<< " time=" << youngestState.stateTime()
|
||||
<< " vulnerabilityKindId=" << youngestState.vulnerabilityKindId()
|
||||
<< " vulnerabilityBits=" << youngestState.vulnerabilityBits()
|
||||
@@ -550,7 +549,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
|
||||
if ( youngestState.vulnerabilityBits() & NCONTAMINATION)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "append N";
|
||||
DEBUG_LOG() << "append N";
|
||||
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(14));
|
||||
QString fullName = ProjectDataManagement::toString(vs);
|
||||
@@ -561,7 +560,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
}
|
||||
if ( youngestState.vulnerabilityBits() & BCONTAMINATION)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "append B";
|
||||
DEBUG_LOG() << "append B";
|
||||
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(15));
|
||||
QString fullName = ProjectDataManagement::toString(vs);
|
||||
@@ -572,7 +571,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
}
|
||||
if ( youngestState.vulnerabilityBits() & CCONTAMINATION)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "append C";
|
||||
DEBUG_LOG() << "append C";
|
||||
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(16));
|
||||
QString fullName = ProjectDataManagement::toString(vs);
|
||||
@@ -616,7 +615,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
m_ui->lbContamination->setHidden(contaminationListIsEmpty);
|
||||
m_ui->lblContamination->setHidden(contaminationListIsEmpty);
|
||||
|
||||
DEBUG_LOG(m_logger)<< "setBackgroundColor ="<< data.manipulation().size();
|
||||
DEBUG_LOG()<< "setBackgroundColor ="<< data.manipulation().size();
|
||||
setBackgroundColor(m_ui->lblEquipNr, Qt::red, data.manipulation().size());
|
||||
|
||||
|
||||
@@ -792,11 +791,11 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
{
|
||||
m_ui->twGear->hide();
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "### m_sanMatStock: " << m_sanMatStock.size();
|
||||
DEBUG_LOG() << "### m_sanMatStock: " << m_sanMatStock.size();
|
||||
|
||||
DEBUG_LOG(m_logger) << "### data.sanitationMaterialStock(): " << data.sanitationMaterialStock().size();
|
||||
DEBUG_LOG(m_logger) << "### data.participantId(): " << data.participantId();
|
||||
DEBUG_LOG(m_logger) << "### data.sampleTime(): " << data.sampleTime();
|
||||
DEBUG_LOG() << "### data.sanitationMaterialStock(): " << data.sanitationMaterialStock().size();
|
||||
DEBUG_LOG() << "### data.participantId(): " << data.participantId();
|
||||
DEBUG_LOG() << "### data.sampleTime(): " << data.sampleTime();
|
||||
|
||||
|
||||
if (data.sanitationMaterialStock().size() == 0)
|
||||
@@ -807,8 +806,8 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
}
|
||||
else if (data.sanitationMaterialStock() != m_sanMatStock)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "### data.qualification(): " << data.qualification();
|
||||
DEBUG_LOG(m_logger) << "### data.sanitationUniqueId(): " << data.sanitationUniqueId();
|
||||
DEBUG_LOG() << "### data.qualification(): " << data.qualification();
|
||||
DEBUG_LOG() << "### data.sanitationUniqueId(): " << data.sanitationUniqueId();
|
||||
|
||||
m_ui->gbSanitation->show();
|
||||
m_ui->lblSanAssignState->setText(ParticipantManagement::toString(data.qualification().underlying()));
|
||||
@@ -1009,7 +1008,7 @@ void ParticipantInfoDialog::onPositionChanged(const ParticipantPosition &positio
|
||||
isOpsBuildingSource = true;
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "reportingSource = OpsBuilding true" ;
|
||||
DEBUG_LOG() << "reportingSource = OpsBuilding true" ;
|
||||
setBackgroundColor(m_ui->lblPositionData, Qt::lightGray, isOpsBuildingSource );
|
||||
|
||||
onUpdatePosition(position.participantId(), position.pos(), position.sampleTime());
|
||||
@@ -1215,7 +1214,7 @@ void ParticipantInfoDialog::setSanitationLabelColor(SanitationResult proceduresD
|
||||
case SanitationResult::deprecatedNA:
|
||||
break;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Set Color to: " << proceduresDone.underlying();
|
||||
DEBUG_LOG() << "Set Color to: " << proceduresDone.underlying();
|
||||
m_ui->lblKind->setPalette(pal);
|
||||
m_ui->lblKind->setAutoFillBackground(true);
|
||||
m_ui->lblKind->setToolTip(toolTip);
|
||||
@@ -1407,7 +1406,7 @@ void ParticipantInfoDialog::onPartitionTimeChanged(qint64 newPartitionTime)
|
||||
{
|
||||
if (LtsUtils::isPositionTimeOutdated(newPartitionTime, m_lastPositionMSec) )
|
||||
{
|
||||
DEBUG_LOG(m_logger)<< "setBackgroundColor ="<< LtsUtils::isPositionTimeOutdated(newPartitionTime, m_lastPositionMSec);
|
||||
DEBUG_LOG()<< "setBackgroundColor ="<< LtsUtils::isPositionTimeOutdated(newPartitionTime, m_lastPositionMSec);
|
||||
setBackgroundColor(m_ui->lblPositionData, Qt::red, true);
|
||||
}
|
||||
qint64 lastPosSec = (newPartitionTime - m_lastPositionMSec) / 1000;
|
||||
@@ -1503,7 +1502,7 @@ void ParticipantInfoDialog::onTargetConfig()
|
||||
{
|
||||
if (!m_tgtFtc)
|
||||
return;
|
||||
INFO_LOG(m_logger) << "onTargetConfig send TargetConfigRequest";
|
||||
INFO_LOG() << "onTargetConfig send TargetConfigRequest";
|
||||
|
||||
TargetManagement::ConfigureTargetRequest request;
|
||||
|
||||
@@ -1522,7 +1521,7 @@ void ParticipantInfoDialog::onTargetConfigChanged(const TargetManagement::Target
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
INFO_LOG(m_logger) << "onTargetConfigChanged participantId = " << m_participant.id()
|
||||
INFO_LOG() << "onTargetConfigChanged participantId = " << m_participant.id()
|
||||
<< " data.participantId = " << data.participantId();
|
||||
if (data.participantId() != m_participant.id())
|
||||
return;
|
||||
@@ -1539,7 +1538,7 @@ void ParticipantInfoDialog::onTargetModeChangeed()
|
||||
{
|
||||
if (!m_tgtFtc)
|
||||
return;
|
||||
INFO_LOG(m_logger) << "onTargetModeChangeed";
|
||||
INFO_LOG() << "onTargetModeChangeed";
|
||||
TargetManagement::ConfigureTargetRequest request;
|
||||
|
||||
request.id(0);
|
||||
@@ -1547,7 +1546,7 @@ void ParticipantInfoDialog::onTargetModeChangeed()
|
||||
request.tgtCommand(TargetManagement::TgtCommand_def::SetMode);
|
||||
int modeInt = m_ui->cbTargetMode->currentData().toInt();
|
||||
TargetManagement::Mode mode = static_cast <TargetManagement::Mode_def::type>(modeInt);
|
||||
INFO_LOG(m_logger) << "onTargetModeChangeed=" << mode;
|
||||
INFO_LOG() << "onTargetModeChangeed=" << mode;
|
||||
request.mode(mode);
|
||||
|
||||
auto cb = [request, this]()
|
||||
@@ -1567,7 +1566,7 @@ void ParticipantInfoDialog::onTargetWeaponChanged()
|
||||
request.participantId(m_participant.id());
|
||||
request.tgtCommand(TargetManagement::TgtCommand_def::SetWeapon);
|
||||
request.weapon(m_ui->cbTargetWeapon->currentData().toInt());
|
||||
INFO_LOG(m_logger) << "onTargetWeaponChangeed = " << request.weapon();
|
||||
INFO_LOG() << "onTargetWeaponChangeed = " << request.weapon();
|
||||
|
||||
auto cb = [request, this]()
|
||||
{
|
||||
@@ -1595,8 +1594,8 @@ void ParticipantInfoDialog::onContextMenuRequested(const QPoint &position)
|
||||
|
||||
GearInformation &gear = m_gearList[pointedItem->row()];
|
||||
|
||||
DEBUG_LOG(m_logger) << "gear type selected = " << gear.gearTypeId();
|
||||
DEBUG_LOG(m_logger) << "gear Id = " << gear.gearId();
|
||||
DEBUG_LOG() << "gear type selected = " << gear.gearTypeId();
|
||||
DEBUG_LOG() << "gear Id = " << gear.gearId();
|
||||
|
||||
QList<QAction*> actions;
|
||||
|
||||
@@ -1678,16 +1677,16 @@ void ParticipantInfoDialog::onUnlockUAS()
|
||||
{
|
||||
UAS uas = m_dtc->getUasByParticipantId(m_participant.id(), m_session->exerciseId());
|
||||
m_uasId = uas.id();
|
||||
DEBUG_LOG(m_logger)<<" -- onUnlockUAS uasId: "<< uas.id() <<" /// participantId: "<<uas.participantId()<<" /// equipmentNumber: "<<m_participant.equipmentNumber();
|
||||
DEBUG_LOG()<<" -- onUnlockUAS uasId: "<< uas.id() <<" /// participantId: "<<uas.participantId()<<" /// equipmentNumber: "<<m_participant.equipmentNumber();
|
||||
|
||||
if (uas.id() <= 0 )
|
||||
{
|
||||
ERROR_LOG(m_logger)<<" -- onUnlockUAS invalid uasId: "<<uas.id()<<" !!!";
|
||||
ERROR_LOG()<<" -- onUnlockUAS invalid uasId: "<<uas.id()<<" !!!";
|
||||
return;
|
||||
}
|
||||
if (!m_participant.equipmentNumber().is_set())
|
||||
{
|
||||
ERROR_LOG(m_logger)<<" -- onUnlockUAS invalid EquipmentNumber for UAS: "<<uas.id()<<" !!!";
|
||||
ERROR_LOG()<<" -- onUnlockUAS invalid EquipmentNumber for UAS: "<<uas.id()<<" !!!";
|
||||
return;
|
||||
}
|
||||
ModifyUasStateRequest req;
|
||||
|
||||
-1
@@ -179,6 +179,5 @@ private:
|
||||
bool m_isTarget;
|
||||
bool m_showPvSan{false};
|
||||
bool m_showVulnerabilityKindProject{false};
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+5
-6
@@ -13,15 +13,14 @@ namespace ParticipantManagement
|
||||
|
||||
ParticipantInfoLtdGearComponent::ParticipantInfoLtdGearComponent(QTableWidget *tableWidget)
|
||||
: m_tableWidget(tableWidget)
|
||||
, m_logger(getLogger("ParticipantInfoGearLtsComponent"))
|
||||
{
|
||||
if (!m_tableWidget)
|
||||
ERROR_LOG(m_logger) << "Got invalid table widget.";
|
||||
ERROR_LOG() << "Got invalid table widget.";
|
||||
}
|
||||
|
||||
void ParticipantInfoLtdGearComponent::updateData(const std::vector<LaserDesignation> &newData)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION;
|
||||
TRACE_LOG() << Q_FUNC_INFO;
|
||||
|
||||
if (!m_tableWidget)
|
||||
return;
|
||||
@@ -37,7 +36,7 @@ void ParticipantInfoLtdGearComponent::updateData(const std::vector<LaserDesignat
|
||||
|
||||
void ParticipantInfoLtdGearComponent::addGear(int gearId, int row)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION;
|
||||
TRACE_LOG() << Q_FUNC_INFO;
|
||||
|
||||
if (!m_tableWidget)
|
||||
return;
|
||||
@@ -61,7 +60,7 @@ void ParticipantInfoLtdGearComponent::clear()
|
||||
|
||||
void ParticipantInfoLtdGearComponent::updateRow(const LaserDesignation &laserDesignation)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << ": " << laserDesignation;
|
||||
TRACE_LOG() << Q_FUNC_INFO << ": " << laserDesignation;
|
||||
|
||||
if (!m_rowPerGearId.contains(laserDesignation.gearId()) || !m_rowPerGearId.value(laserDesignation.gearId()).isValid())
|
||||
return;
|
||||
@@ -72,7 +71,7 @@ void ParticipantInfoLtdGearComponent::updateRow(const LaserDesignation &laserDes
|
||||
|
||||
void ParticipantInfoLtdGearComponent::removeOutdatedData(const std::vector<LaserDesignation> &newData)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION;
|
||||
TRACE_LOG() << Q_FUNC_INFO;
|
||||
|
||||
if (!m_tableWidget)
|
||||
return;
|
||||
|
||||
-2
@@ -52,7 +52,5 @@ private:
|
||||
|
||||
QTableWidget *m_tableWidget;
|
||||
QMap<int, LtdRow> m_rowPerGearId;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+5
-6
@@ -18,7 +18,6 @@ ParticipantInfoTableDialog::ParticipantInfoTableDialog(const QString &menuGroup,
|
||||
, m_dtc(nullptr)
|
||||
, m_ppmGuiIfc(nullptr)
|
||||
, m_ui(new Ui::ParticipantInfoTableDialog)
|
||||
, m_logger(getLogger("ParticipantInfoTableDialog"))
|
||||
, m_infoTableModel(nullptr)
|
||||
, m_sortFilterProxyModel(nullptr)
|
||||
, m_visibleColumns()
|
||||
@@ -53,7 +52,7 @@ void ParticipantInfoTableDialog::retranslate()
|
||||
bool ParticipantInfoTableDialog::init(LtsSession::LtsSession *session,
|
||||
const std::shared_ptr<Interface::Dtc> &dtc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** init";
|
||||
DEBUG_LOG() << "**** init";
|
||||
|
||||
m_session = session;
|
||||
m_dtc = dtc;
|
||||
@@ -105,7 +104,7 @@ void ParticipantInfoTableDialog::onColumnContextMenu(const QPoint &position)
|
||||
|
||||
void ParticipantInfoTableDialog::onAddClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** onAddClicked() ";
|
||||
DEBUG_LOG() << "**** onAddClicked() ";
|
||||
InfoTableAddDialog *addParticipantsDialog = new InfoTableAddDialog(this);
|
||||
addParticipantsDialog->init(m_session, m_dtc);
|
||||
|
||||
@@ -119,7 +118,7 @@ void ParticipantInfoTableDialog::onAddClicked()
|
||||
|
||||
void ParticipantInfoTableDialog::onRemoveClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** onRemoveClicked() ";
|
||||
DEBUG_LOG() << "**** onRemoveClicked() ";
|
||||
const QModelIndexList selectedRows = m_ui->tvParticipant->selectionModel()->selectedRows();
|
||||
|
||||
if (!selectedRows.count())
|
||||
@@ -139,7 +138,7 @@ void ParticipantInfoTableDialog::onRemoveClicked()
|
||||
void ParticipantInfoTableDialog::onSelectionChanged(const QItemSelection &selected,
|
||||
const QItemSelection &deselected)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onSelectionChanged";
|
||||
DEBUG_LOG() << "onSelectionChanged";
|
||||
Q_UNUSED(selected);
|
||||
Q_UNUSED(deselected);
|
||||
|
||||
@@ -149,7 +148,7 @@ void ParticipantInfoTableDialog::onSelectionChanged(const QItemSelection &select
|
||||
|
||||
void ParticipantInfoTableDialog::onShowTlnInfo(const QModelIndex &idx)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onDoubleClick --> showTlnInfo";
|
||||
DEBUG_LOG() << "onDoubleClick --> showTlnInfo";
|
||||
QModelIndex realIdx = m_sortFilterProxyModel->mapToSource(idx);
|
||||
|
||||
const int id = m_infoTableModel->getRowData(realIdx.row()).id();
|
||||
|
||||
+2
-3
@@ -28,7 +28,6 @@ ParticipantInfoTableModel::ParticipantInfoTableModel(QObject *parent)
|
||||
, m_partitionTime(0)
|
||||
, m_timeoutCheckTimer(new QTimer(this))
|
||||
, m_bWithPositionandBiteResult(true)
|
||||
, m_logger(getLogger("ParticipantInfoTableModel"))
|
||||
{
|
||||
m_timeoutCheckTimer->setSingleShot(false);
|
||||
connect(m_timeoutCheckTimer, &QTimer::timeout,
|
||||
@@ -43,7 +42,7 @@ bool ParticipantInfoTableModel::initModel(LtsSession::LtsSession *session,
|
||||
const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
|
||||
bool bWithPositionandBiteResult)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** initModel";
|
||||
DEBUG_LOG() << "**** initModel";
|
||||
|
||||
m_session = session;
|
||||
m_ppmDtc = ppmDtc;
|
||||
@@ -211,7 +210,7 @@ void ParticipantInfoTableModel::updateDataView(const QSet<int> &participantIds)
|
||||
void ParticipantInfoTableModel::onParticipantChanged(const ParticipantManagement::DynamicParticipantData &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** participantDataChanged";
|
||||
DEBUG_LOG() << "**** participantDataChanged";
|
||||
|
||||
const int row = findRowForId(data.participantId());
|
||||
if (row < 0)
|
||||
|
||||
-1
@@ -92,7 +92,6 @@ private:
|
||||
QTimer *m_timeoutCheckTimer;
|
||||
QHash<int, QIcon> m_partyIcons;
|
||||
bool m_bWithPositionandBiteResult;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -19,7 +19,6 @@ ParticipantSearchDialog::ParticipantSearchDialog(QWidget *parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ppmCbxIfc(nullptr)
|
||||
, m_ui(new Ui::ParticipantSearchDialog)
|
||||
, m_logger(getLogger("ParticipantSearchDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->leEquipNo->setValidator(new QIntValidator(0, 100000, m_ui->leEquipNo));
|
||||
|
||||
-1
@@ -89,6 +89,5 @@ private:
|
||||
static int s_preselectedParty;
|
||||
static bool s_preselectedAllParticipants;
|
||||
Ui::ParticipantSearchDialog *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+7
-8
@@ -27,7 +27,6 @@ ParticipantSetInjuryDialog::ParticipantSetInjuryDialog(int participantId, QWidge
|
||||
, m_bgBodypart(nullptr)
|
||||
, m_bgSide(nullptr)
|
||||
, m_ui(new Ui::ParticipantSetInjuryDialog)
|
||||
, m_logger(getLogger("ParticipantSetInjuryDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
@@ -176,7 +175,7 @@ void ParticipantSetInjuryDialog::setOldData(const DynamicParticipantData &data)
|
||||
|
||||
int index = m_ui->cbState->findData(lastState.vulnerabilityState().underlying());
|
||||
|
||||
DEBUG_LOG(m_logger) << "Old vulnerability state = " << index;
|
||||
DEBUG_LOG() << "Old vulnerability state = " << index;
|
||||
|
||||
if (index > 0)
|
||||
m_ui->cbState->setCurrentIndex(index);
|
||||
@@ -189,10 +188,10 @@ uint32_t ParticipantSetInjuryDialog::getInjuryBit()
|
||||
|
||||
int side = m_bgSide->button(1)->isEnabled() ? m_bgSide->checkedId() : 0;
|
||||
|
||||
DEBUG_LOG(m_logger) << "getInjuryBit() -------------- ";
|
||||
DEBUG_LOG(m_logger) << "Injury = " << m_bgInjury->checkedId();
|
||||
DEBUG_LOG(m_logger) << "Body = " << m_bgBodypart->checkedId();
|
||||
DEBUG_LOG(m_logger) << "Side = " << side;
|
||||
DEBUG_LOG() << "getInjuryBit() -------------- ";
|
||||
DEBUG_LOG() << "Injury = " << m_bgInjury->checkedId();
|
||||
DEBUG_LOG() << "Body = " << m_bgBodypart->checkedId();
|
||||
DEBUG_LOG() << "Side = " << side;
|
||||
|
||||
return (((((m_bgInjury->checkedId() * 16) + m_bgBodypart->checkedId()) * 4) + side) + 2048);
|
||||
|
||||
@@ -329,8 +328,8 @@ bool ParticipantSetInjuryDialog::apply()
|
||||
req.participantIds({m_participantId});
|
||||
req.vulnerabilityKind(getInjuryBit());
|
||||
|
||||
DEBUG_LOG(m_logger) << "Saving vulnerability state = " << req.vulnerabilityState();
|
||||
DEBUG_LOG(m_logger) << "Saving vulnerability kind = " << req.vulnerabilityKind();
|
||||
DEBUG_LOG() << "Saving vulnerability state = " << req.vulnerabilityState();
|
||||
DEBUG_LOG() << "Saving vulnerability kind = " << req.vulnerabilityKind();
|
||||
|
||||
return m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
|
||||
-3
@@ -114,8 +114,5 @@ private:
|
||||
QMap<int, ProjectDataManagement::SanitationInjuryKind> m_injuryKind;
|
||||
QMap<int, ProjectDataManagement::SanitationInjuryPlace1> m_injuryPlace1;
|
||||
QMap<int, ProjectDataManagement::SanitationInjuryPlace2> m_injuryPlace2;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -18,7 +18,6 @@ ParticipantSetSanitationDialog::ParticipantSetSanitationDialog(int participantId
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_participantId(participantId)
|
||||
, m_ui(new Ui::ParticipantSetSanitationDialog)
|
||||
, m_logger(getLogger("ParticipantSetSanitationDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_uiRequirements->addRequirement({ m_ui->lbl, [this]()
|
||||
@@ -198,8 +197,8 @@ bool ParticipantSetSanitationDialog::apply()
|
||||
sanDat.originatorEquipmentNumber(0);
|
||||
req.data(sanDat);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Medic treatment: qualification = " << sanDat.qualification();
|
||||
DEBUG_LOG(m_logger) << "Medic treatment: procedures = " << sanDat.sanitationProceduresTaken();
|
||||
DEBUG_LOG() << "Medic treatment: qualification = " << sanDat.qualification();
|
||||
DEBUG_LOG() << "Medic treatment: procedures = " << sanDat.sanitationProceduresTaken();
|
||||
|
||||
return m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
|
||||
-1
@@ -65,7 +65,6 @@ private:
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
|
||||
QList<QCheckBox *> m_procedures;
|
||||
Ui::ParticipantSetSanitationDialog *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
-3
@@ -27,14 +27,13 @@ AreaModel::AreaModel(QObject *parent)
|
||||
tr("Coords")
|
||||
},
|
||||
parent)
|
||||
, m_logger(getLogger("AreaModel"))
|
||||
{}
|
||||
|
||||
|
||||
bool AreaModel::initModel(const TargetInformation &targetInformation)
|
||||
{
|
||||
|
||||
INFO_LOG(m_logger) << "initModel - #AreaModel: " << targetInformation.shootbackAreas().size();
|
||||
INFO_LOG() << "initModel - #AreaModel: " << targetInformation.shootbackAreas().size();
|
||||
|
||||
for (auto singleArea : std::as_const(targetInformation.shootbackAreas()))
|
||||
onShootbackAreaChanged(singleArea, DataModification::eAdded);
|
||||
@@ -80,7 +79,7 @@ QVariant AreaModel::headerData(int section, Qt::Orientation orientation, int rol
|
||||
|
||||
QVariant AreaModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " role=" << role
|
||||
INFO_LOG() << Q_FUNC_INFO << " role=" << role
|
||||
<< " index = " << index.column();
|
||||
|
||||
if (!indexIsValid(index))
|
||||
|
||||
+47
-49
@@ -35,18 +35,17 @@ ParticipantTargetConfigurationDialog::ParticipantTargetConfigurationDialog(QWidg
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ParticipantTargetConfigurationDialog)
|
||||
, m_logger(getLogger("ParticipantTargetConfigurationDialog"))
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
m_ui->setupUi(this);
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
ParticipantTargetConfigurationDialog::~ParticipantTargetConfigurationDialog()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
delete m_ui;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void ParticipantTargetConfigurationDialog::retranslate()
|
||||
@@ -59,14 +58,14 @@ void ParticipantTargetConfigurationDialog::retranslate()
|
||||
|
||||
bool ParticipantTargetConfigurationDialog::apply()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
ModifyTargetInformationRequest req;
|
||||
req.targetInfo(m_targetInformation);
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " update m_targetInformation: " << m_targetInformation;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " update m_targetInformation: " << m_targetInformation;
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
return m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
return m_ftc->modifyTargetInformationRequest(req, this);
|
||||
@@ -78,11 +77,11 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
|
||||
const std::shared_ptr<Interface::Ftc> &ftc,
|
||||
const std::shared_ptr<SituationMap::ForeignGuiInterface> &sitMapGuiIfc)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
m_participantId = participantId;
|
||||
if (m_participantId <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " participant invalid, participantId = " << m_participantId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " participant invalid, participantId = " << m_participantId;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -157,7 +156,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
|
||||
{
|
||||
onTargetInformationChanged(m_targetInformation, DataModification::eAdded);
|
||||
} else {
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " targetInformation not found for participantId = " << m_participantId
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " targetInformation not found for participantId = " << m_participantId
|
||||
<< " - use default.";
|
||||
m_targetInformation.participantId(m_participantId);
|
||||
}
|
||||
@@ -168,7 +167,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
|
||||
|
||||
m_ui->cb_showOnMap->setChecked(true);
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -191,8 +190,8 @@ void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const
|
||||
const ProjectDataManagement::VulnerabilityState_def::type vulStateType = vulState.underlying();
|
||||
|
||||
int idx = m_ui->cb_status->findData(vulStateType);
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " cb_status: vulState=" << vulState;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " cb_status: setCurrentIndex idx=" << idx;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " cb_status: vulState=" << vulState;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " cb_status: setCurrentIndex idx=" << idx;
|
||||
m_ui->cb_status->setCurrentIndex(idx);
|
||||
m_ui->cb_status->setEnabled(true);
|
||||
}
|
||||
@@ -214,7 +213,7 @@ void ParticipantTargetConfigurationDialog::onTargetInformationChanged(const Targ
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " got new targetInformation from dds: " << data;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " got new targetInformation from dds: " << data;
|
||||
m_targetInformation = data;
|
||||
}
|
||||
break;
|
||||
@@ -225,7 +224,7 @@ void ParticipantTargetConfigurationDialog::onTargetInformationChanged(const Targ
|
||||
|
||||
void ParticipantTargetConfigurationDialog::onStatusChanged()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
m_ui->cb_status->setEnabled(false);
|
||||
|
||||
@@ -294,7 +293,7 @@ void ParticipantTargetConfigurationDialog::onStatusChanged()
|
||||
|
||||
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
@@ -401,7 +400,7 @@ bool updateValue(ProjectDataManagement::VulnerabilityState& oldValueRef, Project
|
||||
|
||||
void ParticipantTargetConfigurationDialog::onGuiChanged()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
|
||||
bool hasChanged = false;
|
||||
@@ -418,26 +417,26 @@ void ParticipantTargetConfigurationDialog::onGuiChanged()
|
||||
hasChanged |= updateValue(m_targetInformation.takedownEffect(), static_cast<ProjectDataManagement::VulnerabilityState_def::type>(m_ui->cb_takeDownEffect->currentData().toInt()) );
|
||||
hasChanged |= updateValue(m_targetInformation.takedownInterval(), m_ui->sb_takeDownInterval->value());
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " hasChanged=" << hasChanged;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " hasChanged=" << hasChanged;
|
||||
|
||||
|
||||
const std::vector<ParticipantManagement::ShootbackArea> &modelAreasStdVec = m_areaModel.getDataStdVector();
|
||||
if (modelAreasStdVec != m_targetInformation.shootbackAreas())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " hasChanged=" << hasChanged;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " hasChanged=" << hasChanged;
|
||||
hasChanged = true;
|
||||
m_targetInformation.shootbackAreas(modelAreasStdVec);
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " slotChangesMade sChanged=" << hasChanged;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " slotChangesMade sChanged=" << hasChanged;
|
||||
this->slotChangesMade();
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void ParticipantTargetConfigurationDialog::onDataChanged()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, m_targetInformation=" << m_targetInformation;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, m_targetInformation=" << m_targetInformation;
|
||||
|
||||
int idx;
|
||||
|
||||
@@ -462,12 +461,12 @@ void ParticipantTargetConfigurationDialog::onDataChanged()
|
||||
QVector<ShootbackArea> qVec = QVector<ShootbackArea>(areas.begin(), areas.end());
|
||||
m_areaModel.setData(qVec);
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void ParticipantTargetConfigurationDialog::onAddBtnClicked()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
if (!m_sitMapGuiIfc)
|
||||
return;
|
||||
|
||||
@@ -478,7 +477,7 @@ void ParticipantTargetConfigurationDialog::onAddBtnClicked()
|
||||
s_minPoints,
|
||||
s_maxPoints);
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
QPolygonF areaToPolygon(const ShootbackArea &area)
|
||||
@@ -507,14 +506,14 @@ QPolygonF areaToPolygon(const ShootbackArea &area)
|
||||
|
||||
void ParticipantTargetConfigurationDialog::onEditBtnClicked()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
if (!m_sitMapGuiIfc)
|
||||
return;
|
||||
|
||||
const QModelIndex curIdx = m_ui->ltsDataView->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
INFO_LOG(m_logger) << " edit...";
|
||||
INFO_LOG() << " edit...";
|
||||
|
||||
const ShootbackArea &area = m_areaModel.getRowData(curIdx.row());
|
||||
|
||||
@@ -532,24 +531,24 @@ void ParticipantTargetConfigurationDialog::onEditBtnClicked()
|
||||
-1,
|
||||
coordinates);
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void ParticipantTargetConfigurationDialog::onRemoveBtnClicked()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
const QModelIndex curIdx = m_ui->ltsDataView->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
INFO_LOG(m_logger) << " remove...";
|
||||
INFO_LOG() << " remove...";
|
||||
|
||||
m_areaModel.removeRow(curIdx.row());
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void ParticipantTargetConfigurationDialog::onShowOnMapChanged(int)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
if (!m_sitMapGuiIfc)
|
||||
return;
|
||||
@@ -563,7 +562,7 @@ void ParticipantTargetConfigurationDialog::onShowOnMapChanged(int)
|
||||
for (int row = 0; row < rowCount; ++row)
|
||||
{
|
||||
const ShootbackArea ¤tArea = m_areaModel.getRowData(row);
|
||||
INFO_LOG(m_logger) << " row=" << row << " ; currentArea " << currentArea;
|
||||
INFO_LOG() << " row=" << row << " ; currentArea " << currentArea;
|
||||
const QPolygonF &poly = areaToPolygon(currentArea);
|
||||
polyVec.append(poly);
|
||||
}
|
||||
@@ -572,7 +571,7 @@ void ParticipantTargetConfigurationDialog::onShowOnMapChanged(int)
|
||||
} else {
|
||||
m_sitMapGuiIfc->removePreviewObject();
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void ParticipantTargetConfigurationDialog::onSelectionChanged()
|
||||
@@ -593,7 +592,7 @@ void ParticipantTargetConfigurationDialog::onSelectionChanged()
|
||||
int row = curIdx.row();
|
||||
|
||||
ShootbackArea currentArea = m_areaModel.getRowData(row);
|
||||
INFO_LOG(m_logger) << " currentArea "<< currentArea;
|
||||
INFO_LOG() << " currentArea "<< currentArea;
|
||||
m_previewPolygon = areaToPolygon(currentArea);
|
||||
|
||||
|
||||
@@ -603,11 +602,11 @@ void ParticipantTargetConfigurationDialog::onSelectionChanged()
|
||||
|
||||
void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
INFO_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
if (poly.size() < 3)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " polygon insufficiant, size=" << poly.size();
|
||||
ERROR_LOG() << Q_FUNC_INFO << " polygon insufficiant, size=" << poly.size();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -628,13 +627,13 @@ void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
|
||||
return;
|
||||
ShootbackArea temp = m_areaModel.getRowData(curIdx.row());
|
||||
newArea.identifier(temp.identifier());
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "updating newArea = " << newArea;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "updating newArea = " << newArea;
|
||||
m_areaModel.setRowData(curIdx.row(), newArea);
|
||||
} else {
|
||||
|
||||
int size = m_areaModel.rowCount();
|
||||
newArea.identifier(QString(QStringLiteral("Area_%1")).arg(size).toStdString());
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " adding tempArea = " << newArea;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " adding tempArea = " << newArea;
|
||||
m_areaModel.insertRow(newArea);
|
||||
|
||||
QModelIndex mi = m_areaModel.index(size, 0);
|
||||
@@ -650,11 +649,11 @@ void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
|
||||
|
||||
void ParticipantTargetConfigurationDialog::showPreviewObject()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
if (!m_sitMapGuiIfc || m_previewPolygon.isEmpty())
|
||||
return;
|
||||
m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true);
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
@@ -663,16 +662,15 @@ void ParticipantTargetConfigurationDialog::showPreviewObject()
|
||||
|
||||
EditNameDelegate::EditNameDelegate(QWidget *parent)
|
||||
: QItemDelegate(parent)
|
||||
, m_logger(getLogger("EditNameDelegate"))
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
QWidget *EditNameDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option,
|
||||
const QModelIndex &index) const
|
||||
{
|
||||
FATAL_LOG(m_logger) << LOGFUNCTION
|
||||
FATAL_LOG(m_logger) << Q_FUNC_INFO
|
||||
<< " rox/column: " << index.row() << "/" << index.column() ;
|
||||
|
||||
Q_UNUSED(option)
|
||||
@@ -685,7 +683,7 @@ QWidget *EditNameDelegate::createEditor(QWidget *parent, const QStyleOptionViewI
|
||||
|
||||
void EditNameDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
|
||||
{
|
||||
FATAL_LOG(m_logger) << LOGFUNCTION << " XXXXXXXXXXXXX";
|
||||
FATAL_LOG(m_logger) << Q_FUNC_INFO << " XXXXXXXXXXXXX";
|
||||
QLineEdit *le = qobject_cast<QLineEdit *>(editor);
|
||||
if (!le)
|
||||
return;
|
||||
@@ -693,7 +691,7 @@ void EditNameDelegate::setEditorData(QWidget *editor, const QModelIndex &index)
|
||||
QVariant v = index.data(Qt::EditRole);
|
||||
le->setText(v.toString());
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION
|
||||
DEBUG_LOG() << Q_FUNC_INFO
|
||||
<< " rox/column: " << index.row() << "/" << index.column()
|
||||
<< " Input: " << v.toString();
|
||||
}
|
||||
@@ -706,7 +704,7 @@ void EditNameDelegate::setModelData(QWidget *editor,
|
||||
if (!le)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION
|
||||
DEBUG_LOG() << Q_FUNC_INFO
|
||||
<< " rox/column: " << index.row() << "/" << index.column()
|
||||
<< " setData... Input: " << le->text();
|
||||
|
||||
|
||||
+1
-2
@@ -13,7 +13,6 @@ ParticipantsMountedTableDialog::ParticipantsMountedTableDialog(int32_t carrierId
|
||||
, m_ppmGuiIfc(nullptr)
|
||||
, m_mountedTableModel(nullptr)
|
||||
, m_ui(new Ui::ParticipantsMountedTableDialog)
|
||||
, m_logger(getLogger("ParticipantsMountedTableDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
@@ -46,7 +45,7 @@ void ParticipantsMountedTableDialog::onShowTlnInfo()
|
||||
if (!m_ppmGuiIfc)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "onDoubleClick --> showTlnInfo";
|
||||
DEBUG_LOG() << "onDoubleClick --> showTlnInfo";
|
||||
const QModelIndex idx = m_ui->tvMountedParticipants->currentIndex();
|
||||
const int id = m_mountedTableModel->getRowData(idx.row()).id();
|
||||
m_ppmGuiIfc->showParticipantInfoWindow(id);
|
||||
|
||||
Reference in new issue
Block a user