Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
rename method to better reflect its purpose
  • Loading branch information
alexbruy authored and wonder-sk committed Apr 14, 2023
1 parent 95b622e commit 47c5922
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgsalgorithmpdalboundary.cpp
Expand Up @@ -99,7 +99,7 @@ QStringList QgsPdalBoundaryAlgorithm::createArgumentLists( const QVariantMap &pa
args << QStringLiteral( "--threshold=%1" ).arg( parameterAsInt( parameters, QStringLiteral( "THRESHOLD" ), context ) );
}

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgsalgorithmpdalbuildvpc.cpp
Expand Up @@ -100,7 +100,7 @@ QStringList QgsPdalBuildVpcAlgorithm::createArgumentLists( const QVariantMap &pa
args << "--overview";
}

addThreadsParameter( args );
applyThreadsParameter( args );

for ( const QgsMapLayer *layer : std::as_const( layers ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgsalgorithmpdalclip.cpp
Expand Up @@ -87,7 +87,7 @@ QStringList QgsPdalClipAlgorithm::createArgumentLists( const QVariantMap &parame
QStringLiteral( "--polygon=%1" ).arg( overlayPath )
};

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
Expand Up @@ -79,7 +79,7 @@ QStringList QgsPdalConvertFormatAlgorithm::createArgumentLists( const QVariantMa
QStringLiteral( "--output=%1" ).arg( outputFile )
};

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgsalgorithmpdaldensity.cpp
Expand Up @@ -108,7 +108,7 @@ QStringList QgsPdalDensityAlgorithm::createArgumentLists( const QVariantMap &par
args << QStringLiteral( "--tile-origin-y=%1" ).arg( parameterAsInt( parameters, QStringLiteral( "ORIGIN_Y" ), context ) );
}

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
Expand Up @@ -111,7 +111,7 @@ QStringList QgsPdalExportRasterAlgorithm::createArgumentLists( const QVariantMap
args << QStringLiteral( "--tile-origin-y=%1" ).arg( parameterAsInt( parameters, QStringLiteral( "ORIGIN_Y" ), context ) );
}

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
Expand Up @@ -108,7 +108,7 @@ QStringList QgsPdalExportRasterTinAlgorithm::createArgumentLists( const QVariant
args << QStringLiteral( "--tile-origin-y=%1" ).arg( parameterAsInt( parameters, QStringLiteral( "ORIGIN_Y" ), context ) );
}

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
Expand Up @@ -89,7 +89,7 @@ QStringList QgsPdalExportVectorAlgorithm::createArgumentLists( const QVariantMap
}
}

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgsalgorithmpdalfilter.cpp
Expand Up @@ -81,7 +81,7 @@ QStringList QgsPdalFilterAlgorithm::createArgumentLists( const QVariantMap &para
QStringLiteral( "--output=%1" ).arg( outputFile )
};

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
Expand Up @@ -83,7 +83,7 @@ QStringList QgsPdalFixProjectionAlgorithm::createArgumentLists( const QVariantMa
QStringLiteral( "--assign-crs=%1" ).arg( crs.authid() )
};

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgsalgorithmpdalmerge.cpp
Expand Up @@ -82,7 +82,7 @@ QStringList QgsPdalMergeAlgorithm::createArgumentLists( const QVariantMap &param
args << QStringLiteral( "merge" )
<< QStringLiteral( "--output=%1" ).arg( outputFile );

addThreadsParameter( args );
applyThreadsParameter( args );

for ( const QgsMapLayer *layer : std::as_const( layers ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgsalgorithmpdalreproject.cpp
Expand Up @@ -95,7 +95,7 @@ QStringList QgsPdalReprojectAlgorithm::createArgumentLists( const QVariantMap &p
args << QStringLiteral( "--transform-coord-op=%1" ).arg( coordOp );
}

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgsalgorithmpdalthin.cpp
Expand Up @@ -86,7 +86,7 @@ QStringList QgsPdalThinAlgorithm::createArgumentLists( const QVariantMap &parame
QStringLiteral( "--%1=%2" ).arg( mode == 0 ? QStringLiteral( "step-every-nth" ) : QStringLiteral( "step-sample" ) ).arg( step )
};

addThreadsParameter( args );
applyThreadsParameter( args );
return args;
}

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgsalgorithmpdaltile.cpp
Expand Up @@ -101,7 +101,7 @@ QStringList QgsPdalTileAlgorithm::createArgumentLists( const QVariantMap &parame
args << QStringLiteral( "--a_srs=%1" ).arg( crs.authid() );
}

addThreadsParameter( args );
applyThreadsParameter( args );

for ( const QgsMapLayer *layer : std::as_const( layers ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/pdal/qgspdalalgorithmbase.cpp
Expand Up @@ -45,7 +45,7 @@ QString QgsPdalAlgorithmBase::wrenchExecutableBinary() const
return QString( wrenchExecutable );
}

void QgsPdalAlgorithmBase::addThreadsParameter( QStringList &arguments )
void QgsPdalAlgorithmBase::applyThreadsParameter( QStringList &arguments )
{
QgsSettings settings;
int threads = settings.value( QStringLiteral( "/Processing/Configuration/MAX_THREADS" ), 0 ).toInt();
Expand Down
4 changes: 2 additions & 2 deletions src/analysis/processing/pdal/qgspdalalgorithmbase.h
Expand Up @@ -42,10 +42,10 @@ class QgsPdalAlgorithmBase : public QgsProcessingAlgorithm
void setOutputValue( const QString &name, const QVariant &value );

/**
* Adds max number of concurrent threads for parallel runs parameter
* Applies max number of concurrent threads for parallel runs parameter
* if user has MAX_THREADS option set in Processing options.
*/
void addThreadsParameter( QStringList &arguments );
void applyThreadsParameter( QStringList &arguments );

/**
* Returns path to the pdal_wrench executable binary.
Expand Down

0 comments on commit 47c5922

Please sign in to comment.