Merge pull request #6071 from opengisch/plugins_createfeature_context

Fix NFC tag capture not sending decoded signal & allow to pass on position and cloud user information scops when creating features using FeatureUtils.createFeature() function

Author: nirvn

src/core/utils/featureutils.cpp

@@ -14,6 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "expressioncontextutils.h"
 #include "featureutils.h"
 #include "qgsquickmapsettings.h"
 
@@ -35,11 +36,19 @@ QgsFeature FeatureUtils::createBlankFeature( const QgsFields &fields, const QgsG
   return feature;
 }
 
-QgsFeature FeatureUtils::createFeature( QgsVectorLayer *layer, const QgsGeometry &geometry )
+QgsFeature FeatureUtils::createFeature( QgsVectorLayer *layer, const QgsGeometry &geometry, const GnssPositionInformation &positionInformation, const CloudUserInformation &cloudUserInformation )
 {
   QgsFeature feature;
   QgsAttributeMap attributes;
   QgsExpressionContext context = layer->createExpressionContext();
+  if ( positionInformation.isValid() )
+  {
+    context << ExpressionContextUtils::positionScope( positionInformation, false );
+  }
+  if ( !cloudUserInformation.isEmpty() )
+  {
+    context << ExpressionContextUtils::cloudUserScope( cloudUserInformation );
+  }
   feature = QgsVectorLayerUtils::createFeature( layer, geometry, attributes, &context );
   return feature;
 }

src/core/utils/featureutils.h

@@ -16,7 +16,9 @@
 #ifndef FEATUREUTILS_H
 #define FEATUREUTILS_H
 
+#include "gnsspositioninformation.h"
 #include "qfield_core_export.h"
+#include "qfieldcloudutils.h"
 
 #include <QObject>
 #include <qgsfeature.h>
@@ -42,7 +44,7 @@ class QFIELD_CORE_EXPORT FeatureUtils : public QObject
     /**
      * Returns a new feature with its fields set to default values.
      */
-    static Q_INVOKABLE QgsFeature createFeature( QgsVectorLayer *layer, const QgsGeometry &geometry = QgsGeometry() );
+    static Q_INVOKABLE QgsFeature createFeature( QgsVectorLayer *layer, const QgsGeometry &geometry = QgsGeometry(), const GnssPositionInformation &positionInformation = GnssPositionInformation(), const CloudUserInformation &cloudUserInformation = CloudUserInformation() );
 
     /**
     * Returns the display name of a given feature.

src/qml/CodeReader.qml

@@ -56,6 +56,12 @@ Popup {
     }
   }
 
+  onDecodedStringChanged: {
+    if (decodedString != "") {
+      decoded(decodedString);
+    }
+  }
+
   QfCameraPermission {
     id: cameraPermission
   }
@@ -73,7 +79,6 @@ Popup {
       if (decodedString !== '') {
         codeReader.decodedString = decodedString;
         decodedFlashAnimation.start();
-        decoded(decodedString);
       }
     }
   }

src/qml/qgismobileapp.qml

@@ -3902,6 +3902,7 @@ ApplicationWindow {
 
   ProjectInfo {
     id: projectInfo
+    objectName: "projectInfo"
 
     mapSettings: mapCanvas.mapSettings
     layerTree: dashBoard.layerTree