Skip to content
Permalink
Browse files

[processing] Also hide empty providers in toolbox

Initially empty providers were shown for discoverability,
but discussion with @nirvn and @elpaso have convinced me this
is a bad approach.
  • Loading branch information
nyalldawson committed Sep 17, 2018
1 parent 1d8dbda commit c76410bdbd383cd6c53f27b35cfd4606d1ceab4c
Showing with 8 additions and 24 deletions.
  1. +2 −11 src/gui/processing/qgsprocessingtoolboxmodel.cpp
  2. +6 −13 tests/src/gui/testqgsprocessingmodel.cpp
@@ -742,8 +742,7 @@ bool QgsProcessingToolboxProxyModel::filterAcceptsRow( int sourceRow, const QMod
}

bool hasChildren = false;
// groups are shown only if they have visible children
// but providers are shown if they have visible children, OR the filter string is empty
// groups/providers are shown only if they have visible children
int count = sourceModel()->rowCount( sourceIndex );
for ( int i = 0; i < count; ++i )
{
@@ -754,15 +753,7 @@ bool QgsProcessingToolboxProxyModel::filterAcceptsRow( int sourceRow, const QMod
}
}

if ( QgsProcessingProvider *provider = mModel->providerForIndex( sourceIndex ) )
{
return ( hasChildren || mFilterString.trimmed().isEmpty() ) && provider->isActive();
}
else
{
// group
return hasChildren; // || isRecentNode;
}
return hasChildren;
}

bool QgsProcessingToolboxProxyModel::lessThan( const QModelIndex &left, const QModelIndex &right ) const
@@ -425,17 +425,13 @@ void TestQgsProcessingModel::testProxyModel()
QModelIndex alg2Index = model.index( 0, 0, group1Index );
QCOMPARE( model.data( alg2Index, Qt::DisplayRole ).toString(), QStringLiteral( "a2" ) );

// empty providers/groups should not be shown
model.setFilters( QgsProcessingToolboxProxyModel::FilterModeler );
group1Index = model.index( 0, 0, QModelIndex() );
QCOMPARE( model.rowCount(), 3 );
QCOMPARE( model.rowCount(), 1 );
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 );
@@ -590,23 +586,20 @@ void TestQgsProcessingModel::testView()
QModelIndex alg1Index = view.model()->index( 0, 0, group2Index );
QCOMPARE( view.algorithmForIndex( alg1Index )->id(), QStringLiteral( "p2:a1" ) );

// empty providers/groups should not be shown
view.setFilters( QgsProcessingToolboxProxyModel::FilterModeler );
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()->rowCount(), 1 );
provider2Index = view.model()->index( 0, 0, QModelIndex() );
QCOMPARE( view.model()->data( provider2Index, Qt::DisplayRole ).toString(), QStringLiteral( "provider2" ) );
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 );
QCOMPARE( view.model()->rowCount(), 1 );
provider1Index = view.model()->index( 0, 0, QModelIndex() );
QCOMPARE( view.model()->data( provider1Index, Qt::DisplayRole ).toString(), QStringLiteral( "provider1" ) );
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" ) );

0 comments on commit c76410b

Please sign in to comment.
You can’t perform that action at this time.