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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -59,7 +59,7 @@ AbstractAttributeWidget *EditingModeUI::createAttributeUIWidget(DetailData *deta
if (!minb || !maxb)
{
WARNING_LOG(m_logger) << "createAttributeUIWidget: !minb (" << minb << ") || !maxb (" << maxb << ")";
WARNING_LOG() << "createAttributeUIWidget: !minb (" << minb << ") || !maxb (" << maxb << ")";
break;
}
@@ -90,7 +90,7 @@ AbstractAttributeWidget *EditingModeUI::createAttributeUIWidget(DetailData *deta
break;
}
WARNING_LOG(m_logger) << "DetailData::ATTRIBUTE_UI_TYPE_RAD_RANGE_WIDGET: errorious values!";
WARNING_LOG() << "DetailData::ATTRIBUTE_UI_TYPE_RAD_RANGE_WIDGET: errorious values!";
break;
}
@@ -115,7 +115,7 @@ AbstractAttributeWidget *EditingModeUI::createAttributeUIWidget(DetailData *deta
break;
}
WARNING_LOG(m_logger) << "DetailData::ATTRIBUTE_UI_TYPE_AREA_RANGE_WIDGET: errorious values!";
WARNING_LOG() << "DetailData::ATTRIBUTE_UI_TYPE_AREA_RANGE_WIDGET: errorious values!";
break;
}
@@ -137,7 +137,7 @@ AbstractAttributeWidget *EditingModeUI::createAttributeUIWidget(DetailData *deta
default:
{
WARNING_LOG(m_logger) << "createAttributeUIWidget: invalid attribute type #" << attributeUIType << "!";
WARNING_LOG() << "createAttributeUIWidget: invalid attribute type #" << attributeUIType << "!";
break;
}
@@ -155,7 +155,7 @@ void EditingModeUI::addAttributeContainer(int eventType, const QString &initialV
if (attributeUIWidget == nullptr)
{
DEBUG_LOG(m_logger) << "addAttributeContainer: !attributeUIWidget";
DEBUG_LOG() << "addAttributeContainer: !attributeUIWidget";
return;
}
@@ -170,7 +170,6 @@ EditingModeUI::EditingModeUI(DetailData *detailData, const QString &attributeTyp
: QWidget(parent)
, attributeType(attributeType)
, m_detailData(detailData)
, m_logger(getLogger("EventFilter.EditingModeUI"))
{
QVBoxLayout *editingModeLayout = new QVBoxLayout;
@@ -38,7 +38,6 @@ signals:
private:
QString attributeType;
DetailData *m_detailData;
NGL::INGLLogger &m_logger;
};
}
@@ -30,7 +30,7 @@ QComboBox *SelectionModeUI::createAttributesComboBox(int eventType)
if (cbAttribute.isEmpty())
{
WARNING_LOG(m_logger) << "SelectionModeUI::createAttributesComboBox: event type " << eventType << " has no attribute text for attribute " << attributeKey << " for attribute event lookup - not added";
WARNING_LOG() << "SelectionModeUI::createAttributesComboBox: event type " << eventType << " has no attribute text for attribute " << attributeKey << " for attribute event lookup - not added";
}
else
{
@@ -45,7 +45,6 @@ QComboBox *SelectionModeUI::createAttributesComboBox(int eventType)
SelectionModeUI::SelectionModeUI(DetailData *detailData, const int eventType)
: eventType(eventType)
, m_detailData(detailData)
, m_logger(getLogger("EventFilter.AttributeEditingModeUI"))
{
selectionModeWidget = new QWidget();
selectionModeLayout = new QHBoxLayout();
@@ -47,7 +47,6 @@ public:
QPushButton *pbAddEditingMode;
QPushButton *pbDeleteFilter;
DetailData *m_detailData;
NGL::INGLLogger &m_logger;
};
}
@@ -20,7 +20,6 @@ namespace Timeline
FilterTableEntry::FilterTableEntry(DetailData *detailData, const int &eventType, const bool &active, QWidget *parent)
: QGroupBox(parent)
, m_logger(getLogger("EventFilter.FilterTableEntry"))
, m_eventType(eventType)
@@ -105,7 +104,7 @@ void FilterTableEntry::updateData()
if (!ftec)
{
WARNING_LOG(m_logger) << "FilterTableEntry::filterText(): !ftec";
WARNING_LOG() << "FilterTableEntry::filterText(): !ftec";
continue;
}
@@ -131,7 +130,7 @@ const QJsonObject FilterTableEntry::filter(bool typeSafe) const
if (m_eventType == -1)
{
WARNING_LOG(m_logger) << "FilterTableEntry has no event type.";
WARNING_LOG() << "FilterTableEntry has no event type.";
return {};
}
@@ -166,7 +165,7 @@ const QJsonObject FilterTableEntry::filter(bool typeSafe) const
if (!ftec)
{
WARNING_LOG(m_logger) << "FilterTableEntry::filterText(): !ftec";
WARNING_LOG() << "FilterTableEntry::filterText(): !ftec";
continue;
}
@@ -210,7 +209,7 @@ void FilterTableEntry::slotSelectEventType()
if (m_eventType == -1)
{
WARNING_LOG(m_logger) << "slotSelectEventType: m_eventType == -1";
WARNING_LOG() << "slotSelectEventType: m_eventType == -1";
return;
}
@@ -36,7 +36,6 @@ public:
private:
NGL::INGLLogger &m_logger;
QComboBox *getEventTypesComboBox();
int m_eventType;
@@ -24,7 +24,6 @@ FilterTableEntryAttribute::FilterTableEntryAttribute(DetailData *detailData, int
, m_editionModeUI(nullptr)
, m_attributesLayout(new QVBoxLayout())
, m_detailData(detailData)
, m_logger(getLogger("EventFilter.FilterTableEntryAttribute"))
{
this->setTitle(QString());
@@ -77,7 +76,7 @@ const QJsonObject FilterTableEntryAttribute::filter(bool typeSafe) const
{
if (m_attributeType.isEmpty())
{
WARNING_LOG(m_logger) << "filterText: m_attributeType == -1";
WARNING_LOG() << "filterText: m_attributeType == -1";
return QJsonObject();
}
@@ -94,7 +93,7 @@ const QJsonObject FilterTableEntryAttribute::filter(bool typeSafe) const
if (attributeTypeName.isEmpty())
{
WARNING_LOG(m_logger) << "filterText: !attributeTypeName.length()";
WARNING_LOG() << "filterText: !attributeTypeName.length()";
return QJsonObject();
}
@@ -175,7 +174,7 @@ void FilterTableEntryAttribute::slotAddEditingMode(bool createBlankContainer)
if (m_attributeType.isEmpty())
{
WARNING_LOG(m_logger) << "slotAddEditingMode: invalid attribute type string!";
WARNING_LOG() << "slotAddEditingMode: invalid attribute type string!";
return;
}
@@ -41,8 +41,6 @@ signals:
void attributeChanged(const bool &hasAttribute);
private:
NGL::INGLLogger &m_logger;
private slots:
void slotAddAttributeContainer();
void slotDeleteAttributeContainer();
@@ -36,8 +36,6 @@ FilterWindow::FilterWindow(DetailData *detailData,
, m_ui(new Ui::FilterWindow)
, updateTimer(new QTimer(this))
, m_detailData(detailData)
, m_logger(getLogger("EventFilter.FilterWindow"))
, m_session(session)
{
m_ui->setupUi(this);
@@ -102,11 +100,11 @@ void FilterWindow::slotSave()
filterToDoc(exportFilter()));
if (fileId > 0)
{
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
DEBUG_LOG() << "Saved file with id = " << fileId;
__unchange__();
}
else
ERROR_LOG(m_logger) << "Could not save file in library ";
ERROR_LOG() << "Could not save file in library ";
}
@@ -52,8 +52,6 @@ private:
Ui::FilterWindow *m_ui;
QTimer *updateTimer;
DetailData *m_detailData;
NGL::INGLLogger &m_logger;
LtsSession::LtsSession *m_session;
signals:
@@ -15,7 +15,6 @@ ComboBox::ComboBox(DetailData *detailData, const QString &attributeType, int eve
: AbstractAttributeWidget(parent)
, m_cbValues(new QComboBox())
, m_eventType(eventType)
, m_logger(getLogger("EventFilter.ComboBox"))
{
connect(m_cbValues, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &ComboBox::signalChanges);
@@ -33,7 +32,7 @@ ComboBox::ComboBox(DetailData *detailData, const QString &attributeType, int eve
if (initialValueKey < 0 || !k)
{
WARNING_LOG(m_logger) << "ComboBox::c_tor: initialValueKey < 0 (" << initialValueKey << ")" << "initialValue: " << initialValue;
WARNING_LOG() << "ComboBox::c_tor: initialValueKey < 0 (" << initialValueKey << ")" << "initialValue: " << initialValue;
return;
}
@@ -74,7 +73,7 @@ void ComboBox::updateData(DetailData *detailData)
m_cbValues->setCurrentIndex(m_cbValues->findData(lastSelectedKey, Qt::UserRole));
DEBUG_LOG(m_logger) << "ComboBox: no initial item index found for value id" << lastSelectedKey;
DEBUG_LOG() << "ComboBox: no initial item index found for value id" << lastSelectedKey;
}
@@ -29,8 +29,6 @@ private:
int m_eventType;
QString m_concreteAttributeType;
AttributeValueMap m_avm;
NGL::INGLLogger &m_logger;
};
}
@@ -17,7 +17,6 @@ DefaultRangeWidget::DefaultRangeWidget(unsigned int min, unsigned int max, const
: AbstractAttributeWidget(parent)
, box1(new QSpinBox())
, box2(new QSpinBox())
, m_logger(getLogger("EventFilter.Widgets.DefaultRangeWidget"))
{
connect(box1, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &DefaultRangeWidget::signalChanges);
connect(box2, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &DefaultRangeWidget::signalChanges);
@@ -57,7 +56,7 @@ DefaultRangeWidget::DefaultRangeWidget(unsigned int min, unsigned int max, const
if (valueList.count() != 2)
{
WARNING_LOG(m_logger) << "DefaultRangeWidget: invalid initial value '" << initialValue << "'";
WARNING_LOG() << "DefaultRangeWidget: invalid initial value '" << initialValue << "'";
return;
}
@@ -69,7 +68,7 @@ DefaultRangeWidget::DefaultRangeWidget(unsigned int min, unsigned int max, const
if (!k1 || !k2)
{
WARNING_LOG(m_logger) << "DefaultRangeWidget: initial value is not numeric '" << initialValue << "'";
WARNING_LOG() << "DefaultRangeWidget: initial value is not numeric '" << initialValue << "'";
return;
}
@@ -32,7 +32,6 @@ public:
private:
QSpinBox* box1;
QSpinBox* box2;
NGL::INGLLogger &m_logger;
};
}
@@ -18,7 +18,6 @@ namespace Timeline
TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialValue, QWidget *parent)
: AbstractAttributeWidget(parent)
, m_logger(getLogger("EventFilter.Widgets.TimeRangeWidget"))
, m_edit1(new LtsWidgets::LtsDateTimeEdit(this))
, m_edit2(new LtsWidgets::LtsDateTimeEdit(this))
{
@@ -56,7 +55,7 @@ TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialV
if (initialTimeRange.count() != 2)
{
WARNING_LOG(m_logger) << "invalid initial time range value: " << initialValue;
WARNING_LOG() << "invalid initial time range value: " << initialValue;
return;
}
@@ -65,7 +64,7 @@ TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialV
time *= 1000;
if (!k)
WARNING_LOG(m_logger) << "invalid initial time range start value: " << initialTimeRange.at(0).toString();
WARNING_LOG() << "invalid initial time range start value: " << initialTimeRange.at(0).toString();
else
m_edit1->setMsecsSinceEpoch(time);
@@ -74,7 +73,7 @@ TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialV
time *= 1000;
if (!k)
WARNING_LOG(m_logger) << "invalid initial time range start value: " << initialTimeRange.at(1).toString();
WARNING_LOG() << "invalid initial time range start value: " << initialTimeRange.at(1).toString();
else
m_edit2->setMsecsSinceEpoch(time);
}
@@ -26,7 +26,6 @@ public:
void updateData(DetailData *detailData) override;
private:
NGL::INGLLogger &m_logger;
public:
LtsWidgets::LtsDateTimeEdit *m_edit1;
LtsWidgets::LtsDateTimeEdit *m_edit2;
@@ -53,7 +53,6 @@ DetailData::DetailData(LtsSession::LtsSession *session, QObject *parent)
: QObject(parent)
, m_session(session)
, __already_populated__(false)
, m_logger(getLogger("DetailData"))
{
populate();
}
@@ -397,7 +396,7 @@ DetailData::GetDetailDataResultList DetailData::getDetailData(const LtsTimelineC
const QJsonObject &root = event->detailData();
for (auto i = root.constBegin(); i != root.constEnd(); ++i)
{
DEBUG_LOG(m_logger) << "Adding Detail Data for: " << i.key();
DEBUG_LOG() << "Adding Detail Data for: " << i.key();
result.append(getDetailDataForAttribute(i.key(), *i));
}
@@ -417,7 +416,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
if (attribute.isNull() || attribute.isUndefined())
{
WARNING_LOG(m_logger) << "DetailData::getDetailDataForAttribute: no attribute type " << attributeType
WARNING_LOG() << "DetailData::getDetailDataForAttribute: no attribute type " << attributeType
<< " in " << QJsonDocument(root).toJson();
result.requestResult = DetailData::RequestResult::InvalidAttributeType;
@@ -462,7 +461,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
case QJsonValue::Null:
case QJsonValue::Undefined:
{
WARNING_LOG(m_logger) << "Timeline: DetailData::getDetailDataForAttribute: attribute value is null or undefined! " << attributeValueJson.toString();
WARNING_LOG() << "Timeline: DetailData::getDetailDataForAttribute: attribute value is null or undefined! " << attributeValueJson.toString();
result.requestResult = DetailData::RequestResult::InvalidAttributeTypeJson;
return result;
}
@@ -498,7 +497,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
default:
{
WARNING_LOG(m_logger) << "Timeline: DetailData::getDetailDataForAttribute: attribute value cannot be handled. Type " << attributeValueJson.type() << attributeValueJson.toString();
WARNING_LOG() << "Timeline: DetailData::getDetailDataForAttribute: attribute value cannot be handled. Type " << attributeValueJson.type() << attributeValueJson.toString();
result.requestResult = DetailData::RequestResult::InvalidAttributeType;
return result;
}
@@ -548,7 +547,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
if (concreteAttributeType == attributeType)
{
ERROR_LOG(m_logger) << "getDetailDataForAttribute: attribute type " << attributeType << " does not have an UiType !!!";
ERROR_LOG() << "getDetailDataForAttribute: attribute type " << attributeType << " does not have an UiType !!!";
result.requestResult = DetailData::RequestResult::NoUiTypeForAttribute;
}
else
@@ -692,7 +691,7 @@ QString DetailData::AttributeTypeLookup::getAttributeType(const QString &attribu
return i.key();
}
WARNING_LOG(m_logger) << "getAttributeType: attribute type not found by text '" << attributeText << "'";
WARNING_LOG() << "getAttributeType: attribute type not found by text '" << attributeText << "'";
return QString();
}
@@ -722,7 +721,7 @@ void DetailData::AttributeParameterLookup::addParameter(const QString &attribute
{
if (!parameterMap.count())
{
WARNING_LOG(m_logger) << "addParameter: parameter map is empty!";
WARNING_LOG() << "addParameter: parameter map is empty!";
return;
}
@@ -135,10 +135,7 @@ private:
GetDetailDataForAttributeResult getDetailDataForAttribute(const QString &attributeType, const QJsonValue &attributeValueJson);
LtsSession::LtsSession *m_session;
bool __already_populated__;
NGL::INGLLogger &m_logger;
bool __already_populated__;
public:
class LookupBase
@@ -148,7 +145,6 @@ public:
protected:
QString m_lookupClassName;
NGL::INGLLogger &m_logger;
};
@@ -59,7 +59,6 @@ TimelineViewDialog::TimelineViewDialog(const QString &menuGroup, const LtsWidget
, m_armed(false)
, m_exerciseStart(0)
, m_legendDialog(nullptr)
, m_logger(getLogger("Dialog"))
{
m_ui->setupUi(this);
@@ -274,7 +273,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
if (!m_model->init(eemForeign, mrkDtc, exmDtc, ppmDtc, pdmDtc, ismDtc, session, m_detailData, m_streamNameMapping))
{
ERROR_LOG(m_logger) << "model init failed";
ERROR_LOG() << "model init failed";
return false;
}
@@ -403,7 +402,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
{
WARNING_LOG(m_logger) << "reimpl me!!";
WARNING_LOG() << "reimpl me!!";
});
cacheDialog->setAttribute(Qt::WA_DeleteOnClose, true);
@@ -430,7 +429,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
if (!m_model->hasActiveEventTypes())
{
DEBUG_LOG(m_logger) << "range changed, but no active event types! not arming timer..";
DEBUG_LOG() << "range changed, but no active event types! not arming timer..";
return;
}
@@ -470,7 +469,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
if (m_exerciseStart < 1)
{
LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), tr("Exercise data not available or exercise not started yet."), tr("Cannot open timeline"));
ERROR_LOG(m_logger) << "exercise data not available - exercise start: " << m_exerciseStart;
ERROR_LOG() << "exercise data not available - exercise start: " << m_exerciseStart;
return false;
}
@@ -624,7 +623,7 @@ void TimelineViewDialog::slotStartReplaySituation()
if (rp.id() == 0)
{
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session in stage 1."));
WARNING_LOG(m_logger) << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId() <<
WARNING_LOG() << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId() <<
" - replay partition does not exist - replay id: " << m_requestHelper->getRepliedId() <<
" - url " << m_session->tcpConnectionUrl().toString();
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Import, true);
@@ -638,7 +637,7 @@ void TimelineViewDialog::slotStartReplaySituation()
if (m_replayApp == nullptr)
{
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session in stage 2."));
WARNING_LOG(m_logger) << "Error while trying to create a replay session: domainId: " << m_session->domainId() <<
WARNING_LOG() << "Error while trying to create a replay session: domainId: " << m_session->domainId() <<
" - partition create reply (failed) - replay id: " << m_requestHelper->getRepliedId() <<
" - url: " << m_session->tcpConnectionUrl().toString();
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Import, true);
@@ -990,12 +989,12 @@ void TimelineViewDialog::slotWaitForReady()
if (partitionTime < ex.beginTime())
{
LtsWidgets::LtsMessageDialog::showMessage(this, tr("The current time is outside of the Exercise's period.<br>Events are only recorded in Exercise period boundaries."), tr("No Events available"));
WARNING_LOG(m_logger) << "Partition time was " << partitionTime << ", exercise begin time: " << ex.beginTime();
WARNING_LOG() << "Partition time was " << partitionTime << ", exercise begin time: " << ex.beginTime();
}
}
else
{
WARNING_LOG(m_logger) << "TimelineViewDialog::init: could not check exercise's boundaries!";
WARNING_LOG() << "TimelineViewDialog::init: could not check exercise's boundaries!";
}
LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
@@ -151,8 +151,6 @@ private:
qint64 m_exerciseStart;
TimelineLegendDialog *m_legendDialog;
QTimer *m_armTimer;
NGL::INGLLogger &m_logger;
void setCustomSpan();
void calculateAndSetRange();
void setRange(qint64 min, qint64 max);
@@ -50,8 +50,6 @@ DDSTimelineModel::DDSTimelineModel(QObject *parent)
, m_eventCount(0)
, m_lastCachedEventsId(0)
, m_createFakeEvents(false)
, m_logger(getLogger("DialogModel"))
{
m_liveCache.visible = false;
m_liveCache.start = 0;
@@ -177,14 +175,14 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
QJsonObject root(getDetailData(event));
ev->setEndT(root[QStringLiteral("endTime")].toDouble());
ev->setDetailData(root);
DEBUG_LOG(m_logger) << "live event not added - already exists - modified instead - end";
DEBUG_LOG() << "live event not added - already exists - modified instead - end";
return;
}
if (!isLive())
{
DEBUG_LOG(m_logger) << "not adding live event because we're not live";
DEBUG_LOG() << "not adding live event because we're not live";
return;
}
@@ -193,7 +191,7 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
int eventType = static_cast<int>(event.eventTypeId().underlying());
if (!m_activeEventTypeIds.contains(eventType))
{
DEBUG_LOG(m_logger) << "live event not added - event type ("<<eventType<<") inactive";
DEBUG_LOG() << "live event not added - event type ("<<eventType<<") inactive";
return;
}
@@ -201,7 +199,7 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
if (m_liveCache.events.count() > m_cacheSize)
{
DEBUG_LOG(m_logger) << "more than " << m_cacheSize << " live events - archiving and clearing";
DEBUG_LOG() << "more than " << m_cacheSize << " live events - archiving and clearing";
saveAndClearLiveCache();
}
@@ -221,7 +219,7 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
rebuildTimelineKnownRanges();
#ifdef LTS_DEBUG
DEBUG_LOG(m_logger) << "added live event at " << eventTime << " - cache: " << start << " " << end << ", " << m_liveCache.events.count() << " events";
DEBUG_LOG() << "added live event at " << eventTime << " - cache: " << start << " " << end << ", " << m_liveCache.events.count() << " events";
#endif
addEventAndFilter(ltsEvent);
@@ -281,7 +279,7 @@ void DDSTimelineModel::addCacheRange(const LtsTimelineClassic::Range &range, con
rebuildTimelineKnownRanges();
}
DEBUG_LOG(m_logger) << "added cache for " << range.start << " to " << range.end << " - event count now: " << m_eventCount;
DEBUG_LOG() << "added cache for " << range.start << " to " << range.end << " - event count now: " << m_eventCount;
}
@@ -304,7 +302,7 @@ void DDSTimelineModel::_uncache(const CacheRange &cr)
void DDSTimelineModel::uncache(CacheRange &cr)
{
QString hash(QStringLiteral("<%1:%2:%3>").arg(cr.start).arg(cr.end).arg(cr.events.count()));
DEBUG_LOG(m_logger) << "uncaching " << QString::number(qHash(hash), 16) << " " << cr.start << " "<< cr.end;
DEBUG_LOG() << "uncaching " << QString::number(qHash(hash), 16) << " " << cr.start << " "<< cr.end;
cr.visible = false;
_uncache(cr);
@@ -345,7 +343,7 @@ void DDSTimelineModel::forceUncache()
uncache(cr);
m_eventCount -= cr.events.count();
m_cachedEvents.erase(i);
DEBUG_LOG(m_logger) << "removed an invisible & incomplete cache - event count now: " << m_eventCount;
DEBUG_LOG() << "removed an invisible & incomplete cache - event count now: " << m_eventCount;
return;
}
}
@@ -359,7 +357,7 @@ void DDSTimelineModel::forceUncache()
uncache(cr);
m_eventCount -= cr.events.count();
m_cachedEvents.erase(i);
DEBUG_LOG(m_logger) << "removed an invisible cache - event count now: " << m_eventCount;
DEBUG_LOG() << "removed an invisible cache - event count now: " << m_eventCount;
return;
}
}
@@ -398,7 +396,7 @@ void DDSTimelineModel::forceUncache()
m_cachedEvents.erase(lowestEnd);
}
WARNING_LOG(m_logger) << "force-removing a visible cache ... - event count now: " << m_eventCount;
WARNING_LOG() << "force-removing a visible cache ... - event count now: " << m_eventCount;
}
@@ -436,7 +434,7 @@ void DDSTimelineModel::processEventList(qint64 &highest, bool &incomplete, QVect
count++;
if (count > m_cacheSize)
{
WARNING_LOG(m_logger) << "max cache exceeded - not adding more than " << m_cacheSize << " events";
WARNING_LOG() << "max cache exceeded - not adding more than " << m_cacheSize << " events";
incomplete = true;
emit signalTooMuchEvents();
break;
@@ -461,12 +459,12 @@ void DDSTimelineModel::receivedEvents(const LtsTimelineClassic::Range &range, QV
if (isCacheFull())
{
DEBUG_LOG(m_logger) << "receivedEvents: cache full - force uncache";
DEBUG_LOG() << "receivedEvents: cache full - force uncache";
forceUncache();
}
#ifdef LTS_DEBUG
DEBUG_LOG(m_logger) << "received events count: " << receivedEventsList.count();
DEBUG_LOG() << "received events count: " << receivedEventsList.count();
#endif
qint64 highest = 0;
@@ -476,7 +474,7 @@ void DDSTimelineModel::receivedEvents(const LtsTimelineClassic::Range &range, QV
processEventList(highest, incomplete, cachedEvents, receivedEventsList);
addCacheRange(range, cachedEvents, incomplete ? highest : 0);
DEBUG_LOG(m_logger) << "receivedEvents: loading done";
DEBUG_LOG() << "receivedEvents: loading done";
emit signalLoadingDone();
}
@@ -507,7 +505,7 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
EventRequest *er = qobject_cast<EventRequest *>(sender());
if (er == nullptr)
{
DEBUG_LOG(m_logger) << "not an EventRequest: " << sender();
DEBUG_LOG() << "not an EventRequest: " << sender();
return;
}
@@ -540,7 +538,7 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
if (err.error != QJsonParseError::NoError)
{
ERROR_LOG(m_logger) << "Event #" << id << " with event type id " << eventTypeId << " and start time " << startTime << " json detail data cannot be parsed: " << err.errorString() << " at offset " << err.offset;
ERROR_LOG() << "Event #" << id << " with event type id " << eventTypeId << " and start time " << startTime << " json detail data cannot be parsed: " << err.errorString() << " at offset " << err.offset;
continue;
}
@@ -620,7 +618,7 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
path, paintFunc, color, root, -1, pos, m_session);
#ifdef LTS_DEBUG
DEBUG_LOG(m_logger) << "Event #" << event->uniqueId() << " with event type id " << event->typeId() << " and start time " << event->startTime() << " created";
DEBUG_LOG() << "Event #" << event->uniqueId() << " with event type id " << event->typeId() << " and start time " << event->startTime() << " created";
#endif
er->append(event);
@@ -630,13 +628,13 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
void DDSTimelineModel::requestEvents(const LtsTimelineClassic::Range &range)
{
DEBUG_LOG(m_logger) << "requesting events from " << QDateTime::fromMSecsSinceEpoch(range.start).toString()
DEBUG_LOG() << "requesting events from " << QDateTime::fromMSecsSinceEpoch(range.start).toString()
<< " to " << QDateTime::fromMSecsSinceEpoch(range.end).toString();
if (m_createFakeEvents)
DEBUG_LOG(m_logger) << "requesting fake events ..";
DEBUG_LOG() << "requesting fake events ..";
else
DEBUG_LOG(m_logger) << "requesting real events ..";
DEBUG_LOG() << "requesting real events ..";
EventRequest *request = new EventRequest(m_createFakeEvents ? QUrl(QStringLiteral("ws://127.0.0.1:10090")) : m_eemForeign->eemUrl(),
range.start, range.end, m_activeEventTypeIds, m_cacheSize);
@@ -645,7 +643,7 @@ void DDSTimelineModel::requestEvents(const LtsTimelineClassic::Range &range)
this, [this, range, request]()
{
QVector<LtsTimelineClassic::Event *> eventList = request->eventList();
DEBUG_LOG(m_logger) << ".. received real events! " << range.start << " - " << range.end;
DEBUG_LOG() << ".. received real events! " << range.start << " - " << range.end;
receivedEvents(range, eventList);
request->deleteLater();
@@ -654,7 +652,7 @@ void DDSTimelineModel::requestEvents(const LtsTimelineClassic::Range &range)
connect(request, &EventRequest::signalRequestFailed,
this, [this, request](const QString &errorString)
{
ERROR_LOG(m_logger) << ".. event request from " << request->start() << " to " << request->end() << " failed! '" << errorString << "'";
ERROR_LOG() << ".. event request from " << request->start() << " to " << request->end() << " failed! '" << errorString << "'";
emit signalLoadingDone();
});
@@ -706,12 +704,12 @@ bool DDSTimelineModel::splitLowest(qint64 &rangeMin , qint64 rangeMax , qint64
requestMin = rangeMin;
requestMax = lowestCache.start - 1;
DEBUG_LOG(m_logger) << "splitLowest: there is an uncached range before the lowest cache, adding this uncached range to the request " << requestMin << " - " << requestMax << " and set rangeMin now to " << rangeMin << " while rangeMax keeps being " << rangeMax;
DEBUG_LOG() << "splitLowest: there is an uncached range before the lowest cache, adding this uncached range to the request " << requestMin << " - " << requestMax << " and set rangeMin now to " << rangeMin << " while rangeMax keeps being " << rangeMax;
}
else
{
DEBUG_LOG(m_logger) << "splitLowest: no uncached range at the start of the requested range, no need to request events here - skipping";
DEBUG_LOG() << "splitLowest: no uncached range at the start of the requested range, no need to request events here - skipping";
}
@@ -719,11 +717,11 @@ bool DDSTimelineModel::splitLowest(qint64 &rangeMin , qint64 rangeMax , qint64
if (rangeMin > rangeMax)
{
DEBUG_LOG(m_logger) << "splitLowest: rangeMin > rangeMax - lowestCache.end " << lowestCache.end;
DEBUG_LOG() << "splitLowest: rangeMin > rangeMax - lowestCache.end " << lowestCache.end;
rangeMin = rangeMax;
}
DEBUG_LOG(m_logger) << "splitLowest: space? " << spaceBeforeCache << " | requestMin" << requestMin << " - requestMax " << requestMax << " | oldRangeMin " << oldRangeMin << " - rangeMin " << rangeMin;
DEBUG_LOG() << "splitLowest: space? " << spaceBeforeCache << " | requestMin" << requestMin << " - requestMax " << requestMax << " | oldRangeMin " << oldRangeMin << " - rangeMin " << rangeMin;
return spaceBeforeCache;
}
@@ -761,27 +759,27 @@ void DDSTimelineModel::getAllEventsOfType(const QSet<int> &eventTypeIds)
if (icr == m_cachedEvents.end())
{
WARNING_LOG(m_logger) << "cr after request for crId " << crId << " not available anymore";
WARNING_LOG() << "cr after request for crId " << crId << " not available anymore";
return;
}
CacheRange &cr = icr->second;
QVector<LtsTimelineClassic::Event *> eventList = request->eventList();
DEBUG_LOG(m_logger) << "getAllEventsOfType: .. received real events! " << cr.start << " - " << cr.end;
DEBUG_LOG() << "getAllEventsOfType: .. received real events! " << cr.start << " - " << cr.end;
if (isCacheFull())
{
DEBUG_LOG(m_logger) << "getAllEventsOfType: receivedEvents: cache full - not adding new events";
DEBUG_LOG() << "getAllEventsOfType: receivedEvents: cache full - not adding new events";
cr.incomplete = true;
return;
}
#ifdef LTS_DEBUG
DEBUG_LOG(m_logger) << "getAllEventsOfType: received events count: " << eventList.count();
DEBUG_LOG() << "getAllEventsOfType: received events count: " << eventList.count();
#endif
qint64 highest = 0;
@@ -819,14 +817,14 @@ void DDSTimelineModel::getAllEventsOfType(const QSet<int> &eventTypeIds)
rebuildTimelineKnownRanges();
DEBUG_LOG(m_logger) << "getAllEventsOfType: receivedEvents: loading done";
DEBUG_LOG() << "getAllEventsOfType: receivedEvents: loading done";
request->deleteLater();
});
connect(request, &EventRequest::signalRequestFailed,
this, [this, request](const QString &errorString)
{
ERROR_LOG(m_logger) << "getAllEventsOfType: event request from " << request->start() << " to " << request->end() << " failed! '" << errorString << "'";
ERROR_LOG() << "getAllEventsOfType: event request from " << request->start() << " to " << request->end() << " failed! '" << errorString << "'";
emit signalLoadingDone();
});
@@ -838,17 +836,17 @@ void DDSTimelineModel::getAllEventsOfType(const QSet<int> &eventTypeIds)
void DDSTimelineModel::getEvents(qint64 rangeMin, qint64 rangeMax)
{
DEBUG_LOG(m_logger) << "getEvents: requesting events from " << QDateTime::fromMSecsSinceEpoch(rangeMin).toString() << rangeMin << " to " << QDateTime::fromMSecsSinceEpoch(rangeMax).toString() << rangeMax;
DEBUG_LOG() << "getEvents: requesting events from " << QDateTime::fromMSecsSinceEpoch(rangeMin).toString() << rangeMin << " to " << QDateTime::fromMSecsSinceEpoch(rangeMax).toString() << rangeMax;
if (!hasActiveEventTypes())
{
DEBUG_LOG(m_logger) << "no active event types selected";
DEBUG_LOG() << "no active event types selected";
return;
}
if (m_liveCache.start != 0 && rangeMax > m_liveCache.start)
{
DEBUG_LOG(m_logger) << "live cache active & in range - limited range max from " << rangeMax << " to " << m_liveCache.start - 1;
DEBUG_LOG() << "live cache active & in range - limited range max from " << rangeMax << " to " << m_liveCache.start - 1;
rangeMax = m_liveCache.start - 1;
}
@@ -857,17 +855,17 @@ void DDSTimelineModel::getEvents(qint64 rangeMin, qint64 rangeMax)
for (auto &it : m_cachedEvents)
{
CacheRange &cr = it.second;
DEBUG_LOG(m_logger) << "> start " << cr.start << " end " << cr.end;
DEBUG_LOG() << "> start " << cr.start << " end " << cr.end;
bool inside = isInsideCachedRange(cr, rangeMin, rangeMax);
if (!inside)
continue;
DEBUG_LOG(m_logger) << "found range that was cached, using it instead of requesting new events";
DEBUG_LOG() << "found range that was cached, using it instead of requesting new events";
if (!cr.visible)
{
DEBUG_LOG(m_logger) << "found range that was cached AND not visible, showing it again";
DEBUG_LOG() << "found range that was cached AND not visible, showing it again";
showCached(cr);
}
@@ -902,18 +900,18 @@ void DDSTimelineModel::getEvents(qint64 rangeMin, qint64 rangeMax)
if (rangeMin < rangeMax)
{
DEBUG_LOG(m_logger) << "adding request for leftovers from " << rangeMin << " - " << rangeMax;
DEBUG_LOG() << "adding request for leftovers from " << rangeMin << " - " << rangeMax;
requestRanges.append(Range(rangeMin, rangeMax));
}
int requestRangesCount = requestRanges.count();
DEBUG_LOG(m_logger) << "requestRanges: " << requestRangesCount;
DEBUG_LOG() << "requestRanges: " << requestRangesCount;
for (const auto &range : std::as_const(requestRanges))
requestEvents(range);
if (requestRangesCount < 1)
DEBUG_LOG(m_logger) << "nothing requested (requestRangesCount empty)";
DEBUG_LOG() << "nothing requested (requestRangesCount empty)";
}
@@ -1092,7 +1090,7 @@ QJsonObject DDSTimelineModel::createMarkerDetailData(const MarkerManagement::Mar
}
default:
{
WARNING_LOG(m_logger) << "Marker " << data.id() << "'s description has an invalid marker type: " << (int)md.markerType().underlying();
WARNING_LOG() << "Marker " << data.id() << "'s description has an invalid marker type: " << (int)md.markerType().underlying();
break;
}
}
@@ -1186,7 +1184,7 @@ void DDSTimelineModel::addMarkerManagementMarker(const MarkerManagement::Marker
m_session));
#ifdef LTS_DEBUG
DEBUG_LOG(m_logger) << "marker added! uniqueId " << data.id() << ", startTime " << data.timeStamp();
DEBUG_LOG() << "marker added! uniqueId " << data.id() << ", startTime " << data.timeStamp();
#endif
}
@@ -1220,7 +1218,7 @@ const QJsonObject DDSTimelineModel::getDetailData(const QByteArray &data, int id
QJsonDocument doc(QJsonDocument::fromJson(data, &err));
if (err.error != QJsonParseError::NoError)
{
ERROR_LOG(m_logger) << "getDetailData: Event #" << id << " with event type id " << type << " and start time " << startTime << " json detail data cannot be parsed: " << err.errorString() << " at offset " << err.offset;
ERROR_LOG() << "getDetailData: Event #" << id << " with event type id " << type << " and start time " << startTime << " json detail data cannot be parsed: " << err.errorString() << " at offset " << err.offset;
return QJsonObject();
}
@@ -1319,7 +1317,7 @@ LtsTimelineClassic::Event *DDSTimelineModel::createEvent(const ExerciseEventMana
#ifdef LTS_DEBUG
DEBUG_LOG(m_logger) << "Event #" << event->uniqueId() << " with event type id " << event->typeId() << " and start time " << event->startTime() << " created";
DEBUG_LOG() << "Event #" << event->uniqueId() << " with event type id " << event->typeId() << " and start time " << event->startTime() << " created";
#endif
return event;
@@ -1372,7 +1370,7 @@ QStringList DDSTimelineModel::getPathForAvsEvents(const QString &type, const QJs
QStringList result;
int buildingId = obj[QStringLiteral("MainStructureElementId")].toInt();
DEBUG_LOG(m_logger) << "Building Id = " << buildingId;
DEBUG_LOG() << "Building Id = " << buildingId;
if (buildingId > 0)
{
const QString buildingName = m_ismDtc->getBuildingDisplayName(buildingId);
@@ -1399,7 +1397,7 @@ QStringList DDSTimelineModel::getPathForBuildingEvents(const QString &type, cons
QString buildingName;
int buildingId = obj[QStringLiteral("MainStructureElementId")].toInt();
DEBUG_LOG(m_logger) << "Building Id = " << buildingId;
DEBUG_LOG() << "Building Id = " << buildingId;
if (buildingId > 0)
{
buildingName = m_ismDtc->getBuildingDisplayName(buildingId);
@@ -1418,7 +1416,7 @@ QStringList DDSTimelineModel::getPathForAesEvents(const QString &type, const QJs
result << type;
QString aesName = obj[QStringLiteral("AesName")].toString();
DEBUG_LOG(m_logger) << "AesName = " << aesName;
DEBUG_LOG() << "AesName = " << aesName;
result << aesName;
return result;
@@ -1438,7 +1436,7 @@ void DDSTimelineModel::removeEvent(int eventId)
}
}
WARNING_LOG(m_logger) << "removeEvent: event "<<eventId<<" not found !!";
WARNING_LOG() << "removeEvent: event "<<eventId<<" not found !!";
}
@@ -142,9 +142,6 @@ private:
QSet<int> m_activeEventTypeIds;
QVector<int> m_knownMarkerIds;
NGL::INGLLogger &m_logger;
public slots:
void slotAddLiveEvent(const ExerciseEventManagement::Event &event);
@@ -36,7 +36,6 @@ EventListDialog::EventListDialog(const QString &menuGroup,
, m_listEvents(false)
, m_flmIfc(flmIfc)
, m_session(session)
, m_logger(getLogger("EventList"))
{
m_ui->setupUi(this);
@@ -75,7 +74,7 @@ EventListDialog::EventListDialog(const QString &menuGroup,
EventListDialog::~EventListDialog()
{
DEBUG_LOG(m_logger) << "~EventListDialog";
DEBUG_LOG() << "~EventListDialog";
if (m_proxyModel != nullptr)
m_proxyModel->setInvalid();
m_model->setInvalid();
@@ -140,10 +139,10 @@ void EventListDialog::initColumns()
columnInfos.reserve(colCount);
const auto header = m_ui->ltsDataView->searchView()->header();
DEBUG_LOG(m_logger) << "concealed count: " << m_concealedColumns.length();
DEBUG_LOG() << "concealed count: " << m_concealedColumns.length();
for (int visualIndex = 0; visualIndex < colCount; ++visualIndex)
{
DEBUG_LOG(m_logger) << visualIndex << " concealed? " << m_concealedColumns.contains(visualIndex);
DEBUG_LOG() << visualIndex << " concealed? " << m_concealedColumns.contains(visualIndex);
if (m_concealedColumns.contains(visualIndex))
continue;
@@ -154,7 +153,7 @@ void EventListDialog::initColumns()
ci.visible = !header->isSectionHidden(ci.logicalIndex);
ci.name = m_model->headerData(ci.logicalIndex, Qt::Orientation::Horizontal, Qt::DisplayRole).toString();
DEBUG_LOG(m_logger) << "InitColumns: Adding column " << ci.name <<
DEBUG_LOG() << "InitColumns: Adding column " << ci.name <<
" with visual index = " << ci.visualIndex <<
", logical index = " << ci.logicalIndex;
@@ -238,7 +237,7 @@ void EventListDialog::showColumns()
{
int oldVisualIndex = header->visualIndex(ci.logicalIndex);
DEBUG_LOG(m_logger) << "ShowColumns: Column " << ci.name
DEBUG_LOG() << "ShowColumns: Column " << ci.name
<< ", colVisible: " << ci.visible
<< ", logical index: " << ci.logicalIndex
<< ", old index: " << oldVisualIndex
@@ -265,8 +264,8 @@ void EventListDialog::reInitEventList(const LtsTimelineClassic::EventList &event
newEventList += e;
}
DEBUG_LOG(m_logger) << "reInitEventList size = " << eventList.size();
DEBUG_LOG(m_logger) << "reInitEventList new size = " << newEventList.size();
DEBUG_LOG() << "reInitEventList size = " << eventList.size();
DEBUG_LOG() << "reInitEventList new size = " << newEventList.size();
m_model->clear();
m_model->setData(newEventList);
}
@@ -65,7 +65,6 @@ private:
std::shared_ptr<FileManagement::ForeignGuiInterface> m_flmIfc;
LtsSession::LtsSession *m_session;
EventListDialogProxyModel *m_proxyModel { nullptr };
NGL::INGLLogger &m_logger;
QVector<int> m_concealedColumns;
signals:
@@ -32,7 +32,6 @@ EventListColumns::EventListColumns(const QVector<ColumnInfo> &columns,
, m_ui(new Ui::EventListColumns)
, m_flmIfc(flmIfc)
, m_columns(columns)
, m_logger(getLogger("EventListColumns"))
{
m_ui->setupUi(this);
@@ -147,14 +146,14 @@ void EventListColumns::loadColumns(const QJsonArray &cols)
if (elc)
{
ERROR_LOG(m_logger) << "Modifed Column: " << ci.visualIndex
ERROR_LOG() << "Modifed Column: " << ci.visualIndex
<< ", " << ci.logicalIndex << ", " << ci.name
<< ", " << ci.visible << ", " << objName;
elc->setChecked(ci.visible);
}
else
{
ERROR_LOG(m_logger) << "New Column: " << ci.visualIndex
ERROR_LOG() << "New Column: " << ci.visualIndex
<< ", " << ci.logicalIndex << ", " << ci.name
<< ", " << ci.visible << ", " << objName;
elc = new EventListColumn(ci);
@@ -168,9 +167,9 @@ bool EventListColumns::save()
{
int fileId = m_flmIfc->saveFileContent(this, FileManagement::FileType::Xml, 0, columnsToDoc(exportColumns()));
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 ";
return (fileId > 0);
}
@@ -191,7 +190,7 @@ const QJsonArray EventListColumns::exportColumns() const
for (const EventListColumn *elc : children)
{
const auto &ci = elc->columnInfo();
DEBUG_LOG(m_logger) << "Saving column: " << ci.visualIndex << ", " << elc->text() << ", " << elc->isChecked();
DEBUG_LOG() << "Saving column: " << ci.visualIndex << ", " << elc->text() << ", " << elc->isChecked();
QJsonObject elcObj;
elcObj[QStringLiteral("visualIndex")] = ci.visualIndex;
elcObj[QStringLiteral("logicalIndex")] = ci.logicalIndex;
@@ -78,7 +78,5 @@ private:
Ui::EventListColumns *m_ui;
std::shared_ptr<FileManagement::ForeignGuiInterface> m_flmIfc;
QVector<ColumnInfo> m_columns;
NGL::INGLLogger &m_logger;
};
}
@@ -44,7 +44,6 @@ EventListDialogModel::EventListDialogModel(const std::shared_ptr<ParticipantMana
, m_ppmDtc(ppmDtc)
, m_pdmDtc(pdmDtc)
, m_ismDtc(ismDtc)
, m_logger(getLogger("EventListModel"))
{}
@@ -63,8 +63,6 @@ private:
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
bool m_invalid = false;
NGL::INGLLogger &m_logger;
friend class EventListDialogProxyModel;
};
@@ -23,7 +23,6 @@ namespace Timeline
TimelineLegendDialog::TimelineLegendDialog(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_ui(new Ui::TimelineLegendDialog)
, m_logger(getLogger("TimelineLegendDialog"))
{
m_ui->setupUi(this);
@@ -73,7 +72,7 @@ void TimelineLegendDialog::setActiveEventTypeIds(const QSet<int> &activeEventTyp
if (cb != nullptr)
cb->setChecked(true);
else
WARNING_LOG(m_logger) << "cb for event type " << activeEventType << " not found!";
WARNING_LOG() << "cb for event type " << activeEventType << " not found!";
}
setUnchangeable(false);
@@ -256,7 +255,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
if (paintFunc == nullptr)
{
WARNING_LOG(m_logger) << "No draw function for event " << eventType;
WARNING_LOG() << "No draw function for event " << eventType;
Q_ASSERT(false);
continue;
}
@@ -44,8 +44,6 @@ private:
private:
Ui::TimelineLegendDialog *m_ui;
NGL::INGLLogger &m_logger;
};
}
@@ -32,7 +32,6 @@ namespace Timeline
ShowDetailsDialog::ShowDetailsDialog(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
, m_ui(new Ui::ShowDetailsDialog)
, m_logger(getLogger("ShowDetailsDialog"))
{
m_ui->setupUi(this);
setUnchangeable();
@@ -83,7 +82,7 @@ void ShowDetailsDialog::slotFocusOnMap()
{
if (m_replayAppSession == nullptr)
{
WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no replay app, no focus";
WARNING_LOG() << "ShowDetailsDialog::init: no replay app, no focus";
return;
}
@@ -91,13 +90,13 @@ void ShowDetailsDialog::slotFocusOnMap()
if (!m_replayAppSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
{
WARNING_LOG(m_logger) << "no sitMapIfc, no focusing on replay in Show Details Dialog 1";
WARNING_LOG() << "no sitMapIfc, no focusing on replay in Show Details Dialog 1";
return;
}
if (!sitMapIfc)
{
WARNING_LOG(m_logger) << "no sitMapIfc, no focusing on replay in Show Details Dialog 2";
WARNING_LOG() << "no sitMapIfc, no focusing on replay in Show Details Dialog 2";
return;
}
@@ -105,7 +104,7 @@ void ShowDetailsDialog::slotFocusOnMap()
{
if (!m_event->positionValid())
{
WARNING_LOG(m_logger) << "event has no valid position, skip focusOnMap";
WARNING_LOG() << "event has no valid position, skip focusOnMap";
return;
}
@@ -125,7 +124,7 @@ void ShowDetailsDialog::slotFocusOnMap()
MarkerManagement::MarkerManagementApplyFilter applyFilter(m_replayAppSession, m_fltParticipantIfc, m_fltAesIfc, m_fltBuildingComponentIfc);
if (!applyFilter.applyFilter(filterSettings.toObject()))
{
WARNING_LOG(m_logger) << "filters from event #"<<m_event->uniqueId()<<" could not be applied";
WARNING_LOG() << "filters from event #"<<m_event->uniqueId()<<" could not be applied";
return;
}
}
@@ -154,14 +153,14 @@ bool ShowDetailsDialog::getStreamNameAndEndTime(QString &streamName, qint64 &end
if (_streamName.isEmpty())
{
if (!silent)
ERROR_LOG(m_logger) << "ShowDetailsDialog::slotStartVideo(): stream name is empty " << QJsonDocument(m_event->detailData()).toJson();
ERROR_LOG() << "ShowDetailsDialog::slotStartVideo(): stream name is empty " << QJsonDocument(m_event->detailData()).toJson();
return false;
}
qint64 _endTime = root[QStringLiteral("endTime")].toDouble(0);
if (_endTime == 0 && !silent)
WARNING_LOG(m_logger) << "ShowDetailsDialog::slotStartPlayback: event " << m_event->uniqueId() << " has no end time!";
WARNING_LOG() << "ShowDetailsDialog::slotStartPlayback: event " << m_event->uniqueId() << " has no end time!";
streamName = _streamName;
endTime = _endTime;
@@ -190,7 +189,7 @@ void ShowDetailsDialog::slotStartReplay()
{
if (m_replayAppSession == nullptr)
{
ERROR_LOG(m_logger) << "ShowDetailsDialog::slotStartReplay: no replay app, no replay";
ERROR_LOG() << "ShowDetailsDialog::slotStartReplay: no replay app, no replay";
return;
}
@@ -198,7 +197,7 @@ void ShowDetailsDialog::slotStartReplay()
if (!m_replayAppSession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(srpIfc))
{
ERROR_LOG(m_logger) << "ShowDetailsDialog::slotStartReplay: no srp, no replay in Show Details Dialog";
ERROR_LOG() << "ShowDetailsDialog::slotStartReplay: no srp, no replay in Show Details Dialog";
return;
}
@@ -288,7 +287,7 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
std::shared_ptr<SituationReplay::ForeignGuiInterface> srpIfc;
std::shared_ptr<SituationMap::ForeignGuiInterface> sitMapIfc;
if (!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc))
WARNING_LOG(m_logger) << "!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc)";
WARNING_LOG() << "!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc)";
m_mrkDtc->enableMarker();
@@ -308,10 +307,10 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
});
if (!replayAppSession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(srpIfc))
WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no srp, no replay in Show Details Dialog";
WARNING_LOG() << "ShowDetailsDialog::init: no srp, no replay in Show Details Dialog";
if (!replayAppSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no sitMapIfc, no focusing on replay in Show Details Dialog";
WARNING_LOG() << "ShowDetailsDialog::init: no sitMapIfc, no focusing on replay in Show Details Dialog";
}
m_avmIfc = avmIfc;
@@ -322,22 +321,22 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
m_streamNameMapping = streamNameMapping;
if (m_avmIfc == nullptr)
WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no avm ifc given";
WARNING_LOG() << "ShowDetailsDialog::init: no avm ifc given";
if (m_mrkIfc == nullptr)
WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no mrk ifc given";
WARNING_LOG() << "ShowDetailsDialog::init: no mrk ifc given";
if (m_fltParticipantIfc == nullptr)
WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no flt Part ifc given";
WARNING_LOG() << "ShowDetailsDialog::init: no flt Part ifc given";
if (m_fltAesIfc == nullptr)
WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no flt Aes ifc given";
WARNING_LOG() << "ShowDetailsDialog::init: no flt Aes ifc given";
if (m_fltBuildingComponentIfc == nullptr)
WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no flt buildingComponent ifc given";
WARNING_LOG() << "ShowDetailsDialog::init: no flt buildingComponent ifc given";
if (m_streamNameMapping == nullptr)
WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no stream name mapping given";
WARNING_LOG() << "ShowDetailsDialog::init: no stream name mapping given";
m_event = event;
int eventTypeId = event->typeId();
@@ -424,7 +423,7 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
else if (attributeDetail.requestResult == DetailData::RequestResult::InvalidAttributeType)
{
DEBUG_LOG(m_logger) << "Unhandled attribute " << attributeDetail.attributeTypeId << " - skipping";
DEBUG_LOG() << "Unhandled attribute " << attributeDetail.attributeTypeId << " - skipping";
continue;
}
else
@@ -432,7 +431,7 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
attributeTypeText = QStringLiteral("%1 (%2)").arg(tr("<unknown>"), attributeDetail.attributeTypeId);
attributeValueText = tr("<type unknown>");
WARNING_LOG(m_logger) << "getDetailData failed with message id " << (int)attributeDetail.requestResult << " for attribute " << attributeDetail.attributeTypeId;
WARNING_LOG() << "getDetailData failed with message id " << (int)attributeDetail.requestResult << " for attribute " << attributeDetail.attributeTypeId;
continue;
}
}
@@ -476,9 +475,9 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
QLabel *attributeValueTextLabel = new QLabel(attributeValueText);
DEBUG_LOG(m_logger) << "attributeValueText=" << attributeValueText;
DEBUG_LOG() << "attributeValueText=" << attributeValueText;
attributeValueTextLabel->setTextInteractionFlags(attributeValueTextLabel->textInteractionFlags() | Qt::TextInteractionFlag::TextSelectableByMouse);
DEBUG_LOG(m_logger) << "attributeTypeText=" << attributeTypeText
DEBUG_LOG() << "attributeTypeText=" << attributeTypeText
<< " attributeValueTextLabel=" << attributeValueTextLabel;
m_ui->formLayout->addRow(new QLabel(attributeTypeText), attributeValueTextLabel);
}
@@ -497,7 +496,7 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
void ShowDetailsDialog::updateMarker()
{
DEBUG_LOG(m_logger) << "ShowDetailsDialog::updateMarker";
DEBUG_LOG() << "ShowDetailsDialog::updateMarker";
}
@@ -85,6 +85,5 @@ private:
AudioVideoManagement::StreamNameMapping *m_streamNameMapping{nullptr};
std::shared_ptr<MarkerManagement::Interface::Dtc> m_mrkDtc;
LtsSession::LtsSessionDataDds *m_session{nullptr};
NGL::INGLLogger &m_logger;
};
}