Skip to content
Permalink
Browse files

added libqgis_legend.la where it was needed for compilation

git-svn-id: http://svn.osgeo.org/qgis/trunk@5277 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent
mhugent committed Apr 14, 2006
1 parent b024796 commit eecdb36c9d8257269952b0d6763fca39ef1be0d0
Showing with 4 additions and 69 deletions.
  1. +0 −68 src/gui/qgisapp.cpp
  2. +2 −1 tests/src/core/Makefile.am
  3. +1 −0 tests/src/gui/Makefile.am
  4. +1 −0 tests/src/raster/Makefile.am
@@ -2416,13 +2416,6 @@ void QgisApp::newVectorLayer()

delete openFileDialog;


// check to see if user specified the extension. if not, add it...
//if(filename.find(QRegExp("\\.shp$")) == -1)
//{
//filename += ".shp";
//}

//try to create the new layer with OGRProvider instead of QgsVectorFileWriter
QgsProviderRegistry * pReg = QgsProviderRegistry::instance();
QString ogrlib = pReg->library("ogr");
@@ -2469,67 +2462,6 @@ void QgisApp::newVectorLayer()
}
}

#if 0
//create the new layer with QgsVectorFileWriter
QgsVectorFileWriter* writer=0;

if(geometrytype == QGis::WKBPoint)
{
writer=new QgsVectorFileWriter(filename,enc,wkbPoint);
if(!writer->initialise())
{
QMessageBox::warning(0,tr("Warning"),tr("Writing of the layer failed"),QMessageBox::Ok,Qt::NoButton);
return;
}
}
else if(geometrytype == QGis::WKBLineString)
{
writer=new QgsVectorFileWriter(filename,enc,wkbLineString);
if(!writer->initialise())
{
QMessageBox::warning(0,tr("Warning"),tr("Writing of the layer failed"),QMessageBox::Ok,Qt::NoButton);
return;
}
}
else if(geometrytype == QGis::WKBPolygon)
{
writer=new QgsVectorFileWriter(filename,enc,wkbPolygon);
if(!writer->initialise())
{
QMessageBox::warning(0,tr("Warning"),tr("Writing of the layer failed"),QMessageBox::Ok,Qt::NoButton);
return;
}
}
else
{
#ifdef QGISDEBUG
qWarning("QgisApp.cpp: geometry type not recognised");
#endif

return;
}

if(writer)
{
for(std::list<std::pair<QString, QString> >::iterator it=attributes.begin();it!=attributes.end();++it)
{
if(it->second=="Real")
{
writer->createField(it->first, OFTReal, 10, 3);
}
else if(it->second=="Integer")
{
writer->createField(it->first, OFTInteger, 10, 3);
}
else if(it->second=="String")
{
writer->createField(it->first, OFTString, 40, 1);
}
}
}
delete writer;
#endif //0

//then add the layer to the view
QStringList filelist;
filelist.append(filename);
@@ -56,7 +56,8 @@ GLOBALLDADD = $(QT_LDADD) \
-lproj \
../../../src/core/libqgis_core.la \
../../../src/raster/libqgis_raster.la \
../../../src/gui/libqgis_gui.la
../../../src/legend/libqgis_legend.la \
../../../src/gui/libqgis_gui.la
GLOBALCXXFLAGS = $(CXXFLAGS) \
$(EXTRA_CXXFLAGS) \
$(GDAL_CFLAGS) \
@@ -93,6 +93,7 @@ GLOBALLDADD = $(QT_LDADD) \
-lproj \
../../../src/core/libqgis_core.la \
../../../src/raster/libqgis_raster.la \
../../../src/legend/libqgis_legend.la \
../../../src/gui/libqgis_gui.la
GLOBALCXXFLAGS = $(CXXFLAGS) \
$(EXTRA_CXXFLAGS) \
@@ -20,6 +20,7 @@ GLOBALLDADD = $(QT_LDADD) \
-lproj \
../../../src/core/libqgis_core.la \
../../../src/raster/libqgis_raster.la \
../../../src/legend/libqgis_legend.la \
../../../src/gui/libqgis_gui.la
GLOBALCXXFLAGS = $(CXXFLAGS) \
$(EXTRA_CXXFLAGS) \

0 comments on commit eecdb36

Please sign in to comment.
You can’t perform that action at this time.