HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2413:f80448ee2136

Add padding for axis title...

Miikka Heikkinen -

r2413:f80448ee2136

parent child

Context file:

r2413:f80448ee2136

Collapse all files

src/axis/chartaxis.cpp +7 -1

                   m_title(new QGraphicsSimpleTextItem(item)),
                   m_animation(0),
                   m_labelPadding(5),
-                  m_intervalAxis(intervalAxis)
+                  m_intervalAxis(intervalAxis),
+                  m_titlePadding(3)
             {
                 Q_ASSERT(item);
                 //initial initialization
                 m_labelPadding = padding;
             }
+            void ChartAxis::setTitlePadding(int padding)
+            {
+                m_titlePadding = padding;
+            }
             bool ChartAxis::isEmpty()
             {
                 return m_axisRect.isEmpty() || m_gridRect.isEmpty() ||  qFuzzyCompare(min(),max());

src/axis/chartaxis_p.h +4 0

                 void setLabelPadding(int padding);
                 int labelPadding() const { return m_labelPadding;};
+                void setTitlePadding(int padding);
+                int titlePadding() const { return m_titlePadding;};
                 QFont titleFont() const;
                 QString titleText() const;
                 int m_labelPadding;
                 QStringList m_labelsList;
                 bool m_intervalAxis;
+                int m_titlePadding;
                 friend class AxisAnimation;
                 friend class ArrowItem;

src/axis/horizontalaxis.cpp +5 -5

                     QPointF center = gridRect.center() - title->boundingRect().center();
                     if (alignment() == Qt::AlignTop) {
-                        title->setPos(center.x(), axisRect.top());
+                        title->setPos(center.x(), axisRect.top() + titlePadding());
                     } else  if (alignment() == Qt::AlignBottom) {
-                        title->setPos(center.x(), axisRect.bottom() - title->boundingRect().height());
+                        title->setPos(center.x(), axisRect.bottom() - title->boundingRect().height() - titlePadding());
                     }
                 }
                     //label text wrapping
                     QString text = labelList.at(i);
                     QRectF boundingRect = labelBoundingRect(fn, text);
-                    qreal size = axisRect.bottom() - axisRect.top() - labelPadding() - title->boundingRect().height();
+                    qreal size = axisRect.bottom() - axisRect.top() - labelPadding() - title->boundingRect().height() - (titlePadding() * 2);
                     if (boundingRect.height() > size) {
                         QString label = text + "...";
                         while (boundingRect.height() >= size && label.length() > 3) {
                 switch (which) {
                 case Qt::MinimumSize:
-                        sh = QSizeF(fn.boundingRect("...").width(), fn.height());
+                        sh = QSizeF(fn.boundingRect("...").width(), fn.height() + (titlePadding() * 2));
                     break;
                 case Qt::MaximumSize:
                 case Qt::PreferredSize:
-                        sh = QSizeF(fn.boundingRect(axis()->titleText()).width(), fn.height());
+                        sh = QSizeF(fn.boundingRect(axis()->titleText()).width(), fn.height() + (titlePadding() * 2));
                     break;
                 default:
                     break;

src/axis/verticalaxis.cpp +5 -5

                     QPointF center = gridRect.center() - title->boundingRect().center();
                     if (alignment() == Qt::AlignLeft) {
-                        title->setPos(axisRect.left() - title->boundingRect().width()/2 + title->boundingRect().height()/2 , center.y());
+                        title->setPos(axisRect.left() - title->boundingRect().width() / 2 + title->boundingRect().height() / 2 + titlePadding(), center.y());
                     }
                     else if (alignment() == Qt::AlignRight) {
-                        title->setPos(axisRect.right()- title->boundingRect().width()/2 - title->boundingRect().height()/2, center.y());
+                        title->setPos(axisRect.right() - title->boundingRect().width() / 2 - title->boundingRect().height() / 2 - titlePadding(), center.y());
                     }
                     title->setTransformOriginPoint(title->boundingRect().center());
                     title->setRotation(270);
                     QString text = labelList.at(i);
                     QRectF boundingRect = labelBoundingRect(fn, text);
-                    qreal size = axisRect.right() - axisRect.left() - labelPadding() - title->boundingRect().height();
+                    qreal size = axisRect.right() - axisRect.left() - labelPadding() - title->boundingRect().height() - (titlePadding() * 2);
                     if (boundingRect.width() > size) {
                         QString label = text + "...";
                         while (boundingRect.width() > size && label.length() > 3) {
                 switch (which) {
                 case Qt::MinimumSize:
-                        sh = QSizeF(fn.height(), fn.boundingRect("...").width());
+                        sh = QSizeF(fn.height() + (titlePadding() * 2), fn.boundingRect("...").width());
                     break;
                 case Qt::MaximumSize:
                 case Qt::PreferredSize:
-                        sh = QSizeF(fn.height(), fn.boundingRect(axis()->titleText()).width());
+                        sh = QSizeF(fn.height() + (titlePadding() * 2), fn.boundingRect(axis()->titleText()).width());
                     break;
                 default:
                     break;

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