Merge pull request #5440 from m-kuhn/relrefthreadingv2

[feature] Relation Reference Widget : Threaded Version
qgis · Oct 27, 2017 · 40955b2 · 40955b2
2 parents f6abdd5 + 38a4eb4
commit 40955b2
Show file tree

Hide file tree

Showing 20 changed files with 2,046 additions and 137 deletions.
diff --git a/.ci/travis/linux/before_script.sh b/.ci/travis/linux/before_script.sh
@@ -17,12 +17,14 @@ set -e
 
 pushd .docker
 
+echo "travis_fold:start:docker"
 docker --version
 docker-compose --version
 docker-compose -f $DOCKER_COMPOSE config
 #docker pull ubuntu:16.04
 docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
 docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
+echo "travis_fold:end:docker"
 # image should be pushed even if QGIS build fails
 # but push is achieved only on branches (not for PRs)
 if [[ $DOCKER_PUSH =~ true ]]; then

diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -311,6 +311,7 @@
 %Include qgsfieldmodel.sip
 %Include qgsfieldproxymodel.sip
 %Include qgsfiledownloader.sip
+%Include qgsfeaturefiltermodel.sip
 %Include qgsgeometryvalidator.sip
 %Include qgsgml.sip
 %Include qgsgmlschema.sip

diff --git a/python/core/qgsfeaturefiltermodel.sip b/python/core/qgsfeaturefiltermodel.sip
@@ -0,0 +1,238 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/qgsfeaturefiltermodel.h                                     *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+class QgsFeatureFilterModel : QAbstractItemModel
+{
+%Docstring
+ Provides a list of features based on filter conditions.
+ Features are fetched asynchronously.
+
+.. versionadded:: 3.0
+%End
+
+%TypeHeaderCode
+#include "qgsfeaturefiltermodel.h"
+%End
+  public:
+
+    enum Role
+    {
+      IdentifierValueRole,
+      ValueRole
+    };
+
+    explicit QgsFeatureFilterModel( QObject *parent = 0 );
+%Docstring
+ Create a new QgsFeatureFilterModel, optionally specifying a ``parent``.
+%End
+    ~QgsFeatureFilterModel();
+
+    QgsVectorLayer *sourceLayer() const;
+%Docstring
+ The source layer from which features will be fetched.
+ :rtype: QgsVectorLayer
+%End
+
+    void setSourceLayer( QgsVectorLayer *sourceLayer );
+%Docstring
+ The source layer from which features will be fetched.
+%End
+
+    QString displayExpression() const;
+%Docstring
+ The display expression will be used for
+
+  - displaying values in the combobox
+  - filtering based on filterValue
+ :rtype: str
+%End
+
+    void setDisplayExpression( const QString &displayExpression );
+%Docstring
+ The display expression will be used for
+
+  - displaying values in the combobox
+  - filtering based on filterValue
+%End
+
+    QString filterValue() const;
+%Docstring
+ This value will be used to filter the features available from
+ this model. Whenever a substring of the displayExpression of a feature
+ matches the filter value, it will be accessible by this model.
+ :rtype: str
+%End
+
+    void setFilterValue( const QString &filterValue );
+%Docstring
+ This value will be used to filter the features available from
+ this model. Whenever a substring of the displayExpression of a feature
+ matches the filter value, it will be accessible by this model.
+%End
+
+    virtual QModelIndex index( int row, int column, const QModelIndex &parent ) const;
+    virtual QModelIndex parent( const QModelIndex &child ) const;
+    virtual int rowCount( const QModelIndex &parent ) const;
+    virtual int columnCount( const QModelIndex &parent ) const;
+    virtual QVariant data( const QModelIndex &index, int role ) const;
+
+    QString filterExpression() const;
+%Docstring
+ An additional filter expression to apply, next to the filterValue.
+ Can be used for spatial filtering etc.
+ :rtype: str
+%End
+
+    void setFilterExpression( const QString &filterExpression );
+%Docstring
+ An additional filter expression to apply, next to the filterValue.
+ Can be used for spatial filtering etc.
+%End
+
+    bool isLoading() const;
+%Docstring
+ Indicator if the model is currently performing any feature iteration in the background.
+ :rtype: bool
+%End
+
+    QString identifierField() const;
+%Docstring
+ The identifier field should be a unique field that can be used to identify individual features.
+ It is normally set to the primary key of the layer.
+ :rtype: str
+%End
+
+    void setIdentifierField( const QString &identifierField );
+%Docstring
+ The identifier field should be a unique field that can be used to identify individual features.
+ It is normally set to the primary key of the layer.
+%End
+
+    QVariant extraIdentifierValue() const;
+%Docstring
+ Allows specifying one value that does not need to match the filter criteria but will
+ still be available in the model.
+ :rtype: QVariant
+%End
+
+    void setExtraIdentifierValue( const QVariant &extraIdentifierValue );
+%Docstring
+ Allows specifying one value that does not need to match the filter criteria but will
+ still be available in the model.
+%End
+
+    int extraIdentifierValueIndex() const;
+%Docstring
+ The index at which the extra identifier value is available within the model.
+ :rtype: int
+%End
+
+    bool extraValueDoesNotExist() const;
+%Docstring
+ Flag indicating that the extraIdentifierValue does not exist in the data.
+ :rtype: bool
+%End
+
+    bool allowNull() const;
+%Docstring
+ Add a NULL entry to the list.
+ :rtype: bool
+%End
+
+    void setAllowNull( bool allowNull );
+%Docstring
+ Add a NULL entry to the list.
+%End
+
+  signals:
+
+    void sourceLayerChanged();
+%Docstring
+ The source layer from which features will be fetched.
+%End
+
+    void displayExpressionChanged();
+%Docstring
+ The display expression will be used for
+
+  - displaying values in the combobox
+  - filtering based on filterValue
+%End
+
+    void filterValueChanged();
+%Docstring
+ This value will be used to filter the features available from
+ this model. Whenever a substring of the displayExpression of a feature
+ matches the filter value, it will be accessible by this model.
+%End
+
+    void filterExpressionChanged();
+%Docstring
+ An additional filter expression to apply, next to the filterValue.
+ Can be used for spatial filtering etc.
+%End
+
+    void isLoadingChanged();
+%Docstring
+ Indicator if the model is currently performing any feature iteration in the background.
+%End
+
+    void identifierFieldChanged();
+%Docstring
+ The identifier field should be a unique field that can be used to identify individual features.
+ It is normally set to the primary key of the layer.
+%End
+
+    void filterJobCompleted();
+%Docstring
+ Indicates that a filter job has been completed and new data may be available.
+%End
+
+    void extraIdentifierValueChanged();
+%Docstring
+ Allows specifying one value that does not need to match the filter criteria but will
+ still be available in the model.
+%End
+
+    void extraIdentifierValueIndexChanged( int index );
+%Docstring
+ The index at which the extra identifier value is available within the model.
+%End
+
+    void extraValueDoesNotExistChanged();
+%Docstring
+ Flag indicating that the extraIdentifierValue does not exist in the data.
+%End
+
+    void beginUpdate();
+%Docstring
+ Notification that the model is about to be changed because a job was completed.
+%End
+
+    void endUpdate();
+%Docstring
+ Notification that the model change is finished. Will always be emitted in sync with beginUpdate.
+%End
+
+    void allowNullChanged();
+%Docstring
+ Add a NULL entry to the list.
+%End
+
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/qgsfeaturefiltermodel.h                                     *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
@@ -108,6 +108,7 @@
 %Include qgsfeatureselectiondlg.sip
 %Include qgsfieldcombobox.sip
 %Include qgsfieldexpressionwidget.sip
+%Include qgsfeaturelistcombobox.sip
 %Include qgsfieldvalidator.sip
 %Include qgsfieldvalueslineedit.sip
 %Include qgsfilewidget.sip