From bd8719dee6b9f907c30ba4a9d80258ee20dacd2f Mon Sep 17 00:00:00 2001 From: spo Date: Wed, 3 Jun 2015 10:28:09 +0300 Subject: [PATCH] Issue #586: Paprameter name suffixed by a digit -- Use localization decimal point for matching floats. --- src/ModuleBase/ModuleBase_ParamSpinBox.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ModuleBase/ModuleBase_ParamSpinBox.cpp b/src/ModuleBase/ModuleBase_ParamSpinBox.cpp index dd3eebd30..5e59599a3 100644 --- a/src/ModuleBase/ModuleBase_ParamSpinBox.cpp +++ b/src/ModuleBase/ModuleBase_ParamSpinBox.cpp @@ -8,8 +8,9 @@ #include #include -#include +#include #include +#include #include #include @@ -164,8 +165,9 @@ bool ModuleBase_ParamSpinBox::hasVariable() const bool ModuleBase_ParamSpinBox::hasVariable(const QString& theText) const { - //QRegExp varNameMask("[-+]?[0-9]*[.]?[0-9]+([eE][-+]?[0-9]+)?"); //This row causes problem with input in sketcher (circle) - QRegExp varNameMask("[-+]?[0-9]*.?[0-9]+([eE][-+]?[0-9]+)?"); + QString aPattern = QString("[-+]?[0-9]*[%1]?[0-9]+([eE][-+]?[0-9]+)?") + .arg(QLocale::system().decimalPoint()); + QRegExp varNameMask(aPattern); return !varNameMask.exactMatch(theText); } -- 2.39.2