Merge pull request #5595 from alexbruy/fix-north-arrow

nyalldawson · web-flow · commit c1b683b51e8c · 2017-11-12T12:08:49.000+11:00
[north arrow] prevent crash if project CRS is not defined
diff --git a/src/app/qgsdecorationnortharrow.cpp b/src/app/qgsdecorationnortharrow.cpp
@@ -123,7 +123,15 @@ void QgsDecorationNorthArrow::render( const QgsMapSettings &mapSettings, QgsRend
       // called when the projection or map extent changes
       if ( mAutomatic )
       {
-        mRotationInt = QgsBearingUtils:: bearingTrueNorth( mapSettings.destinationCrs(), context.extent().center() );
+        try
+        {
+          mRotationInt = QgsBearingUtils:: bearingTrueNorth( mapSettings.destinationCrs(), context.extent().center() );
+        }
+        catch ( QgsException &e )
+        {
+          mRotationInt = 0.0;
+          //QgsDebugMsg( "Can not get direction to true north. Probably project CRS is not defined." );
+        }
         mRotationInt += mapSettings.rotation();
       }
 
@@ -210,5 +218,4 @@ void QgsDecorationNorthArrow::render( const QgsMapSettings &mapSettings, QgsRend
       context.painter()->drawText( 10, 20, tr( "North arrow pixmap not found" ) );
     }
   }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,15 @@ void QgsDecorationNorthArrow::render( const QgsMapSettings &mapSettings, QgsRend`
`123`	`123`	`// called when the projection or map extent changes`
`124`	`124`	`if ( mAutomatic )`
`125`	`125`	`{`
`126`		`- mRotationInt = QgsBearingUtils:: bearingTrueNorth( mapSettings.destinationCrs(), context.extent().center() );`
	`126`	`+ try`
	`127`	`+ {`
	`128`	`+ mRotationInt = QgsBearingUtils:: bearingTrueNorth( mapSettings.destinationCrs(), context.extent().center() );`
	`129`	`+ }`
	`130`	`+ catch ( QgsException &e )`
	`131`	`+ {`
	`132`	`+ mRotationInt = 0.0;`
	`133`	`+ //QgsDebugMsg( "Can not get direction to true north. Probably project CRS is not defined." );`
	`134`	`+ }`
`127`	`135`	`mRotationInt += mapSettings.rotation();`
`128`	`136`	`}`
`129`	`137`
`@@ -210,5 +218,4 @@ void QgsDecorationNorthArrow::render( const QgsMapSettings &mapSettings, QgsRend`
`210`	`218`	`context.painter()->drawText( 10, 20, tr( "North arrow pixmap not found" ) );`
`211`	`219`	`}`
`212`	`220`	`}`
`213`		`-`
`214`	`221`	`}`