Skip to content

Filter floating chip #4427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabriel-bolbotina wants to merge 3 commits into
base: dev/filtering
Choose a base branch
from
+88 −101
Open

Filter floating chip #4427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67dee9d
Updated the filter icon
gabriel-bolbotina Mar 26, 2026
0166dca
Formatted qml code
gabriel-bolbotina Mar 27, 2026
7f9a538
Reverted logic in MMMapButton
gabriel-bolbotina Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/filtercontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ QString FilterController::buildFieldExpression( const FieldFilter &filter ) cons

// Match all positions: only value {k}, first {k,...}, last ...,k}, middle ...,k,...
keyConditions << QStringLiteral( "(%1 LIKE '{%2}' OR %1 LIKE '{%2,%%' OR %1 LIKE '%%,%2}' OR %1 LIKE '%%,%2,%%')" )
.arg( quotedField, escapedKey );
.arg( quotedField, escapedKey );
}
return keyConditions.join( QStringLiteral( " OR " ) );
}
Expand Down Expand Up @@ -726,7 +726,7 @@ QVariantList FilterController::extractValueRelationOptions( const QVariantMap &c
QString escapedSearch = searchText;
escapedSearch.replace( "'", "''" );
QString filterExpr = QStringLiteral( "LOWER(%1) LIKE '%%2%'" )
.arg( QgsExpression::quotedColumnRef( valueFieldName ), escapedSearch.toLower() );
.arg( QgsExpression::quotedColumnRef( valueFieldName ), escapedSearch.toLower() );
request.setFilterExpression( filterExpr );
}

Expand Down Expand Up @@ -785,8 +785,8 @@ QVariantList FilterController::extractValueRelationOptions( const QVariantMap &c
selectedRequest.setFlags( Qgis::FeatureRequestFlag::NoGeometry );
selectedRequest.setSubsetOfAttributes( QStringList( { keyFieldName, valueFieldName } ), referencedLayer->fields() );
selectedRequest.setFilterExpression(
QStringLiteral( "%1 IN (%2)" ).arg( QgsExpression::quotedColumnRef( keyFieldName ), quotedKeys.join( QStringLiteral( ", " ) ) )
);
QStringLiteral( "%1 IN (%2)" ).arg( QgsExpression::quotedColumnRef( keyFieldName ), quotedKeys.join( QStringLiteral( ", " ) ) )
);

QVariantList selectedItems;
QgsFeatureIterator selIt = referencedLayer->getFeatures( selectedRequest );
Expand Down Expand Up @@ -856,8 +856,8 @@ QStringList FilterController::lookupValueRelationTexts( const QVariantMap &confi
request.setFlags( Qgis::FeatureRequestFlag::NoGeometry );
request.setSubsetOfAttributes( QStringList( { keyFieldName, valueFieldName } ), referencedLayer->fields() );
request.setFilterExpression(
QStringLiteral( "%1 IN (%2)" ).arg( QgsExpression::quotedColumnRef( keyFieldName ), quotedKeys.join( QStringLiteral( ", " ) ) )
);
QStringLiteral( "%1 IN (%2)" ).arg( QgsExpression::quotedColumnRef( keyFieldName ), quotedKeys.join( QStringLiteral( ", " ) ) )
);

QgsFeatureIterator it = referencedLayer->getFeatures( request );
QgsFeature feature;
Expand Down
2 changes: 1 addition & 1 deletion app/icons/Filter.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions app/icons/FilterFilled.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion app/icons/icons.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<file>Features.svg</file>
<file>FeaturesFilled.svg</file>
<file>Filter.svg</file>
<file>FilterFilled.svg</file>
<file>GPSAntennaHeight.svg</file>
<file>GPSIcon.svg</file>
<file>GPSSatellite.svg</file>
Expand Down
2 changes: 0 additions & 2 deletions app/mmstyle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ class MMStyle: public QObject
Q_PROPERTY( QUrl facebookIcon READ facebookIcon CONSTANT )
Q_PROPERTY( QUrl featuresIcon READ featuresIcon CONSTANT )
Q_PROPERTY( QUrl filterIcon READ filterIcon CONSTANT )
Q_PROPERTY( QUrl filterFilledIcon READ filterFilledIcon CONSTANT )
Q_PROPERTY( QUrl globeIcon READ globeIcon CONSTANT )
Q_PROPERTY( QUrl globalIcon READ globalIcon CONSTANT )
Q_PROPERTY( QUrl gpsIcon READ gpsIcon CONSTANT )
Expand Down Expand Up @@ -433,7 +432,6 @@ class MMStyle: public QObject
QUrl deleteIcon() const {return QUrl( "qrc:/Delete.svg" );}
QUrl featuresIcon() const {return QUrl( "qrc:/Features.svg" );}
QUrl filterIcon() const {return QUrl( "qrc:/Filter.svg" );}
QUrl filterFilledIcon() const {return QUrl( "qrc:/FilterFilled.svg" );}
QUrl downloadIcon() const {return QUrl( "qrc:/Download.svg" );}
QUrl uploadIcon() const {return QUrl( "qrc:/Upload.svg" );}
QUrl editIcon() const {return QUrl( "qrc:/Edit.svg" );}
Expand Down
Loading
Loading