Skip to content

Commit 6aea483

Browse files
nyalldawsonnyalldawson
committed
[processing] Pep8 fixes for model to script
1 parent 92f5cb9 commit 6aea483

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

‎src/core/processing/models/qgsprocessingmodelchildalgorithm.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ QStringList QgsProcessingModelChildAlgorithm::asPythonCode( const QgsProcessing:
184184
sourceParts << part;
185185
}
186186
if ( sourceParts.count() == 1 )
187-
paramParts << QStringLiteral( "'%1':%2" ).arg( paramIt.key(), sourceParts.at( 0 ) );
187+
paramParts << QStringLiteral( "'%1': %2" ).arg( paramIt.key(), sourceParts.at( 0 ) );
188188
else
189-
paramParts << QStringLiteral( "'%1':[%2]" ).arg( paramIt.key(), sourceParts.join( ',' ) );
189+
paramParts << QStringLiteral( "'%1': [%2]" ).arg( paramIt.key(), sourceParts.join( ',' ) );
190190
}
191191

192192
lines << baseIndent + QStringLiteral( "alg_params = {" );
@@ -197,7 +197,11 @@ QStringList QgsProcessingModelChildAlgorithm::asPythonCode( const QgsProcessing:
197197
}
198198
for ( auto it = extraParameters.constBegin(); it != extraParameters.constEnd(); ++it )
199199
{
200-
lines << baseIndent + lineIndent + QgsProcessingUtils::stringToPythonLiteral( it.key() ) + ':' + it.value() + ',';
200+
lines << baseIndent + lineIndent + QStringLiteral( "%1: %2," ).arg( QgsProcessingUtils::stringToPythonLiteral( it.key() ), it.value() );
201+
}
202+
if ( lines.constLast().endsWith( ',' ) )
203+
{
204+
lines[ lines.count() - 1 ].truncate( lines.constLast().length() - 1 );
201205
}
202206
lines << baseIndent + QStringLiteral( "}" );
203207

‎tests/src/analysis/testqgsprocessing.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -6156,7 +6156,7 @@ void TestQgsProcessing::modelerAlgorithm()
61566156
QgsStringMap extraParams;
61576157
extraParams[QStringLiteral( "SOMETHING" )] = QStringLiteral( "SOMETHING_ELSE" );
61586158
extraParams[QStringLiteral( "SOMETHING2" )] = QStringLiteral( "SOMETHING_ELSE2" );
6159-
QCOMPARE( child.asPythonCode( QgsProcessing::PythonQgsProcessingAlgorithmSubclass, extraParams, 4, 2 ).join( '\n' ), QStringLiteral( " alg_params = {\n 'SOMETHING':SOMETHING_ELSE,\n 'SOMETHING2':SOMETHING_ELSE2,\n }\n outputs[''] = processing.run('native:centroids', alg_params, context=context, feedback=feedback, is_child_algorithm=True)" ) );
6159+
QCOMPARE( child.asPythonCode( QgsProcessing::PythonQgsProcessingAlgorithmSubclass, extraParams, 4, 2 ).join( '\n' ), QStringLiteral( " alg_params = {\n 'SOMETHING': SOMETHING_ELSE,\n 'SOMETHING2': SOMETHING_ELSE2\n }\n outputs[''] = processing.run('native:centroids', alg_params, context=context, feedback=feedback, is_child_algorithm=True)" ) );
61606160
// bit of a hack -- but try to simulate an algorithm not originally available!
61616161
child.mAlgorithm.reset();
61626162
QVERIFY( !child.algorithm() );
@@ -6199,7 +6199,7 @@ void TestQgsProcessing::modelerAlgorithm()
61996199
QCOMPARE( child.parameterSources().value( QStringLiteral( "b" ) ).at( 0 ).staticValue().toInt(), 7 );
62006200
QCOMPARE( child.parameterSources().value( QStringLiteral( "b" ) ).at( 1 ).staticValue().toInt(), 9 );
62016201

6202-
QCOMPARE( child.asPythonCode( QgsProcessing::PythonQgsProcessingAlgorithmSubclass, extraParams, 4, 2 ).join( '\n' ), QStringLiteral( " alg_params = {\n 'a':5,\n 'b':[7,9],\n 'SOMETHING':SOMETHING_ELSE,\n 'SOMETHING2':SOMETHING_ELSE2,\n }\n outputs['my_id'] = processing.run('native:centroids', alg_params, context=context, feedback=feedback, is_child_algorithm=True)" ) );
6202+
QCOMPARE( child.asPythonCode( QgsProcessing::PythonQgsProcessingAlgorithmSubclass, extraParams, 4, 2 ).join( '\n' ), QStringLiteral( " alg_params = {\n 'a': 5,\n 'b': [7,9],\n 'SOMETHING': SOMETHING_ELSE,\n 'SOMETHING2': SOMETHING_ELSE2\n }\n outputs['my_id'] = processing.run('native:centroids', alg_params, context=context, feedback=feedback, is_child_algorithm=True)" ) );
62036203

62046204
QgsProcessingModelOutput testModelOut;
62056205
testModelOut.setChildId( QStringLiteral( "my_id" ) );
@@ -6235,7 +6235,7 @@ void TestQgsProcessing::modelerAlgorithm()
62356235
QCOMPARE( child.modelOutput( "a" ).description(), QStringLiteral( "my output" ) );
62366236
child.modelOutput( "a" ).setDescription( QStringLiteral( "my output 2" ) );
62376237
QCOMPARE( child.modelOutput( "a" ).description(), QStringLiteral( "my output 2" ) );
6238-
QCOMPARE( child.asPythonCode( QgsProcessing::PythonQgsProcessingAlgorithmSubclass, extraParams, 4, 2 ).join( '\n' ), QStringLiteral( " alg_params = {\n 'a':5,\n 'b':[7,9],\n 'SOMETHING':SOMETHING_ELSE,\n 'SOMETHING2':SOMETHING_ELSE2,\n }\n outputs['my_id'] = processing.run('native:centroids', alg_params, context=context, feedback=feedback, is_child_algorithm=True)\n results['my_id:a'] = outputs['my_id']['']" ) );
6238+
QCOMPARE( child.asPythonCode( QgsProcessing::PythonQgsProcessingAlgorithmSubclass, extraParams, 4, 2 ).join( '\n' ), QStringLiteral( " alg_params = {\n 'a': 5,\n 'b': [7,9],\n 'SOMETHING': SOMETHING_ELSE,\n 'SOMETHING2': SOMETHING_ELSE2\n }\n outputs['my_id'] = processing.run('native:centroids', alg_params, context=context, feedback=feedback, is_child_algorithm=True)\n results['my_id:a'] = outputs['my_id']['']" ) );
62396239

62406240
// no existent
62416241
child.modelOutput( "b" ).setDescription( QStringLiteral( "my output 3" ) );
@@ -6983,26 +6983,26 @@ void TestQgsProcessing::modelExecution()
69836983
" results = {}\n"
69846984
" outputs = {}\n"
69856985
" alg_params = {\n"
6986-
" 'DISSOLVE':False,\n"
6987-
" 'DISTANCE':parameters['DIST'],\n"
6988-
" 'END_CAP_STYLE':1,\n"
6989-
" 'INPUT':parameters['SOURCE_LAYER'],\n"
6990-
" 'JOIN_STYLE':2,\n"
6991-
" 'SEGMENTS':QgsExpression('@myvar*2').evaluate(),\n"
6992-
" 'OUTPUT':parameters['cx1:MODEL_OUT_LAYER'],\n"
6986+
" 'DISSOLVE': False,\n"
6987+
" 'DISTANCE': parameters['DIST'],\n"
6988+
" 'END_CAP_STYLE': 1,\n"
6989+
" 'INPUT': parameters['SOURCE_LAYER'],\n"
6990+
" 'JOIN_STYLE': 2,\n"
6991+
" 'SEGMENTS': QgsExpression('@myvar*2').evaluate(),\n"
6992+
" 'OUTPUT': parameters['cx1:MODEL_OUT_LAYER']\n"
69936993
" }\n"
69946994
" outputs['cx1'] = processing.run('native:buffer', alg_params, context=context, feedback=feedback, is_child_algorithm=True)\n"
69956995
" results['cx1:MODEL_OUT_LAYER'] = outputs['cx1']['OUTPUT']\n"
69966996
" alg_params = {\n"
6997-
" 'INPUT':outputs['cx1']['OUTPUT'],\n"
6998-
" 'OUTPUT':QgsProcessing.TEMPORARY_OUTPUT,\n"
6997+
" 'INPUT': outputs['cx1']['OUTPUT'],\n"
6998+
" 'OUTPUT': QgsProcessing.TEMPORARY_OUTPUT\n"
69996999
" }\n"
70007000
" outputs['cx2'] = processing.run('native:centroids', alg_params, context=context, feedback=feedback, is_child_algorithm=True)\n"
70017001
" alg_params = {\n"
7002-
" 'EXPRESSION':'true',\n"
7003-
" 'INPUT':outputs['cx1']['OUTPUT'],\n"
7004-
" 'OUTPUT':parameters['MY_OUT'],\n"
7005-
" 'OUTPUT':parameters['cx3:MY_OUT'],\n"
7002+
" 'EXPRESSION': 'true',\n"
7003+
" 'INPUT': outputs['cx1']['OUTPUT'],\n"
7004+
" 'OUTPUT': parameters['MY_OUT'],\n"
7005+
" 'OUTPUT': parameters['cx3:MY_OUT']\n"
70067006
" }\n"
70077007
" outputs['cx3'] = processing.run('native:extractbyexpression', alg_params, context=context, feedback=feedback, is_child_algorithm=True)\n"
70087008
" results['cx3:MY_OUT'] = outputs['cx3']['OUTPUT']\n"

0 commit comments

Comments
 (0)