[diagrams] Fix bars drawn outside of registered diagram extent for so…

…me orientations (cherry picked from commit 993d90a)
qgis · Nov 23, 2019 · 2d88851 · 2d88851
1 parent e483229
commit 2d88851
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/core/diagram/qgshistogramdiagram.cpp b/src/core/diagram/qgshistogramdiagram.cpp
@@ -151,6 +151,7 @@ void QgsHistogramDiagram::renderDiagram( const QgsFeature &feature, QgsRenderCon
   if ( !feature.fields().isEmpty() )
     expressionContext.setFields( feature.fields() );
 
+  values.reserve( s.categoryAttributes.size() );
   for ( const QString &cat : qgis::as_const( s.categoryAttributes ) )
   {
     QgsExpression *expression = getExpression( cat, expressionContext );
@@ -191,11 +192,11 @@ void QgsHistogramDiagram::renderDiagram( const QgsFeature &feature, QgsRenderCon
         break;
 
       case QgsDiagramSettings::Right:
-        p->drawRect( baseX, baseY - currentOffset, length, scaledWidth * -1 );
+        p->drawRect( baseX, baseY - currentOffset, length, scaledWidth );
         break;
 
       case QgsDiagramSettings::Left:
-        p->drawRect( baseX + scaledMaxVal, baseY - currentOffset, 0 - length, scaledWidth * -1 );
+        p->drawRect( baseX + scaledMaxVal, baseY - currentOffset, 0 - length, scaledWidth );
         break;
     }