Fix for [ 1181249 ] Crash when loading shape files

git-svn-id: http://svn.osgeo.org/qgis/trunk@3137 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2005-04-12 11:51:30 +00:00
parent e75d32ed0d
commit 769f4ed10d
3 changed files with 18 additions and 5 deletions

View File

@ -2,7 +2,9 @@
------------------------------------------------------------------------------
Version 0.6 'Simon' .... development version
QGIS Change Log
2005-04-10 [timlinux] 0.6devel11
2005-04-12 [timlinux] 0.6devel12
** Fix for [ 1181249 ] Crash when loading shape files
2005-04-11 [timlinux] 0.6devel11
** Data binding on projection and ellipsoid selector on custom projection
dialog
2005-04-11 [ges] 0.6.0devel10

View File

@ -26,7 +26,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=6
MICRO_VERSION=0
EXTRA_VERSION=11
EXTRA_VERSION=12
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else

View File

@ -2607,9 +2607,20 @@ void QgsVectorLayer::setCoordinateSystem()
}
else ///qgis/projections/defaultBehaviour==useDefault
{
//shamelessly hard coded for now
//XXX TODO get this from options dlg
mySourceWKT = mySettings.readEntry("/qgis/projections/defaultProjectionWKT");
//default to geo / wgs84 for now
QString myGeoWKT = "GEOGCS[\"WGS 84\", "
" DATUM[\"WGS_1984\", "
" SPHEROID[\"WGS 84\",6378137,298.257223563, "
" AUTHORITY[\"EPSG\",7030]], "
" TOWGS84[0,0,0,0,0,0,0], "
" AUTHORITY[\"EPSG\",6326]], "
" PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",8901]], "
" UNIT[\"DMSH\",0.0174532925199433,AUTHORITY[\"EPSG\",9108]], "
" AXIS[\"Lat\",NORTH], "
" AXIS[\"Long\",EAST], "
" AUTHORITY[\"EPSG\",4326]]";
mySourceWKT = mySettings.readEntry("/qgis/projections/defaultProjectionWKT",myGeoWKT);
}
}