Fix LogView consistency and LtsUtilsGuiDds link after the merge
- LogView: take the complete XmlPatterns (d327c66c4) file set - the
auto-merged mix (XmlPatterns .cpp + validation .hpp) left duplicated
m_logger members and constructor signature mismatches, because the
two lineages reworked the module differently.
- LogView CMakeLists: the cleanup version (separate LogViewLogger
static library, required by tabPluginTetraJson and present in the
Release 2 target list).
- LtsUtilsGuiDds: link ddscore (BUILD_RTI) for the Core::FunctionReply
symbols, as in story/release-2-cleanup.
Full-scope ninja all is green; ctest 20/22 (the two failures,
GrantleeParserSmoke and utils_test, are out of the driver's 46-target
scope and 'Not Run' in the official baseline).
This commit is contained in:
1 parent
edd5e3ba81
commit
473462cbdb
42 files changed
+2779
-3251
No files matched your search
@@ -1,10 +1,5 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* some models for LogViewGui
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
@@ -21,95 +16,94 @@
|
||||
namespace N_LogView
|
||||
{
|
||||
|
||||
class ParticipantModel final : public QAbstractTableModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
using QAbstractTableModel::QAbstractTableModel;
|
||||
class ParticipantModel final : public QAbstractTableModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
using QAbstractTableModel::QAbstractTableModel;
|
||||
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation,
|
||||
int role = Qt::DisplayRole) const override;
|
||||
|
||||
void clearParticipants();
|
||||
bool addUpdateParticipants(const QVector<int> &eqIds, const QVector<int> &issis, const QVector<int> &numberOfTelegrams);
|
||||
void clearParticipants();
|
||||
bool addUpdateParticipants(const QVector<int> &eqIds,
|
||||
const QVector<int> &issis,
|
||||
const QVector<int> &numberOfTelegrams);
|
||||
protected:
|
||||
void updateHeatMap() const;
|
||||
protected:
|
||||
|
||||
QVector<QPair<int, int> > m_particpants;
|
||||
|
||||
QHash<int, int> m_particpantMap;
|
||||
|
||||
mutable QHash<int, QColor> m_participantHeatmap;
|
||||
};
|
||||
|
||||
protected:
|
||||
void updateHeatMap() const;
|
||||
class TelegramModel final : public QAbstractTableModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
using QAbstractTableModel::QAbstractTableModel;
|
||||
|
||||
protected:
|
||||
// eqId , issi
|
||||
QVector<QPair<int, int>> m_particpants;
|
||||
// eqid, count telegrams
|
||||
QHash<int, int> m_particpantMap;
|
||||
// eqId, QColor for heatmap
|
||||
mutable QHash<int, QColor> m_participantHeatmap;
|
||||
};
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
|
||||
class TelegramModel final : public QAbstractTableModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
using QAbstractTableModel::QAbstractTableModel;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation,
|
||||
int role = Qt::DisplayRole) const override;
|
||||
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
void clearTelegrams();
|
||||
void appendTelegrams(const QVector<QSharedPointer<LogViewTelegram> > &telegrams);
|
||||
void appendTelegram(const QSharedPointer<LogViewTelegram> &telegram);
|
||||
QSharedPointer<LogViewTelegram> telegram(int row) const;
|
||||
protected:
|
||||
QVector<QSharedPointer<LogViewTelegram> > m_telegrams;
|
||||
};
|
||||
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||
class TelegramProxyModel final : public QSortFilterProxyModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
using QSortFilterProxyModel::QSortFilterProxyModel;
|
||||
|
||||
void clearTelegrams();
|
||||
void appendTelegrams(const QVector<QSharedPointer<LogViewTelegram>> &telegrams);
|
||||
void appendTelegram(const QSharedPointer<LogViewTelegram> &telegram);
|
||||
QSharedPointer<LogViewTelegram> telegram(int row) const;
|
||||
void setFilterByEquipmentIds(bool bFilterByEquipmentIds);
|
||||
void setAllowedEquipmentIds(const std::set<int> &allowedEquipmentIds);
|
||||
|
||||
protected:
|
||||
QVector<QSharedPointer<LogViewTelegram>> m_telegrams;
|
||||
};
|
||||
void setFilteredCentralTelegramIds(const std::set<int> &filteredCentralTelegramIds);
|
||||
void setFilteredTetraTelegramIds(const std::set<int> &filteredTetraTelegramIds);
|
||||
void setFilteredWlsTelegramIds(const std::set<int> &filteredWlsTelegramIds);
|
||||
|
||||
class TelegramProxyModel final : public QSortFilterProxyModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
using QSortFilterProxyModel::QSortFilterProxyModel;
|
||||
void setFilterCentralTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol direction, bool bFilter);
|
||||
void setFilterTetraTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol direction, bool bFilter);
|
||||
void setFilterTetraPDU(N_CoPrtCnv::CoPrtCnvRadioTelegram::E_PDU_Type pduType, bool bFilter);
|
||||
void setFilterWlsTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol direction, bool bFilter);
|
||||
|
||||
void setFilterByEquipmentIds(bool bFilterByEquipmentIds);
|
||||
void setAllowedEquipmentIds(const std::set<int> &allowedEquipmentIds);
|
||||
void setFilterTetraLogin(bool bFilter);
|
||||
void setFilterTetraFragmented(bool bFilter);
|
||||
|
||||
void setFilteredCentralTelegramIds(const std::set<int> &filteredCentralTelegramIds);
|
||||
void setFilteredTetraTelegramIds(const std::set<int> &filteredTetraTelegramIds);
|
||||
void setFilteredWlsTelegramIds(const std::set<int> &filteredWlsTelegramIds);
|
||||
QSharedPointer<LogViewTelegram> telegram(int row) const;
|
||||
protected:
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
|
||||
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
|
||||
protected:
|
||||
std::set<int> m_allowedEquipmentIds;
|
||||
std::set<int> m_filteredCentralTelegramIds;
|
||||
std::set<int> m_filteredTetraTelegramIds;
|
||||
std::set<int> m_filteredWlsTelegramIds;
|
||||
bool m_bFilterByEquipmentIds = false;
|
||||
bool m_bFilterLoginTelegrams = false;
|
||||
bool m_bFilterFragmentedTelegrams = false;
|
||||
std::set<N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol> m_filterCentralTelegrams;
|
||||
std::set<N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol> m_filterTetraTelegrams;
|
||||
std::set<N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol> m_filterWlsTelegrams;
|
||||
std::set<N_CoPrtCnv::CoPrtCnvRadioTelegram::E_PDU_Type> m_filterTetraPDU;
|
||||
};
|
||||
|
||||
void setFilterCentralTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol direction, bool bFilter);
|
||||
void setFilterTetraTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol direction, bool bFilter);
|
||||
void setFilterTetraPDU(N_CoPrtCnv::CoPrtCnvRadioTelegram::E_PDU_Type pduType, bool bFilter);
|
||||
void setFilterWlsTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol direction, bool bFilter);
|
||||
|
||||
void setFilterTetraLogin(bool bFilter);
|
||||
void setFilterTetraFragmented(bool bFilter);
|
||||
|
||||
QSharedPointer<LogViewTelegram> telegram(int row) const;
|
||||
|
||||
protected:
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
|
||||
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
|
||||
|
||||
protected:
|
||||
std::set<int> m_allowedEquipmentIds;
|
||||
std::set<int> m_filteredCentralTelegramIds;
|
||||
std::set<int> m_filteredTetraTelegramIds;
|
||||
std::set<int> m_filteredWlsTelegramIds;
|
||||
bool m_bFilterByEquipmentIds = false;
|
||||
bool m_bFilterLoginTelegrams = false;
|
||||
bool m_bFilterFragmentedTelegrams = false;
|
||||
std::set<N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol> m_filterCentralTelegrams;
|
||||
std::set<N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol> m_filterTetraTelegrams;
|
||||
std::set<N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol> m_filterWlsTelegrams;
|
||||
std::set<N_CoPrtCnv::CoPrtCnvRadioTelegram::E_PDU_Type> m_filterTetraPDU;
|
||||
};
|
||||
|
||||
} // namespace N_LogView
|
||||
}
|
||||
Reference in new issue
Block a user