HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r69:c7c3c4960b21

Add background to chart...

Michal Klocek -

r69:c7c3c4960b21

parent child

Context file:

r69:c7c3c4960b21

Collapse all files

example/colorlinechart/colorlinechart.pro created 644 +15 0

@@ -0,0 +1,15
	1	!include( ../../common.pri ) {
	2	error( "Couldn't find the common.pri file!" )
	3	}
	4
	5	!include( ../../integrated.pri ) {
	6	error( "Couldn't find the integrated.pri file !")
	7	}
	8
	9	TARGET = colorlineChart
	10	TEMPLATE = app
	11	QT += core gui
	12	SOURCES += main.cpp
	13
	14
	15

example/colorlinechart/main.cpp created 644 +40 0

@@ -0,0 +1,40
	1	#include <QApplication>
	2	#include <QMainWindow>
	3	#include <qchartview.h>
	4	#include <qxychartseries.h>
	5	#include <qchart.h>
	6	#include <cmath>
	7
	8	QTCOMMERCIALCHART_USE_NAMESPACE
	9
	10	#define PI 3.14159265358979
	11
	12	int main(int argc, char *argv[])
	13	{
	14	QApplication a(argc, argv);
	15
	16	QMainWindow window;
	17
	18	QXYChartSeries* series0 = QXYChartSeries::create();
	19	series0->setColor(Qt::blue);
	20	QXYChartSeries* series1 = QXYChartSeries::create();
	21	series1->setColor(Qt::red);
	22
	23	int numPoints = 100;
	24
	25	for (int x = 0; x <= numPoints; ++x) {
	26	series0->add(x, abs(sin(PI/50x)100));
	27	series1->add(x, abs(cos(PI/50x)100));
	28	}
	29
	30	QChartView* chartView = new QChartView(&window);
	31	chartView->addSeries(series0);
	32	chartView->addSeries(series1);
	33	chartView->setBackgroundColor(Qt::yellow);
	34
	35	window.setCentralWidget(chartView);
	36	window.resize(400, 300);
	37	window.show();
	38
	39	return a.exec();
	40	}

example/example.pro +2 -1

             TEMPLATE = subdirs
             SUBDIRS += linechart \
-                       zoomlinechart
+                       zoomlinechart \
+                       colorlinechart

src/qchart.cpp +23 0

             #include "qchart.h"
             #include "qchartseries.h"
             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qpieseries.h"
             #include "qxychartseries.h"
             #include "barchartseries.h"
             #include "bargroup.h"
             #include "xylinechartitem_p.h"
             #include "plotdomain_p.h"
             #include "axisitem_p.h"
             #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QChart::QChart(QGraphicsObject* parent) : QGraphicsObject(parent),
+                m_background(new QGraphicsRectItem(this)),
+                m_title(new QGraphicsTextItem(this)),
                 m_axisX(new AxisItem(AxisItem::X_AXIS,this)),
                 m_axisY(new AxisItem(AxisItem::Y_AXIS,this)),
                 m_plotDataIndex(0),
                 m_marginSize(0)
             {
                 // TODO: the default theme?
                 setTheme(QChart::ChartThemeVanilla);
                 //  setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 PlotDomain domain;
                 m_plotDomainList<<domain;
                 m_chartItems<<m_axisX;
                 m_chartItems<<m_axisY;
             }
             QChart::~QChart(){}
             QRectF QChart::boundingRect() const
             {
                 return m_rect;
             }
             void QChart::addSeries(QChartSeries* series)
             {
                 // TODO: we should check the series not already added
                 m_series<<series;
                 switch(series->type())
                 {
                 case QChartSeries::SeriesTypeLine: {
                     QXYChartSeries* xyseries = static_cast<QXYChartSeries*>(series);
                     // Use color defined by theme in case the series does not define a custom color
                     if (!xyseries->color().isValid() && m_themeColors.count())
                         xyseries->setColor(m_themeColors.takeFirst());
                     m_plotDataIndex = 0 ;
                     m_plotDomainList.resize(1);
                     PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                     for (int i = 0 ; i < xyseries->count() ; i++)
                     {
                         qreal x = xyseries->x(i);
                         qreal y = xyseries->y(i);
                         domain.m_minX = qMin(domain.m_minX,x);
                         domain.m_minY = qMin(domain.m_minY,y);
                         domain.m_maxX = qMax(domain.m_maxX,x);
                         domain.m_maxY = qMax(domain.m_maxY,y);
                     }
                     XYLineChartItem* item = new XYLineChartItem(xyseries,this);
                     m_chartItems<<item;
                     foreach(ChartItem* i ,m_chartItems)
                         i->setPlotDomain(m_plotDomainList.at(m_plotDataIndex));
                     break;
                 }
                 case QChartSeries::SeriesTypeBar: {
                     qDebug() << "barSeries added";
                     BarChartSeries* barSeries = static_cast<BarChartSeries*>(series);
                     // Who owns the series?
                     BarGroup* group = new BarGroup(*barSeries, this);
                     scene()->addItem(group);
                     m_BarGroupItems.append(group); // If we need to access group later
                     break;
                     }
                 case QChartSeries::SeriesTypeScatter: {
                     QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
                     connect(this, SIGNAL(sizeChanged(QRectF)),
                             scatterSeries, SLOT(chartSizeChanged(QRectF)));
                     scatterSeries->d->setParentItem(this);
                     QColor nextColor = m_themeColors.takeFirst();
                     nextColor.setAlpha(150); // TODO: default opacity?
                     scatterSeries->setMarkerColor(nextColor);
                     }
                 case QChartSeries::SeriesTypePie: {
                     // TODO: we now have also a list of y values as a parameter, it is ignored
                     // we should use a generic data class instead of list of x and y values
                     QPieSeries *pieSeries = qobject_cast<QPieSeries *>(series);
                     connect(this, SIGNAL(sizeChanged(QRectF)),
                             pieSeries, SLOT(chartSizeChanged(QRectF)));
                     // TODO: how to define the color for all the slices of a pie?
                     }
                 }
             }
             QChartSeries* QChart::createSeries(QChartSeries::QChartSeriesType type)
             {
                 // TODO: support also other types; not only scatter and pie
                 QChartSeries *series(0);
                 switch (type) {
                 case QChartSeries::SeriesTypeLine: {
                     series = QXYChartSeries::create();
                     break;
                 }
                 case QChartSeries::SeriesTypeBar: {
                     series = new BarChartSeries(this);
                     break;
                 }
                 case QChartSeries::SeriesTypeScatter: {
                     series = new QScatterSeries(this);
                     break;
                 }
                 case QChartSeries::SeriesTypePie: {
                     series = new QPieSeries(this);
                     break;
                 }
                 default:
                     Q_ASSERT(false);
                     break;
                 }
                 addSeries(series);
                 return series;
             }
             void QChart::setSize(const QSize& size)
             {
                 m_rect = QRect(QPoint(0,0),size);
                 QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
+                //recalculate background gradient
+                m_background->setRect(rect);
+                m_backgroundGradient.setFinalStop(0,m_background->rect().height());
+                m_background->setBrush(m_backgroundGradient);
+                //resize elements
                 foreach (ChartItem* item ,m_chartItems) {
                     item->setPos(rect.topLeft());
                     item->setSize(rect.size());
                 }
                 // TODO: TTD for setting scale
                 //emit scaleChanged(100, 100);
                 // TODO: calculate the origo
                 // TODO: not sure if emitting a signal here is the best from performance point of view
                 emit sizeChanged(QRectF(0, 0, size.width(), size.height()));
                 update();
             }
+            void QChart::setBackgroundColor(const QColor& color)
+            {
+                m_backgroundGradient.setColorAt( 0.0, Qt::white);
+                m_backgroundGradient.setColorAt( 1.0, color);
+                m_background->setBrush(m_backgroundGradient);
+                m_background->setPen(Qt::NoPen);
+                m_background->update();
+            }
+            void QChart::setTitle(const QString& title)
+            {
+                m_title->setPlainText(title);
+            }
             int QChart::margin() const
             {
                 return m_marginSize;
             }
             void QChart::setMargin(int margin)
             {
                 m_marginSize = margin;
             }
             void QChart::setTheme(QChart::ChartTheme theme)
             {
                 // TODO: define color themes
                 switch (theme) {
                 case ChartThemeVanilla:
                     m_themeColors.append(QColor(255, 238, 174));
                     m_themeColors.append(QColor(228, 228, 160));
                     m_themeColors.append(QColor(228, 179, 160));
                     m_themeColors.append(QColor(180, 151, 18));
                     m_themeColors.append(QColor(252, 252, 37));
                     break;
                 case ChartThemeIcy:
                     m_themeColors.append(QColor(255, 238, 174));
                     m_themeColors.append(QColor(228, 228, 160));
                     m_themeColors.append(QColor(228, 179, 160));
                     m_themeColors.append(QColor(180, 151, 18));
                     m_themeColors.append(QColor(252, 252, 37));
                     break;
                 case ChartThemeGrayscale:
                     m_themeColors.append(QColor(255, 238, 174));
                     m_themeColors.append(QColor(228, 228, 160));
                     m_themeColors.append(QColor(228, 179, 160));
                     m_themeColors.append(QColor(180, 151, 18));
                     m_themeColors.append(QColor(252, 252, 37));
                     break;
                 default:
                     Q_ASSERT(false);
                     break;
                 }
                 // TODO: update coloring of different elements to match the selected theme
             }
             void QChart::zoomInToRect(const QRect& rectangle)
             {
                 if(!rectangle.isValid()) return;
                 qreal margin = this->margin();
                 QRect rect = rectangle.normalized();
                 rect.translate(-margin, -margin);
                 PlotDomain& oldDomain = m_plotDomainList[m_plotDataIndex];
                 PlotDomain newDomain;
                 qreal dx = oldDomain.spanX() / (m_rect.width() - 2 * margin);
                 qreal dy = oldDomain.spanY() / (m_rect.height() - 2 * margin);
                 newDomain.m_minX = oldDomain.m_minX + dx * rect.left();
                 newDomain.m_maxX = oldDomain.m_minX + dx * rect.right();
                 newDomain.m_minY = oldDomain.m_maxY - dy * rect.bottom();
                 newDomain.m_maxY = oldDomain.m_maxY - dy * rect.top();
                 m_plotDomainList.resize(m_plotDataIndex + 1);
                 m_plotDomainList<<newDomain;
                 m_plotDataIndex++;
                 foreach (ChartItem* item ,m_chartItems)
                     item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                 update();
             }
             void QChart::zoomIn()
             {
                 if (m_plotDataIndex < m_plotDomainList.count() - 1) {
                     m_plotDataIndex++;
                     foreach (ChartItem* item ,m_chartItems)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 }else{
                     QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                     rect.setWidth(rect.width()/2);
                     rect.setHeight(rect.height()/2);
                     rect.moveCenter(m_rect.center());
                     zoomInToRect(rect);
                 }
             }
             void QChart::zoomOut()
             {
                 if (m_plotDataIndex > 0) {
                     m_plotDataIndex--;
                     foreach (ChartItem* item ,m_chartItems)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 }
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +7 -1

             #ifndef CHART_H
             #define CHART_H
             #include <qchartglobal.h>
             #include <qchartseries.h>
             #include <QGraphicsObject>
+            #include <QLinearGradient>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AxisItem;
             class QChartSeries;
             class PlotDomain;
             class ChartItem;
             class BarGroup;
             // TODO: We don't need to have QChart tied to QGraphicsItem:
             //class QTCOMMERCIALCHART_EXPORT QChart
             //class QTCOMMERCIALCHART_EXPORT QChartGraphicsItem : public QGraphicsItem {
             // public: QChartGraphicsItem(QChart &chart);
             /*!
              * TODO: define the responsibilities
              */
             class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsObject
             {
                 Q_OBJECT
             public:
                 enum ChartTheme {
                     ChartThemeVanilla = 0,
                     ChartThemeIcy,
                     ChartThemeGrayscale
                 };
             public:
                 QChart(QGraphicsObject* parent = 0);
                 ~QChart();
                 //from QGraphicsItem
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
                 void addSeries(QChartSeries* series);
                 //TODO: QChartSeries* createSeries(QSeriesData *data, QChartSeries::QChartSeriesType type);
                 // TODO: who owns the series now? maybe owned by chart and returned a reference instead...
                 QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
                 void setSize(const QSize& size);
                 void setMargin(int margin);
                 int margin() const;
                 void setTheme(QChart::ChartTheme theme);
+                void setTitle(const QString& title);
+                void setBackgroundColor(const QColor& color);
                 void zoomInToRect(const QRect& rectangle);
                 void zoomIn();
                 void zoomOut();
             signals:
                 //TODO chage to const QSize& size
                 void sizeChanged(QRectF rect);
                 void scaleChanged(qreal xscale, qreal yscale);
             private:
                 Q_DISABLE_COPY(QChart)
+                QGraphicsRectItem* m_background;
+                QLinearGradient m_backgroundGradient;
+                QGraphicsTextItem* m_title;
                 AxisItem* m_axisX;
                 AxisItem* m_axisY;
                 QRect m_rect;
                 QList<const QChartSeries*> m_series;
                 QVector<PlotDomain> m_plotDomainList;
                 QList<ChartItem*> m_chartItems;
                 //TODO: remove
                 QList<QGraphicsItem*> m_items;
                 int m_plotDataIndex;
                 int m_marginSize;
                 QList<QColor> m_themeColors;
                 QList<BarGroup*> m_BarGroupItems;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qchartview.cpp +11 0

             #include "qchartview.h"
             #include "qchart.h"
             #include <QGraphicsView>
             #include <QGraphicsScene>
             #include <QRubberBand>
             #include <QResizeEvent>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QChartView::QChartView(QWidget *parent) :
                 QGraphicsView(parent),
                 m_scene(new QGraphicsScene()),
                 m_chart(new QChart())
             {
             	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setScene(m_scene);
                 m_chart->setMargin(50);
                 m_scene->addItem(m_chart);
                 setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
             }
             QChartView::~QChartView()
             {
             }
             void QChartView::resizeEvent(QResizeEvent *event)
             {
                 m_scene->setSceneRect(0,0,size().width(),size().height());
                 m_chart->setSize(size());
                 QWidget::resizeEvent(event);
             }
             void QChartView::addSeries(QChartSeries* series)
             {
                 m_chart->addSeries(series);
             }
             QChartSeries* QChartView::createSeries(QChartSeries::QChartSeriesType type)
             {
                 return m_chart->createSeries(type);
             }
             void QChartView::zoomInToRect(const QRect& rectangle)
             {
                 m_chart->zoomInToRect(rectangle);
             }
             void QChartView::zoomIn()
             {
                 m_chart->zoomIn();
             }
             void QChartView::zoomOut()
             {
                 m_chart->zoomOut();
             }
             int QChartView::margin() const
             {
                 return m_chart->margin();
             }
+            void QChartView::setTitle(const QString& title)
+            {
+                m_chart->setTitle(title);
+            }
+            void QChartView::setBackgroundColor(const QColor& color)
+            {
+                m_chart->setBackgroundColor(color);
+            }
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h +2 0

             #ifndef QCHARTWIDGET_H
             #define QCHARTWIDGET_H
             #include "qchartglobal.h"
             #include "qchartseries.h"
             #include <QGraphicsView>
             class QGraphicsScene;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class QTCOMMERCIALCHART_EXPORT QChartView : public QGraphicsView
             {
             public:
                 explicit QChartView(QWidget *parent = 0);
                 ~QChartView();
                 //implement from QWidget
                 void resizeEvent(QResizeEvent *event);
                 void addSeries(QChartSeries* series);
                 // Convenience function
                 QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
                 int margin() const;
+                void setTitle(const QString& title);
+                void setBackgroundColor(const QColor& color);
                 void zoomInToRect(const QRect& rectangle);
                 void zoomIn();
                 void zoomOut();
             private:
                 QGraphicsScene *m_scene;
                 QChart* m_chart;
                 QPoint m_origin;
                 Q_DISABLE_COPY(QChartView)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QCHARTWIDGET_H

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