Revert #3543 and use QgsFeatureRequest::setOrderBy instead

MerginMaps · Oct 7, 2024 · bc03521 · bc03521
1 parent 76bc2fd
commit bc03521
Show file tree

Hide file tree

Showing 12 changed files with 106 additions and 249 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -52,7 +52,6 @@ set(MM_SRCS
     compass.cpp
     featurelayerpair.cpp
     featuresmodel.cpp
-    featuresproxymodel.cpp
     fieldsmodel.cpp
     guidelinecontroller.cpp
     identifykit.cpp
@@ -136,7 +135,6 @@ set(MM_HDRS
     enumhelper.h
     featurelayerpair.h
     featuresmodel.h
-    featuresproxymodel.h
     fieldsmodel.h
     guidelinecontroller.h
     identifykit.h

diff --git a/app/featuresmodel.cpp b/app/featuresmodel.cpp
@@ -141,7 +141,6 @@ QVariant FeaturesModel::data( const QModelIndex &index, int role ) const
     case LayerName: return pair.layer() ? pair.layer()->name() : QString();
     case LayerIcon: return pair.layer() ? InputUtils::loadIconFromLayer( pair.layer() ) : QString();
     case Qt::DisplayRole: return featureTitle( pair );
-    case SortValue: return sortValue( pair );
   }
 
   return QVariant();
@@ -178,13 +177,6 @@ QVariant FeaturesModel::featureTitle( const FeatureLayerPair &featurePair ) cons
   return title;
 }
 
-QVariant FeaturesModel::sortValue( const FeatureLayerPair &featurePair ) const
-{
-  mExpressionContext.setFeature( featurePair.feature() );
-  QVariant result = mSortExpression.evaluate( &mExpressionContext );
-  return result;
-}
-
 QString FeaturesModel::searchResultPair( const FeatureLayerPair &pair ) const
 {
   if ( mSearchExpression.isEmpty() )
@@ -259,6 +251,20 @@ void FeaturesModel::setupFeatureRequest( QgsFeatureRequest &request )
     request.setFilterExpression( buildSearchExpression() );
   }
 
+  if ( mLayer && !mLayer->attributeTableConfig().sortExpression().isEmpty() )
+  {
+    // get a context with global, project and layer scopes
+    // QGIS docs are not very clear, but this context is also used for evaluation of the request's 'order by' expressions too
+    QgsExpressionContext context = mLayer->createExpressionContext();
+    request.setExpressionContext( context );
+    request.setOrderBy( QgsFeatureRequest::OrderBy(
+    {
+      QgsFeatureRequest::OrderByClause(
+        mLayer->attributeTableConfig().sortExpression(),
+        mLayer->attributeTableConfig().sortOrder() == Qt::AscendingOrder )
+    } ) );
+  }
+
   request.setLimit( FEATURES_LIMIT );
 }
 
@@ -288,7 +294,6 @@ QHash<int, QByteArray> FeaturesModel::roleNames() const
   roleNames[SearchResult] = QStringLiteral( "SearchResult" ).toLatin1();
   roleNames[LayerName] = QStringLiteral( "LayerName" ).toLatin1();
   roleNames[LayerIcon] = QStringLiteral( "LayerIcon" ).toLatin1();
-  roleNames[SortValue] = QStringLiteral( "SortValue" ).toLatin1();
   return roleNames;
 }
 
@@ -361,8 +366,6 @@ void FeaturesModel::setLayer( QgsVectorLayer *newLayer )
     }
 
     mLayer = newLayer;
-    mExpressionContext = mLayer->createExpressionContext();
-    setupSorting();
     emit layerChanged( mLayer );
 
     if ( mLayer )
@@ -383,21 +386,3 @@ QgsVectorLayer *FeaturesModel::layer() const
 {
   return mLayer;
 }
-
-void FeaturesModel::setupSorting()
-{
-  mSortExpressionString = mLayer ? mLayer->attributeTableConfig().sortExpression() : QString();
-  mSortOrder = mLayer ? mLayer->attributeTableConfig().sortOrder() : Qt::AscendingOrder;
-  mSortExpression = QgsExpression( mSortExpressionString );
-  mSortExpression.prepare( &mExpressionContext );
-}
-
-bool FeaturesModel::sortingEnabled() const
-{
-  return !mSortExpressionString.isEmpty();
-}
-
-Qt::SortOrder FeaturesModel::sortOrder() const
-{
-  return mSortOrder;
-}
diff --git a/app/featuresmodel.h b/app/featuresmodel.h
@@ -64,7 +64,6 @@ class FeaturesModel : public QAbstractListModel
       SearchResult, // pair of attribute and its value by which the feature was found, empty if search expression is empty
       LayerName,
       LayerIcon,
-      SortValue,
     };
     Q_ENUM( ModelRoles );
 
@@ -118,15 +117,6 @@ class FeaturesModel : public QAbstractListModel
 
     int layerFeaturesCount() const;
 
-    //! Populates the sort expression and sort order for the model
-    virtual void setupSorting();
-
-    //! Returns true if there is a sort expression set for the model
-    bool sortingEnabled() const;
-
-    //! Returns the order in witch the model should be sorted
-    Qt::SortOrder sortOrder() const;
-
   signals:
 
     void featuresLimitChanged( int featuresLimit );
@@ -149,11 +139,6 @@ class FeaturesModel : public QAbstractListModel
 
     virtual QVariant featureTitle( const FeatureLayerPair &featurePair ) const;
 
-    QString mSortExpressionString;
-    mutable QgsExpression mSortExpression;
-    mutable QgsExpressionContext mExpressionContext;
-    Qt::SortOrder mSortOrder = Qt::AscendingOrder;
-
   private slots:
     void onFutureFinished();
 
@@ -166,9 +151,6 @@ class FeaturesModel : public QAbstractListModel
     //! Returns found attribute and its value from search expression for feature
     QString searchResultPair( const FeatureLayerPair &feat ) const;
 
-    //! Evaluates the sort expression and returns the value used for this feature when sorting the model
-    QVariant sortValue( const FeatureLayerPair &featurePair ) const;
-
     const int FEATURES_LIMIT = 10000; //!< Number of maximum features loaded from layer
 
     FeatureLayerPairs mFeatures;

diff --git a/app/featuresproxymodel.cpp b/app/featuresproxymodel.cpp
diff --git a/app/featuresproxymodel.h b/app/featuresproxymodel.h
diff --git a/app/main.cpp b/app/main.cpp
@@ -91,7 +91,6 @@
 #include "position/positionkit.h"
 #include "scalebarkit.h"
 #include "featuresmodel.h"
-#include "featuresproxymodel.h"
 #include "relationfeaturesmodel.h"
 #include "relationreferencefeaturesmodel.h"
 #include "fieldvalidator.h"
@@ -327,7 +326,6 @@ void initDeclarative()
   qmlRegisterType< MapThemesModel >( "mm", 1, 0, "MapThemesModel" );
   qmlRegisterType< GuidelineController >( "mm", 1, 0, "GuidelineController" );
   qmlRegisterType< FeaturesModel >( "mm", 1, 0, "FeaturesModel" );
-  qmlRegisterType< FeaturesProxyModel >( "mm", 1, 0, "FeaturesProxyModel" );
   qmlRegisterType< RelationFeaturesModel >( "mm", 1, 0, "RelationFeaturesModel" );
   qmlRegisterType< ValueRelationFeaturesModel >( "mm", 1, 0, "ValueRelationFeaturesModel" );
   qmlRegisterType< RelationReferenceFeaturesModel >( "mm", 1, 0, "RelationReferenceFeaturesModel" );

diff --git a/app/qml/form/editors/MMFormValueRelationEditor.qml b/app/qml/form/editors/MMFormValueRelationEditor.qml
@@ -76,15 +76,11 @@ MMFormComboboxBaseEditor {
       valueRole: "FeatureId"
       textRole: "FeatureTitle"
 
-      list.model: MM.FeaturesProxyModel {
-        id: vrDropdownProxyModel
+      list.model: MM.ValueRelationFeaturesModel {
+        id: vrDropdownModel
 
-        featuresSourceModel: MM.ValueRelationFeaturesModel {
-          id: vrDropdownModel
-
-          config: root._fieldConfig
-          pair: root._fieldFeatureLayerPair
-        }
+        config: root._fieldConfig
+        pair: root._fieldFeatureLayerPair
       }
 
       onSearchTextChanged: ( searchText ) => vrDropdownModel.searchExpression = searchText

diff --git a/app/qml/layers/MMFeaturesListPage.qml b/app/qml/layers/MMFeaturesListPage.qml
@@ -55,14 +55,10 @@ MMComponents.MMPage {
         topMargin: __style.spacing20
       }
 
-      model: MM.FeaturesProxyModel {
-        id: featuresProxyModel
+      model: MM.FeaturesModel {
+        id: featuresModel
 
-        featuresSourceModel: MM.FeaturesModel {
-          id: featuresModel
-
-          layer: root.selectedLayer
-        }
+        layer: root.selectedLayer
       }
 
       clip: true