HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r87:efb0f73ff869

Adds title support

Michal Klocek -

r87:efb0f73ff869

parent child

Context file:

r87:efb0f73ff869

Collapse all files

example/linechart/main.cpp +1 0

                 QChartView* chartView =  new QChartView(&window);
                 chartView->setRenderHint(QPainter::Antialiasing);
+                chartView->setTitle("Example: sin & cos functions");
                 chartView->addSeries(series0);
                 chartView->addSeries(series1);

src/qchart.cpp +29 -26

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QChart::QChart(QGraphicsObject* parent) : QGraphicsObject(parent),
-                m_background(0),
+                m_backgroundItem(0),
-                m_title(0),
+                m_titleItem(0),
-                m_axisX(new AxisItem(AxisItem::X_AXIS,this)),
+                m_axisXItem(new AxisItem(AxisItem::X_AXIS,this)),
                 m_plotDataIndex(0),
                 m_marginSize(0)
             {
                 PlotDomain domain;
                 m_plotDomainList<<domain;
-                m_axisY << new AxisItem(AxisItem::Y_AXIS,this);
+                m_axisYItem << new AxisItem(AxisItem::Y_AXIS,this);
-                m_chartItems<<m_axisX;
+                m_chartItems<<m_axisXItem;
-                m_chartItems<<m_axisY.at(0);
+                m_chartItems<<m_axisYItem.at(0);
             }
             QChart::~QChart(){}
                 QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                 //recaculate title
-                if(m_title){
+                if(m_titleItem){
+                    QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
+                    m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
                 }
                 //recalculate background gradient
-                if(m_background){
+                if(m_backgroundItem){
-                    m_background->setRect(rect);
+                    m_backgroundItem->setRect(rect);
                     if(m_bacgroundOrinetation==HorizonatlGradientOrientation)
-                    m_backgroundGradient.setFinalStop(m_background->rect().width(),0);
+                    m_backgroundGradient.setFinalStop(m_backgroundItem->rect().width(),0);
                     else
-                    m_backgroundGradient.setFinalStop(0,m_background->rect().height());
+                    m_backgroundGradient.setFinalStop(0,m_backgroundItem->rect().height());
-                    m_background->setBrush(m_backgroundGradient);
+                    m_backgroundItem->setBrush(m_backgroundGradient);
                 }
                 //resize elements
             void QChart::setBackground(const QColor& startColor, const QColor& endColor, GradientOrientation orientation)
             {
-                if(!m_background){
+                if(!m_backgroundItem){
-                    m_background = new QGraphicsRectItem(this);
+                    m_backgroundItem = new QGraphicsRectItem(this);
-                    m_background->setZValue(-1);
+                    m_backgroundItem->setZValue(-1);
                 }
                 m_bacgroundOrinetation = orientation;
                     m_backgroundGradient.setFinalStop(m_rect.width(),0);
                 }
-                m_background->setBrush(m_backgroundGradient);
+                m_backgroundItem->setBrush(m_backgroundGradient);
-                m_background->setPen(Qt::NoPen);
+                m_backgroundItem->setPen(Qt::NoPen);
-                m_background->update();
+                m_backgroundItem->update();
             }
-            void QChart::setTitle(const QString& title)
+            void QChart::setTitle(const QString& title,const QFont& font)
             {
-                if(!m_title) m_title = new QGraphicsTextItem(this);
+                if(!m_titleItem) m_titleItem = new QGraphicsTextItem(this);
-                m_title->setPlainText(title);
+                m_titleItem->setPlainText(title);
+                m_titleItem->setFont(font);
             }
             int QChart::margin() const
                     break;
                 }
-                if(m_background){
+                if(m_backgroundItem){
-                m_background->setBrush(m_backgroundGradient);
+                m_backgroundItem->setBrush(m_backgroundGradient);
-                m_background->setPen(Qt::NoPen);
+                m_backgroundItem->setPen(Qt::NoPen);
                 }
                 foreach(QChartSeries* series, m_chartSeries) {
             void QChart::setAxisX(const QChartAxis& axis)
             {
-                setAxis(m_axisX,axis);
+                setAxis(m_axisXItem,axis);
             }
             void QChart::setAxisY(const QChartAxis& axis)
             {
-                setAxis(m_axisY.at(0),axis);
+                setAxis(m_axisYItem.at(0),axis);
             }
             void QChart::setAxisY(const QList<QChartAxis>& axis)

src/qchart.h +6 -5

             #include <qchartseries.h>
             #include <QGraphicsObject>
             #include <QLinearGradient>
+            #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 int margin() const;
                 void setTheme(QChart::ChartThemeId theme);
-                void setTitle(const QString& title);
+                void setTitle(const QString& title,const QFont& font = QFont());
                 void setBackground(const QColor& startColor, const QColor& endColor = Qt::white, GradientOrientation orientation = VerticalGradientOrientation);
                 void zoomInToRect(const QRect& rectangle);
                 QColor nextColor();
                 Q_DISABLE_COPY(QChart)
-                QGraphicsRectItem* m_background;
+                QGraphicsRectItem* m_backgroundItem;
                 QLinearGradient m_backgroundGradient;
                 GradientOrientation m_bacgroundOrinetation;
-                QGraphicsTextItem* m_title;
+                QGraphicsTextItem* m_titleItem;
-                AxisItem* m_axisX;
+                AxisItem* m_axisXItem;
-                QList<AxisItem*> m_axisY;
+                QList<AxisItem*> m_axisYItem;
                 QRect m_rect;
                 QList<QChartSeries*> m_chartSeries;
                 QVector<PlotDomain> m_plotDomainList;

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