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

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
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 -6
View File
@@ -25,7 +25,6 @@ CombatNetRadioDialog::CombatNetRadioDialog(LtsSession::LtsSession *session, cons
, m_ui(new Ui::CombatNetRadioDialog)
, m_menuGroup(menuGroup)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("CombatNetRadioDialog"))
{
m_ui->setupUi(this);
setUnchangeable(true);
@@ -60,7 +59,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
avmFtc->enableModifyCnrConfig() &&
avmFtc->enableRemoveCnrConfig()))
{
ERROR_LOG(m_logger) << "Could not enable topics";
ERROR_LOG() << "Could not enable topics";
return false;
}
@@ -79,7 +78,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
{
m_filter.reset();
m_model.reset();
ERROR_LOG(m_logger) << "Could not init model";
ERROR_LOG() << "Could not init model";
return false;
}
@@ -192,14 +191,14 @@ void CombatNetRadioDialog::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
DEBUG_LOG() << "Saved file with id = " << fileId;
else
ERROR_LOG(m_logger) << "Could not save file in library ";
ERROR_LOG() << "Could not save file in library ";
}
void CombatNetRadioDialog::onImportButtonClicked()
{
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
DEBUG_LOG() << " 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
-3
View File
@@ -94,8 +94,5 @@ private:
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
ExerciseManagement::Interface::Dtc *m_exmDtc{nullptr};
std::shared_ptr<FileManagement::ForeignGuiInterface> m_flmGui;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
+4 -5
View File
@@ -26,7 +26,6 @@ CombatNetRadioDialogModel::CombatNetRadioDialogModel(int32_t exerciseId, QObject
tr("Global")
}, parent)
, m_exerciseId(exerciseId)
, m_logger(getLogger("CombatNetRadioDialogModel"))
{
}
@@ -41,7 +40,7 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
switch (index.column())
{
case CHANNEL:
INFO_LOG(m_logger)<<"CombatNetRadioDialogModel::data role =" << role
INFO_LOG()<<"CombatNetRadioDialogModel::data role =" << role
<< " row = " << index.row();
return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId()).name());
case RADIO_CIRCUIT:
@@ -62,14 +61,14 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
if (unit.id() != unitId)
return {};
INFO_LOG(m_logger) << " config.unitId()=" << unitId
INFO_LOG() << " 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(m_logger) << "unitStr = " << unitStr;
INFO_LOG() << "unitStr = " << unitStr;
return unitStr;
}
@@ -99,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(m_logger) << "Could not retrieve visible Parties!";
ERROR_LOG() << "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
@@ -46,8 +46,6 @@ private:
QMap<int32_t, CnrChannel> m_cnrChannels;
QMap<int32_t, ParticipantManagement::Party> m_parties;
QMap<int32_t, ParticipantManagement::Participant> m_units;
LOGGER_T m_logger;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
+8 -9
View File
@@ -92,7 +92,6 @@ EditCombatNetRadioDialog::EditCombatNetRadioDialog(const boost::optional<int32_t
, m_avmFtc(avmFtc)
, m_exmDtc(exmDtc)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("EditCombatNetRadioDialog"))
{
Q_ASSERT(ppmDtc);
Q_ASSERT(avmDtc);
@@ -174,7 +173,7 @@ bool EditCombatNetRadioDialog::apply()
if (m_ui->cbUnit->currentIndex() > 0)
{
request.unitId().set(m_ui->cbUnit->currentData().toInt());
INFO_LOG(m_logger)<< "currentIndex="<<m_ui->cbUnit->currentIndex()
INFO_LOG()<< "currentIndex="<<m_ui->cbUnit->currentIndex()
<< " unitId ="<<request.unitId().get();
}
@@ -190,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(m_logger) << "Could not retrieve visible Parties!";
ERROR_LOG() << "Could not retrieve visible Parties!";
for (const ParticipantManagement::Party &party : std::as_const(parties))
m_ui->cbParty->addItem(ParticipantManagement::trPartyName(party.name()), party.id());
@@ -490,10 +489,10 @@ void EditCombatNetRadioDialog::onPartyIndexChanged(int index)
if (unit.designator().size() > 0)
{
unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
INFO_LOG(m_logger)<<"Designator != leer: unitStr = " << unitStr;
INFO_LOG()<<"Designator != leer: unitStr = " << unitStr;
}
unitStr += QString::fromStdString(unit.tacticalIdentifier());
INFO_LOG(m_logger) << "unitStr =" << unitStr
INFO_LOG() << "unitStr =" << unitStr
<< " id =" << unit.id();
m_ui->cbUnit->addItem(unitStr, unit.id());
@@ -562,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(m_logger) << "Saved file with id = " << fileId;
DEBUG_LOG() << "Saved file with id = " << fileId;
else
ERROR_LOG(m_logger) << "Could not save file in library ";
ERROR_LOG() << "Could not save file in library ";
}
void EditCombatNetRadioDialog::onImportButtonClicked()
{
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
DEBUG_LOG() << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_exerciseId, FileManagement::toString(FileManagement::XmlType::AVMEditCombatNetRadio));
@@ -589,7 +588,7 @@ void EditCombatNetRadioDialog::onImportButtonClicked()
{
ModifyCnrConfigRequest req = jsonToModifyCnrConfig(content);
setUiValues(toConfig(req));
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
INFO_LOG() << "--- onImportButtonClicked() ";
}
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
-2
View File
@@ -117,7 +117,5 @@ private:
QVector<QString> m_takenNames;
std::unique_ptr<LtsUtils::RequestHelper> m_requestHelper;
bool m_isGlobal;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.cpp
-1
View File
@@ -15,7 +15,6 @@ LoadCombatNetRadioDialog::LoadCombatNetRadioDialog(const QByteArray &data,
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
, m_ui(new Ui::LoadCombatNetRadioDialog)
, m_model(new LoadCombatNetRadioDialogModel(data, session))
, m_logger(getLogger("LoadCombatNetRadioDialog"))
{
m_ui->setupUi(this);
m_ui->dataView->setModel(m_model);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h
-2
View File
@@ -60,7 +60,5 @@ private:
std::unique_ptr<Ui::LoadCombatNetRadioDialog> m_ui;
LoadCombatNetRadioDialogModel *m_model;
bool m_isApplied = false;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
+8 -9
View File
@@ -34,9 +34,8 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
tr("Conflict(s)")
}, parent)
, m_exerciseId(session == nullptr ? 0 : session->exerciseId())
, m_logger(getLogger("LoadCombatNetRadioDialogModel"))
{
DEBUG_LOG(m_logger) << "Own exercise id: " << m_exerciseId;
DEBUG_LOG() << "Own exercise id: " << m_exerciseId;
if (session != nullptr)
{
@@ -45,28 +44,28 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
if (!session->getDtc<AudioVideoManagement::DataInterface>(avmDtc)
|| !avmDtc->enableCnrChannel()
|| !avmDtc->enableCnrConfig())
ERROR_LOG(m_logger) << "Could not get AVM data";
ERROR_LOG() << "Could not get AVM data";
else
{
m_cnrChannels = avmDtc->cnrChannels();
m_cnrConfigs = avmDtc->cnrConfigs();
}
DEBUG_LOG(m_logger) << "cnrconfigs: " << m_cnrConfigs.size();
DEBUG_LOG(m_logger) << "ownExerciseId: " << m_exerciseId;
DEBUG_LOG() << "cnrconfigs: " << m_cnrConfigs.size();
DEBUG_LOG() << "ownExerciseId: " << m_exerciseId;
std::shared_ptr<ExerciseManagement::Interface::Dtc> exmDtc;
if (!session->getDtc<ExerciseManagement::DataInterface>(exmDtc)
|| !exmDtc->enableExercise())
ERROR_LOG(m_logger) << "Could not get EXM data";
ERROR_LOG() << "Could not get EXM data";
else
m_exercises = exmDtc->exercises();
DEBUG_LOG(m_logger) << "exercises: " << m_exercises.size();
DEBUG_LOG() << "exercises: " << m_exercises.size();
}
else
ERROR_LOG(m_logger) << "Got invalid session.";
ERROR_LOG() << "Got invalid session.";
m_vecData = jsonToCnrConfigVector(data);
@@ -378,7 +377,7 @@ QVector<Core::RemoveElementRequest> LoadCombatNetRadioDialogModel::removeRequest
{
if (!m_conflictedCnrIds.contains(idxCounter))
{
WARNING_LOG(m_logger) << "Tried to get remove request for row " << idxCounter << " but it is not present.";
WARNING_LOG() << "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
@@ -107,7 +107,5 @@ private:
QVector<Qt::CheckState> m_includeStates;
QVector<int32_t> m_disabledRows;
QVector<Conflicts> m_conflicts;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
+7 -8
View File
@@ -67,7 +67,6 @@ EditFrequencyPlanningDialog::EditFrequencyPlanningDialog(LtsSession::LtsSession
, m_exerciseId(session->exerciseId())
, m_isEdit(EditFrequencyPlanningSetResourceDialog::DialogMode::Assign)
, m_activeFrequencyPlanningStatus(0)
, m_logger(getLogger("EditFrequencyPlanningDialog"))
{
m_ui->setupUi(this);
@@ -139,7 +138,7 @@ void EditFrequencyPlanningDialog::retranslate()
void EditFrequencyPlanningDialog::onRemoveFrequencyPlanningReply(const Core::FunctionReplyObject &reply)
{
if (reply.error())
ERROR_LOG(m_logger) << reply.str();
ERROR_LOG() << reply.str();
m_requestHelper->requestReply(reply);
}
@@ -186,7 +185,7 @@ void EditFrequencyPlanningDialog::onAddClicked()
if (cnrConfigId <= 0)
return;
DEBUG_LOG(m_logger) << "---RessourceDialog aufrufen...."
DEBUG_LOG() << "---RessourceDialog aufrufen...."
<< " cnrConfigId: " << cnrConfigId
<< " radioCircuit: " << cnrConfigRow.radioCircuit()
<< " FrequencySetId: " << m_frequencyDataModel->getFrequencySetId();
@@ -271,7 +270,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Assign"));
}
DEBUG_LOG(m_logger) << "---enableAssignUnassignButtons()...."
DEBUG_LOG() << "---enableAssignUnassignButtons()...."
<< " cnrConfigId: " << cnrConfigId
<< " radioCircuitId: " << cnrConfigRow.radioCircuit();
@@ -283,7 +282,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
void EditFrequencyPlanningDialog::onAssignRadioCircuit(const FrequencyPlanningData &fpd)
{
DEBUG_LOG(m_logger) << "---onAssignRadioCircuit()...."
DEBUG_LOG() << "---onAssignRadioCircuit()...."
<< "CnrConfigId: " << fpd.cnrConfigId();
m_frequencyDataModel->setFrequencyPlanningData(fpd);
@@ -371,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(m_logger) << "Saved file with id = " << fileId;
DEBUG_LOG() << "Saved file with id = " << fileId;
else
ERROR_LOG(m_logger) << "Could not save file in library ";
ERROR_LOG() << "Could not save file in library ";
}
void EditFrequencyPlanningDialog::onImportButtonClicked()
{
DEBUG_LOG(m_logger) << "--- onImportButtonClicked() ";
DEBUG_LOG() << "--- 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
+7 -8
View File
@@ -150,11 +150,10 @@ EditFrequencyPlanningFrequencyDataModel::EditFrequencyPlanningFrequencyDataModel
, m_ismDtc(ismDtc)
, m_ppmDtc(ppmDtc)
, m_initPlan(initPlanning)
, m_logger(getLogger("EditFrequencyPlanningDataModel"))
{
Q_ASSERT(avmDtc);
Q_ASSERT(ppmDtc);
DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
int frequencySetId = initPlanning.frequencySetId();
std::vector<FrequencySetDataWithId> fsdVec = m_avmDtc->frequencySet(frequencySetId).data();
@@ -385,14 +384,14 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex &index,
return QStringLiteral("-");
const auto unit = m_units[unitId];
INFO_LOG(m_logger) << " config.unitId()=" << unitId
INFO_LOG() << " 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(m_logger) << "unitStr = " << unitStr;
INFO_LOG() << "unitStr = " << unitStr;
return unitStr;
}
@@ -607,7 +606,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencePlanningId(int id)
m_initPlan.id(id);
return;
}
WARNING_LOG(m_logger) << "Trying to set a new frequency planning id but there is alreay an id set ("
WARNING_LOG() << "Trying to set a new frequency planning id but there is alreay an id set ("
<< m_initPlan.id() << " - " << id << ")";
}
@@ -784,12 +783,12 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
{
if (inner != outer)
{
DEBUG_LOG(m_logger) << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
DEBUG_LOG() << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
<< " (B): " << pI.cnrConfigId();
}
else
{
DEBUG_LOG(m_logger) << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
DEBUG_LOG() << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
<< " (B): " << pI.cnrConfigId();
if (!m_multipleAssignedCnrIds.contains(p.cnrConfigId()) )
m_multipleAssignedCnrIds.append(p.cnrConfigId());
@@ -809,7 +808,7 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
qs.append(QString::number(id));
qs.append(QStringLiteral(", "));
}
DEBUG_LOG(m_logger) << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
DEBUG_LOG() << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
<< " cnrConfigIds: " << qs;
#endif
return bOk;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp
+1 -2
View File
@@ -24,7 +24,6 @@ EditFrequencyPlanningResourceDataModel::EditFrequencyPlanningResourceDataModel(c
}, parent)
, m_assignedFrequencySetDataIds(assignedFrequencySetDataIds)
, m_frequencyBand(frequencyBand)
, m_logger(getLogger("EditFrequencyPlanningResourceDataModel"))
{
}
@@ -89,7 +88,7 @@ bool EditFrequencyPlanningResourceDataModel::isFiltered(const AudioVideoManageme
if (m_assignedFrequencySetDataIds.contains(data.id()))
{
DEBUG_LOG(m_logger) << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
DEBUG_LOG() << "---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_edit_frequency_planning_resource_dialog.cpp
-1
View File
@@ -42,7 +42,6 @@ EditFrequencyPlanningResourceDialog::EditFrequencyPlanningResourceDialog(int fre
, m_ui(new Ui::EditFrequencyPlanningResourceDialog)
, m_frequencySetId(frequencySetId)
, m_dialogMode(dialogMode)
, m_logger(getLogger("EditFrequencyPlanningResourceDialog"))
{
m_ui->setupUi(this);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp
-1
View File
@@ -32,7 +32,6 @@ EditFrequencyPlanningSetResourceDialog::EditFrequencyPlanningSetResourceDialog(
, m_avmDtc(avmDtc)
, m_frequencyResourceDataModel(nullptr)
, m_config(m_avmDtc->cnrConfig(cnrConfigId))
, m_logger(getLogger("EditFrequencyPlanningSetResourceDialog"))
{
m_ui->setupUi(this);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
+8 -9
View File
@@ -38,11 +38,10 @@ FrequencyPlanningDialog::FrequencyPlanningDialog(LtsSession::LtsSession *session
, m_ismDtc(nullptr)
, m_flmGui(nullptr)
, m_activeFrequencyPlanningStatus(0)
, m_logger(getLogger("FrequencyPlanningDialog"))
{
m_ui->setupUi(this);
DEBUG_LOG(m_logger) << "---FrequencyPlanningDialog() ";
DEBUG_LOG() << "---FrequencyPlanningDialog() ";
m_ui->dataView->setSelectionMode(QAbstractItemView::SingleSelection);
m_ui->dataView->treeView()->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -92,7 +91,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
avmDtc->enableActiveFrequencyPlanning() &&
ismDtc->enableMainStructureElement()))
{
ERROR_LOG(m_logger) << "Could not enable topics";
ERROR_LOG() << "Could not enable topics";
return false;
}
@@ -109,7 +108,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
{
delete m_model;
m_model = nullptr;
ERROR_LOG(m_logger) << "Could not init model";
ERROR_LOG() << "Could not init model";
return false;
}
@@ -301,7 +300,7 @@ void FrequencyPlanningDialog::onEditClicked()
return;
const FrequencyPlanning &fp = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>();
DEBUG_LOG(m_logger) << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId();
DEBUG_LOG() << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId();
m_copy = false;
showEditDialog(m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>());
@@ -441,14 +440,14 @@ void FrequencyPlanningDialog::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
DEBUG_LOG() << "Saved file with id = " << fileId;
else
ERROR_LOG(m_logger) << "Could not save file in library ";
ERROR_LOG() << "Could not save file in library ";
}
void FrequencyPlanningDialog::onImportButtonClicked()
{
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
DEBUG_LOG() << " onImportButtonClicked() ";
if (m_model->rowCount() > 0)
{
QHash<LtsWidgets::Button, QString> texts({{LtsWidgets::Button::Yes, tr("Ok")}});
@@ -485,7 +484,7 @@ void FrequencyPlanningDialog::onImportButtonClicked()
return m_avmFtc->modifyFrequencyPlanningRequest(request, this);
});
}
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
INFO_LOG() << "--- onImportButtonClicked() ";
}
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h
-2
View File
@@ -124,7 +124,5 @@ private:
std::shared_ptr<FileManagement::ForeignGuiInterface> m_flmGui;
QMap<int, EditFrequencyPlanningDialog*> m_editDlgMap;
int m_activeFrequencyPlanningStatus;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
+3 -4
View File
@@ -21,9 +21,8 @@ FrequencyPlanningDialogModel::FrequencyPlanningDialogModel(int32_t exerciseId, Q
tr("Active")
}, parent)
, m_exerciseId(exerciseId)
, m_logger(getLogger("FrequencyPlanningDialogModel"))
{
DEBUG_LOG(m_logger) << "---FrequencyPlanningDialogModel() ";
DEBUG_LOG() << "---FrequencyPlanningDialogModel() ";
}
QVariant FrequencyPlanningDialogModel::data(const QModelIndex &index, int role) const
@@ -83,7 +82,7 @@ FrequencySet FrequencyPlanningDialogModel::frequencySetByIndex(const QModelIndex
void FrequencyPlanningDialogModel::onFrequencyPlanningChanged(const FrequencyPlanning &data, DataModification modType)
{
INFO_LOG(m_logger) << "onFrequencyPlanningChanged "
INFO_LOG() << "onFrequencyPlanningChanged "
<< " data.exerciseId()" << data.exerciseId()
<< " m_exerciseId=" << m_exerciseId;
if ((data.exerciseId().is_set() && data.exerciseId().get() != m_exerciseId)
@@ -101,7 +100,7 @@ QByteArray FrequencyPlanningDialogModel::modelToJson()
for (int row = 0; row < rowCount(); row++)
{
DEBUG_LOG(m_logger) << "row =" << ": " << row;
DEBUG_LOG() << "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
-1
View File
@@ -53,7 +53,6 @@ private:
QMap<int32_t, FrequencySet> m_frequencySets;
friend class FrequencyPlanningDialogProxyModel;
LOGGER_T m_logger;
};
class FrequencyPlanningDialogProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
-1
View File
@@ -22,7 +22,6 @@ FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface
, m_ui(new Ui::FrequencyPlanningWidget)
, m_assignedFrequencySetDataIds(allocatedDataSets)
, m_avmDtc(avmDtc)
, m_logger(getLogger("EditFrequencyPlanningResourceDialog"))
{
m_ui->setupUi(this);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp
+1 -2
View File
@@ -15,9 +15,8 @@ InitFrequencyPlanningDialog::InitFrequencyPlanningDialog(LtsSession::LtsSession
, m_ui(new Ui::InitFrequencyPlanningDialog)
, m_dateOfCreation(session->partitionTime())
, m_session(session)
, m_logger(getLogger("InitFrequencyPlanningDialog"))
{
DEBUG_LOG(m_logger) << "---InitFrequencyPlanningDialog() ";
DEBUG_LOG() << "---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
@@ -40,7 +40,5 @@ private:
Ui::InitFrequencyPlanningDialog *m_ui;
qint64 m_dateOfCreation;
LtsSession::LtsSession *m_session;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp
-1
View File
@@ -13,7 +13,6 @@ LoadFrequencyPlanningDialog::LoadFrequencyPlanningDialog(const QByteArray &data,
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
, m_ui(new Ui::LoadFrequencyPlanningDialog)
, m_model(new LoadFrequencyPlanningDialogModel(initPlan, avmDtc, ismDtc, this))
, m_logger(getLogger("LoadFrequencyPlanningDialog"))
{
m_ui->setupUi(this);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h
-2
View File
@@ -62,7 +62,5 @@ private:
std::unique_ptr<Ui::LoadFrequencyPlanningDialog> m_ui;
LoadFrequencyPlanningDialogModel *m_model;
bool m_isApplied = false;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
+4 -5
View File
@@ -140,10 +140,9 @@ LoadFrequencyPlanningDialogModel::LoadFrequencyPlanningDialogModel(const Frequen
, m_initPlan(initPlan)
, m_parentPlan(initPlan)
, m_exerciseId(initPlan.exerciseId().is_set() ? initPlan.exerciseId().get() : 0)
, m_logger(getLogger("EditFrequencyPlanningDataModel"))
{
Q_ASSERT(avmDtc);
DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
m_initPlan.data().clear();
@@ -168,7 +167,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray &data)
if (m_initPlan.frequencySetId() != obj.value<int>("frequencySetId"))
{
ERROR_LOG(m_logger) << "false frequency set!";
ERROR_LOG() << "false frequency set!";
return;
}
@@ -620,7 +619,7 @@ void LoadFrequencyPlanningDialogModel::checkConflicts()
if (!item || !item->data().canConvert<ItemData>())
{
DEBUG_LOG(m_logger) << "Could not get item for row " << row;
DEBUG_LOG() << "Could not get item for row " << row;
continue;
}
@@ -874,7 +873,7 @@ QVector<FrequencyPlanningData> LoadFrequencyPlanningDialogModel::planningData()
if (!item || !item->data().canConvert<ItemData>())
{
DEBUG_LOG(m_logger) << "Could not get item for row " << row;
DEBUG_LOG() << "Could not get item for row " << row;
continue;
}