Skip to content

Commit 7710882

Browse files
committed
change output of QgsGdalProvider::generateBandName() and fix indentation
1 parent 82164b4 commit 7710882

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

src/providers/gdal/qgsgdalprovider.cpp

+24-22
Original file line numberDiff line numberDiff line change
@@ -876,10 +876,10 @@ int QgsGdalProvider::yBlockSize() const
876876
int QgsGdalProvider::xSize() const { return mWidth; }
877877
int QgsGdalProvider::ySize() const { return mHeight; }
878878

879-
QString QgsGdalProvider::generateBandName( int BandNo ) const
879+
QString QgsGdalProvider::generateBandName( int theBandNumber ) const
880880
{
881881
#ifdef GDAL_COMPUTE_VERSION /* only available in GDAL 1.10 or later */
882-
#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,10,0)
882+
#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,10,0)
883883
if ( strcmp( GDALGetDriverShortName( GDALGetDatasetDriver( mGdalDataset ) ), "netCDF" ) == 0 )
884884
{
885885
char ** GDALmetadata = GDALGetMetadata( mGdalDataset, NULL );
@@ -890,60 +890,62 @@ QString QgsGdalProvider::generateBandName( int BandNo ) const
890890
QStringList dimExtraValues;
891891
QMap< QString, QString > unitsMap;
892892
for ( QStringList::const_iterator i = metadata.begin();
893-
i != metadata.end();
894-
++i )
893+
i != metadata.end(); ++i )
895894
{
896-
QString val(*i);
895+
QString val( *i );
897896
if ( !val.startsWith( "NETCDF_DIM_EXTRA" ) && !val.contains( "#units=" ) )
898897
continue;
899898
QStringList values = val.split( "=" );
900899
val = values.at( 1 );
901-
if ( values.at( 0 ) == "NETCDF_DIM_EXTRA" ) {
902-
dimExtraValues = val.replace(QString("{"), QString("")).replace(QString("}"), QString("")).split(",");
900+
if ( values.at( 0 ) == "NETCDF_DIM_EXTRA" )
901+
{
902+
dimExtraValues = val.replace( QString( "{" ), QString( "" ) ).replace( QString( "}" ), QString( "" ) ).split( "," );
903903
//http://qt-project.org/doc/qt-4.8/qregexp.html#capturedTexts
904-
} else {
905-
unitsMap[ values.at(0).split( "#" ).at(0) ] = val;
904+
}
905+
else
906+
{
907+
unitsMap[ values.at( 0 ).split( "#" ).at( 0 )] = val;
906908
}
907909
}
908910
if ( dimExtraValues.count() > 0 )
909911
{
910912
QStringList bandNameValues;
911-
GDALRasterBandH gdalBand = GDALGetRasterBand( mGdalDataset, BandNo );
913+
GDALRasterBandH gdalBand = GDALGetRasterBand( mGdalDataset, theBandNumber );
912914
GDALmetadata = GDALGetMetadata( gdalBand, NULL );
913915

914916
if ( GDALmetadata )
915917
{
916918
metadata = cStringList2Q_( GDALmetadata );
917919
for ( QStringList::const_iterator i = metadata.begin();
918-
i != metadata.end();
919-
++i )
920+
i != metadata.end(); ++i )
920921
{
921-
QString val(*i);
922+
QString val( *i );
922923
if ( !val.startsWith( "NETCDF_DIM_" ) )
923924
continue;
924925
QStringList values = val.split( "=" );
925926
for ( QStringList::const_iterator j = dimExtraValues.begin();
926-
j != dimExtraValues.end();
927-
++j )
927+
j != dimExtraValues.end(); ++j )
928928
{
929-
QString dim = (*j);
930-
if ( values.at( 0 ) != "NETCDF_DIM_"+dim )
929+
QString dim = ( *j );
930+
if ( values.at( 0 ) != "NETCDF_DIM_" + dim )
931931
continue;
932-
if ( unitsMap.contains( dim ) )
933-
bandNameValues.append( values.at(1)+" "+unitsMap[ dim ] );
932+
if ( unitsMap.contains( dim ) && unitsMap[ dim ] != "" && unitsMap[ dim ] != "none" )
933+
bandNameValues.append( dim + "=" + values.at( 1 ) + " (" + unitsMap[ dim ] + ")" );
934934
else
935-
bandNameValues.append( values.at(1) );
935+
bandNameValues.append( dim + "=" + values.at( 1 ) );
936936
}
937937
}
938938
}
939+
939940
if ( bandNameValues.count() > 0 )
940-
return bandNameValues.join(" ");
941+
return tr( "Band" ) + QString( " %1 / %2" ) .arg( theBandNumber, 1 + ( int ) log10(( float ) bandCount() ), 10, QChar( '0' ) ).arg( bandNameValues.join( " / " ) );
941942
}
942943
}
943944
}
944945
#endif
945946
#endif
946-
return tr( "Band" ) + QString( " %1" ) .arg( BandNo, 1 + ( int ) log10(( float ) bandCount() ), 10, QChar( '0' ) );
947+
948+
return QgsRasterDataProvider::generateBandName( theBandNumber );
947949
}
948950

949951
QgsRasterIdentifyResult QgsGdalProvider::identify( const QgsPoint & thePoint, QgsRaster::IdentifyFormat theFormat, const QgsRectangle &theExtent, int theWidth, int theHeight )

0 commit comments

Comments
 (0)