HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2542:189023d9a551

Optimize polar chart radius calculation a bit....

Miikka Heikkinen -

r2542:189023d9a551

parent child

Context file:

r2542:189023d9a551

Collapse all files

src/axis/polarchartaxisangular.cpp +16 -2

             #include "qabstractaxis.h"
             #include "qabstractaxis_p.h"
             #include <QDebug>
+            #include <qmath.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                         QPointF labelPoint = QLineF::fromPolar(radius + tickWidth(), 90.0 - labelCoordinate).p2();
                         boundingRect = moveLabelToPosition(labelCoordinate, labelPoint, boundingRect);
-                        if (boundingRect.isEmpty() || maxRect.intersected(boundingRect) == boundingRect) {
+                        QRectF intersectRect = maxRect.intersected(boundingRect);
+                        if (boundingRect.isEmpty() || intersectRect == boundingRect) {
                             i++;
                         } else {
-                            radius -= 1.0;
+                            qreal reduction(0.0);
+                            // If there is no intersection, reduce by smallest dimension of label rect to be on the safe side
+                            if (intersectRect.isEmpty()) {
+                                reduction = qMin(boundingRect.height(), boundingRect.width());
+                            } else {
+                                // Approximate needed radius reduction is the amount label rect exceeds max rect in either dimension.
+                                // Could be further optimized by figuring out the proper math how to calculate exact needed reduction.
+                                reduction = qMax(boundingRect.height() - intersectRect.height(),
+                                                 boundingRect.width() - intersectRect.width());
+                            }
+                            // Typically the approximated reduction is little low, so add one
+                            radius -= (reduction + 1.0);
                             if (radius < 1.0) // safeguard
                                 return 1.0;
                         }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages