fix issues from Nyall review

qgis · Sep 24, 2018 · 9c1dc79 · 9c1dc79
1 parent 1b82abf
commit 9c1dc79
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/core/mesh/qgsmeshlayerrenderer.cpp b/src/core/mesh/qgsmeshlayerrenderer.cpp
@@ -244,7 +244,6 @@ void QgsMeshLayerRenderer::renderMesh( const QgsMeshRendererMeshSettings &settin
   if ( mContext.flags() & QgsRenderContext::Antialiasing )
     painter->setRenderHint( QPainter::Antialiasing, true );
 
-  painter->setRenderHint( QPainter::Antialiasing );
   QPen pen = painter->pen();
   pen.setCapStyle( Qt::FlatCap );
   pen.setJoinStyle( Qt::MiterJoin );

diff --git a/src/core/mesh/qgsmeshvectorrenderer.cpp b/src/core/mesh/qgsmeshvectorrenderer.cpp
@@ -81,7 +81,6 @@ void QgsMeshVectorRenderer::draw()
   if ( mContext.flags() & QgsRenderContext::Antialiasing )
     painter->setRenderHint( QPainter::Antialiasing, true );
 
-  painter->setRenderHint( QPainter::Antialiasing );
   QPen pen = painter->pen();
   pen.setCapStyle( Qt::FlatCap );
   pen.setJoinStyle( Qt::MiterJoin );

diff --git a/src/core/mesh/qgstriangularmesh.cpp b/src/core/mesh/qgstriangularmesh.cpp
@@ -26,6 +26,7 @@
 #include "qgsgeometry.h"
 #include "qgsrectangle.h"
 #include "qgsfeatureiterator.h"
+#include "qgslogger.h"
 
 ///@cond PRIVATE
 
@@ -133,11 +134,20 @@ void QgsTriangularMesh::update( QgsMesh *nativeMesh, QgsRenderContext *context )
     const QgsMeshVertex &vertex = nativeMesh->vertices.at( i );
     if ( mCoordinateTransform.isValid() )
     {
-      QgsPointXY mapPoint = mCoordinateTransform.transform( QgsPointXY( vertex.x(), vertex.y() ) );
-      QgsMeshVertex mapVertex( mapPoint );
-      mapVertex.setZ( vertex.z() );
-      mapVertex.setM( vertex.m() );
-      mTriangularMesh.vertices[i] = mapVertex;
+      try
+      {
+        QgsPointXY mapPoint = mCoordinateTransform.transform( QgsPointXY( vertex.x(), vertex.y() ) );
+        QgsMeshVertex mapVertex( mapPoint );
+        mapVertex.setZ( vertex.z() );
+        mapVertex.setM( vertex.m() );
+        mTriangularMesh.vertices[i] = mapVertex;
+      }
+      catch ( QgsCsException &cse )
+      {
+        Q_UNUSED( cse );
+        QgsDebugMsg( QStringLiteral( "Caught CRS exception %1" ).arg( cse.what() ) );
+        mTriangularMesh.vertices[i] = vertex;
+      }
     }
     else
     {