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

fix attribute table display bug

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@223 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2003-06-05 02:56:32 +00:00
parent ab149d6805
commit bdf0b1851a
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qgis/src/qgisapp.cpp
View File

@ -74,7 +74,7 @@
#include <ogrsf_frmts.h>
// version
static const char *qgisVersion = "0.0.11pre1 June 2, 2003";
static const char *qgisVersion = "0.0.11pre2 June 4, 2003";
static const int qgisVersionInt = 10;
// cursors
static unsigned char zoom_in_bits[] = {
@ -210,7 +210,9 @@ void QgisApp::about()
"*Version check under tools menu\n"
"*Fix for PostGIS bug when srid != -1\n"
"*Database Connections can now be deleted\n"
"*Fixes to Database Connection dialog\n";
"*Fixes to Database Connection dialog\n"
"*Improved detection of invalid layers when loading\n"
;
abt->setWhatsNew(watsNew);

20
qgis/src/qgsshapefilelayer.cpp
View File

@ -41,7 +41,7 @@ QgsShapeFileLayer::QgsShapeFileLayer(QString vectorLayerPath, QString baseName)
ogrDataSource = OGRSFDriverRegistrar::Open((const char *) dataSource);
if (ogrDataSource != NULL) {
std::cout << "Adding " << dataSource << std::endl;
ogrLayer = ogrDataSource->GetLayer(0);
OGREnvelope *ext = new OGREnvelope();
ogrLayer->GetExtent(ext);
@ -51,11 +51,18 @@ QgsShapeFileLayer::QgsShapeFileLayer(QString vectorLayerPath, QString baseName)
layerExtent.setYmin(ext->MinY);
// get the feature type
OGRFeature *feat = ogrLayer->GetNextFeature();
OGRGeometry *geom = feat->GetGeometryRef();
feature = geom->getGeometryType();
ogrLayer->ResetReading();
delete feat;
if(feat){
OGRGeometry *geom = feat->GetGeometryRef();
if(geom){
feature = geom->getGeometryType();
ogrLayer->ResetReading();
}else{
valid = false;
}
delete feat;
}else{
valid = false;
}
} else {
valid = false;
}
@ -351,6 +358,7 @@ void QgsShapeFileLayer::table()
fet = ogrLayer->GetNextFeature();
}
ogrLayer->ResetReading();
at->table()->setSorting(true);