sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

descriptive name for mStoredFilterExpressions to make a difference to future QgsStoredExpression objects

Browse Source
This commit is contained in:
David Signer 2019-08-20 21:24:45 +02:00
parent 8e70d7e999
commit ffa41cb814
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/qgsvectorlayer.sip.in
View File

@ -2300,7 +2300,7 @@ Configuration and logic to apply automatically on any edit happening on this lay
QgsStoredExpressionManager *storedExpressions();
QgsStoredExpressionManager *storedFilterExpressions();
%Docstring
Returns all the stored expressions for this layer as the manager

10
src/app/qgsattributetabledialog.cpp
View File

@ -489,7 +489,7 @@ void QgsAttributeTableDialog::storedFilterExpressionBoxInit()
delete a;
}
const QList< QgsStoredExpression > storedExpressions = mLayer->storedExpressions()->storedExpressions();
const QList< QgsStoredExpression > storedExpressions = mLayer->storedFilterExpressions()->storedExpressions();
for ( const QgsStoredExpression &storedExpression : storedExpressions )
{
QAction *storedExpressionAction = new QAction( storedExpression.name, mFilterButton );
@ -1107,7 +1107,7 @@ void QgsAttributeTableDialog::openConditionalStyles()
void QgsAttributeTableDialog::saveAsStoredFilterExpression()
{
mLayer->storedExpressions()->addStoredExpression( "test", mFilterQuery->text() );
mLayer->storedFilterExpressions()->addStoredExpression( "test", mFilterQuery->text() );
//update menu list of stored filter expressions
storedFilterExpressionBoxInit();
@ -1128,11 +1128,11 @@ void QgsAttributeTableDialog::handleStoreFilterExpression()
{
if ( !mActionHandleStoreFilterExpression->isChecked() )
{
mLayer->storedExpressions()->removeStoredExpression( mActionHandleStoreFilterExpression->data().toUuid() );
mLayer->storedFilterExpressions()->removeStoredExpression( mActionHandleStoreFilterExpression->data().toUuid() );
}
else
{
mLayer->storedExpressions()->addStoredExpression( mFilterQuery->text(), mFilterQuery->text() );
mLayer->storedFilterExpressions()->addStoredExpression( mFilterQuery->text(), mFilterQuery->text() );
}
storeExpressionButtonInit();
@ -1146,7 +1146,7 @@ void QgsAttributeTableDialog::handleStoreFilterExpression()
void QgsAttributeTableDialog::updateCurrentStoredFilterExpression( const QString &value )
{
//dave make time thingy because this is emmited on every tipe
QgsStoredExpression currentStoredExpression = mLayer->storedExpressions()->findStoredExpressionByExpression( value );
QgsStoredExpression currentStoredExpression = mLayer->storedFilterExpressions()->findStoredExpressionByExpression( value );
//set checked when it's an existing stored expression
//here it should set the button (with this action) to checked or unchecked, but this toggles blöderweise handleStoreFilterExpression dave :-/

8
src/core/qgsvectorlayer.cpp
View File

@ -158,7 +158,7 @@ QgsVectorLayer::QgsVectorLayer( const QString &vectorLayerPath,
mGeometryOptions = qgis::make_unique<QgsGeometryOptions>();
mActions = new QgsActionManager( this );
mConditionalStyles = new QgsConditionalLayerStyles();
mStoredExpressions = new QgsStoredExpressionManager();
mStoredFilterExpressions = new QgsStoredExpressionManager();
mJoinBuffer = new QgsVectorLayerJoinBuffer( this );
mJoinBuffer->setParent( this );
@ -206,7 +206,7 @@ QgsVectorLayer::~QgsVectorLayer()
delete mRenderer;
delete mConditionalStyles;
delete mStoredExpressions;
delete mStoredFilterExpressions;
if ( mFeatureCounter )
mFeatureCounter->cancel();
@ -2177,7 +2177,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode &layerNode, QString &errorMes
{
mAttributeTableConfig.readXml( layerNode );
mConditionalStyles->readXml( layerNode, context );
mStoredExpressions->readXml( layerNode );
mStoredFilterExpressions->readXml( layerNode );
}
if ( categories.testFlag( CustomProperties ) )
@ -2516,7 +2516,7 @@ bool QgsVectorLayer::writeSymbology( QDomNode &node, QDomDocument &doc, QString
{
mAttributeTableConfig.writeXml( node );
mConditionalStyles->writeXml( node, doc, context );
mStoredExpressions->writeXml( node );
mStoredFilterExpressions->writeXml( node );
}
if ( categories.testFlag( Forms ) )

4
src/core/qgsvectorlayer.h
View File

@ -2141,7 +2141,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
*
* \since QGIS 3.10
*/
QgsStoredExpressionManager *storedExpressions() { return mStoredExpressions; }
QgsStoredExpressionManager *storedFilterExpressions() { return mStoredFilterExpressions; }
public slots:
@ -2649,7 +2649,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
bool mAllowCommit = true;
//! Stored expression used for e.g. filter
QgsStoredExpressionManager *mStoredExpressions = nullptr;
QgsStoredExpressionManager *mStoredFilterExpressions = nullptr;
friend class QgsVectorLayerFeatureSource;