Skip to content

Commit 8fbb717

Browse files
AndrewAnnexnyalldawson
AndrewAnnex
authored and
nyalldawson
committed
addressed comments, ran prepare-commit.sh
1 parent c04accd commit 8fbb717

File tree

2 files changed

+35
-43
lines changed

2 files changed

+35
-43
lines changed

‎src/providers/gdal/qgsgdalprovider.cpp

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -935,64 +935,68 @@ QString QgsGdalProvider::generateBandName( int bandNumber ) const
935935

936936
if ( strcmp( GDALGetDriverShortName( GDALGetDatasetDriver( mGdalDataset ) ), "netCDF" ) == 0 || strcmp( GDALGetDriverShortName( GDALGetDatasetDriver( mGdalDataset ) ), "GTiff" ) == 0 )
937937
{
938-
char **GDALmetadata = GDALGetMetadata(mGdalDataset, nullptr);
938+
char **GDALmetadata = GDALGetMetadata( mGdalDataset, nullptr );
939939
if ( GDALmetadata )
940940
{
941-
QStringList metadata = QgsOgrUtils::cStringListToQStringList(GDALmetadata);
941+
QStringList metadata = QgsOgrUtils::cStringListToQStringList( GDALmetadata );
942942
QStringList dimExtraValues;
943943
QMap<QString, QString> unitsMap;
944-
for (QStringList::const_iterator i = metadata.constBegin(); i != metadata.constEnd(); ++i) {
945-
QString val(*i);
946-
if ( !val.startsWith(QLatin1String("NETCDF_DIM_EXTRA")) && !val.startsWith(QLatin1String("GTIFF_DIM_EXTRA")) && !val.contains(QLatin1String("#units=")) )
944+
for ( QStringList::const_iterator i = metadata.constBegin(); i != metadata.constEnd(); ++i )
945+
{
946+
QString val( *i );
947+
if ( !val.startsWith( QLatin1String( "NETCDF_DIM_EXTRA" ) ) && !val.startsWith( QLatin1String( "GTIFF_DIM_EXTRA" ) ) && !val.contains( QLatin1String( "#units=" ) ) )
947948
continue;
948-
QStringList values = val.split('=');
949-
val = values.at(1);
950-
if ( values.at(0) == QLatin1String("NETCDF_DIM_EXTRA") || values.at(0) == QLatin1String("GTIFF_DIM_EXTRA") ) {
951-
dimExtraValues = val.replace('{', QString()).replace('}', QString()).split(',');
949+
QStringList values = val.split( '=' );
950+
val = values.at( 1 );
951+
if ( values.at( 0 ) == QLatin1String( "NETCDF_DIM_EXTRA" ) || values.at( 0 ) == QLatin1String( "GTIFF_DIM_EXTRA" ) )
952+
{
953+
dimExtraValues = val.replace( '{', QString() ).replace( '}', QString() ).split( ',' );
952954
//http://qt-project.org/doc/qt-4.8/qregexp.html#capturedTexts
953-
} else {
954-
unitsMap[values.at(0).split('#').at(0)] = val;
955+
}
956+
else
957+
{
958+
unitsMap[values.at( 0 ).split( '#' ).at( 0 )] = val;
955959
}
956960
}
957961
if ( !dimExtraValues.isEmpty() )
958962
{
959963
QStringList bandNameValues;
960-
GDALRasterBandH gdalBand = GDALGetRasterBand(mGdalDataset, bandNumber);
961-
GDALmetadata = GDALGetMetadata(gdalBand, nullptr);
964+
GDALRasterBandH gdalBand = GDALGetRasterBand( mGdalDataset, bandNumber );
965+
GDALmetadata = GDALGetMetadata( gdalBand, nullptr );
962966
if ( GDALmetadata )
963967
{
964-
metadata = QgsOgrUtils::cStringListToQStringList(GDALmetadata);
965-
for (QStringList::const_iterator i = metadata.constBegin(); i != metadata.constEnd(); ++i)
968+
metadata = QgsOgrUtils::cStringListToQStringList( GDALmetadata );
969+
for ( QStringList::const_iterator i = metadata.constBegin(); i != metadata.constEnd(); ++i )
966970
{
967-
QString val(*i);
968-
if ( !val.startsWith(QLatin1String("NETCDF_DIM_")) && !val.startsWith(QLatin1String("GTIFF_DIM_")) )
971+
QString val( *i );
972+
if ( !val.startsWith( QLatin1String( "NETCDF_DIM_" ) ) && !val.startsWith( QLatin1String( "GTIFF_DIM_" ) ) )
969973
continue;
970-
QStringList values = val.split('=');
971-
for (QStringList::const_iterator j = dimExtraValues.constBegin(); j != dimExtraValues.constEnd(); ++j)
974+
QStringList values = val.split( '=' );
975+
for ( QStringList::const_iterator j = dimExtraValues.constBegin(); j != dimExtraValues.constEnd(); ++j )
972976
{
973-
QString dim = (*j);
974-
if ( values.at(0) != "NETCDF_DIM_" + dim && values.at(0) != "GTIFF_DIM_" + dim )
977+
QString dim = ( *j );
978+
if ( values.at( 0 ) != "NETCDF_DIM_" + dim && values.at( 0 ) != "GTIFF_DIM_" + dim )
975979
continue;
976-
if ( unitsMap.contains(dim) && !unitsMap[dim].isEmpty() && unitsMap[dim] != QLatin1String("none") )
977-
bandNameValues.append(dim + '=' + values.at(1) + " (" + unitsMap[dim] + ')');
980+
if ( unitsMap.contains( dim ) && !unitsMap[dim].isEmpty() && unitsMap[dim] != QLatin1String( "none" ) )
981+
bandNameValues.append( dim + '=' + values.at( 1 ) + " (" + unitsMap[dim] + ')' );
978982
else
979-
bandNameValues.append(dim + '=' + values.at(1));
983+
bandNameValues.append( dim + '=' + values.at( 1 ) );
980984
}
981985
}
982986
}
983987
if ( !bandNameValues.isEmpty() )
984988
{
985-
return tr("Band") + QStringLiteral(" %1 / %2").arg(bandNumber, 1 + (int) std::log10((float) bandCount()), 10, QChar('0')).arg(bandNameValues.join(QStringLiteral(" / ")));
989+
return tr( "Band" ) + QStringLiteral( " %1: %2" ).arg( bandNumber, 1 + ( int ) std::log10( ( float ) bandCount() ), 10, QChar( '0' ) ).arg( bandNameValues.join( QStringLiteral( " / " ) ) );
986990
}
987991
}
988992
}
989993
}
990994
QString generatedBandName = QgsRasterDataProvider::generateBandName( bandNumber );
991995
GDALRasterBandH myGdalBand = getBand( bandNumber );
992-
QString gdalBandName(GDALGetDescription(myGdalBand));
993-
if( !gdalBandName.isEmpty() )
996+
QString gdalBandName( GDALGetDescription( myGdalBand ) );
997+
if ( !gdalBandName.isEmpty() )
994998
{
995-
return generatedBandName + QStringLiteral(": ") + gdalBandName;
999+
return generatedBandName + QStringLiteral( ": " ) + gdalBandName;
9961000
}
9971001
return generatedBandName;
9981002
}

‎tests/src/providers/testqgsgdalprovider.cpp

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,7 @@ void TestQgsGdalProvider::bandName()
251251
QgsDataProvider *provider = QgsProviderRegistry::instance()->createProvider( QStringLiteral( "gdal" ), raster, QgsDataProvider::ProviderOptions() );
252252
QgsRasterDataProvider *rp = dynamic_cast< QgsRasterDataProvider * >( provider );
253253
QVERIFY( rp );
254-
if ( rp )
255-
{
256-
qDebug() << "Band Name 1: " << rp->generateBandName( 1 );
257-
QCOMPARE( rp->generateBandName( 1 ), QStringLiteral( "Band 1 / wvln=1.234 (um)" ) );
258-
}
254+
QCOMPARE( rp->generateBandName( 1 ), QStringLiteral( "Band 1: wvln=1.234 (um)" ) );
259255
delete provider;
260256
}
261257

@@ -265,11 +261,7 @@ void TestQgsGdalProvider::bandNameNoDescription()
265261
QgsDataProvider *provider = QgsProviderRegistry::instance()->createProvider( QStringLiteral( "gdal" ), raster, QgsDataProvider::ProviderOptions() );
266262
QgsRasterDataProvider *rp = dynamic_cast< QgsRasterDataProvider * >( provider );
267263
QVERIFY( rp );
268-
if ( rp )
269-
{
270-
qDebug() << "Band Name 1: " << rp->generateBandName( 1 );
271-
QCOMPARE( rp->generateBandName( 1 ), QStringLiteral( "Band 1" ) );
272-
}
264+
QCOMPARE( rp->generateBandName( 1 ), QStringLiteral( "Band 1" ) );
273265
delete provider;
274266
}
275267

@@ -279,11 +271,7 @@ void TestQgsGdalProvider::bandNameWithDescription()
279271
QgsDataProvider *provider = QgsProviderRegistry::instance()->createProvider( QStringLiteral( "gdal" ), raster, QgsDataProvider::ProviderOptions() );
280272
QgsRasterDataProvider *rp = dynamic_cast< QgsRasterDataProvider * >( provider );
281273
QVERIFY( rp );
282-
if ( rp )
283-
{
284-
qDebug() << "Band Name 1: " << rp->generateBandName( 1 );
285-
QCOMPARE( rp->generateBandName( 1 ), QStringLiteral( "Band 1: 1.234 um" ) );
286-
}
274+
QCOMPARE( rp->generateBandName( 1 ), QStringLiteral( "Band 1: 1.234 um" ) );
287275
delete provider;
288276
}
289277

0 commit comments

Comments
 (0)