in consideration of performance and function,

change the QSyntaxHighlighter to my AbstractLineFilter.

Author: logic-wei

VisualLog.pro

@@ -29,13 +29,18 @@ SOURCES += \
         mainwindow.cpp \
     logviewer.cpp \
     finder.cpp \
-    highlighter.cpp
+    highlighter.cpp \
+    logviewport.cpp \
+    logfilter.cpp
 
 HEADERS += \
         mainwindow.h \
     logviewer.h \
     finder.h \
-    highlighter.h
+    highlighter.h \
+    abstractlinefilter.h \
+    logviewport.h \
+    logfilter.h
 
 FORMS +=
 

abstractlinefilter.h

@@ -0,0 +1,38 @@
+#ifndef ABSTRACTLINEFILTER_H
+#define ABSTRACTLINEFILTER_H
+
+#include <QObject>
+#include <QString>
+#include <QTextCharFormat>
+
+
+class LogViewer;
+
+class AbstractLineFilter : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AbstractLineFilter(QObject *parent = nullptr):QObject(parent){}
+
+    friend class LogViewer;
+
+    void update() {emit updated();}
+    QTextCharFormat & format() {return mFormat;}
+    bool visible() {return mVisible;}
+
+protected:
+    virtual void onNextLine(const QString &line) = 0;
+
+    void setFormat(const QTextCharFormat &format) {mFormat = format;}
+    void setVisible(bool visible) {mVisible = visible;}
+
+signals:
+    void updated();
+
+private:
+    QTextCharFormat mFormat;
+    bool            mVisible;
+};
+
+#endif // ABSTRACTLINEFILTER_H

highlighter.cpp

@@ -6,7 +6,7 @@ Highlighter::Highlighter(QWidget *parent):
     mMainLayout(new QVBoxLayout()),
     mToolLayout(new QHBoxLayout()),
     mControlLayout(new QHBoxLayout()),
-    mRegulationBox(new QComboBox(mRootWidget)),
+    mRuleBox(new QComboBox(mRootWidget)),
     mNewButton(new QToolButton(mRootWidget)),
     mDelButton(new QToolButton(mRootWidget)),
     mSaveButton(new QToolButton(mRootWidget)),
@@ -16,12 +16,13 @@ Highlighter::Highlighter(QWidget *parent):
     mFindNxtButton(new QPushButton(mRootWidget))
 {
     setupUi();
+    mFilter = QSharedPointer<LogFilter>(new LogFilter());
 }
 
 void Highlighter::setupUi()
 {
     // widget setting
-    mRegulationBox->setEditable(true);
+    mRuleBox->setEditable(true);
     mNewButton->setText("+");
     mDelButton->setText("-");
     mSaveButton->setText("<<");
@@ -30,7 +31,7 @@ void Highlighter::setupUi()
     mFindNxtButton->setText("find next");
 
     // layout setting
-    mToolLayout->addWidget(mRegulationBox);
+    mToolLayout->addWidget(mRuleBox);
     mToolLayout->addWidget(mNewButton);
     mToolLayout->addWidget(mDelButton);
     mToolLayout->addWidget(mSaveButton);
@@ -47,3 +48,8 @@ void Highlighter::setupUi()
     mRootWidget->setLayout(mMainLayout);
     setWidget(mRootWidget);
 }
+
+QSharedPointer<AbstractLineFilter> Highlighter::logHighlighter()
+{
+    return mFilter;
+}

highlighter.h

@@ -13,6 +13,9 @@
 #include <QLayout>
 #include <QVBoxLayout>
 
+#include "abstractlinefilter.h"
+#include "logfilter.h"
+
 
 class Highlighter : public QDockWidget
 {
@@ -21,7 +24,8 @@ class Highlighter : public QDockWidget
 public:
     explicit Highlighter(QWidget *parent = nullptr);
 
-    QSharedPointer<QSyntaxHighlighter> logHighlighter();
+    QSharedPointer<AbstractLineFilter> logHighlighter();
+
 
 signals:
     void logHighlighterChanged();
@@ -30,19 +34,23 @@ class Highlighter : public QDockWidget
     void setupUi();
 
 private:
+    // ui
     QWidget *mRootWidget;
     QLayout *mMainLayout;
     QLayout *mToolLayout;
     QLayout *mControlLayout;
 
-    QComboBox       *mRegulationBox;
+    QComboBox       *mRuleBox;
     QToolButton     *mNewButton;
     QToolButton     *mDelButton;
     QToolButton     *mSaveButton;
     QPlainTextEdit  *mTextEdit;
     QToolButton     *mHighlightButton;
     QPushButton     *mFindPreButton;
     QPushButton     *mFindNxtButton;
+
+    //others
+    QSharedPointer<LogFilter> mFilter;
 };
 
 #endif // HIGHLIGHTER_H

logfilter.cpp

@@ -0,0 +1,39 @@
+#include "logfilter.h"
+
+LogFilter::LogFilter():
+    mRules(0)
+{
+    setDefaultRule(Rule(".*", true, QColor(0 ,0 ,0), QColor(255, 0, 0)));
+}
+
+void LogFilter::addRule(const Rule &rule)
+{
+    mRules.append(rule);
+}
+
+void LogFilter::clearRule()
+{
+    mRules.clear();
+}
+
+void LogFilter::onNextLine(const QString &line)
+{
+    // match the rules
+    foreach(const Rule &rule, mRules) {
+        QRegularExpressionMatch match = rule.pattern.match(line);
+        if(match.hasMatch()) {
+            setVisible(rule.visible);
+            setFormat(rule.format);
+            return;
+        }
+    }
+
+    // default
+    setVisible(mDefaultRule.visible);
+    setFormat(mDefaultRule.format);
+}
+
+void LogFilter::setDefaultRule(const Rule &rule)
+{
+    mDefaultRule = rule;
+}

logfilter.h

@@ -0,0 +1,53 @@
+#ifndef LOGFILTER_H
+#define LOGFILTER_H
+
+#include <QObject>
+#include <QString>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QRegularExpressionMatchIterator>
+#include <QColor>
+#include <QVector>
+#include <QTextCharFormat>
+#include <QBrush>
+#include <QDebug>
+
+#include "abstractlinefilter.h"
+
+
+class LogFilter : public AbstractLineFilter
+{
+    Q_OBJECT
+
+public:
+    struct Rule {
+    public:
+        Rule() {}
+        Rule(QString pattern, bool visible, QColor foreground, QColor background):
+            pattern(pattern),
+            visible(visible)
+        {
+            format.setForeground(QBrush(foreground));
+            format.setBackground(QBrush(background));
+        }
+
+        QRegularExpression  pattern;
+        bool                visible;
+        QTextCharFormat     format;
+    };
+
+    LogFilter();
+
+    void addRule(const Rule &rule);
+    void clearRule();
+    void setDefaultRule(const Rule &rule);
+
+protected:
+    virtual void onNextLine(const QString &line);
+
+private:
+    QVector<Rule>   mRules;
+    Rule            mDefaultRule;
+};
+
+#endif // LOGFILTER_H