Syntax highlighter, node and beam counters

Fixed bugs in syntax highlighter and added node and beam counters to statusbar.
RORMasa · Jun 17, 2015 · 7e96ead · 7e96ead
1 parent 490e5fd
commit 7e96ead
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 30 deletions.
diff --git a/bin/BNEditor.exe b/bin/BNEditor.exe
diff --git a/source/NodeBeam.cpp b/source/NodeBeam.cpp
@@ -1267,16 +1267,14 @@ int NodeBeam::AddNode(int NodeGroupID)
         }
         for(int i5=0; i5<Beams.size();i5++)
         {
-            if(Beams[i5].Node1GlobalID >= activenode) Beams[i5].Node1GlobalID++;
-
-            if(Beams[i5].Node2GlobalID >= activenode) Beams[i5].Node2GlobalID++;
+            if(Beams.at(i5).Node1GlobalID >= activenode) Beams[i5].Node1GlobalID++;
+            if(Beams.at(i5).Node2GlobalID >= activenode) Beams[i5].Node2GlobalID++;
 
         }
     }
     //else create empty group.
     else
     {
-        //qDebug()<<"Creating 1.st node group.";
         NodeGroups.resize(NodeGroups.size()+1);
         NodeGroups[NodeGroups.size()-1].NodeGroupName = "Node Group 1.";
         NodeGroups[NodeGroups.size()-1].NodeGroupID = 0;
@@ -1287,10 +1285,6 @@ int NodeBeam::AddNode(int NodeGroupID)
         TempNode.GlobalID = activenode;
         TempNode.GroupID = 0;
         Nodes.insert(activenode, TempNode);
-        //qDebug() << "Adding node " << TempNode.GlobalID << " " << TempNode.locX;
-        //qDebug() << Nodes[0].locX;
-
-
     }
 
     if(green<255) green++;
@@ -1304,6 +1298,7 @@ int NodeBeam::AddNode(int NodeGroupID)
     //To be written on JBEAM widget next time it is refreshed
     JBEAM_temp.AddNode(TempNode);
 
+    emit nodeCountChanged(Nodes.size());
     return TempNode.GlobalID;
 }
 
@@ -1366,6 +1361,8 @@ void NodeBeam::DeleteNode(int NodeGlobalID)
         Nodes[i].GlobalID--;
         //qDebug() << "Node global ID lowered from " << (Nodes[i].GlobalID+1) << " to " <<  Nodes[i].GlobalID  ;
     }
+
+    emit nodeCountChanged(Nodes.size());
 }
 
 /* Add beam */
@@ -1414,6 +1411,7 @@ void NodeBeam::AddBeamT(bool jbeamAdd)
     }
 
     if(jbeamAdd) JBEAM_temp.AddBeam(TempBeam);
+    emit beamCountChanged(Beams.size());
 }
 
 /* Add empty beam group at the end of the list  */
@@ -1441,6 +1439,7 @@ void NodeBeam::DeleteBeam(int BeamIndex)
     //Remove
     BeamGroups[Beams[BeamIndex].BeamGroupID].BeamAmount--;
     Beams.remove(BeamIndex);
+    emit beamCountChanged(Beams.size());
 }
 
 void NodeBeam::DuplicateNodes()

diff --git a/source/NodeBeam.h b/source/NodeBeam.h
@@ -426,6 +426,9 @@ class NodeBeam : public QObject
     void LUA_setJbeamText(QString text);
     void LUA_HtmlInputDialog(QString htmlfile);
 
+    void nodeCountChanged(int count);
+    void beamCountChanged(int count);
+
 private:
 
     /*When parsing a line from a file, in grid_index

diff --git a/source/glwidget.cpp b/source/glwidget.cpp
@@ -512,7 +512,7 @@ void GLWidget::drawpicking_triangle()
 
             float conv = 1.0f/255.0f;
 
-            for(int i=0; i<NBPointer->ListTypes.at(i2).contaier.size();i++)
+            for(int i=0; i<NBPointer->ListTypes.at(i2).contaier.size();++i)
             {
                 //Draw each triangle with unique color
                 int red = (i & 0x0000ff);

diff --git a/source/jbeamtextbox.cpp b/source/jbeamtextbox.cpp
@@ -612,9 +612,7 @@ bool JBEAM_TextBox::JBEAM_FindOtherContainer(QString JBEAM_box, QString listtype
              if(level<1) break;
         }
     }
-
     End = i;
-
     return true;
 }
 
@@ -855,21 +853,12 @@ void JBEAM_TextBox::SetFilePath(QString FileName)
 Highlighter::Highlighter(QTextDocument * document) :
     QSyntaxHighlighter(document)
 {
-    QTextCharFormat commentformat;
-    commentformat.setForeground(QColor(0,140,0));
-    commentformat.setFontItalic(1);
-
-    //Comment highlight
-    HighlightingRule temprule;
-    temprule.pattern = QRegExp("\/\/.*");
-    temprule.format = commentformat;
-    rules.append(temprule);
-
 
     QTextCharFormat strformat;
     strformat.setForeground(QColor(40,40,255));
 
-    temprule.pattern = QRegExp("\".*\"");
+    HighlightingRule temprule;
+    temprule.pattern = QRegExp("\"[^\\\"]*\"");
     temprule.format = strformat;
     rules.append(temprule);
 
@@ -884,21 +873,38 @@ Highlighter::Highlighter(QTextDocument * document) :
     rules.append(temprule);
 
     QStringList keywords;
+    /*
     keywords << "\"nodes\"" << "\"beams\"" << "\"triangles\"" << "\"information\""
-             << "\"authors\"" << "\"hubWheels\"" << "\"pressureWheels\"";
+             << "\"authors\"" << "\"hubWheels\"" << "\"pressureWheels\"" << "\"refNodes\""
+             << "\"slots\"" << "\"slotType\"" << "\"name\"" << "\"slots\"" << "\"flexbodies\""
+             << "\"scalebeamSpring\"" << "\"scalebeamDamp\"" << "\"scalebeamDeform\""
+             << "\"scalebeamStrength\"" << "\"breakGroup\"" << "\"deformGroup\"" << "\"disableMeshBreaking\""
+             << "\"beamDeform\"" << "\"beamStrength\""<< "\"beamSpring\"" << "\"beamDamp\"" << "\"beamPrecompression\"";*/
+
+    keywords << "\\\"[^\\\"]*\\\"\\s*:";
 
     strformat.setForeground(QColor(200,40,40));
     strformat.setFontWeight(QFont::Bold);
 
     foreach(const QString keyword, keywords)
     {
         temprule.pattern = QRegExp(keyword);
+        temprule.pattern.setMinimal(true);
         temprule.format = strformat;
         rules.append(temprule);
     }
 
+    QTextCharFormat commentformat;
+    commentformat.setForeground(QColor(0,140,0));
+    commentformat.setFontItalic(1);
+
+    //Comment highlight
+    temprule.pattern = QRegExp("\/\/.*");
+    temprule.format = commentformat;
+    rules.append(temprule);
+
     QStringList BNEkeywords;
-    BNEkeywords << "//BNEnodes" << "//BNEbeams" << "//BNEtriangles";
+    BNEkeywords << "//BNE.*";
     strformat.setFontWeight(QFont::Bold);
     strformat.setForeground(QColor(40,100,40));
     strformat.setBackground(QColor(220,220,220));
@@ -927,9 +933,10 @@ void Highlighter::highlightBlock(const QString &text)
     {
         QRegExp regex = rule.pattern;
         int index = regex.indexIn(text);
-        if(index >= 0)
+        while(index >= 0)
         {
             setFormat(index,regex.matchedLength(),rule.format);
+            index = regex.indexIn(text,index+regex.matchedLength());
         }
     }
 

diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp
@@ -101,6 +101,8 @@ MainWindow::MainWindow(QWidget *parent) :
     QObject::connect(CurrentNodeBeam,SIGNAL(LUA_getJbeamText()),this,SLOT(LUA_JBEAM_Get()));
     QObject::connect(CurrentNodeBeam,SIGNAL(LUA_setJbeamText(QString)),this,SLOT(LUA_JBEAM_Set(QString)));
     QObject::connect(CurrentNodeBeam,SIGNAL(LUA_HtmlInputDialog(QString)),this,SLOT(htmlinputdialog(QString)));
+    QObject::connect(CurrentNodeBeam,SIGNAL(nodeCountChanged(int)),this,SLOT(nodeCountChanged(int)));
+    QObject::connect(CurrentNodeBeam,SIGNAL(beamCountChanged(int)),this,SLOT(beamCountChanged(int)));
 
     //Link nodebeam to glwidgets
     for(int i=0; i<2; i++)
@@ -239,14 +241,28 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->treeWidget->header()->resizeSection(0,75); //Make node ID colum narrower in nodes tree widget
 
     //init StatusBar
-    StatusBar_nodecount = new QLabel();
-    StatusBar_nodecount->setToolTip("Node counter");
+    StatusBar_nodecount = new QLabel("Nodes: 99999");
+    StatusBar_nodecount->setToolTip("Number of nodes");
+    StatusBar_nodecount->setMinimumSize(StatusBar_nodecount->sizeHint());
+    StatusBar_nodecount->setIndent(3);
+    StatusBar_nodecount->setAlignment(Qt::AlignCenter);
+
+    StatusBar_beamcount = new QLabel("Beams : 99999");
+    StatusBar_beamcount->setToolTip("Number of beams");
+    StatusBar_beamcount->setMinimumSize(StatusBar_beamcount->sizeHint());
+    StatusBar_beamcount->setIndent(3);
+    StatusBar_beamcount->setAlignment(Qt::AlignCenter);
+
+
     StatusBar_mode = new QLabel();
     StatusBar_mode->setToolTip("Coordinate system");
     StatusBar_info = new QLabel();
+    ui->statusBar->addWidget(StatusBar_mode);
     ui->statusBar->addWidget(StatusBar_nodecount);
-    ui->statusBar->addWidget(StatusBar_mode, 1);
+    ui->statusBar->addWidget(StatusBar_beamcount);
     ui->statusBar->addWidget(StatusBar_info);
+    nodeCountChanged(CurrentNodeBeam->Nodes.size());
+    beamCountChanged(CurrentNodeBeam->Beams.size());
 
     //Swap editor axises for RoR if necessary
     if(AppSettings->readsetting("editor_mode")=="2")
@@ -262,13 +278,13 @@ MainWindow::MainWindow(QWidget *parent) :
         ui->lineEdit_rotatex->move(20,70);
         ui->lineEdit_rotatey->move(20,30);
         ui->lineEdit_rotatez->move(20,50);
-        StatusBar_mode->setText("ROR");
+        StatusBar_mode->setText(" ROR ");
     }
     else
     {
         EditorMode = 0;
         CurrentNodeBeam->EditorMode = 0;
-        StatusBar_mode->setText("BeamNG");
+        StatusBar_mode->setText(" BeamNG ");
     }
 
     //Update JBEAM textbox cursor locations
@@ -3278,3 +3294,12 @@ void MainWindow::on_actionClose_triggered()
     }
     on_pushButton_3_clicked();
 }
+
+void MainWindow::nodeCountChanged(int count)
+{
+    StatusBar_nodecount->setText(tr("Nodes: ") + QString::number(count));
+}
+void MainWindow::beamCountChanged(int count)
+{
+    StatusBar_beamcount->setText(tr("Beams: ") + QString::number(count));
+}
diff --git a/source/mainwindow.h b/source/mainwindow.h
@@ -37,6 +37,7 @@ class MainWindow : public QMainWindow
     QLabel * StatusBar_info;
     QLabel * StatusBar_mode;
     QLabel * StatusBar_nodecount;
+    QLabel * StatusBar_beamcount;
 
     bool *TexboxOutdated;
 
@@ -61,6 +62,9 @@ public slots:
     void LUA_JBEAM_Set(QString text);
     void htmlinputdialog(QString html);
 
+    void nodeCountChanged(int count);
+    void beamCountChanged(int count);
+
 signals:
     void ZoomChanged();