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
+3
-4
@@ -24,7 +24,6 @@ BldConfigDialog::BldConfigDialog(int bldEntityId, const QString &displayName, QW
|
||||
, m_displayName(displayName)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::BldConfigDialog)
|
||||
, m_logger(getLogger("BuildingConfigDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -99,7 +98,7 @@ void BldConfigDialog::fillCbx()
|
||||
|
||||
bool BldConfigDialog::apply()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
|
||||
if (m_ui->chbOwnership->isChecked())
|
||||
{
|
||||
@@ -135,8 +134,8 @@ bool BldConfigDialog::apply()
|
||||
|
||||
requestData.resetContamination(m_ui->chbResetContamination->isChecked());
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "currentIndex: " << m_ui->cmbStatus->currentIndex();
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "currentData: " << state;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "currentIndex: " << m_ui->cmbStatus->currentIndex();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "currentData: " << state;
|
||||
|
||||
return m_ftc->setBuildingStatesRequest(requestData, this);
|
||||
});
|
||||
|
||||
-2
@@ -62,7 +62,5 @@ private:
|
||||
LtsUtils::RequestHelper *m_requestHelper = nullptr;
|
||||
|
||||
Ui::BldConfigDialog *m_ui = nullptr;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
-1
@@ -14,7 +14,6 @@ BuildingHistoryDialog::BuildingHistoryDialog(const QString &bldName, QWidget *pa
|
||||
, m_model(new BuildingHistoryDialogModel(this))
|
||||
, m_proxyModel(new BuildingHistoryDialogProxyModel(this))
|
||||
, m_ui(new Ui::BuildingHistoryDialog)
|
||||
, m_logger(getLogger("BuildingHistoryDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_proxyModel->setSourceModel(m_model);
|
||||
|
||||
+14
-15
@@ -28,7 +28,6 @@ BuildingHistoryDialogModel::BuildingHistoryDialogModel(QObject *parent)
|
||||
},
|
||||
parent)
|
||||
, m_mseId(-1)
|
||||
, m_logger(getLogger("BuildingHistoryDialogModel"))
|
||||
{}
|
||||
|
||||
bool BuildingHistoryDialogModel::initModel(int mseId,
|
||||
@@ -49,7 +48,7 @@ bool BuildingHistoryDialogModel::initModel(int mseId,
|
||||
connect(dtc.get(), &Interface::Dtc::historyStateChanged,
|
||||
this, &BuildingHistoryDialogModel::onHistoryStateChanged);
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_mseId=" << m_mseId;
|
||||
DEBUG_LOG() << "m_mseId=" << m_mseId;
|
||||
reinitModel(dtc->historyState(m_mseId).stateHistory());
|
||||
return true;
|
||||
}
|
||||
@@ -81,7 +80,7 @@ QVariant BuildingHistoryDialogModel::data(const QModelIndex &index, int role) co
|
||||
|
||||
void BuildingHistoryDialogModel::onHistoryStateChanged(const Buildings::HistoryState &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onHistoryStateChanged";
|
||||
DEBUG_LOG() << "onHistoryStateChanged";
|
||||
if (m_mseId != data.mseId())
|
||||
return;
|
||||
|
||||
@@ -155,14 +154,14 @@ QString BuildingHistoryDialogModel::getOriginatorName(const HistoryStateItemEx &
|
||||
|
||||
QString BuildingHistoryDialogModel::getContaminations(const std::vector< Buildings::ContaminationState > &contaminationStates) const
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "BuildingHistoryDialogModel::getContaminations";
|
||||
DEBUG_LOG() << "BuildingHistoryDialogModel::getContaminations";
|
||||
QStringList contaminationList;
|
||||
for (const auto &cs : contaminationStates)
|
||||
{
|
||||
AreaEffectSimulation::AesItem item;
|
||||
m_aesDtc->aesItemFromId(cs.aesId(), item);
|
||||
const ProjectDataManagement::GearClass &gc = m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId());
|
||||
DEBUG_LOG(m_logger) << "gc=" << gc;
|
||||
DEBUG_LOG() << "gc=" << gc;
|
||||
if (gc == ProjectDataManagement::GearClass::Unknown)
|
||||
continue;
|
||||
QString gearClassName = ProjectDataManagement::toString(gc).trimmed();
|
||||
@@ -170,14 +169,14 @@ QString BuildingHistoryDialogModel::getContaminations(const std::vector< Buildin
|
||||
if (!contaminationList.contains(gearClassName))
|
||||
contaminationList.append(gearClassName);
|
||||
else
|
||||
DEBUG_LOG(m_logger) << "contaminationList.contains(gearClassName)" << gearClassName;
|
||||
DEBUG_LOG() << "contaminationList.contains(gearClassName)" << gearClassName;
|
||||
}
|
||||
return contaminationList.join(QStringLiteral("+"));
|
||||
}
|
||||
|
||||
void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::HistoryStateItem> &newData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "BuildingHistoryDialogModel::reinitModel size=" << newData.size();
|
||||
DEBUG_LOG() << "BuildingHistoryDialogModel::reinitModel size=" << newData.size();
|
||||
int indexModel = 0;
|
||||
|
||||
int contaminationOffest = 0;
|
||||
@@ -190,16 +189,16 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
|
||||
|
||||
for (size_t stateHistoryIndex = 0; stateHistoryIndex < newData.size(); ++stateHistoryIndex)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "\n\nstateHistoryIndex=" << stateHistoryIndex;
|
||||
DEBUG_LOG() << "\n\nstateHistoryIndex=" << stateHistoryIndex;
|
||||
|
||||
|
||||
if (((newData.at(stateHistoryIndex).contaminationStates().size() > 0 && stateHistoryIndex == 0)
|
||||
|| (stateHistoryIndex > 0 && (newData.at(stateHistoryIndex).contaminationStates().size() > newData.at(stateHistoryIndex - 1).contaminationStates().size())))
|
||||
&& (stateHistoryIndex > 0))
|
||||
DEBUG_LOG(m_logger) << "1. State ist Kontamination";
|
||||
DEBUG_LOG() << "1. State ist Kontamination";
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "State aus StateItem nehmen: stateHistoryIndex=" << stateHistoryIndex;
|
||||
DEBUG_LOG() << "State aus StateItem nehmen: stateHistoryIndex=" << stateHistoryIndex;
|
||||
auto &data = m_vecData[stateHistoryIndex];
|
||||
data = HistoryStateItemEx(newData.at(stateHistoryIndex));
|
||||
data.chargeTypeName = getChargeTypeName(data.chargeTypeId());
|
||||
@@ -213,7 +212,7 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
|
||||
data.contamination.clear();
|
||||
else
|
||||
data.contamination = QStringLiteral("C");
|
||||
DEBUG_LOG(m_logger) << "indexModel=" << indexModel
|
||||
DEBUG_LOG() << "indexModel=" << indexModel
|
||||
<< " chargeTypeId=" << data.chargeTypeId()
|
||||
<< " chargeTypeName=" << getChargeTypeName(data.chargeTypeId())
|
||||
<< " originatorName=" << getOriginatorName(data);
|
||||
@@ -228,7 +227,7 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
|
||||
|
||||
AreaEffectSimulation::AesItem item;
|
||||
m_aesDtc->aesItemFromId(contaminationState.aesId(), item);
|
||||
DEBUG_LOG(m_logger) << "m_vecData.size=" << m_vecData.size()
|
||||
DEBUG_LOG() << "m_vecData.size=" << m_vecData.size()
|
||||
<< " indexModel=" << indexModel
|
||||
<< " newData.size()=" << newData.size()
|
||||
<< " contaminationOffest=" << contaminationOffest;
|
||||
@@ -236,13 +235,13 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
|
||||
|
||||
if (stateHistoryIndex > 0)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "stateHistoryIndex=" << stateHistoryIndex
|
||||
DEBUG_LOG() << "stateHistoryIndex=" << stateHistoryIndex
|
||||
<< " contaminationIndex="
|
||||
<< " newData.at(stateHistoryIndex-1).contaminationStates().size() =" << newData.at(stateHistoryIndex - 1).contaminationStates().size();
|
||||
if (contaminationIndex < newData.at(stateHistoryIndex - 1).contaminationStates().size())
|
||||
{
|
||||
contaminationIndex++;
|
||||
DEBUG_LOG(m_logger) << "continue";
|
||||
DEBUG_LOG() << "continue";
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -263,7 +262,7 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
|
||||
data.contamination = QStringLiteral("C");
|
||||
::rti::core::int64 time = item.effectStart().get();
|
||||
data.time(time);
|
||||
DEBUG_LOG(m_logger) << " indexModel=" << indexModel
|
||||
DEBUG_LOG() << " indexModel=" << indexModel
|
||||
<< " AesId=" << contaminationState.aesId()
|
||||
<< " chargeTypeId=" << data.chargeTypeId()
|
||||
<< " chargeTypeName=" << getChargeTypeName(data.chargeTypeId())
|
||||
|
||||
-3
@@ -90,9 +90,6 @@ private:
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
friend class BuildingHistoryDialogProxyModel;
|
||||
};
|
||||
|
||||
|
||||
+3
-4
@@ -29,7 +29,6 @@ HitLineInfoDialog::HitLineInfoDialog(int hitLineId, QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_hitLineId(hitLineId)
|
||||
, m_ui(new Ui::HitLineInfoDialog)
|
||||
, m_logger(getLogger("BuildingHitLineInfoDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -85,7 +84,7 @@ bool HitLineInfoDialog::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (data.id() == m_hitLineId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Found Building HitLine Id: " << data.id();
|
||||
DEBUG_LOG() << "Found Building HitLine Id: " << data.id();
|
||||
m_hitLineInfo = data;
|
||||
m_participantOriginator = m_ppmDtc->participant(data.originatorParticipantId());
|
||||
showHitLineInfos();
|
||||
@@ -93,14 +92,14 @@ bool HitLineInfoDialog::init(LtsSession::LtsSession *session)
|
||||
});
|
||||
|
||||
if (!m_isInitialized)
|
||||
WARNING_LOG(m_logger) << "Non Building HitLineInfo data found for id: " << m_hitLineId;
|
||||
WARNING_LOG() << "Non Building 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_hitLineInfo.buildingId() <= 0 || m_hitLineInfo.originatorParticipantId() <= 0)
|
||||
return;
|
||||
|
||||
-1
@@ -99,7 +99,6 @@ private:
|
||||
|
||||
|
||||
Ui::HitLineInfoDialog *m_ui = nullptr;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -14,7 +14,6 @@ BridgeHistoryDialog::BridgeHistoryDialog(const QString &bldName, QWidget *parent
|
||||
, m_model(new BridgeHistoryDialogModel(this))
|
||||
, m_proxyModel(new BridgeHistoryDialogProxyModel(this))
|
||||
, m_ui(new Ui::BridgeHistoryDialog)
|
||||
, m_logger(getLogger("BridgeHistoryDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_proxyModel->setSourceModel(m_model);
|
||||
|
||||
-1
@@ -28,7 +28,6 @@ BridgeHistoryDialogModel::BridgeHistoryDialogModel(QObject *parent)
|
||||
},
|
||||
parent)
|
||||
, m_ddsId(-1)
|
||||
, m_logger(getLogger("BridgeHistoryDialogModel"))
|
||||
{}
|
||||
|
||||
bool BridgeHistoryDialogModel::initModel(int dds_id,
|
||||
|
||||
-3
@@ -70,9 +70,6 @@ private:
|
||||
void reinitModel(const QMap<int, BridgeStatus> &newData);
|
||||
int m_ddsId;
|
||||
std::shared_ptr<Interface::Dtc> m_dtc;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
friend class BridgeHistoryDialogProxyModel;
|
||||
};
|
||||
|
||||
|
||||
+2
-2
@@ -76,13 +76,13 @@ void InfoDialogBase::onFindOnMap()
|
||||
if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
|
||||
ifc->centerMapToBuildingObject(m_mseId);
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
}
|
||||
|
||||
|
||||
void InfoDialogBase::onShowDetails()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
BldConfigDialog *dialog = new BldConfigDialog(m_mseId, buildingDisplayName(), this);
|
||||
|
||||
if (dialog->init(m_session))
|
||||
|
||||
-2
@@ -70,7 +70,5 @@ protected:
|
||||
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
|
||||
std::shared_ptr<BuildingViewer::ForeignGuiInterface> m_bdvGuiIfc;
|
||||
std::shared_ptr<ServiceMonitor::ForeignGuiInterface> m_smoGuiIfc;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -14,9 +14,8 @@ RelayInfoWidget::RelayInfoWidget(int id, QWidget *parent)
|
||||
, m_id(id)
|
||||
, m_state(false)
|
||||
, m_ui(new Ui::RelayInfoWidget)
|
||||
, m_logger(getLogger("RelayInfoWidget"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "RelayInfoWidget";
|
||||
DEBUG_LOG() << "RelayInfoWidget";
|
||||
m_ui->setupUi(this);
|
||||
|
||||
m_ui->ledStatus->setAspectHint(LtsWidgets::LtsLedWidget::AspectHint::WidthIsHeight);
|
||||
|
||||
@@ -47,7 +47,6 @@ private:
|
||||
int m_id;
|
||||
bool m_state;
|
||||
Ui::RelayInfoWidget *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user