HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r86:84e7b4b4f9e0

Add gradient bacground support...

Michal Klocek -

r86:84e7b4b4f9e0

parent child

Context file:

r86:84e7b4b4f9e0

Collapse all files

example/colorlinechart/main.cpp +2 -1

                 }
                 QChartView* chartView =  new QChartView(&window);
+                chartView->setRenderHint(QPainter::Antialiasing);
                 chartView->addSeries(series0);
                 chartView->addSeries(series1);
-                //chartView->setBackgroundColor(Qt::yellow);
+                chartView->setBackground(Qt::blue,Qt::yellow,QChart::HorizonatlGradientOrientation);
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);

src/axisitem.cpp +2 -10

                          int x = i * deltaX + m_rect.left();
-                         //last grid outside chart rect
-                         if(i==0) x--;
-                         if(i==m_ticks) x++;
                          qreal label = m_plotDomain.m_minX + (i * m_plotDomain.spanX()/ m_ticks);
-                         m_grid<<new QGraphicsLineItem(x, m_rect.top()-1, x, m_rect.bottom()+1+LABEL_PADDING,this);
+                         m_grid<<new QGraphicsLineItem(x, m_rect.top(), x, m_rect.bottom(),this);
                          QGraphicsSimpleTextItem* text = new QGraphicsSimpleTextItem(QString::number(label),this);
                          QPointF center = text->boundingRect().center();
                          int y = j * -deltaY + m_rect.bottom();
-                         //last grid outside chart rect
-                         if(j==0) y++;
-                         if(j==m_ticks) y--;
                          qreal label = m_plotDomain.m_minY + (j * m_plotDomain.spanY()
                              / m_ticks);
-                         m_grid<<new QGraphicsLineItem(m_rect.left()- 1 - LABEL_PADDING , y, m_rect.right()+1, y,this);
+                         m_grid<<new QGraphicsLineItem(m_rect.left()  , y, m_rect.right(), y,this);
                          QGraphicsSimpleTextItem* text = new QGraphicsSimpleTextItem(QString::number(label),this);
                          QPointF center = text->boundingRect().center();

src/qchart.cpp +33 -7

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QChart::QChart(QGraphicsObject* parent) : QGraphicsObject(parent),
-                m_background(new QGraphicsRectItem()),
+                m_background(0),
-                m_title(new QGraphicsTextItem(this)),
+                m_title(0),
                 m_axisX(new AxisItem(AxisItem::X_AXIS,this)),
                 m_plotDataIndex(0),
                 m_marginSize(0)
             {
                 // TODO: the default theme?
                 //setTheme(QChart::ChartThemeVanilla);
-                m_backgroundGradient.setColorAt(0.0, Qt::white);
                 PlotDomain domain;
                 m_plotDomainList<<domain;
                 m_rect = QRect(QPoint(0,0),size);
                 QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
+                //recaculate title
+                if(m_title){
+                }
                 //recalculate background gradient
+                if(m_background){
                     m_background->setRect(rect);
+                    if(m_bacgroundOrinetation==HorizonatlGradientOrientation)
+                    m_backgroundGradient.setFinalStop(m_background->rect().width(),0);
+                    else
                     m_backgroundGradient.setFinalStop(0,m_background->rect().height());
                     m_background->setBrush(m_backgroundGradient);
-                m_background->setPen(Qt::NoPen);
                 //resize elements
                 foreach (ChartItem* item ,m_chartItems) {
                 update();
             }
-            void QChart::setBackgroundColor(const QColor& color)
+            void QChart::setBackground(const QColor& startColor, const QColor& endColor, GradientOrientation orientation)
             {
-                m_backgroundGradient.setColorAt( 0.0, Qt::white);
-                m_backgroundGradient.setColorAt( 1.0, color);
+                if(!m_background){
+                    m_background = new QGraphicsRectItem(this);
+                    m_background->setZValue(-1);
+                }
+                m_bacgroundOrinetation = orientation;
+                m_backgroundGradient.setColorAt( 0.0, startColor);
+                m_backgroundGradient.setColorAt( 1.0, endColor);
+                m_backgroundGradient.setStart(0,0);
+                if(orientation == VerticalGradientOrientation){
+                    m_backgroundGradient.setFinalStop(0,m_rect.height());
+                }else{
+                    m_backgroundGradient.setFinalStop(m_rect.width(),0);
+                }
                 m_background->setBrush(m_backgroundGradient);
                 m_background->setPen(Qt::NoPen);
                 m_background->update();
             void QChart::setTitle(const QString& title)
             {
+                if(!m_title) m_title = new QGraphicsTextItem(this);
                 m_title->setPlainText(title);
             }
                     break;
                 }
+                if(m_background){
                 m_background->setBrush(m_backgroundGradient);
                 m_background->setPen(Qt::NoPen);
+                }
                 foreach(QChartSeries* series, m_chartSeries) {
                     // TODO: other series interested on themes?

src/qchart.h +6 -1

             {
                 Q_OBJECT
             public:
+                enum GradientOrientation {
+                    HorizonatlGradientOrientation,
+                    VerticalGradientOrientation
+                };
                 enum ChartThemeId {
                     /*! The default theme follows the GUI style of the Operating System */
                     ChartThemeDefault = 0,
                 void setTheme(QChart::ChartThemeId theme);
                 void setTitle(const QString& title);
-                void setBackgroundColor(const QColor& color);
+                void setBackground(const QColor& startColor, const QColor& endColor = Qt::white, GradientOrientation orientation = VerticalGradientOrientation);
                 void zoomInToRect(const QRect& rectangle);
                 void zoomIn();
                 Q_DISABLE_COPY(QChart)
                 QGraphicsRectItem* m_background;
                 QLinearGradient m_backgroundGradient;
+                GradientOrientation m_bacgroundOrinetation;
                 QGraphicsTextItem* m_title;
                 AxisItem* m_axisX;
                 QList<AxisItem*> m_axisY;

src/qchartview.cpp +2 -2

                 m_chart->setTitle(title);
             }
-            void QChartView::setBackgroundColor(const QColor& color)
+            void QChartView::setBackground(const QColor& startColor, const QColor& endColor, QChart::GradientOrientation orientation)
             {
-                m_chart->setBackgroundColor(color);
+                m_chart->setBackground(startColor,endColor,orientation);
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h +2 -1

             #include "qchartglobal.h"
             #include "qchartseries.h"
+            #include "qchart.h"
             #include <QGraphicsView>
             class QGraphicsScene;
                 int margin() const;
                 void setTitle(const QString& title);
-                void setBackgroundColor(const QColor& color);
+                void setBackground(const QColor& startColor, const QColor& endColor = Qt::white, QChart::GradientOrientation orientation = QChart::VerticalGradientOrientation);
                 void zoomInToRect(const QRect& rectangle);
                 void zoomIn();
                 void zoomOut();

src/xylinechart/qxychartseries.cpp 0 -4

                 m_pen=pen;
             }
-            void QXYChartSeries::setBrush(const QBrush& brush)
-                m_brush=brush;
             QDebug operator<< (QDebug debug, const QXYChartSeries series)
             {

src/xylinechart/qxychartseries.h 0 -3

                 void setPen(const QPen& pen);
                 const QPen& pen() const { return m_pen;}
-                void setBrush(const QBrush& brush);
-                const QBrush& brush() const { return m_brush;}
                 int count() const;
                 qreal x(int pos) const;
             private:
                 QList<qreal> m_x;
                 QList<qreal> m_y;
-                QBrush m_brush;
                 QPen m_pen;
             };

src/xylinechart/xylinechartitem.cpp +1 -1

                m_pathItem->setPath(path);
                m_pathItem->setPen(m_series->pen());
-               m_pathItem->setBrush(m_series->brush());
+               m_pathItem->setBrush(Qt::NoBrush);
             }

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