Skip to content

Commit 9c1dc79

Browse files
committedSep 24, 2018
fix issues from Nyall review
1 parent 1b82abf commit 9c1dc79

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed
 

‎src/core/mesh/qgsmeshlayerrenderer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ void QgsMeshLayerRenderer::renderMesh( const QgsMeshRendererMeshSettings &settin
244244
if ( mContext.flags() & QgsRenderContext::Antialiasing )
245245
painter->setRenderHint( QPainter::Antialiasing, true );
246246

247-
painter->setRenderHint( QPainter::Antialiasing );
248247
QPen pen = painter->pen();
249248
pen.setCapStyle( Qt::FlatCap );
250249
pen.setJoinStyle( Qt::MiterJoin );

‎src/core/mesh/qgsmeshvectorrenderer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ void QgsMeshVectorRenderer::draw()
8181
if ( mContext.flags() & QgsRenderContext::Antialiasing )
8282
painter->setRenderHint( QPainter::Antialiasing, true );
8383

84-
painter->setRenderHint( QPainter::Antialiasing );
8584
QPen pen = painter->pen();
8685
pen.setCapStyle( Qt::FlatCap );
8786
pen.setJoinStyle( Qt::MiterJoin );

‎src/core/mesh/qgstriangularmesh.cpp

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "qgsgeometry.h"
2727
#include "qgsrectangle.h"
2828
#include "qgsfeatureiterator.h"
29+
#include "qgslogger.h"
2930

3031
///@cond PRIVATE
3132

@@ -133,11 +134,20 @@ void QgsTriangularMesh::update( QgsMesh *nativeMesh, QgsRenderContext *context )
133134
const QgsMeshVertex &vertex = nativeMesh->vertices.at( i );
134135
if ( mCoordinateTransform.isValid() )
135136
{
136-
QgsPointXY mapPoint = mCoordinateTransform.transform( QgsPointXY( vertex.x(), vertex.y() ) );
137-
QgsMeshVertex mapVertex( mapPoint );
138-
mapVertex.setZ( vertex.z() );
139-
mapVertex.setM( vertex.m() );
140-
mTriangularMesh.vertices[i] = mapVertex;
137+
try
138+
{
139+
QgsPointXY mapPoint = mCoordinateTransform.transform( QgsPointXY( vertex.x(), vertex.y() ) );
140+
QgsMeshVertex mapVertex( mapPoint );
141+
mapVertex.setZ( vertex.z() );
142+
mapVertex.setM( vertex.m() );
143+
mTriangularMesh.vertices[i] = mapVertex;
144+
}
145+
catch ( QgsCsException &cse )
146+
{
147+
Q_UNUSED( cse );
148+
QgsDebugMsg( QStringLiteral( "Caught CRS exception %1" ).arg( cse.what() ) );
149+
mTriangularMesh.vertices[i] = vertex;
150+
}
141151
}
142152
else
143153
{

0 commit comments

Comments
 (0)
Please sign in to comment.