allow fetching all features in QgsFeaturePickerWidget (#36193)

and more documentation
qgis · May 5, 2020 · c22c73d · c22c73d
1 parent 9e91eb5
commit c22c73d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/python/core/auto_generated/qgsfeaturepickermodelbase.sip.in b/python/core/auto_generated/qgsfeaturepickermodelbase.sip.in
@@ -148,6 +148,7 @@ Returns the feature request fetch limit
     void setFetchLimit( int fetchLimit );
 %Docstring
 Defines the feature request fetch limit
+If set to 0, no limit is applied when fetching
 %End
 
   signals:

diff --git a/python/gui/auto_generated/qgsfeaturepickerwidget.sip.in b/python/gui/auto_generated/qgsfeaturepickerwidget.sip.in
@@ -110,6 +110,7 @@ Returns the feature request fetch limit
     void setFetchLimit( int fetchLimit );
 %Docstring
 Defines the feature request fetch limit
+If set to 0, no limit is applied when fetching
 %End
 
     bool showBrowserButtons() const;
@@ -120,6 +121,10 @@ Returns if the browsing buttons are shown
     void setShowBrowserButtons( bool showBrowserButtons );
 %Docstring
 Defines if the browsing buttons are shown
+
+.. note::
+
+   Buttons are browsing the currently fetched features. If a limit is set, there might be more features to be fetched from the layer.
 %End
 
 

diff --git a/src/core/qgsfeaturepickermodelbase.cpp b/src/core/qgsfeaturepickermodelbase.cpp
@@ -409,7 +409,8 @@ void QgsFeaturePickerModelBase::scheduledReload()
 
   if ( !mFetchGeometry )
     request.setFlags( QgsFeatureRequest::NoGeometry );
-  request.setLimit( mFetchLimit );
+  if ( mFetchLimit > 0 )
+    request.setLimit( mFetchLimit );
 
   mGatherer = createValuesGatherer( request );
   mGatherer->setData( mShouldReloadCurrentFeature );

diff --git a/src/core/qgsfeaturepickermodelbase.h b/src/core/qgsfeaturepickermodelbase.h
@@ -170,6 +170,7 @@ class CORE_EXPORT QgsFeaturePickerModelBase : public QAbstractItemModel SIP_ABST
 
     /**
      * Defines the feature request fetch limit
+     * If set to 0, no limit is applied when fetching
      */
     void setFetchLimit( int fetchLimit );
 

diff --git a/src/gui/qgsfeaturepickerwidget.h b/src/gui/qgsfeaturepickerwidget.h
@@ -137,6 +137,7 @@ class GUI_EXPORT QgsFeaturePickerWidget : public QWidget
 
     /**
      * Defines the feature request fetch limit
+     * If set to 0, no limit is applied when fetching
      */
     void setFetchLimit( int fetchLimit );
 
@@ -147,6 +148,7 @@ class GUI_EXPORT QgsFeaturePickerWidget : public QWidget
 
     /**
      * Defines if the browsing buttons are shown
+     * \note Buttons are browsing the currently fetched features. If a limit is set, there might be more features to be fetched from the layer.
      */
     void setShowBrowserButtons( bool showBrowserButtons );