Improved frontend

Author: TheStalkerDen

DiffFrontend/DiffFrontend.pro

@@ -12,20 +12,22 @@ SOURCES += \
     diffviewer.cpp \
     diffviewertext.cpp \
     diffviewertextbuilder.cpp \
+    global.cpp \
     linenumberarea.cpp \
     main.cpp \
     mainwindow.cpp \
-    stat.cpp \
-    statjsonreader.cpp
+    statjsonreader.cpp \
+    stats.cpp
 
 HEADERS += \
     diffviewer.h \
     diffviewertext.h \
     diffviewertextbuilder.h \
+    global.h \
     linenumberarea.h \
     mainwindow.h \
-    stat.h \
-    statjsonreader.h
+    statjsonreader.h \
+    stats.h
 
 FORMS += \
     mainwindow.ui

DiffFrontend/diffviewer.cpp

@@ -18,7 +18,7 @@ DiffViewer::DiffViewer(QWidget *parent)
 void DiffViewer::lineNumbeerAreaPaintEvent(QPaintEvent *event)
 {
     QPainter painter(lineNumberArea);
-    painter.fillRect(event->rect(), Qt::blue);
+    painter.fillRect(event->rect(), Qt::black);
 
     QTextBlock block = firstVisibleBlock();
     int blockNumber = block.blockNumber();

DiffFrontend/diffviewertext.cpp

@@ -6,9 +6,10 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 
-DiffViewerText::DiffViewerText(QObject *parent) : QObject(parent)
+DiffViewerText::DiffViewerText(int forTextVersion, QObject *parent) : QObject(parent)
 {
-
+    this->forTextVersion = forTextVersion;
+    global = Global::getInstance();
 }
 
 QString DiffViewerText::getText()
@@ -18,12 +19,16 @@ QString DiffViewerText::getText()
 
 void DiffViewerText::generateHTMLTextFromLexemsArrayJson(QJsonArray lexems, QJsonObject comments)
 {
+    global->currentTextVersion = forTextVersion;
+    text.clear();
     DiffViewerTextBuilder builder;
     text = builder.generateTextFromLexemsArray(lexems,comments);
 }
 
 void DiffViewerText::generateHTMLTextFromJson(QJsonValue jsonVal,QJsonObject comments, bool isTopLevel)
 {
+    global->currentTextVersion = forTextVersion;
+    text.clear();
     DiffViewerTextBuilder builder;
     text = builder.generateText(jsonVal,comments, isTopLevel);
 }

DiffFrontend/diffviewertext.h

@@ -1,20 +1,24 @@
 #ifndef DIFFVIEWERTEXT_H
 #define DIFFVIEWERTEXT_H
 
+#include <Global.h>
 #include <QJsonDocument>
 #include <QObject>
 
 class DiffViewerText : public QObject
 {
     Q_OBJECT
 public:
-    explicit DiffViewerText(QObject *parent = nullptr);
+    explicit DiffViewerText(int forTextVersion, QObject *parent = nullptr);
     QString getText();
     void generateHTMLTextFromJson(QJsonValue obj, QJsonObject comments, bool isTopLevel = true);
     void generateHTMLTextFromLexemsArrayJson(QJsonArray lexems, QJsonObject comments);
 private:
 
+    Global* global;
+
     QJsonDocument loadedJson;
+    int forTextVersion;
 
     QString text;
 

DiffFrontend/diffviewertextbuilder.cpp

@@ -5,7 +5,7 @@
 
 DiffViewerTextBuilder::DiffViewerTextBuilder()
 {
-
+    global = Global::getInstance();
 }
 
 QString DiffViewerTextBuilder::generateText(QJsonValue jsonVal, QJsonObject comments, bool isTopLevel= true)
@@ -88,6 +88,14 @@ void DiffViewerTextBuilder::pasteLexem(const QJsonObject &lex)
         text.append("<font style=\"background-color: #E5F0FF;\">");
         text.append(lex["string"].toString());
         text.append("</font>");
+    }else if (lex["type"].toString() == "errorLexem"){
+        if(lex["id"] == global->getSelectedErrorLexId()){
+            text.append("<font style=\"background-color:#ffffe6;\">");
+        }else{
+            text.append("<font style=\"background-color:#FF9CA1;\">");
+        }
+        text.append(lex["string"].toString());
+        text.append("</font>");
     }else {
         text.append(lex["string"].toString());
     }
@@ -144,16 +152,22 @@ void DiffViewerTextBuilder::genList(const QJsonObject &listObj, bool isFirstCall
 
 
     pasteSpacesBeforeParent(getTrueLine(lparenCoord[0].toInt()),lparenCoord[1].toInt());
-    if(listObj["diff-st"].toString() == "deleted"){
+    if((listObj["diff-st"].toString() == "deleted") ||
+            listObj["isIllegalNode"].toBool()){
         text.append("<font style=\"background-color:#FF9CA1;\">");
         main_part();
         text.append("</font>");
     }else if (listObj["diff-st"].toString() == "new"){
         text.append("<font style=\"background-color:#C9FFBF;\">");
         main_part();
         text.append("</font>");
-    }else if(listObj["diff-st"].toString() == "moved"){
-        text.append("<font style=\"background-color: #E5F0FF;\">");
+    }else if(listObj["diff-st"].isArray() && listObj["diff-st"].toArray()[0] == "moved"){
+        if((global->currentTextVersion == 1 && global->current_selected_moved_ids[1] == listObj["diff-st"].toArray()[1].toInt())
+                || (global->currentTextVersion == 2 && global->current_selected_moved_ids[0] == listObj["diff-st"].toArray()[1].toInt())){
+             text.append("<font style=\"background-color: #AAA0FF;\">");
+        } else {
+           text.append("<font style=\"background-color: #E5F0FF;\">");
+        }
         main_part();
         text.append("</font>");
     }else {

DiffFrontend/diffviewertextbuilder.h

@@ -1,6 +1,8 @@
 #ifndef DIFFVIEWERTEXTBUILDER_H
 #define DIFFVIEWERTEXTBUILDER_H
 
+#include "global.h"
+
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QString>
@@ -16,6 +18,8 @@ class DiffViewerTextBuilder
     QString generateTextFromLexemsArray(QJsonArray, QJsonObject);
 
 private:
+    Global* global;
+
     QString text;
     QJsonObject comments;
     bool isTopLevel;

DiffFrontend/global.cpp

@@ -0,0 +1,25 @@
+#include "global.h"
+
+Global* Global::global_ = nullptr;
+
+Global *Global::getInstance()
+{
+    if(global_ ==nullptr){
+        global_ = new Global();
+    }
+    return global_;
+}
+
+int Global::getSelectedErrorLexId()
+{
+    if(currentTextVersion == 1){
+        return selected_error_lex_id1;
+    } else if(currentTextVersion == 2) {
+        return selected_error_lex_id2;
+    }
+}
+
+Global::Global()
+{
+
+}

DiffFrontend/global.h

@@ -0,0 +1,25 @@
+#ifndef GLOBAL_H
+#define GLOBAL_H
+
+
+class Global
+{
+public:
+    void operator=(const Global&) = delete;
+    static Global *getInstance();
+
+    int currentTextVersion = 1;
+
+    int selected_error_lex_id1 = -1;
+    int selected_error_lex_id2 = -1;
+
+    int current_selected_moved_ids[2] = {-1,-1};
+
+    int getSelectedErrorLexId();
+protected:
+    Global();
+
+    static Global* global_;
+};
+
+#endif // GLOBAL_H