[processing] Empty provider nodes should still be shown in toolbox,

nyalldawson · nyalldawson · commit 325f2a4622c2 · 2018-07-18T08:56:52.000+10:00
unless a filter string is entered

This allows easier discoverability - e.g. without this, the model
and script nodes are hidden until models/scripts have already
been created.
diff --git a/src/gui/processing/qgsprocessingtoolboxmodel.cpp b/src/gui/processing/qgsprocessingtoolboxmodel.cpp
@@ -722,7 +722,8 @@ bool QgsProcessingToolboxProxyModel::filterAcceptsRow( int sourceRow, const QMod
   }
 
   bool hasChildren = false;
-  // providers and groups are shown only if they have visible children
+  // groups are shown only if they have visible children
+  // but providers are shown if they have visible children, OR the filter string is empty
   int count = sourceModel()->rowCount( sourceIndex );
   for ( int i = 0; i < count; ++i )
   {
@@ -735,7 +736,7 @@ bool QgsProcessingToolboxProxyModel::filterAcceptsRow( int sourceRow, const QMod
 
   if ( QgsProcessingProvider *provider = mModel->providerForIndex( sourceIndex ) )
   {
-    return hasChildren && provider->isActive();
+    return ( hasChildren || mFilterString.trimmed().isEmpty() ) && provider->isActive();
   }
   else
   {
diff --git a/tests/src/gui/testqgsprocessingmodel.cpp b/tests/src/gui/testqgsprocessingmodel.cpp
@@ -427,10 +427,15 @@ void TestQgsProcessingModel::testProxyModel()
 
   model.setFilters( QgsProcessingToolboxProxyModel::FilterModeler );
   group1Index = model.index( 0, 0, QModelIndex() );
-  QCOMPARE( model.rowCount(), 1 );
+  QCOMPARE( model.rowCount(), 3 );
   QCOMPARE( model.rowCount( group1Index ), 1 );
   QCOMPARE( model.data( group1Index, Qt::DisplayRole ).toString(), QStringLiteral( "group1" ) );
   QCOMPARE( model.data( model.index( 0, 0, group1Index ), Qt::DisplayRole ).toString(), QStringLiteral( "a2" ) );
+  // no filter string, so empty providers should be shown
+  QCOMPARE( model.data( model.index( 1, 0, QModelIndex() ), Qt::DisplayRole ).toString(), QStringLiteral( "provider1" ) );
+  QCOMPARE( model.rowCount( model.index( 1, 0, QModelIndex() ) ), 0 );
+  QCOMPARE( model.data( model.index( 2, 0, QModelIndex() ), Qt::DisplayRole ).toString(), QStringLiteral( "provider2" ) );
+  QCOMPARE( model.rowCount( model.index( 2, 0, QModelIndex() ) ), 0 );
   model.setFilters( QgsProcessingToolboxProxyModel::FilterToolbox );
   group2Index = model.index( 0, 0, QModelIndex() );
   QCOMPARE( model.rowCount(), 3 );
@@ -586,18 +591,22 @@ void TestQgsProcessingModel::testView()
   QCOMPARE( view.algorithmForIndex( alg1Index )->id(), QStringLiteral( "p2:a1" ) );
 
   view.setFilters( QgsProcessingToolboxProxyModel::FilterModeler );
-  provider2Index = view.model()->index( 0, 0, QModelIndex() );
+  QCOMPARE( view.model()->rowCount(), 2 );
+  QCOMPARE( view.model()->data( view.model()->index( 0, 0, QModelIndex() ), Qt::DisplayRole ).toString(), QStringLiteral( "provider1" ) );
+  QCOMPARE( view.model()->rowCount( view.model()->index( 0, 0, QModelIndex() ) ), 0 );
+  provider2Index = view.model()->index( 1, 0, QModelIndex() );
   QCOMPARE( view.model()->data( provider2Index, Qt::DisplayRole ).toString(), QStringLiteral( "provider2" ) );
-  QCOMPARE( view.model()->rowCount(), 1 );
   QCOMPARE( view.model()->rowCount( provider2Index ), 1 );
   group2Index = view.model()->index( 0, 0, provider2Index );
   QCOMPARE( view.model()->rowCount( group2Index ), 1 );
   QCOMPARE( view.algorithmForIndex( view.model()->index( 0, 0, group2Index ) )->id(), QStringLiteral( "p2:a1" ) );
   view.setFilters( QgsProcessingToolboxProxyModel::FilterToolbox );
+  QCOMPARE( view.model()->rowCount(), 2 );
   provider1Index = view.model()->index( 0, 0, QModelIndex() );
   QCOMPARE( view.model()->data( provider1Index, Qt::DisplayRole ).toString(), QStringLiteral( "provider1" ) );
-  QCOMPARE( view.model()->rowCount(), 1 );
   QCOMPARE( view.model()->rowCount( provider1Index ), 1 );
+  QCOMPARE( view.model()->data( view.model()->index( 1, 0, QModelIndex() ), Qt::DisplayRole ).toString(), QStringLiteral( "provider2" ) );
+  QCOMPARE( view.model()->rowCount( view.model()->index( 1, 0, QModelIndex() ) ), 0 );
   group2Index = view.model()->index( 0, 0, provider1Index );
   QCOMPARE( view.model()->rowCount( group2Index ), 1 );
   QCOMPARE( view.algorithmForIndex( view.model()->index( 0, 0, group2Index ) )->id(), QStringLiteral( "p1:a2" ) );

Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,8 @@ bool QgsProcessingToolboxProxyModel::filterAcceptsRow( int sourceRow, const QMod`
`722`	`722`	`}`
`723`	`723`
`724`	`724`	`bool hasChildren = false;`
`725`		`- // providers and groups are shown only if they have visible children`
	`725`	`+ // groups are shown only if they have visible children`
	`726`	`+ // but providers are shown if they have visible children, OR the filter string is empty`
`726`	`727`	`int count = sourceModel()->rowCount( sourceIndex );`
`727`	`728`	`for ( int i = 0; i < count; ++i )`
`728`	`729`	`{`
`@@ -735,7 +736,7 @@ bool QgsProcessingToolboxProxyModel::filterAcceptsRow( int sourceRow, const QMod`
`735`	`736`
`736`	`737`	`if ( QgsProcessingProvider *provider = mModel->providerForIndex( sourceIndex ) )`
`737`	`738`	`{`
`738`		`- return hasChildren && provider->isActive();`
	`739`	`+ return ( hasChildren \|\| mFilterString.trimmed().isEmpty() ) && provider->isActive();`
`739`	`740`	`}`
`740`	`741`	`else`
`741`	`742`	`{`