finished the prototype that's not very perfect

Author: logic-wei

highlighter/highlighter.cpp

@@ -17,6 +17,7 @@ Highlighter::Highlighter(QWidget *parent):
 {
     setupUi();
     mFilter = QSharedPointer<LogFilter>(new LogFilter());
+    connect(mJsonEdit, &JsonTextEdit::updated, this, &Highlighter::onJsonObjectUpdated);
 }
 
 void Highlighter::setupUi()
@@ -61,3 +62,82 @@ QSharedPointer<AbstractLineFilter> Highlighter::logHighlighter()
 {
     return mFilter;
 }
+
+void Highlighter::onJsonObjectUpdated(const QJsonObject &jsonObject)
+{
+    mFilter->clearRule();
+    qDebug()<<"jsonUpdate";
+    // traverse every rules
+    foreach (const QString &ruleName, jsonObject.keys()) {
+        QJsonValue value = jsonObject.value(ruleName);
+        qDebug()<<"key="<<ruleName;
+        if (value.isObject()) {
+            QJsonObject propsObject = value.toObject();
+            LogFilter::Rule filterRule(true, QColor(0, 0, 0), QColor(255, 255, 255));
+
+            // traverse every properties
+            foreach (const QString &propName, propsObject.keys()) {
+                QJsonValue propValue = propsObject.value(propName);
+                if (propValue.isNull()) continue;
+
+                updateFilterRule(&filterRule, propName, propValue);
+            }
+
+            // set properties to filter
+            if (ruleName != "default") {
+                mFilter->addRule(filterRule);
+            } else {
+                mFilter->setDefaultRule(filterRule);
+            }
+        }
+    }
+
+    mFilter->update();
+}
+
+void Highlighter::updateFilterRule(LogFilter::Rule *filterRule,
+                                 const QString &propName, const QJsonValue &propValue)
+{
+    if (propName == "pattern") {
+        if (propValue.isString()) {
+            filterRule->pattern = QRegularExpression(propValue.toString());
+        }
+    } else if (propName == "visible") {
+        if (propValue.isBool()) {
+            filterRule->visible = propValue.toBool();
+        }
+    } else if (propName == "foreground") {
+        if (propValue.isArray()) {
+            QJsonArray propArrayValue = propValue.toArray();
+            if (propArrayValue.size() == 3 && isDoubleJsonArray(propArrayValue)) {
+
+                int r = propArrayValue.at(0).toInt() % 256;
+                int g = propArrayValue.at(1).toInt() % 256;
+                int b = propArrayValue.at(2).toInt() % 256;
+
+                filterRule->format.setForeground(QColor(r, g, b));
+            }
+        }
+    } else if (propName == "background") {
+        if (propValue.isArray()) {
+            QJsonArray propArrayValue = propValue.toArray();
+            if (propArrayValue.size() == 3 && isDoubleJsonArray(propArrayValue)) {
+
+                int r = propArrayValue.at(0).toInt() % 256;
+                int g = propArrayValue.at(1).toInt() % 256;
+                int b = propArrayValue.at(2).toInt() % 256;
+
+                filterRule->format.setBackground(QColor(r, g, b));
+            }
+        }
+    }
+}
+
+bool Highlighter::isDoubleJsonArray(const QJsonArray &jsonArray)
+{
+    foreach (const QJsonValue jsonValue, jsonArray) {
+        if (jsonValue.type() != QJsonValue::Type::Double)
+            return false;
+    }
+    return true;
+}

highlighter/highlighter.h

@@ -1,4 +1,4 @@
-#ifndef HIGHLIGHTER_H
+#ifndef HIGHLIGHTER_H
 #define HIGHLIGHTER_H
 
 #include <QObject>
@@ -13,6 +13,13 @@
 #include <QLayout>
 #include <QVBoxLayout>
 #include <QFontMetrics>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonDocument>
+#include <QString>
+#include <QRegularExpression>
+#include <QColor>
 
 #include "../logviewer/abstractlinefilter.h"
 #include "logfilter.h"
@@ -33,8 +40,14 @@ class Highlighter : public QDockWidget
 signals:
     void logHighlighterChanged();
 
+private slots:
+    void onJsonObjectUpdated(const QJsonObject &jsonObject);
+
 private:
     void setupUi();
+    void updateFilterRule(LogFilter::Rule *filterRule,
+                        const QString &propName, const QJsonValue &propValue);
+    bool isDoubleJsonArray(const QJsonArray &jsonArray);
 
 private:
     // ui

highlighter/logfilter.cpp

@@ -3,16 +3,18 @@
 LogFilter::LogFilter():
     mRules(0)
 {
-    setDefaultRule(Rule(".*", true, QColor(0 ,0 ,0), QColor(255, 0, 0)));
+    setDefaultRule(Rule(".*", true, QColor(0 ,0 ,0), QColor(255, 255, 255)));
 }
 
 void LogFilter::addRule(const Rule &rule)
 {
+    qDebug()<<"addRule";
     mRules.append(rule);
 }
 
 void LogFilter::clearRule()
 {
+    qDebug()<<"clearRule";
     mRules.clear();
 }
 
@@ -35,5 +37,6 @@ void LogFilter::onNextLine(const QString &line)
 
 void LogFilter::setDefaultRule(const Rule &rule)
 {
+    qDebug()<<"setDefaultRule";
     mDefaultRule = rule;
 }

highlighter/logfilter.h

@@ -25,12 +25,15 @@ class LogFilter : public AbstractLineFilter
         Rule() {}
         Rule(QString pattern, bool visible, QColor foreground, QColor background):
             pattern(pattern),
-            visible(visible)
-        {
+            visible(visible) {
             format.setForeground(QBrush(foreground));
             format.setBackground(QBrush(background));
         }
 
+        Rule(bool visible, QColor foreground, QColor background) {
+            Rule("", visible, foreground, background);
+        }
+
         QRegularExpression  pattern;
         bool                visible;
         QTextCharFormat     format;

logviewer/logviewer.cpp

@@ -137,7 +137,7 @@ void LogViewer::updateContent()
             mFilter->onNextLine(line);
             if (mFilter->visible()) {
                 textEdit->setCurrentCharFormat(mFilter->format());
-                textEdit->insertPlainText(line+"\n");
+                textEdit->insertPlainText(line);
             }
 
             byteLine = buffer->readLine();