Apply suggestion

nirvn · Nov 8, 2023 · 5b1d8ec · 5b1d8ec
1 parent cb8c062
commit 5b1d8ec
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 17 deletions.
diff --git a/src/gui/editorwidgets/qgshtmlwidgetwrapper.cpp b/src/gui/editorwidgets/qgshtmlwidgetwrapper.cpp
@@ -44,9 +44,7 @@ QWidget *QgsHtmlWidgetWrapper::createWidget( QWidget *parent )
     {
       if ( attributeChanged )
       {
-        const thread_local QRegularExpression expRe { QStringLiteral( R"re(expression.evaluate\s*\(\s*"(.*)"\))re" ), QRegularExpression::PatternOption::MultilineOption | QRegularExpression::PatternOption::DotMatchesEverythingOption };
-        const QRegularExpressionMatch match { expRe.match( mHtmlCode ) };
-        if ( match.hasMatch() && QgsValueRelationFieldFormatter::expressionRequiresFormScope( match.captured( 1 ) ) )
+        if ( mRequiresFormScope )
         {
           mFormFeature.setAttribute( attribute, newValue );
           setHtmlContext();
@@ -121,6 +119,18 @@ void QgsHtmlWidgetWrapper::checkGeometryNeeds()
 void QgsHtmlWidgetWrapper::setHtmlCode( const QString &htmlCode )
 {
   mHtmlCode = htmlCode;
+
+  bool ok = false;
+  const thread_local QRegularExpression expRe( QStringLiteral( R"re(expression.evaluate\s*\(\s*"(.*)"\))re" ), QRegularExpression::PatternOption::MultilineOption | QRegularExpression::PatternOption::DotMatchesEverythingOption );
+  QRegularExpressionMatchIterator matchIt = expRe.globalMatch( mHtmlCode );
+  while ( !ok && matchIt.hasNext() )
+  {
+    const QRegularExpressionMatch match = matchIt.next();
+    const QgsExpression exp = match.captured( 1 );
+    ok = QgsValueRelationFieldFormatter::expressionRequiresFormScope( exp );
+  }
+  mRequiresFormScope = ok;
+
   checkGeometryNeeds();
 }
 

diff --git a/src/gui/editorwidgets/qgshtmlwidgetwrapper.h b/src/gui/editorwidgets/qgshtmlwidgetwrapper.h
@@ -79,6 +79,7 @@ class GUI_EXPORT QgsHtmlWidgetWrapper : public QgsWidgetWrapper
     QgsFeature mFeature;
     bool mNeedsGeometry = false;
     QgsFeature mFormFeature;
+    bool mRequiresFormScope = false;
 
     friend class TestQgsHtmlWidgetWrapper;
 };

diff --git a/src/gui/editorwidgets/qgsqmlwidgetwrapper.cpp b/src/gui/editorwidgets/qgsqmlwidgetwrapper.cpp
@@ -46,9 +46,7 @@ QWidget *QgsQmlWidgetWrapper::createWidget( QWidget *parent )
     {
       if ( attributeChanged )
       {
-        const thread_local QRegularExpression expRe { QStringLiteral( R"re(expression.evaluate\s*\(\s*"(.*)"\))re" ), QRegularExpression::PatternOption::MultilineOption | QRegularExpression::PatternOption::DotMatchesEverythingOption };
-        const QRegularExpressionMatch match { expRe.match( mQmlCode ) };
-        if ( match.hasMatch() && QgsValueRelationFieldFormatter::expressionRequiresFormScope( match.captured( 1 ) ) )
+        if ( mRequiresFormScope )
         {
           mFormFeature.setAttribute( attribute, newValue );
           setQmlContext();
@@ -99,6 +97,17 @@ void QgsQmlWidgetWrapper::setQmlCode( const QString &qmlCode )
 
   mQmlCode = qmlCode;
 
+  bool ok = false;
+  const thread_local QRegularExpression expRe( QStringLiteral( R"re(expression.evaluate\s*\(\s*"(.*)"\))re" ), QRegularExpression::PatternOption::MultilineOption | QRegularExpression::PatternOption::DotMatchesEverythingOption );
+  QRegularExpressionMatchIterator matchIt = expRe.globalMatch( mQmlCode );
+  while ( !ok && matchIt.hasNext() )
+  {
+    const QRegularExpressionMatch match = matchIt.next();
+    const QgsExpression exp = match.captured( 1 );
+    ok = QgsValueRelationFieldFormatter::expressionRequiresFormScope( exp );
+  }
+  mRequiresFormScope = ok;
+
   if ( !mQmlFile.open() )
   {
     QgsMessageLog::logMessage( tr( "Failed to open temporary QML file" ) );

diff --git a/src/gui/editorwidgets/qgsqmlwidgetwrapper.h b/src/gui/editorwidgets/qgsqmlwidgetwrapper.h
@@ -67,6 +67,7 @@ class GUI_EXPORT QgsQmlWidgetWrapper : public QgsWidgetWrapper
     QQuickWidget *mWidget = nullptr;
     QgsFeature mFeature;
     QgsFeature mFormFeature;
+    bool mRequiresFormScope = false;
 };
 
 

diff --git a/src/gui/editorwidgets/qgstextwidgetwrapper.cpp b/src/gui/editorwidgets/qgstextwidgetwrapper.cpp
@@ -42,17 +42,7 @@ QWidget *QgsTextWidgetWrapper::createWidget( QWidget *parent )
     {
       if ( attributeChanged )
       {
-        bool ok { false };
-        const thread_local QRegularExpression sRegEx{ QStringLiteral( "\\[%(.*?)%\\]" ),  QRegularExpression::MultilineOption | QRegularExpression::DotMatchesEverythingOption };
-        QRegularExpressionMatchIterator matchIt { sRegEx.globalMatch( mText ) };
-        while ( !ok && matchIt.hasNext() )
-        {
-          const QRegularExpressionMatch match { matchIt.next() };
-          const QgsExpression exp { match.captured( 1 ) };
-          ok = QgsValueRelationFieldFormatter::expressionRequiresFormScope( exp );
-        }
-
-        if ( ok )
+        if ( mRequiresFormScope )
         {
           mFormFeature.setAttribute( attribute, newValue );
           updateTextContext();
@@ -99,6 +89,18 @@ void QgsTextWidgetWrapper::reinitWidget( )
 void QgsTextWidgetWrapper::setText( const QString &text )
 {
   mText = text;
+
+  bool ok = false;
+  const thread_local QRegularExpression sRegEx( QStringLiteral( "\\[%(.*?)%\\]" ),  QRegularExpression::MultilineOption | QRegularExpression::DotMatchesEverythingOption );
+  QRegularExpressionMatchIterator matchIt = sRegEx.globalMatch( mText );
+  while ( !ok && matchIt.hasNext() )
+  {
+    const QRegularExpressionMatch match = matchIt.next();
+    const QgsExpression exp = match.captured( 1 );
+    ok = QgsValueRelationFieldFormatter::expressionRequiresFormScope( exp );
+  }
+  mRequiresFormScope = ok;
+
   reinitWidget();
 }
 

diff --git a/src/gui/editorwidgets/qgstextwidgetwrapper.h b/src/gui/editorwidgets/qgstextwidgetwrapper.h
@@ -71,6 +71,7 @@ class GUI_EXPORT QgsTextWidgetWrapper : public QgsWidgetWrapper
     QLabel *mWidget = nullptr;
     QgsFeature mFeature;
     QgsFeature mFormFeature;
+    bool mRequiresFormScope = false;
     QgsExpressionContext mTextContext;
     bool mNeedsGeometry = false;