@@ -935,64 +935,68 @@ QString QgsGdalProvider::generateBandName( int bandNumber ) const
935
935
936
936
if ( strcmp ( GDALGetDriverShortName ( GDALGetDatasetDriver ( mGdalDataset ) ), " netCDF" ) == 0 || strcmp ( GDALGetDriverShortName ( GDALGetDatasetDriver ( mGdalDataset ) ), " GTiff" ) == 0 )
937
937
{
938
- char **GDALmetadata = GDALGetMetadata (mGdalDataset , nullptr );
938
+ char **GDALmetadata = GDALGetMetadata ( mGdalDataset , nullptr );
939
939
if ( GDALmetadata )
940
940
{
941
- QStringList metadata = QgsOgrUtils::cStringListToQStringList (GDALmetadata);
941
+ QStringList metadata = QgsOgrUtils::cStringListToQStringList ( GDALmetadata );
942
942
QStringList dimExtraValues;
943
943
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=" ) ) )
947
948
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 ( ' ,' );
952
954
// 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;
955
959
}
956
960
}
957
961
if ( !dimExtraValues.isEmpty () )
958
962
{
959
963
QStringList bandNameValues;
960
- GDALRasterBandH gdalBand = GDALGetRasterBand (mGdalDataset , bandNumber);
961
- GDALmetadata = GDALGetMetadata (gdalBand, nullptr );
964
+ GDALRasterBandH gdalBand = GDALGetRasterBand ( mGdalDataset , bandNumber );
965
+ GDALmetadata = GDALGetMetadata ( gdalBand, nullptr );
962
966
if ( GDALmetadata )
963
967
{
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 )
966
970
{
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_" ) ) )
969
973
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 )
972
976
{
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 )
975
979
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] + ' )' );
978
982
else
979
- bandNameValues.append (dim + ' =' + values.at (1 ) );
983
+ bandNameValues.append ( dim + ' =' + values.at ( 1 ) );
980
984
}
981
985
}
982
986
}
983
987
if ( !bandNameValues.isEmpty () )
984
988
{
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 ( " / " ) ) );
986
990
}
987
991
}
988
992
}
989
993
}
990
994
QString generatedBandName = QgsRasterDataProvider::generateBandName ( bandNumber );
991
995
GDALRasterBandH myGdalBand = getBand ( bandNumber );
992
- QString gdalBandName (GDALGetDescription (myGdalBand) );
993
- if ( !gdalBandName.isEmpty () )
996
+ QString gdalBandName ( GDALGetDescription ( myGdalBand ) );
997
+ if ( !gdalBandName.isEmpty () )
994
998
{
995
- return generatedBandName + QStringLiteral (" : " ) + gdalBandName;
999
+ return generatedBandName + QStringLiteral ( " : " ) + gdalBandName;
996
1000
}
997
1001
return generatedBandName;
998
1002
}
0 commit comments