suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix highlighting of words with numbers

Browse Source
This commit is contained in:
wmayer 2015-04-10 23:38:29 +02:00
parent 1c79112f6e
commit 64b83139c7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Fem/Gui/AbaqusHighlighter.cpp
View File

@ -49,7 +49,7 @@ void AbaqusHighlighter::highlightBlock(const QString &text)
// Find a syntax file for the Abaqus format here
// http://notepad-plus.sourceforge.net/commun/userDefinedLang/userDefineLang_Abaqus.xml
//
enum { NormalState = -1, Definition, BeforeKey, InideKey, BeforeValue, InsideValue, Number };
enum { NormalState = -1, Definition, BeforeKey, InideKey, BeforeValue, InsideValue, Text, Number };
int state = NormalState;
int start = 0;
@ -112,7 +112,7 @@ void AbaqusHighlighter::highlightBlock(const QString &text)
}
// Number
else if (state == Number) {
if (!text[i].isNumber()) {
if (!text[i].isNumber() && text[i] != QLatin1Char('.')) {
QTextCharFormat numberFormat;
numberFormat.setForeground(numberColor);
setFormat(start, i - start, numberFormat);
@ -121,7 +121,7 @@ void AbaqusHighlighter::highlightBlock(const QString &text)
state = NormalState;
}
}
else if (text[i].isNumber()) {
else if (text[i].isNumber() || text[i] == QLatin1Char('-')) {
if (state == NormalState) {
start = i;
state = Number;
@ -140,6 +140,15 @@ void AbaqusHighlighter::highlightBlock(const QString &text)
start = i;
state = Definition;
}
else if (text[i].isLetterOrNumber()) {
if (state == NormalState) {
start = i;
state = Text;
}
}
else {
state = NormalState;
}
}
if (state == Definition) {