sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

in addLayer() Removed superfluous check for OGR plug-in since that's now handled elsewhere.

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4284 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mcoletti 2005-12-01 22:40:07 +00:00
parent 76dddcb9b7
commit deae1bd7d3
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/qgisapp.cpp
View File

@ -1110,44 +1110,26 @@ static void openFilesRememberingFilter_(QString const &filterName,
*/
void QgisApp::addLayer()
{
mMapCanvas->freeze();
//qDebug( "vector file filters: " + fileFilters );
// XXX pOgr is subsequently never used; so why do we do this?
QString pOgr = mProviderRegistry->library("ogr");
if (pOgr.isEmpty())
{
#ifdef QGSDEBUG
qDebug("unable to get OGR registry");
QStringList selectedFiles;
#ifdef QGISDEBUG
std::cerr << "Vector file filters: " << mVectorFileFilter.toLocal8Bit().data() << std::endl;
#endif
QString enc;
QString title = tr("Open an OGR Supported Vector Layer");
openFilesRememberingFilter_("lastVectorFileFilter", mVectorFileFilter, selectedFiles, enc,
title);
if (selectedFiles.isEmpty())
{
// no files were selected, so just bail
mMapCanvas->freeze(false);
return;
}
else
{
mMapCanvas->freeze();
QStringList selectedFiles;
#ifdef QGISDEBUG
std::cerr << "Vector file filters: " << mVectorFileFilter.toLocal8Bit().data() << std::endl;
#endif
QString enc;
QString title = tr("Open an OGR Supported Vector Layer");
openFilesRememberingFilter_("lastVectorFileFilter", mVectorFileFilter, selectedFiles, enc,
title);
if (selectedFiles.isEmpty())
{
// no files were selected, so just bail
mMapCanvas->freeze(false);
return;
}
addLayer(selectedFiles, enc);
}
addLayer(selectedFiles, enc);
} // QgisApp::addLayer()