Skip to content

Commit

Permalink
Merge pull request #36089 from 3nids/expression-preview
Browse files Browse the repository at this point in the history 
Feature browser for preview in expression builder
  • Loading branch information
@3nids
3nids committed Apr 30, 2020
2 parents 9d5b69a + d7edbcb commit 578ab85
Show file tree
Hide file tree
Showing 28 changed files with 3,098 additions and 1,236 deletions.
194 changes: 7 additions & 187 deletions python/core/auto_generated/qgsfeaturefiltermodel.sip.in
View file
Expand Up @@ -8,8 +8,7 @@




class QgsFeatureFilterModel : QAbstractItemModel
class QgsFeatureFilterModel : QgsFeaturePickerModelBase
{
%Docstring
Provides a list of features based on filter conditions.
Expand All @@ -23,85 +22,9 @@ Features are fetched asynchronously.
%End
public:

enum Role
{
IdentifierValueRole,
IdentifierValuesRole,
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.
%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
%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.
%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.
%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.
%End

QString identifierField() const;
Expand All @@ -120,14 +43,6 @@ The identifier field should be a unique field that can be used to identify indiv
It is normally set to the primary key of the layer.

.. versionadded:: 3.10
%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.

.. deprecated:: QGIS 3.10
%End

void setIdentifierFields( const QStringList &identifierFields );
Expand All @@ -142,28 +57,21 @@ It is normally set to the primary key of the layer.
.. versionadded:: 3.10
%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.
virtual void setExtraIdentifierValueToNull();

.. deprecated:: QGIS 3.10
%End

QVariantList extraIdentifierValues() const;
%Docstring
Allows specifying one value that does not need to match the filter criteria but will
still be available in the model.
still be available in the model as NULL value(s).

.. versionadded:: 3.10
%End

void setExtraIdentifierValue( const QVariant &extraIdentifierValue );
QVariantList extraIdentifierValues() const;
%Docstring
Allows specifying one value that does not need to match the filter criteria but will
still be available in the model.

.. deprecated:: QGIS 3.10
.. versionadded:: 3.10
%End

void setExtraIdentifierValues( const QVariantList &extraIdentifierValues );
Expand All @@ -174,107 +82,19 @@ still be available in the model.
.. versionadded:: 3.10
%End

void setExtraIdentifierValuesToNull();
%Docstring
Allows specifying one value that does not need to match the filter criteria but will
still be available in the model as NULL value(s).

.. versionadded:: 3.10
%End

int extraIdentifierValueIndex() const;
%Docstring
The index at which the extra identifier value is available within the model.
%End

bool extraValueDoesNotExist() const;
%Docstring
Flag indicating that the extraIdentifierValue does not exist in the data.
%End

bool allowNull() const;
%Docstring
Add a NULL entry to the list.
%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();
void identifierFieldsChanged();
%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();
void extraIdentifierValuesChanged();
%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

};
Expand Down
64 changes: 64 additions & 0 deletions python/core/auto_generated/qgsfeaturepickermodel.sip.in
View file
@@ -0,0 +1,64 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsfeaturepickermodel.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/



class QgsFeaturePickerModel : QgsFeaturePickerModelBase
{
%Docstring
Provides a list of features based on filter conditions.
Features are fetched asynchronously.

.. versionadded:: 3.0
%End

%TypeHeaderCode
#include "qgsfeaturepickermodel.h"
%End
public:

explicit QgsFeaturePickerModel( QObject *parent = 0 );
%Docstring
Create a new QgsFeaturePickerModel, optionally specifying a ``parent``.
%End

virtual void setExtraIdentifierValueToNull();

%Docstring
Allows specifying one value that does not need to match the filter criteria but will
still be available in the model as NULL value(s).

.. versionadded:: 3.10
%End

void setFeature( const QgsFeatureId &fid );
%Docstring
Set the feature to the given feature id
%End

QgsFeature feature() const;
%Docstring
Returns the current feature
%End

signals:
void featureChanged( const QgsFeature &feature );
%Docstring
Emitted when the current feature changes
%End


};

/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsfeaturepickermodel.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

0 comments on commit 578ab85

Please sign in to comment.