HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2153:cd956b4e0b4d

Makes theming axis title aware

Michal Klocek -

r2153:cd956b4e0b4d

parent child

Context file:

r2153:cd956b4e0b4d

Collapse all files

demos/chartviewer/charts/font/font.cpp +4 0

                     chart->setTitleFont(font);
                     chart->axisX()->setLabelsFont(font);
                     chart->axisY()->setLabelsFont(font);
+                    chart->axisX()->setTitle("Axis X");
+                    chart->axisY()->setTitle("Axis Y");
+                    chart->axisX()->setTitleFont(font);
+                    chart->axisY()->setTitleFont(font);
                     return chart;
                 }

src/axis/chartaxis.cpp +28 -3

             void ChartAxis::setLabelsFont(const QFont &font)
             {
-                foreach (QGraphicsItem *item , m_labels->childItems())
-                    static_cast<QGraphicsSimpleTextItem *>(item)->setFont(font);
                 if (m_font != font) {
                     m_font = font;
                     foreach (QGraphicsItem *item , m_labels->childItems())
                 bool visible = m_chartAxis->isVisible();
+                //TODO: split this into separate signal/slots ?
                 setArrowVisibility(visible && m_chartAxis->isLineVisible());
                 setGridVisibility(visible && m_chartAxis->isGridLineVisible());
                 setLabelsVisibility(visible && m_chartAxis->labelsVisible());
                 setShadesPen(m_chartAxis->shadesPen());
                 setShadesBrush(m_chartAxis->shadesBrush());
                 setTitleText(m_chartAxis->title());
+                setTitleFont(m_chartAxis->titleFont());
+                setTitlePen(m_chartAxis->titlePen());
+                setTitleBrush(m_chartAxis->titleBrush());
             }
             void ChartAxis::setTitleText(const QString &title)
                 }
             }
+            void ChartAxis::setTitlePen(const QPen &pen)
+            {
+                m_title->setPen(pen);
+            }
+            void ChartAxis::setTitleBrush(const QBrush &brush)
+            {
+                m_title->setBrush(brush);
+            }
+            void ChartAxis::setTitleFont(const QFont &font)
+            {
+                if(m_title->font() != font){
+                    m_title->setFont(font);
+                    QGraphicsLayoutItem::updateGeometry();
+                    presenter()->layout()->invalidate();
+                }
+            }
+            QFont ChartAxis::titleFont() const
+            {
+                return  m_title->font();
+            }
             void ChartAxis::hide()
             {
                 setArrowVisibility(false);

src/axis/chartaxis_p.h +1 -2

                 void setTitlePen(const QPen &pen);
                 void setTitleBrush(const QBrush &brush);
                 void setTitleFont(const QFont &font);
-                QFont titleFont() const { return  m_titleFont; };
+                QFont titleFont() const;
                 void setTitleText(const QString &title);
                 QString titleText() const {return m_titleText; };
                 qreal m_max;
                 AxisAnimation *m_animation;
                 QFont m_font;
-                QFont m_titleFont;
                 QString m_titleText;
                 int m_labelPadding;
                 QStringList m_labelsList;

src/charttheme.cpp +14 0

                     if (m_force || brush == axis->labelsBrush())
                         axis->setLabelsBrush(m_labelBrush);
+                    //TODO: introduce axis brush
+                    if (m_force || brush == axis->titleBrush())
+                              axis->setTitleBrush(m_labelBrush);
                     if (m_force || pen == axis->labelsPen())
                         axis->setLabelsPen(Qt::NoPen); // NoPen for performance reasons
+                    if (m_force || pen == axis->titlePen())
+                        axis->setTitlePen(Qt::NoPen); // Noen for performance reasons
                     if (m_force || axis->shadesVisible()) {
                         if (m_force || brush == axis->shadesBrush())
                     if (m_force || font == axis->labelsFont())
                         axis->setLabelsFont(m_labelFont);
+                    //TODO: discuss with Tero
+                    if (m_force || font == axis->titleFont()){
+                               QFont font(m_labelFont);
+                               font.setBold(true);
+                               axis->setTitleFont(font);
+                    }
                 }
             }

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