sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-19 00:04:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Fix dependency calculation for model child algs

Browse Source
This commit is contained in:
Nyall Dawson 2018-02-21 18:14:06 +10:00
parent 76c21ea369
commit f8c3f39670
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/processing/models/qgsprocessingmodelalgorithm.cpp
View File

@ -1045,7 +1045,7 @@ void QgsProcessingModelAlgorithm::dependentChildAlgorithmsRecursive( const QStri
&& source.outputChildId() == childId ) && source.outputChildId() == childId )
{ {
depends.insert( childIt->childId() ); depends.insert( childIt->childId() );
dependsOnChildAlgorithmsRecursive( childIt->childId(), depends ); dependentChildAlgorithmsRecursive( childIt->childId(), depends );
break; break;
} }
} }

28
tests/src/analysis/testqgsprocessing.cpp
View File

@ -5095,6 +5095,34 @@ void TestQgsProcessing::modelerAlgorithm()
QVERIFY( alg3.dependsOnChildAlgorithms( "c9" ).contains( "c7" ) ); QVERIFY( alg3.dependsOnChildAlgorithms( "c9" ).contains( "c7" ) );
QVERIFY( alg3.dependsOnChildAlgorithms( "c9" ).contains( "c8" ) ); QVERIFY( alg3.dependsOnChildAlgorithms( "c9" ).contains( "c8" ) );
QgsProcessingModelChildAlgorithm c9b;
c9b.setChildId( "c9b" );
c9b.addParameterSources( "x", QgsProcessingModelChildParameterSources() << QgsProcessingModelChildParameterSource::fromChildOutput( "c9", "x" ) );
alg3.addChildAlgorithm( c9b );
QCOMPARE( alg3.dependentChildAlgorithms( "c9" ).count(), 1 );
QCOMPARE( alg3.dependentChildAlgorithms( "c8" ).count(), 2 );
QVERIFY( alg3.dependentChildAlgorithms( "c8" ).contains( "c9" ) );
QVERIFY( alg3.dependentChildAlgorithms( "c8" ).contains( "c9b" ) );
QCOMPARE( alg3.dependentChildAlgorithms( "c7" ).count(), 3 );
QVERIFY( alg3.dependentChildAlgorithms( "c7" ).contains( "c8" ) );
QVERIFY( alg3.dependentChildAlgorithms( "c7" ).contains( "c9" ) );
QVERIFY( alg3.dependentChildAlgorithms( "c7" ).contains( "c9b" ) );
QVERIFY( alg3.dependsOnChildAlgorithms( "c7" ).isEmpty() );
QCOMPARE( alg3.dependsOnChildAlgorithms( "c8" ).count(), 1 );
QVERIFY( alg3.dependsOnChildAlgorithms( "c8" ).contains( "c7" ) );
QCOMPARE( alg3.dependsOnChildAlgorithms( "c9" ).count(), 2 );
QVERIFY( alg3.dependsOnChildAlgorithms( "c9" ).contains( "c7" ) );
QVERIFY( alg3.dependsOnChildAlgorithms( "c9" ).contains( "c8" ) );
QCOMPARE( alg3.dependsOnChildAlgorithms( "c9b" ).count(), 3 );
QVERIFY( alg3.dependsOnChildAlgorithms( "c9b" ).contains( "c7" ) );
QVERIFY( alg3.dependsOnChildAlgorithms( "c9b" ).contains( "c8" ) );
QVERIFY( alg3.dependsOnChildAlgorithms( "c9b" ).contains( "c9" ) );
alg3.removeChildAlgorithm( "c9b" );
// (de)activate child algorithm // (de)activate child algorithm
alg3.deactivateChildAlgorithm( "c9" ); alg3.deactivateChildAlgorithm( "c9" );
QVERIFY( !alg3.childAlgorithm( "c9" ).isActive() ); QVERIFY( !alg3.childAlgorithm( "c9" ).isActive() );