Sort variables in variable editor

nyalldawson · nyalldawson · commit 390ea4e9ba08 · 2015-09-11T17:11:48.000+10:00
diff --git a/python/core/qgsexpressioncontext.sip b/python/core/qgsexpressioncontext.sip
@@ -125,9 +125,17 @@ class QgsExpressionContextScope
 
     /** Returns a list of variable names contained within the scope.
      * @see functionNames()
+     * @see filteredVariableNames()
      */
     QStringList variableNames() const;
 
+    /** Returns a fitlered and sorted list of variable names contained within the scope.
+     * Hidden variable names will be excluded, and the list will be sorted so that
+     * read only variables are listed first.
+     * @see variableNames()
+     */
+    QStringList filteredVariableNames() const;
+
     /** Tests whether the specified variable is read only and should not be editable
      * by users.
      * @param name variable name
diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
@@ -112,6 +112,51 @@ QStringList QgsExpressionContextScope::variableNames() const
   return names;
 }
 
+bool QgsExpressionContextScope::variableNameSort( const QString& a, const QString& b )
+{
+  return QString::localeAwareCompare( a, b ) < 0;
+}
+
+// not public API
+/// @cond
+class QgsExpressionContextVariableCompare
+{
+  public:
+    explicit QgsExpressionContextVariableCompare( const QgsExpressionContextScope& scope )
+        : mScope( scope )
+    {  }
+
+    bool operator()( const QString& a, const QString& b ) const
+    {
+      bool aReadOnly = mScope.isReadOnly( a );
+      bool bReadOnly = mScope.isReadOnly( b );
+      if ( aReadOnly != bReadOnly )
+        return aReadOnly;
+      return QString::localeAwareCompare( a, b ) < 0;
+    }
+
+  private:
+    const QgsExpressionContextScope& mScope;
+};
+/// @endcond
+
+QStringList QgsExpressionContextScope::filteredVariableNames() const
+{
+  QStringList allVariables = mVariables.keys();
+  QStringList filtered;
+  Q_FOREACH ( const QString& variable, allVariables )
+  {
+    if ( variable.startsWith( "_" ) )
+      continue;
+
+    filtered << variable;
+  }
+  QgsExpressionContextVariableCompare cmp( *this );
+  qSort( filtered.begin(), filtered.end(), cmp );
+
+  return filtered;
+}
+
 bool QgsExpressionContextScope::isReadOnly( const QString &name ) const
 {
   return hasVariable( name ) ? mVariables.value( name ).readOnly : false;
diff --git a/src/core/qgsexpressioncontext.h b/src/core/qgsexpressioncontext.h
@@ -155,9 +155,17 @@ class CORE_EXPORT QgsExpressionContextScope
 
     /** Returns a list of variable names contained within the scope.
      * @see functionNames()
+     * @see filteredVariableNames()
      */
     QStringList variableNames() const;
 
+    /** Returns a fitlered and sorted list of variable names contained within the scope.
+     * Hidden variable names will be excluded, and the list will be sorted so that
+     * read only variables are listed first.
+     * @see variableNames()
+     */
+    QStringList filteredVariableNames() const;
+
     /** Tests whether the specified variable is read only and should not be editable
      * by users.
      * @param name variable name
@@ -216,6 +224,7 @@ class CORE_EXPORT QgsExpressionContextScope
     QHash<QString, StaticVariable> mVariables;
     QHash<QString, QgsScopedExpressionFunction* > mFunctions;
 
+    bool variableNameSort( const QString &a, const QString &b );
 };
 
 /** \ingroup core
diff --git a/src/gui/qgsvariableeditorwidget.cpp b/src/gui/qgsvariableeditorwidget.cpp
@@ -366,11 +366,8 @@ void QgsVariableEditorTree::refreshScopeVariables( QgsExpressionContextScope* sc
   bool isCurrent = scopeIndex == mEditableScopeIndex;
   QTreeWidgetItem* scopeItem = mScopeToItem.value( scopeIndex );
 
-  Q_FOREACH ( const QString& name, scope->variableNames() )
+  Q_FOREACH ( const QString& name, scope->filteredVariableNames() )
   {
-    if ( name.startsWith( QChar( '_' ) ) )
-      continue;
-
     QTreeWidgetItem* item;
     if ( mVariableToItem.contains( qMakePair( scopeIndex, name ) ) )
     {
diff --git a/tests/src/core/testqgsexpressioncontext.cpp b/tests/src/core/testqgsexpressioncontext.cpp
@@ -165,6 +165,10 @@ void TestQgsExpressionContext::contextScope()
   scope.setVariable( "readonly", "newvalue" );
   QVERIFY( scope.isReadOnly( "readonly" ) );
 
+  //test retrieving filtered variable names
+  scope.setVariable( "_hidden_", "hidden" );
+  QCOMPARE( scope.filteredVariableNames(), QStringList() << "readonly" << "notreadonly" << "test" );
+
   //removal
   scope.setVariable( "toremove", 5 );
   QVERIFY( scope.hasVariable( "toremove" ) );

Original file line number	Diff line number	Diff line change
`@@ -366,11 +366,8 @@ void QgsVariableEditorTree::refreshScopeVariables( QgsExpressionContextScope* sc`
`366`	`366`	`bool isCurrent = scopeIndex == mEditableScopeIndex;`
`367`	`367`	`QTreeWidgetItem* scopeItem = mScopeToItem.value( scopeIndex );`
`368`	`368`
`369`		`- Q_FOREACH ( const QString& name, scope->variableNames() )`
	`369`	`+ Q_FOREACH ( const QString& name, scope->filteredVariableNames() )`
`370`	`370`	`{`
`371`		`- if ( name.startsWith( QChar( '_' ) ) )`
`372`		`- continue;`
`373`		`-`
`374`	`371`	`QTreeWidgetItem* item;`
`375`	`372`	`if ( mVariableToItem.contains( qMakePair( scopeIndex, name ) ) )`
`376`	`373`	`{`