changed detection method of layer type when reading a project file

git-svn-id: http://svn.osgeo.org/qgis/trunk@589 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2004-01-25 07:37:00 +00:00
parent 1ef2673283
commit b241d03556

View File

@ -12,7 +12,7 @@
* (at your option) any later version. * * (at your option) any later version. *
* * * *
***************************************************************************/ ***************************************************************************/
/* qgsprojectio.cpp,v 1.16 2004/01/19 23:58:58 timlinux Exp */ /* qgsprojectio.cpp,v 1.17 2004/01/25 07:37:00 gsherman Exp */
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <qfiledialog.h> #include <qfiledialog.h>
@ -158,20 +158,18 @@ bool QgsProjectIo::read(){
// add the layer to the maplayer // add the layer to the maplayer
if(type == "database"){ if(type == "vector"){
QString provider;
#ifdef POSTGRESQL // determine type of vector layer
QgsVectorLayer *dbl = new QgsVectorLayer(dataSource, layerName, "postgres"); if((dataSource.find("host=") > -1) && (dataSource.find("dbname=") > -1)){
provider = "postgres";
}else{
provider = "ogr";
}
QgsVectorLayer *dbl = new QgsVectorLayer(dataSource, layerName, provider);
map->addLayer(dbl); map->addLayer(dbl);
dbl->setSymbol(sym); dbl->setSymbol(sym);
dbl->setVisible(visible == "1"); dbl->setVisible(visible == "1");
#endif
} else if ( type == "vector" ) {
QgsVectorLayer *shpl = new QgsVectorLayer(dataSource, layerName, "ogr");
map->addLayer(shpl);
shpl->setSymbol(sym);
shpl->setVisible(visible == "1");
} else if ( type == "raster" ) { } else if ( type == "raster" ) {
QgsRasterLayer *myRasterLayer = new QgsRasterLayer(dataSource, layerName); QgsRasterLayer *myRasterLayer = new QgsRasterLayer(dataSource, layerName);