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

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp
+5 -5
View File
@@ -59,7 +59,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
avmFtc->enableModifyCnrConfig() &&
avmFtc->enableRemoveCnrConfig()))
{
ERROR_LOG() << "Could not enable topics";
ERROR_LOG(m_logger) << "Could not enable topics";
return false;
}
@@ -78,7 +78,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
{
m_filter.reset();
m_model.reset();
ERROR_LOG() << "Could not init model";
ERROR_LOG(m_logger) << "Could not init model";
return false;
}
@@ -191,14 +191,14 @@ void CombatNetRadioDialog::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void CombatNetRadioDialog::onImportButtonClicked()
{
DEBUG_LOG() << " onImportButtonClicked() ";
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMCombatNetRadio));
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h
+2
View File
@@ -79,6 +79,8 @@ private Q_SLOTS:
void onImportButtonClicked();
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void tableColumnOrganiserSetting() override;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
+4 -4
View File
@@ -40,7 +40,7 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
switch (index.column())
{
case CHANNEL:
INFO_LOG()<<"CombatNetRadioDialogModel::data role =" << role
INFO_LOG(m_logger)<<"CombatNetRadioDialogModel::data role =" << role
<< " row = " << index.row();
return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId()).name());
case RADIO_CIRCUIT:
@@ -61,14 +61,14 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
if (unit.id() != unitId)
return {};
INFO_LOG() << " config.unitId()=" << unitId
INFO_LOG(m_logger) << " config.unitId()=" << unitId
<< " Str=" << unit.name();
QString unitStr;
if (unit.designator().size() > 0)
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
unitStr.append(QString::fromStdString(unit.tacticalIdentifier()));
INFO_LOG() << "unitStr = " << unitStr;
INFO_LOG(m_logger) << "unitStr = " << unitStr;
return unitStr;
}
@@ -98,7 +98,7 @@ bool CombatNetRadioDialogModel::init(const std::shared_ptr<Interface::Dtc> &avmD
if (!ppmDtc->visibleParties(m_parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
{
ERROR_LOG() << "Could not retrieve visible Parties!";
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
return false;
}
m_units = ppmDtc->units();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h
+2
View File
@@ -41,6 +41,8 @@ public:
bool onlyGlobals();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<Interface::Dtc> m_avmDtc;
int32_t m_exerciseId;
QMap<int32_t, CnrChannel> m_cnrChannels;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
+8 -8
View File
@@ -173,7 +173,7 @@ bool EditCombatNetRadioDialog::apply()
if (m_ui->cbUnit->currentIndex() > 0)
{
request.unitId().set(m_ui->cbUnit->currentData().toInt());
INFO_LOG()<< "currentIndex="<<m_ui->cbUnit->currentIndex()
INFO_LOG(m_logger)<< "currentIndex="<<m_ui->cbUnit->currentIndex()
<< " unitId ="<<request.unitId().get();
}
@@ -189,7 +189,7 @@ void EditCombatNetRadioDialog::init(LtsSession::LtsSession *session)
QMap<qint32, ParticipantManagement::Party> parties;
if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
ERROR_LOG() << "Could not retrieve visible Parties!";
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
for (const ParticipantManagement::Party &party : std::as_const(parties))
m_ui->cbParty->addItem(ParticipantManagement::trPartyName(party.name()), party.id());
@@ -489,10 +489,10 @@ void EditCombatNetRadioDialog::onPartyIndexChanged(int index)
if (unit.designator().size() > 0)
{
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
INFO_LOG()<<"Designator != leer: unitStr = " << unitStr;
INFO_LOG(m_logger)<<"Designator != leer: unitStr = " << unitStr;
}
unitStr += QString::fromStdString(unit.tacticalIdentifier());
INFO_LOG() << "unitStr =" << unitStr
INFO_LOG(m_logger) << "unitStr =" << unitStr
<< " id =" << unit.id();
m_ui->cbUnit->addItem(unitStr, unit.id());
@@ -561,14 +561,14 @@ void EditCombatNetRadioDialog::onExportButtonClicked()
QByteArray byteArray = cnrConfigRequestToJson();
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_exerciseId, byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void EditCombatNetRadioDialog::onImportButtonClicked()
{
DEBUG_LOG() << " onImportButtonClicked() ";
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_exerciseId, FileManagement::toString(FileManagement::XmlType::AVMEditCombatNetRadio));
@@ -588,7 +588,7 @@ void EditCombatNetRadioDialog::onImportButtonClicked()
{
ModifyCnrConfigRequest req = jsonToModifyCnrConfig(content);
setUiValues(toConfig(req));
INFO_LOG() << "--- onImportButtonClicked() ";
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
}
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
+2
View File
@@ -69,6 +69,8 @@ public:
void onModifyCnrConfigReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
protected:
NGL::INGLLogger &m_logger;
bool apply() override;
private:
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h
+2
View File
@@ -57,6 +57,8 @@ private Q_SLOTS:
void onOk();
private:
NGL::INGLLogger &m_logger;
std::unique_ptr<Ui::LoadCombatNetRadioDialog> m_ui;
LoadCombatNetRadioDialogModel *m_model;
bool m_isApplied = false;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
+8 -8
View File
@@ -35,7 +35,7 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
}, parent)
, m_exerciseId(session == nullptr ? 0 : session->exerciseId())
{
DEBUG_LOG() << "Own exercise id: " << m_exerciseId;
DEBUG_LOG(m_logger) << "Own exercise id: " << m_exerciseId;
if (session != nullptr)
{
@@ -44,28 +44,28 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
if (!session->getDtc<AudioVideoManagement::DataInterface>(avmDtc)
|| !avmDtc->enableCnrChannel()
|| !avmDtc->enableCnrConfig())
ERROR_LOG() << "Could not get AVM data";
ERROR_LOG(m_logger) << "Could not get AVM data";
else
{
m_cnrChannels = avmDtc->cnrChannels();
m_cnrConfigs = avmDtc->cnrConfigs();
}
DEBUG_LOG() << "cnrconfigs: " << m_cnrConfigs.size();
DEBUG_LOG() << "ownExerciseId: " << m_exerciseId;
DEBUG_LOG(m_logger) << "cnrconfigs: " << m_cnrConfigs.size();
DEBUG_LOG(m_logger) << "ownExerciseId: " << m_exerciseId;
std::shared_ptr<ExerciseManagement::Interface::Dtc> exmDtc;
if (!session->getDtc<ExerciseManagement::DataInterface>(exmDtc)
|| !exmDtc->enableExercise())
ERROR_LOG() << "Could not get EXM data";
ERROR_LOG(m_logger) << "Could not get EXM data";
else
m_exercises = exmDtc->exercises();
DEBUG_LOG() << "exercises: " << m_exercises.size();
DEBUG_LOG(m_logger) << "exercises: " << m_exercises.size();
}
else
ERROR_LOG() << "Got invalid session.";
ERROR_LOG(m_logger) << "Got invalid session.";
m_vecData = jsonToCnrConfigVector(data);
@@ -377,7 +377,7 @@ QVector<Core::RemoveElementRequest> LoadCombatNetRadioDialogModel::removeRequest
{
if (!m_conflictedCnrIds.contains(idxCounter))
{
WARNING_LOG() << "Tried to get remove request for row " << idxCounter << " but it is not present.";
WARNING_LOG(m_logger) << "Tried to get remove request for row " << idxCounter << " but it is not present.";
continue;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h
+2
View File
@@ -81,6 +81,8 @@ public Q_SLOTS:
private:
NGL::INGLLogger &m_logger;
LoadCombatNetRadioDialogModel::Conflicts getConflicts(int32_t row, const CnrConfig &config);
QString conflictsText(Conflicts conflicts) const;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
+7 -7
View File
@@ -138,7 +138,7 @@ void EditFrequencyPlanningDialog::retranslate()
void EditFrequencyPlanningDialog::onRemoveFrequencyPlanningReply(const Core::FunctionReplyObject &reply)
{
if (reply.error())
ERROR_LOG() << reply.str();
ERROR_LOG(m_logger) << reply.str();
m_requestHelper->requestReply(reply);
}
@@ -185,7 +185,7 @@ void EditFrequencyPlanningDialog::onAddClicked()
if (cnrConfigId <= 0)
return;
DEBUG_LOG() << "---RessourceDialog aufrufen...."
DEBUG_LOG(m_logger) << "---RessourceDialog aufrufen...."
<< " cnrConfigId: " << cnrConfigId
<< " radioCircuit: " << cnrConfigRow.radioCircuit()
<< " FrequencySetId: " << m_frequencyDataModel->getFrequencySetId();
@@ -270,7 +270,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Assign"));
}
DEBUG_LOG() << "---enableAssignUnassignButtons()...."
DEBUG_LOG(m_logger) << "---enableAssignUnassignButtons()...."
<< " cnrConfigId: " << cnrConfigId
<< " radioCircuitId: " << cnrConfigRow.radioCircuit();
@@ -282,7 +282,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
void EditFrequencyPlanningDialog::onAssignRadioCircuit(const FrequencyPlanningData &fpd)
{
DEBUG_LOG() << "---onAssignRadioCircuit()...."
DEBUG_LOG(m_logger) << "---onAssignRadioCircuit()...."
<< "CnrConfigId: " << fpd.cnrConfigId();
m_frequencyDataModel->setFrequencyPlanningData(fpd);
@@ -370,14 +370,14 @@ void EditFrequencyPlanningDialog::onExportButtonClicked()
QByteArray byteArray = m_frequencyDataModel->uiToJson();
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void EditFrequencyPlanningDialog::onImportButtonClicked()
{
DEBUG_LOG() << "--- onImportButtonClicked() ";
DEBUG_LOG(m_logger) << "--- onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMEditFrequencyPlanning));
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp
+9 -10
View File
@@ -153,7 +153,7 @@ EditFrequencyPlanningFrequencyDataModel::EditFrequencyPlanningFrequencyDataModel
{
Q_ASSERT(avmDtc);
Q_ASSERT(ppmDtc);
DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
int frequencySetId = initPlanning.frequencySetId();
std::vector<FrequencySetDataWithId> fsdVec = m_avmDtc->frequencySet(frequencySetId).data();
@@ -384,14 +384,14 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex &index,
return QStringLiteral("-");
const auto unit = m_units[unitId];
INFO_LOG() << " config.unitId()=" << unitId
INFO_LOG(m_logger) << " config.unitId()=" << unitId
<< " Str=" << unit.name();
QString unitStr;
if (unit.designator().size() > 0)
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
unitStr.append(QString::fromStdString(unit.tacticalIdentifier()));
INFO_LOG() << "unitStr = " << unitStr;
INFO_LOG(m_logger) << "unitStr = " << unitStr;
return unitStr;
}
@@ -606,7 +606,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencePlanningId(int id)
m_initPlan.id(id);
return;
}
WARNING_LOG() << "Trying to set a new frequency planning id but there is alreay an id set ("
WARNING_LOG(m_logger) << "Trying to set a new frequency planning id but there is alreay an id set ("
<< m_initPlan.id() << " - " << id << ")";
}
@@ -783,12 +783,12 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
{
if (inner != outer)
{
DEBUG_LOG() << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
DEBUG_LOG(m_logger) << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
<< " (B): " << pI.cnrConfigId();
}
else
{
DEBUG_LOG() << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
DEBUG_LOG(m_logger) << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
<< " (B): " << pI.cnrConfigId();
if (!m_multipleAssignedCnrIds.contains(p.cnrConfigId()) )
m_multipleAssignedCnrIds.append(p.cnrConfigId());
@@ -808,7 +808,7 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
qs.append(QString::number(id));
qs.append(QStringLiteral(", "));
}
DEBUG_LOG() << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
DEBUG_LOG(m_logger) << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
<< " cnrConfigIds: " << qs;
#endif
return bOk;
@@ -906,9 +906,8 @@ QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanning
FPFDelegate::FPFDelegate(QObject *parent)
: QStyledItemDelegate(parent)
{
FPFDelegate::FPFDelegate(QObject *parent) : QStyledItemDelegate(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
}
void FPFDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ bool EditFrequencyPlanningResourceDataModel::isFiltered(const AudioVideoManageme
if (m_assignedFrequencySetDataIds.contains(data.id()))
{
DEBUG_LOG() << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
DEBUG_LOG(m_logger) << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
<< " frequencySetDataId: " << data.id() << " ist bereits enthalten";
return true;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
+8 -8
View File
@@ -41,7 +41,7 @@ FrequencyPlanningDialog::FrequencyPlanningDialog(LtsSession::LtsSession *session
{
m_ui->setupUi(this);
DEBUG_LOG() << "---FrequencyPlanningDialog() ";
DEBUG_LOG(m_logger) << "---FrequencyPlanningDialog() ";
m_ui->dataView->setSelectionMode(QAbstractItemView::SingleSelection);
m_ui->dataView->treeView()->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -91,7 +91,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
avmDtc->enableActiveFrequencyPlanning() &&
ismDtc->enableMainStructureElement()))
{
ERROR_LOG() << "Could not enable topics";
ERROR_LOG(m_logger) << "Could not enable topics";
return false;
}
@@ -108,7 +108,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
{
delete m_model;
m_model = nullptr;
ERROR_LOG() << "Could not init model";
ERROR_LOG(m_logger) << "Could not init model";
return false;
}
@@ -300,7 +300,7 @@ void FrequencyPlanningDialog::onEditClicked()
return;
const FrequencyPlanning &fp = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>();
DEBUG_LOG() << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId();
DEBUG_LOG(m_logger) << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId();
m_copy = false;
showEditDialog(m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>());
@@ -440,14 +440,14 @@ void FrequencyPlanningDialog::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG() << "Saved file with id = " << fileId;
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
else
ERROR_LOG() << "Could not save file in library ";
ERROR_LOG(m_logger) << "Could not save file in library ";
}
void FrequencyPlanningDialog::onImportButtonClicked()
{
DEBUG_LOG() << " onImportButtonClicked() ";
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
if (m_model->rowCount() > 0)
{
QHash<LtsWidgets::Button, QString> texts({{LtsWidgets::Button::Yes, tr("Ok")}});
@@ -484,7 +484,7 @@ void FrequencyPlanningDialog::onImportButtonClicked()
return m_avmFtc->modifyFrequencyPlanningRequest(request, this);
});
}
INFO_LOG() << "--- onImportButtonClicked() ";
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
}
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h
+2
View File
@@ -99,6 +99,8 @@ signals:
void aboutToCloseMe(int);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void unsetActiveFrequencyPlanning();
void setActiveFrequencyPlanning(const ActiveFrequencyPlanning &activePlanning);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
+3 -3
View File
@@ -22,7 +22,7 @@ FrequencyPlanningDialogModel::FrequencyPlanningDialogModel(int32_t exerciseId, Q
}, parent)
, m_exerciseId(exerciseId)
{
DEBUG_LOG() << "---FrequencyPlanningDialogModel() ";
DEBUG_LOG(m_logger) << "---FrequencyPlanningDialogModel() ";
}
QVariant FrequencyPlanningDialogModel::data(const QModelIndex &index, int role) const
@@ -82,7 +82,7 @@ FrequencySet FrequencyPlanningDialogModel::frequencySetByIndex(const QModelIndex
void FrequencyPlanningDialogModel::onFrequencyPlanningChanged(const FrequencyPlanning &data, DataModification modType)
{
INFO_LOG() << "onFrequencyPlanningChanged "
INFO_LOG(m_logger) << "onFrequencyPlanningChanged "
<< " data.exerciseId()" << data.exerciseId()
<< " m_exerciseId=" << m_exerciseId;
if ((data.exerciseId().is_set() && data.exerciseId().get() != m_exerciseId)
@@ -100,7 +100,7 @@ QByteArray FrequencyPlanningDialogModel::modelToJson()
for (int row = 0; row < rowCount(); row++)
{
DEBUG_LOG() << "row =" << ": " << row;
DEBUG_LOG(m_logger) << "row =" << ": " << row;
QJsonObject inner;
const FrequencyPlanning &planning = m_vecData.at(row);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h
+2
View File
@@ -46,6 +46,8 @@ private Q_SLOTS:
void onFrequencyPlanningChanged(const FrequencyPlanning &data, DataModification modType);
private:
NGL::INGLLogger &m_logger;
int32_t m_exerciseId;
boost::optional<int> m_activePlanningId;
std::shared_ptr<Interface::Dtc> m_avmDtc;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
+3 -4
View File
@@ -17,12 +17,11 @@
namespace AudioVideoManagement
{
FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface::Dtc> &avmDtc, QSet<int> &allocatedDataSets, QWidget *parent)
: QWidget(parent)
FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface::Dtc> &avmDtc, QSet<int> &allocatedDataSets, QWidget *parent) : QWidget(parent)
, m_ui(new Ui::FrequencyPlanningWidget)
, m_assignedFrequencySetDataIds(allocatedDataSets)
, m_avmDtc(avmDtc)
{
, m_avmDtc(avmDtc),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_ui->setupUi(this);
m_ui->cbFrequencyBand->addItem(toString(FrequencyBand_def::VHF), FrequencyBand_def::VHF);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ InitFrequencyPlanningDialog::InitFrequencyPlanningDialog(LtsSession::LtsSession
, m_dateOfCreation(session->partitionTime())
, m_session(session)
{
DEBUG_LOG() << "---InitFrequencyPlanningDialog() ";
DEBUG_LOG(m_logger) << "---InitFrequencyPlanningDialog() ";
m_ui->setupUi(this);
QMap<int32_t, FrequencySet> frequencySets = avmDtc->frequencySets();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h
+2
View File
@@ -34,6 +34,8 @@ signals:
void newInitFrequencyPlanning(const FrequencyPlanning &);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
bool apply() override;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h
+2
View File
@@ -59,6 +59,8 @@ private Q_SLOTS:
void onOk();
private:
NGL::INGLLogger &m_logger;
std::unique_ptr<Ui::LoadFrequencyPlanningDialog> m_ui;
LoadFrequencyPlanningDialogModel *m_model;
bool m_isApplied = false;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
+6 -7
View File
@@ -142,7 +142,7 @@ LoadFrequencyPlanningDialogModel::LoadFrequencyPlanningDialogModel(const Frequen
, m_exerciseId(initPlan.exerciseId().is_set() ? initPlan.exerciseId().get() : 0)
{
Q_ASSERT(avmDtc);
DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
m_initPlan.data().clear();
@@ -167,7 +167,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray &data)
if (m_initPlan.frequencySetId() != obj.value<int>("frequencySetId"))
{
ERROR_LOG() << "false frequency set!";
ERROR_LOG(m_logger) << "false frequency set!";
return;
}
@@ -619,7 +619,7 @@ void LoadFrequencyPlanningDialogModel::checkConflicts()
if (!item || !item->data().canConvert<ItemData>())
{
DEBUG_LOG() << "Could not get item for row " << row;
DEBUG_LOG(m_logger) << "Could not get item for row " << row;
continue;
}
@@ -873,7 +873,7 @@ QVector<FrequencyPlanningData> LoadFrequencyPlanningDialogModel::planningData()
if (!item || !item->data().canConvert<ItemData>())
{
DEBUG_LOG() << "Could not get item for row " << row;
DEBUG_LOG(m_logger) << "Could not get item for row " << row;
continue;
}
@@ -918,9 +918,8 @@ LoadFrequencyPlanningDialogModel::ConfigTreeItem* LoadFrequencyPlanningDialogMod
DrawDelegate::DrawDelegate(QObject *parent)
: QStyledItemDelegate(parent)
{
DrawDelegate::DrawDelegate(QObject *parent) : QStyledItemDelegate(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
}
void DrawDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{