From 8792c4954dcce5425c4ea9a70ae75dfe762c9921 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Fri, 30 Aug 2019 16:41:39 +0200 Subject: [PATCH] fix missing lower bound in ranges --- .../symbology/classification/qgsclassificationmethod.cpp | 6 ++++-- src/core/symbology/qgsgraduatedsymbolrenderer.cpp | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/core/symbology/classification/qgsclassificationmethod.cpp b/src/core/symbology/classification/qgsclassificationmethod.cpp index 49d2d069146..11fbdfe3fb1 100644 --- a/src/core/symbology/classification/qgsclassificationmethod.cpp +++ b/src/core/symbology/classification/qgsclassificationmethod.cpp @@ -191,7 +191,8 @@ QList QgsClassificationMethod::classes( const QgsVectorL } // get the breaks - const QList breaks = calculateBreaks( minimum, maximum, values, nclasses ); + QList breaks = calculateBreaks( minimum, maximum, values, nclasses ); + breaks.insert( 0, minimum ); // create classes return breaksToClasses( breaks ); } @@ -203,7 +204,8 @@ QList QgsClassificationMethod::classes( const QList breaks = calculateBreaks( minimum, maximum, values, nclasses ); + QList breaks = calculateBreaks( minimum, maximum, values, nclasses ); + breaks.insert( 0, minimum ); // create classes return breaksToClasses( breaks ); } diff --git a/src/core/symbology/qgsgraduatedsymbolrenderer.cpp b/src/core/symbology/qgsgraduatedsymbolrenderer.cpp index 5f9fdbe7f8e..e81de82ac96 100644 --- a/src/core/symbology/qgsgraduatedsymbolrenderer.cpp +++ b/src/core/symbology/qgsgraduatedsymbolrenderer.cpp @@ -326,8 +326,7 @@ QgsSymbolList QgsGraduatedSymbolRenderer::symbols( QgsRenderContext &context ) c Q_UNUSED( context ) QgsSymbolList lst; lst.reserve( mRanges.count() ); - const auto constMRanges = mRanges; - for ( const QgsRendererRange &range : constMRanges ) + for ( const QgsRendererRange &range : qgis::as_const( mRanges ) ) { lst.append( range.symbol() ); } @@ -336,7 +335,7 @@ QgsSymbolList QgsGraduatedSymbolRenderer::symbols( QgsRenderContext &context ) c bool QgsGraduatedSymbolRenderer::accept( QgsStyleEntityVisitorInterface *visitor ) const { - for ( const QgsRendererRange &range : mRanges ) + for ( const QgsRendererRange &range : qgis::as_const( mRanges ) ) { QgsStyleSymbolEntity entity( range.symbol() ); if ( !visitor->visit( QgsStyleEntityVisitorInterface::StyleLeaf( &entity, QStringLiteral( "%1 - %2" ).arg( range.lowerValue() ).arg( range.upperValue() ), range.label() ) ) )