kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Path: [skip ci] replace QRegExp with QRegularExpression

Browse Source
This commit is contained in:
wmayer
2022-10-08 14:07:22 +02:00
parent a7dc5c23e4
commit 6df7cf1afa
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Path/PathScripts/PathInspect.py
View File

@@ -61,28 +61,28 @@ class GCodeHighlighter(QtGui.QSyntaxHighlighter):
self.highlightingRules = []
numberFormat = QtGui.QTextCharFormat()
numberFormat.setForeground(colors[0])
self.highlightingRules.append((QtCore.QRegExp("[\\-0-9\\.]"), numberFormat))
self.highlightingRules.append((QtCore.QRegularExpression("[\\-0-9\\.]"), numberFormat))
keywordFormat = QtGui.QTextCharFormat()
keywordFormat.setForeground(colors[1])
keywordFormat.setFontWeight(QtGui.QFont.Bold)
keywordPatterns = ["\\bG[0-9]+\\b", "\\bM[0-9]+\\b"]
self.highlightingRules.extend(
[(QtCore.QRegExp(pattern), keywordFormat) for pattern in keywordPatterns]
[(QtCore.QRegularExpression(pattern), keywordFormat) for pattern in keywordPatterns]
)
speedFormat = QtGui.QTextCharFormat()
speedFormat.setFontWeight(QtGui.QFont.Bold)
speedFormat.setForeground(colors[2])
self.highlightingRules.append((QtCore.QRegExp("\\bF[0-9\\.]+\\b"), speedFormat))
self.highlightingRules.append((QtCore.QRegularExpression("\\bF[0-9\\.]+\\b"), speedFormat))
def highlightBlock(self, text):
for pattern, fmt in self.highlightingRules:
expression = QtCore.QRegExp(pattern)
index = expression.indexIn(text)
while index >= 0:
length = expression.matchedLength()
self.setFormat(index, length, fmt)
index = expression.indexIn(text, index + length)
expression = QtCore.QRegularExpression(pattern)
index = expression.match(text)
while index.hasMatch():
length = index.capturedLength()
self.setFormat(index.capturedStart(), length, fmt)
index = expression.match(text, index.capturedStart() + length)
class GCodeEditorDialog(QtGui.QDialog):

16
src/Mod/Path/PathScripts/PostUtils.py
View File

@@ -53,22 +53,22 @@ class GCodeHighlighter(QtGui.QSyntaxHighlighter):
keywordPatterns = ["\\bG[0-9]+\\b", "\\bM[0-9]+\\b"]
self.highlightingRules = [
(QtCore.QRegExp(pattern), keywordFormat) for pattern in keywordPatterns
(QtCore.QRegularExpression(pattern), keywordFormat) for pattern in keywordPatterns
]
speedFormat = QtGui.QTextCharFormat()
speedFormat.setFontWeight(QtGui.QFont.Bold)
speedFormat.setForeground(QtCore.Qt.green)
self.highlightingRules.append((QtCore.QRegExp("\\bF[0-9\\.]+\\b"), speedFormat))
self.highlightingRules.append((QtCore.QRegularExpression("\\bF[0-9\\.]+\\b"), speedFormat))
def highlightBlock(self, text):
for pattern, hlFormat in self.highlightingRules:
expression = QtCore.QRegExp(pattern)
index = expression.indexIn(text)
while index >= 0:
length = expression.matchedLength()
self.setFormat(index, length, hlFormat)
index = expression.indexIn(text, index + length)
expression = QtCore.QRegularExpression(pattern)
index = expression.match(text)
while index.hasMatch():
length = index.capturedLength()
self.setFormat(index.capturedStart(), length, hlFormat)
index = expression.match(text, index.capturedStart() + length)
class GCodeEditorDialog(QtGui.QDialog):