HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2570:ac7068d4fd37

Fix checking for labels out of axis grid....

Miikka Heikkinen -

r2570:ac7068d4fd37

parent child

Context file:

r2570:ac7068d4fd37

src/axis/horizontalaxis.cpp +3 -3

                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
                     qreal heightDiff = rect.height() - boundingRect.height();
+                    qreal widthDiff = rect.width() - boundingRect.width();
                     //ticks and label position
                     if (axis()->alignment() == Qt::AlignTop) {
                             labelItem->setPos(leftBound + (delta / 2.0) - center.x(), labelItem->pos().y());
                         }
                     }
                     //label overlap detection - compensate one pixel for rounding errors
                     if (labelItem->pos().x() < width || forceHide ||
-                        labelItem->pos().x() < (axisRect.left() - 1.0) ||
+                        (labelItem->pos().x() + (widthDiff / 2.0)) < (axisRect.left() - 1.0) ||
-                        (labelItem->pos().x() + boundingRect.width() - 1.0) > axisRect.right()){
+                        (labelItem->pos().x() + (widthDiff / 2.0) - 1.0) > axisRect.right()){
                         labelItem->setVisible(false);
                     } else {
                         labelItem->setVisible(true);

src/axis/verticalaxis.cpp +3 -2

                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
                     qreal widthDiff = rect.width() - boundingRect.width();
+                    qreal heightDiff = rect.height() - boundingRect.height();
                     //ticks and label position
                     if (axis()->alignment() == Qt::AlignLeft) {
                     //label overlap detection - compensate one pixel for rounding errors
                     if (labelItem->pos().y() + boundingRect.height() > height || forceHide ||
-                        (labelItem->pos().y() + (boundingRect.height() / 2.0) - 1.0) > axisRect.bottom() ||
+                        (labelItem->pos().y() + (heightDiff / 2.0) - 1.0) > axisRect.bottom() ||
-                        labelItem->pos().y() + (boundingRect.height() / 2.0) < (axisRect.top() - 1.0)) {
+                        labelItem->pos().y() + (heightDiff / 2.0) < (axisRect.top() - 1.0)) {
                         labelItem->setVisible(false);
                     }
                     else {

General Comments 0

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

No TODOs yet

	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