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

Don't prompt for CRS for annotation layers

Browse Source 
Fixes #38739
This commit is contained in:
Nyall Dawson 2020-09-16 14:41:13 +10:00
parent 49037e050a
commit 15975c1d51
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/annotations/qgsannotationlayer.cpp
View File

@ -26,6 +26,7 @@ QgsAnnotationLayer::QgsAnnotationLayer( const QString &name, const LayerOptions
: QgsMapLayer( QgsMapLayerType::AnnotationLayer, name ) : QgsMapLayer( QgsMapLayerType::AnnotationLayer, name )
, mTransformContext( options.transformContext ) , mTransformContext( options.transformContext )
{ {
mShouldValidateCrs = false;
mValid = true; mValid = true;
} }

4
src/core/qgsmaplayer.cpp
View File

@ -257,7 +257,7 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, QgsReadWriteCon
QDomNode srsNode = layerElement.namedItem( QStringLiteral( "srs" ) ); QDomNode srsNode = layerElement.namedItem( QStringLiteral( "srs" ) );
mCRS.readXml( srsNode ); mCRS.readXml( srsNode );
mCRS.setValidationHint( tr( "Specify CRS for layer %1" ).arg( mne.text() ) ); mCRS.setValidationHint( tr( "Specify CRS for layer %1" ).arg( mne.text() ) );
if ( isSpatial() ) if ( isSpatial() && type() != QgsMapLayerType::AnnotationLayer )
mCRS.validate(); mCRS.validate();
savedCRS = mCRS; savedCRS = mCRS;
@ -770,7 +770,7 @@ void QgsMapLayer::setCrs( const QgsCoordinateReferenceSystem &srs, bool emitSign
{ {
mCRS = srs; mCRS = srs;
if ( mShouldValidateCrs && isSpatial() && !mCRS.isValid() ) if ( mShouldValidateCrs && isSpatial() && !mCRS.isValid() && type() != QgsMapLayerType::AnnotationLayer )
{ {
mCRS.setValidationHint( tr( "Specify CRS for layer %1" ).arg( name() ) ); mCRS.setValidationHint( tr( "Specify CRS for layer %1" ).arg( name() ) );
mCRS.validate(); mCRS.validate();