kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix QRegularExpression

Browse Source 
-add isValid
-add debug
This commit is contained in:
Simon De Backer
2020-09-23 22:50:41 +02:00
parent 2fe53ba6e8
commit d9f38f8a5d
3 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sources/factory/elementpicturefactory.cpp
View File

@@ -569,11 +569,23 @@ void ElementPictureFactory::setPainterStyle(const QDomElement &dom, QPainter &pa
#pragma message("@TODO remove code for QT 5.14 or later")
const QStringList styles = dom.attribute("style").split(";", Qt::SkipEmptyParts);
#endif
QRegularExpression rx("^\\s*([a-z-]+)\\s*:\\s*([a-zA-Z-]+)\\s*$");
QRegularExpression rx("^(?<name>[a-z-]+): (?<value>[a-z-]+)$");
if (!rx.isValid())
{
qWarning() <<"this is an error in the code"
<< rx.errorString()
<< rx.patternErrorOffset();
return;
}
for (QString style : styles) {
if (rx==QRegularExpression(style)) {
QString style_name = rx.namedCaptureGroups().at(1);
QString style_value = rx.namedCaptureGroups().at(2);
QRegularExpressionMatch match = rx.match(style);
if (!match.hasMatch())
{
qDebug()<<"no Match"
<<style;
}else {
QString style_name = match.captured("name");
QString style_value = match.captured("value");
if (style_name == "line-style") {
if (style_value == "dashed") pen.setStyle(Qt::DashLine);
else if (style_value == "dotted") pen.setStyle(Qt::DotLine);