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

QgsCoordinateReferenceSystem::readXML() returns false on failure

Browse Source 
simplified a check for valid crs
This commit is contained in:
Sebastian Dietrich 2015-12-12 00:12:36 +01:00
parent 2d0be1cf69
commit ac1ee1cd50
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/composer/qgscomposermapgrid.cpp
View File

@ -400,16 +400,9 @@ bool QgsComposerMapGrid::readXML( const QDomElement& itemElem, const QDomDocumen
} }
} }
if ( !mCRS.readXML( itemElem ) )
QDomElement crsElem = itemElem.firstChildElement( "spatialrefsys" );
if ( !crsElem.isNull() )
{
mCRS.readXML( itemElem );
}
else
{
mCRS = QgsCoordinateReferenceSystem(); mCRS = QgsCoordinateReferenceSystem();
}
mBlendMode = ( QPainter::CompositionMode )( itemElem.attribute( "blendMode", "0" ).toUInt() ); mBlendMode = ( QPainter::CompositionMode )( itemElem.attribute( "blendMode", "0" ).toUInt() );
//annotation //annotation

4
src/core/qgscoordinatereferencesystem.cpp
View File

@ -1148,6 +1148,7 @@ QString QgsCoordinateReferenceSystem::toWkt() const
bool QgsCoordinateReferenceSystem::readXML( const QDomNode & theNode ) bool QgsCoordinateReferenceSystem::readXML( const QDomNode & theNode )
{ {
QgsDebugMsg( "Reading Spatial Ref Sys from xml ------------------------!" ); QgsDebugMsg( "Reading Spatial Ref Sys from xml ------------------------!" );
bool result = true;
QDomNode srsNode = theNode.namedItem( "spatialrefsys" ); QDomNode srsNode = theNode.namedItem( "spatialrefsys" );
if ( ! srsNode.isNull() ) if ( ! srsNode.isNull() )
@ -1260,8 +1261,9 @@ bool QgsCoordinateReferenceSystem::readXML( const QDomNode & theNode )
{ {
// Return default CRS if none was found in the XML. // Return default CRS if none was found in the XML.
createFromId( GEOCRS_ID, InternalCrsId ); createFromId( GEOCRS_ID, InternalCrsId );
result = false;
} }
return true; return result;
} }
bool QgsCoordinateReferenceSystem::writeXML( QDomNode & theNode, QDomDocument & theDoc ) const bool QgsCoordinateReferenceSystem::writeXML( QDomNode & theNode, QDomDocument & theDoc ) const