mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
use comma as delimiter in all part of raster fileformat list
git-svn-id: http://svn.osgeo.org/qgis/trunk@7375 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
271314d4dd
commit
7c2152c4a9
@ -136,7 +136,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter(QString & theFileFiltersStri
|
|||||||
|
|
||||||
QStringList metadataTokens; // essentially the metadata string delimited by '='
|
QStringList metadataTokens; // essentially the metadata string delimited by '='
|
||||||
|
|
||||||
QString catchallFilter; // for Any file(*.*), but also for those
|
QStringList catchallFilter; // for Any file(*.*), but also for those
|
||||||
// drivers with no specific file filter
|
// drivers with no specific file filter
|
||||||
|
|
||||||
GDALDriver *jp2Driver = NULL; // first JPEG2000 driver found
|
GDALDriver *jp2Driver = NULL; // first JPEG2000 driver found
|
||||||
@ -269,7 +269,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter(QString & theFileFiltersStri
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
catchallFilter += QString(myGdalDriver->GetDescription()) + " ";
|
catchallFilter << QString(myGdalDriver->GetDescription());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -278,7 +278,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter(QString & theFileFiltersStri
|
|||||||
} // each loaded GDAL driver
|
} // each loaded GDAL driver
|
||||||
|
|
||||||
// can't forget the default case
|
// can't forget the default case
|
||||||
theFileFiltersString += catchallFilter + tr("and all other files") + " (*)";
|
theFileFiltersString += catchallFilter.join(", ") + " " + tr("and all other files") + " (*)";
|
||||||
QgsDebugMsg("Raster filter list built: " + theFileFiltersString);
|
QgsDebugMsg("Raster filter list built: " + theFileFiltersString);
|
||||||
} // buildSupportedRasterFileFilter_()
|
} // buildSupportedRasterFileFilter_()
|
||||||
|
|
||||||
@ -374,8 +374,7 @@ QgsRasterLayer::QgsRasterLayer(QString const & path, QString const & baseName)
|
|||||||
showDebugOverlayFlag(false),
|
showDebugOverlayFlag(false),
|
||||||
invertHistogramFlag(false),
|
invertHistogramFlag(false),
|
||||||
stdDevsToPlotDouble(0),
|
stdDevsToPlotDouble(0),
|
||||||
dataProvider(0)
|
dataProvider(0)
|
||||||
|
|
||||||
{
|
{
|
||||||
userDefinedColorMinMax = false; //defaults needed to bypass stretch
|
userDefinedColorMinMax = false; //defaults needed to bypass stretch
|
||||||
userDefinedGrayMinMax = false;
|
userDefinedGrayMinMax = false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user