code layout

3nids · 3nids · commit 9488f06025a6 · 2020-04-30T06:52:22.000+02:00
diff --git a/python/core/auto_generated/qgsfeaturepickermodel.sip.in b/python/core/auto_generated/qgsfeaturepickermodel.sip.in
@@ -48,6 +48,9 @@ Returns the current feature
 
   signals:
     void featureChanged( const QgsFeature &feature );
+%Docstring
+Emitted when the current feature changes
+%End
 
 
 };
diff --git a/python/core/auto_generated/qgsfeaturepickermodelbase.sip.in b/python/core/auto_generated/qgsfeaturepickermodelbase.sip.in
@@ -250,6 +250,9 @@ Update the request to match the current feature to be reloaded
 %End
 
     void setExtraIdentifierValueUnguarded( const QVariant &identifierValue );
+%Docstring
+This will set the identifier value to be set in the model even if it doesn't exist currently in the data
+%End
 
 
 
diff --git a/src/core/qgsfeaturefiltermodel.cpp b/src/core/qgsfeaturefiltermodel.cpp
@@ -40,7 +40,7 @@ QgsFeatureFilterModel::QgsFeatureFilterModel( QObject *parent )
 {
   setFetchGeometry( false );
   setFetchLimit( QgsSettings().value( QStringLiteral( "maxEntriesRelationWidget" ), 100, QgsSettings::Gui ).toInt() );
-  setExtraIdentifierValueUnguarded( QVariantList() );
+  setExtraIdentifierValueUnguarded( nullIentifier() );
 }
 
 QString QgsFeatureFilterModel::identifierField() const
diff --git a/src/core/qgsfeaturepickermodel.cpp b/src/core/qgsfeaturepickermodel.cpp
@@ -25,7 +25,7 @@ QgsFeaturePickerModel::QgsFeaturePickerModel( QObject *parent )
   :  QgsFeaturePickerModelBase( parent )
 {
   setFetchGeometry( true );
-  setExtraIdentifierValueUnguarded( FID_NULL );
+  setExtraIdentifierValueUnguarded( nullIentifier() );
 
   connect( this, &QgsFeaturePickerModelBase::extraIdentifierValueIndexChanged, this, [ = ]() {emit featureChanged( feature() );} );
 }
diff --git a/src/core/qgsfeaturepickermodel.h b/src/core/qgsfeaturepickermodel.h
@@ -55,6 +55,7 @@ class CORE_EXPORT QgsFeaturePickerModel : public QgsFeaturePickerModelBase
     QgsFeature feature() const;
 
   signals:
+    //! Emitted when the current feature changes
     void featureChanged( const QgsFeature &feature );
 
 
diff --git a/src/core/qgsfeaturepickermodelbase.h b/src/core/qgsfeaturepickermodelbase.h
@@ -274,6 +274,7 @@ class CORE_EXPORT QgsFeaturePickerModelBase : public QAbstractItemModel SIP_ABST
     //! Update the request to match the current feature to be reloaded
     virtual void requestToReloadCurrentFeature( QgsFeatureRequest &request ) = 0;
 
+    //! This will set the identifier value to be set in the model even if it doesn't exist currently in the data
     void setExtraIdentifierValueUnguarded( const QVariant &identifierValue );
 
 #ifndef SIP_RUN
@@ -284,10 +285,11 @@ class CORE_EXPORT QgsFeaturePickerModelBase : public QAbstractItemModel SIP_ABST
      */
     virtual QSet<QString> requestedAttributes() const {return {};}
 
+    //! Creates the value gatherer
     virtual QgsFeatureExpressionValuesGatherer *createValuesGatherer( const QgsFeatureRequest &request ) const = 0;
 
     //! Creates an entry with just the identifier so the feature can be retrieved in a next iteration
-    virtual QgsFeatureExpressionValuesGatherer::Entry createEntry( const QVariant &identifer ) const = 0;
+    virtual QgsFeatureExpressionValuesGatherer::Entry createEntry( const QVariant &identifier ) const = 0;
 
     //! Returns the identifier of the given entry
     virtual QVariant entryIdentifier( const QgsFeatureExpressionValuesGatherer::Entry &entry ) const = 0;
diff --git a/tests/src/python/test_qgsfeaturepicker.py b/tests/src/python/test_qgsfeaturepicker.py
@@ -102,7 +102,7 @@ def testLineEdit(self):
         spy = QSignalSpy(w.featureChanged)
         spy.wait()
         w.findChild(QComboBox).lineEdit().clear()
-        QTest.keyClicks(w.findChild(QComboBox).lineEdit(), "test99");
+        QTest.keyClicks(w.findChild(QComboBox).lineEdit(), "test99")
         spy.wait()
         self.assertEqual(w.feature().id(), 99)
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ QgsFeatureFilterModel::QgsFeatureFilterModel( QObject *parent )`
`40`	`40`	`{`
`41`	`41`	`setFetchGeometry( false );`
`42`	`42`	`setFetchLimit( QgsSettings().value( QStringLiteral( "maxEntriesRelationWidget" ), 100, QgsSettings::Gui ).toInt() );`
`43`		`- setExtraIdentifierValueUnguarded( QVariantList() );`
	`43`	`+ setExtraIdentifierValueUnguarded( nullIentifier() );`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`QString QgsFeatureFilterModel::identifierField() const`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ QgsFeaturePickerModel::QgsFeaturePickerModel( QObject *parent )`
`25`	`25`	`: QgsFeaturePickerModelBase( parent )`
`26`	`26`	`{`
`27`	`27`	`setFetchGeometry( true );`
`28`		`- setExtraIdentifierValueUnguarded( FID_NULL );`
	`28`	`+ setExtraIdentifierValueUnguarded( nullIentifier() );`
`29`	`29`
`30`	`30`	`connect( this, &QgsFeaturePickerModelBase::extraIdentifierValueIndexChanged, this, [ = ]() {emit featureChanged( feature() );} );`
`31`	`31`	`}`