sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated code

Browse Source 
The input check was already done before entering
in the GPU branch
This commit is contained in:
Alessandro Pasotti 2018-12-01 17:31:45 +01:00
parent e01c162fcd
commit 5ef87371aa
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/analysis/raster/qgsrastercalculator.cpp
View File

@ -315,32 +315,9 @@ QgsRasterCalculator::Result QgsRasterCalculator::processCalculation( QgsFeedback
#ifdef HAVE_OPENCL
QgsRasterCalculator::Result QgsRasterCalculator::processCalculationGPU( QgsFeedback *feedback )
{
//prepare search string / tree
std::unique_ptr< QgsRasterCalcNode > calcNode( QgsRasterCalcNode::parseRasterCalcString( mFormulaString, mLastError ) );
if ( !calcNode )
{
//error
return ParserError;
}
QString cExpression( calcNode->toString( true ) );
// Safety check
for ( const auto &r : mRasterEntries )
{
if ( !r.raster ) // no raster layer in entry
{
mLastError = QObject::tr( "No raster layer for entry %1" ).arg( r.ref );
return InputLayerError;
}
if ( r.bandNumber <= 0 || r.bandNumber > r.raster->bandCount() )
{
mLastError = QObject::tr( "Band number %1 is not valid for entry %2" ).arg( r.bandNumber ).arg( r.ref );
return BandError;
}
}
QList<const QgsRasterCalcNode *> nodeList( calcNode->findNodes( QgsRasterCalcNode::Type::tRasterRef ) );
QSet<QString> capturedTexts;
for ( const auto &r : qgis::as_const( nodeList ) )