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
|
||||
|
||||
@@ -15,34 +10,35 @@
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
class TelegramEditModel final : public QAbstractTableModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
using QAbstractTableModel::QAbstractTableModel;
|
||||
class TelegramEditModel 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 clearTelegrams();
|
||||
void appendTelegrams(const QVector<QSharedPointer<LogViewTelegram>> &telegrams);
|
||||
int appendTelegram(const QSharedPointer<LogViewTelegram> &telegram);
|
||||
QSharedPointer<LogViewTelegram> telegram(int row) const;
|
||||
void clearTelegrams();
|
||||
void appendTelegrams(const QVector<QSharedPointer<LogViewTelegram> > &telegrams);
|
||||
int appendTelegram(const QSharedPointer<LogViewTelegram> &telegram);
|
||||
QSharedPointer<LogViewTelegram> telegram(int row) const;
|
||||
|
||||
bool moveUp(int row);
|
||||
bool moveDown(int row);
|
||||
bool moveUp(int row);
|
||||
bool moveDown(int row);
|
||||
|
||||
void emitDataChanged(int row);
|
||||
void emitDataChanged(int row);
|
||||
|
||||
void removeTelegrams(const QSet<int> &rows);
|
||||
void removeTelegrams(const QSet<int> &rows);
|
||||
|
||||
void pasteRows(int row, const QSharedPointer<LogViewTelegram> &tele);
|
||||
void pasteRows(int row, const QSharedPointer<LogViewTelegram> &tele);
|
||||
protected:
|
||||
QVector<QSharedPointer<LogViewTelegram> > m_telegrams;
|
||||
|
||||
protected:
|
||||
QVector<QSharedPointer<LogViewTelegram>> m_telegrams;
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user