HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r584:bcc474698f6b

New theme with light colors, chartview background

Tero Ahola -

r584:bcc474698f6b

parent child

Context file:

r584:bcc474698f6b

Collapse all files

src/themes/chartthemelight_p.h created 644 +36 0

@@ -0,0 +1,36
	1	#include "charttheme_p.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4
	5	class ChartThemeLight: public ChartTheme
	6	{
	7	public:
	8	ChartThemeLight() : ChartTheme(QChart::ChartThemeLight)
	9	{
	10	// Series colors
	11	m_seriesColors << QRgb(0x1c9dde);
	12	m_seriesColors << QRgb(0xf7a015);
	13	m_seriesColors << QRgb(0x8dc444);
	14	generateSeriesGradients();
	15
	16	// Background
	17	QLinearGradient backgroundGradient;
	18	backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
	19	backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
	20	backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
	21	m_chartBackgroundGradient = backgroundGradient;
	22
	23	// Axes and other
	24	m_masterFont = QFont();
	25	m_axisLinePen = QPen(QRgb(0x424242));
	26	m_axisLinePen.setWidth(1);
	27	m_axisLabelBrush = QBrush(QRgb(0x424242));
	28	m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
	29	m_backgroundShadesPen = Qt::NoPen;
	30	m_backgroundShades = BackgroundShadesNone;
	31	m_gridLinePen = QPen(QRgb(0x424242));
	32	m_gridLinePen.setWidth(1);
	33	}
	34	};
	35
	36	QTCOMMERCIALCHART_END_NAMESPACE

src/charttheme.cpp +9 -5

             #include "charttheme_p.h"
             #include "qchart.h"
+            #include "qchartview.h"
             #include "qlegend.h"
             #include "qchartaxis.h"
             #include <QTime>
             //series
             #include "qbarset.h"
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qlineseries.h"
             #include "qareaseries.h"
             #include "qscatterseries.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include "qsplineseries.h"
             //items
             #include "axisitem_p.h"
             #include "barpresenter_p.h"
             #include "stackedbarpresenter_p.h"
             #include "percentbarpresenter_p.h"
             #include "linechartitem_p.h"
             #include "areachartitem_p.h"
             #include "scatterchartitem_p.h"
             #include "piechartitem_p.h"
             #include "splinechartitem_p.h"
             //themes
             #include "chartthemedefault_p.h"
             #include "chartthemevanilla_p.h"
             #include "chartthemeicy_p.h"
             #include "chartthemegrayscale_p.h"
             #include "chartthemescientific_p.h"
             #include "chartthemebluecerulean_p.h"
+            #include "chartthemelight_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartTheme::ChartTheme(QChart::ChartTheme id)
             {
                 m_id = id;
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
             }
             ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme)
             {
                 switch(theme) {
                     case QChart::ChartThemeVanilla:
                         return new ChartThemeVanilla();
                     case QChart::ChartThemeIcy:
                         return new ChartThemeIcy();
                     case QChart::ChartThemeGrayscale:
                         return new ChartThemeGrayscale();
                     case QChart::ChartThemeScientific:
                         return new ChartThemeScientific();
                     case QChart::ChartThemeBlueCerulean:
                         return new ChartThemeBlueCerulean();
+                    case QChart::ChartThemeLight:
+                        return new ChartThemeLight();
                     default:
                         return new ChartThemeDefault();
                 }
             }
             void ChartTheme::decorate(QChart* chart)
             {
-                if (m_backgroundShades == BackgroundShadesNone)
+                if (m_backgroundShades == BackgroundShadesNone) {
-                    chart->setChartBackgroundBrush(m_backgroundGradient);
+                    chart->setChartBackgroundBrush(m_chartBackgroundGradient);
-                else
+                } else {
                     chart->setChartBackgroundBrush(Qt::NoBrush);
+                }
                 chart->setChartTitleFont(m_masterFont);
             }
             void ChartTheme::decorate(QLegend* legend)
             {
-                legend->setBackgroundBrush(m_backgroundGradient);
+                legend->setBackgroundBrush(m_chartBackgroundGradient);
             }
             void ChartTheme::decorate(QAreaSeries* series, int index)
             {
                 QPen pen;
                 QBrush brush;
                 if (pen == series->pen()){
                     pen.setColor(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1.0));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
                 if (brush == series->brush()) {
                    QBrush brush(m_seriesColors.at(index % m_seriesColors.size()));
                    series->setBrush(brush);
                 }
             }
             void ChartTheme::decorate(QLineSeries* series,int index)
             {
                 QPen pen;
                 if(pen == series->pen()){
                     pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
             }
             void ChartTheme::decorate(BarPresenter* item, QBarSeries* series,int index)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<sets.count(); i++) {
                     qreal pos = 0.5;
                     if (sets.count() > 1)
                         pos = (qreal) i / (qreal) (sets.count() - 1);
                     QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     sets.at(i)->setBrush(QBrush(c));
                     // Pick label color as far as possible from bar color (within gradient).
                     // 0.3 is magic number that was picked as value that gave enough contrast with icy theme gradient :)
                     // TODO: better picking of label color?
                     if (pos < 0.3) {
                         c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1);
                     } else {
                         c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0);
                     }
                     sets.at(i)->setFloatingValuePen(QPen(c));
                 }
             }
             void ChartTheme::decorate(StackedBarPresenter* item, QStackedBarSeries* series,int index)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<sets.count(); i++) {
                     qreal pos = 0.5;
                     if (sets.count() > 1)
                         pos = (qreal) i / (qreal) (sets.count() - 1);
                     QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     sets.at(i)->setBrush(QBrush(c));
                     if (pos < 0.3) {
                         c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1);
                     } else {
                         c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0);
                     }
                     sets.at(i)->setFloatingValuePen(QPen(c));
                 }
             }
             void ChartTheme::decorate(PercentBarPresenter* item, QPercentBarSeries* series,int index)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<sets.count(); i++) {
                     qreal pos = 0.5;
                     if (sets.count() > 1)
                         pos = (qreal) i / (qreal) (sets.count() - 1);
                     QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     sets.at(i)->setBrush(QBrush(c));
                     if (pos < 0.3) {
                         c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1);
                     } else {
                         c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0);
                     }
                     sets.at(i)->setFloatingValuePen(QPen(c));
                 }
             }
             void ChartTheme::decorate(QScatterSeries* series, int index)
             {
                 QPen pen;
                 QBrush brush;
                 if (pen == series->pen()) {
                     pen.setColor(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1.0));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
                 if (brush == series->brush()) {
                     QBrush brush(m_seriesColors.at(index % m_seriesColors.size()));
                     series->setBrush(brush);
                 }
             }
             void ChartTheme::decorate(PieChartItem* item, QPieSeries* series, int index)
             {
                 // Get color for a slice from a gradient linearly, beginning from the start of the gradient
                 for (int i(0); i < series->slices().count(); i++) {
                     qreal pos = (qreal) i / (qreal) series->count();
                     QColor penColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.1);
                     series->slices().at(i)->setSlicePen(penColor);
                     QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     series->slices().at(i)->setSliceBrush(brushColor);
                 }
             }
             void ChartTheme::decorate(QSplineSeries* series, int index)
             {
                 QPen pen;
                 if(pen == series->pen()){
                     pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
             }
             void ChartTheme::decorate(QChartAxis* axis,bool axisX)
             {
                 if (axis->isAxisVisible()) {
                     axis->setLabelsBrush(m_axisLabelBrush);
                     axis->setLabelsPen(m_axisLabelPen);
-                    // TODO: check the axis type (x or y) should define whether to show the shades or not
                     if (m_backgroundShades == BackgroundShadesBoth
                             || (m_backgroundShades == BackgroundShadesVertical && axisX)
                             || (m_backgroundShades == BackgroundShadesHorizontal && !axisX)) {
                         axis->setShadesPen(m_backgroundShadesPen);
                         axis->setShadesBrush(m_backgroundShadesBrush);
                     } else {
                         // The shades not supposed to be shown for this axis, clear possible brush and pen
                         axis->setShadesPen(Qt::NoPen);
                         axis->setShadesBrush(Qt::NoBrush);
                     }
                     axis->setAxisPen(m_axisLinePen);
                     axis->setGridLinePen(m_gridLinePen);
                     axis->setLabelsFont(m_masterFont);
                 }
             }
             void ChartTheme::generateSeriesGradients()
             {
                 // Generate gradients in HSV color space
                 foreach (QColor color, m_seriesColors) {
                     QLinearGradient g;
                     qreal h = color.hsvHueF();
                     qreal s = color.hsvSaturationF();
                     // TODO: tune the algorithm to give nice results with most base colors defined in
                     // most themes. The rest of the gradients we can define manually in theme specific
                     // implementation.
                     QColor start = color;
                     start.setHsvF(h, 0.05, 0.95);
                     g.setColorAt(0.0, start);
                     g.setColorAt(0.5, color);
                     QColor end = color;
                     end.setHsvF(h, s, 0.25);
                     g.setColorAt(1.0, end);
                     m_seriesGradients << g;
                 }
             }
             QColor ChartTheme::colorAt(const QColor &start, const QColor &end, qreal pos)
             {
                 Q_ASSERT(pos >=0.0 && pos <= 1.0);
                 qreal r = start.redF() + ((end.redF() - start.redF()) * pos);
                 qreal g = start.greenF() + ((end.greenF() - start.greenF()) * pos);
                 qreal b = start.blueF() + ((end.blueF() - start.blueF()) * pos);
                 QColor c;
                 c.setRgbF(r, g, b);
                 return c;
             }
             QColor ChartTheme::colorAt(const QGradient &gradient, qreal pos)
             {
                 Q_ASSERT(pos >=0 && pos <= 1.0);
                 // another possibility:
                 // http://stackoverflow.com/questions/3306786/get-intermediate-color-from-a-gradient
                 QGradientStops stops = gradient.stops();
                 int count = stops.count();
                 // find previous stop relative to position
                 QGradientStop prev = stops.first();
                 for (int i=0; i<count; i++) {
                     QGradientStop stop = stops.at(i);
                     if (pos > stop.first)
                         prev = stop;
                     // given position is actually a stop position?
                     if (pos == stop.first) {
                         //qDebug() << "stop color" << pos;
                         return stop.second;
                     }
                 }
                 // find next stop relative to position
                 QGradientStop next = stops.last();
                 for (int i=count-1; i>=0; i--) {
                     QGradientStop stop = stops.at(i);
                     if (pos < stop.first)
                         next = stop;
                 }
                 //qDebug() << "prev" << prev.first << "pos" << pos << "next" << next.first;
                 qreal range = next.first - prev.first;
                 qreal posDelta = pos - prev.first;
                 qreal relativePos = posDelta / range;
                 //qDebug() << "range" << range << "posDelta" << posDelta << "relativePos" << relativePos;
                 return colorAt(prev.second, next.second, relativePos);
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/charttheme_p.h +1 -1

             #ifndef CHARTTHEME_H
             #define CHARTTHEME_H
             #include "qchartglobal.h"
             #include "qchart.h"
             #include <QColor>
             #include <QGradientStops>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem;
             class QSeries;
             class LineChartItem;
             class QLineSeries;
             class BarPresenter;
             class QBarSeries;
             class StackedBarPresenter;
             class QStackedBarSeries;
             class QPercentBarSeries;
             class PercentBarPresenter;
             class QScatterSeries;
             class ScatterChartItem;
             class PieChartItem;
             class QPieSeries;
             class SplineChartItem;
             class QSplineSeries;
             class AreaChartItem;
             class QAreaSeries;
             class ChartTheme
             {
             public:
                 enum BackgroundShadesMode {
                     BackgroundShadesNone = 0,
                     BackgroundShadesVertical,
                     BackgroundShadesHorizontal,
                     BackgroundShadesBoth
                 };
             protected:
                 explicit ChartTheme(QChart::ChartTheme id =  QChart::ChartThemeDefault);
             public:
                 static ChartTheme* createTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme id() const {return m_id;}
                 void decorate(QChart* chart);
                 void decorate(QLegend* legend);
                 //void decorate(ChartItem* item, QSeries* series,int index);
                 void decorate(BarPresenter* item, QBarSeries* series, int index);
                 void decorate(StackedBarPresenter* item, QStackedBarSeries* series, int index);
                 void decorate(PercentBarPresenter* item, QPercentBarSeries* series, int index);
                 void decorate(QLineSeries* series, int index);
                 void decorate(QAreaSeries* series, int index);
                 void decorate(QScatterSeries* series, int index);
                 void decorate(PieChartItem* item, QPieSeries* series, int index);
                 void decorate(QSplineSeries* series, int index);
                 void decorate(QChartAxis* axis, bool axisX);
             public: // utils
                 void generateSeriesGradients();
                 static QColor colorAt(const QColor &start, const QColor &end, qreal pos);
                 static QColor colorAt(const QGradient &gradient, qreal pos);
             protected:
                 QChart::ChartTheme m_id;
                 QList<QColor> m_seriesColors;
                 QList<QGradient> m_seriesGradients;
-                QLinearGradient m_backgroundGradient;
+                QLinearGradient m_chartBackgroundGradient;
                 QFont m_masterFont;
                 QPen m_axisLinePen;
                 QBrush m_axisLabelBrush;
                 QPen m_axisLabelPen;
                 QPen m_backgroundShadesPen;
                 QBrush m_backgroundShadesBrush;
                 BackgroundShadesMode m_backgroundShades;
                 QPen m_gridLinePen;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // CHARTTHEME_H

src/qchart.cpp +1 0

             #include "qchart.h"
             #include "qchartaxis.h"
             #include "qlegend.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \enum QChart::ChartTheme
                 This enum describes the theme used by the chart.
                 \value ChartThemeDefault Follows the GUI style of the Operating System
                 \value ChartThemeVanilla
                 \value ChartThemeIcy
                 \value ChartThemeGrayscale
                 \value ChartThemeScientific
                 \value ChartThemeBlueCerulean
+                \value ChartThemeLight
                 \value ChartThemeCount Not really a theme; the total count of themes.
             */
             /*!
                 \enum QChart::AnimationOption
                 For enabling/disabling animations. Defaults to NoAnimation.
                 \value NoAnimation
                 \value GridAxisAnimations
                 \value SeriesAnimations
                 \value AllAnimations
             */
             /*!
                 \class QChart
                 \brief QtCommercial chart API.
                 QChart is a QGraphicsWidget that you can show in a QGraphicsScene. It manages the graphical
                 representation of different types of QChartSeries and other chart related objects like
                 QChartAxis and QChartLegend. If you simply want to show a chart in a layout, you can use the
                 convenience class QChartView instead of QChart.
                 \sa QChartView
             */
             /*!
                 Constructs a chart object which is a child of a\a parent. Parameter \a wFlags is passed to the QGraphicsWidget constructor.
             */
             QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
                 m_backgroundItem(0),
                 m_titleItem(0),
                 m_legend(new QLegend(this)),
                 m_dataset(new ChartDataSet(this)),
                 m_presenter(new ChartPresenter(this,m_dataset))
             {
                 connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),m_legend,SLOT(handleSeriesAdded(QSeries*,Domain*)));
                 connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),m_legend,SLOT(handleSeriesRemoved(QSeries*)));
             }
             /*!
                 Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.
             */
             QChart::~QChart()
             {
                 disconnect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),m_legend,SLOT(handleSeriesAdded(QSeries*,Domain*)));
                 disconnect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),m_legend,SLOT(handleSeriesRemoved(QSeries*)));
             }
             /*!
                 Adds the \a series and optional \a axisY onto the chart and takes the ownership of the objects.
                 If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
                 the y axis).
             */
             void QChart::addSeries(QSeries* series, QChartAxis* axisY)
             {
                 m_dataset->addSeries(series, axisY);
             }
             /*!
                 Removes the \a series specified in a perameter from the QChartView.
                 It releses its ownership of the specified QChartSeries object.
                 It does not delete the pointed QChartSeries data object
                 \sa addSeries(), removeAllSeries()
             */
             void QChart::removeSeries(QSeries* series)
             {
                 m_dataset->removeSeries(series);
             }
             /*!
                 Removes all the QChartSeries that have been added to the QChartView
                 It also deletes the pointed QChartSeries data objects
                 \sa addSeries(), removeSeries()
             */
             void QChart::removeAllSeries()
             {
                 m_dataset->removeAllSeries();
             }
             /*!
                 Sets the \a brush that is used for painting the background of the chart area.
             */
             void QChart::setChartBackgroundBrush(const QBrush& brush)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setBrush(brush);
                 m_backgroundItem->update();
             }
             /*!
                 Sets the \a pen that is used for painting the background of the chart area.
             */
             void QChart::setChartBackgroundPen(const QPen& pen)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setPen(pen);
                 m_backgroundItem->update();
             }
             /*!
                 Sets the chart \a title. The description text that is drawn above the chart.
             */
             void QChart::setChartTitle(const QString& title)
             {
                 createChartTitleItem();
                 m_titleItem->setText(title);
                 updateLayout();
             }
             /*!
                 Returns the chart title. The description text that is drawn above the chart.
             */
             QString QChart::chartTitle() const
             {
                 if(m_titleItem)
                 return m_titleItem->text();
                 else
                 return QString();
             }
             /*!
                 Sets the \a font that is used for rendering the description text that is rendered above the chart.
             */
             void QChart::setChartTitleFont(const QFont& font)
             {
                 createChartTitleItem();
                 m_titleItem->setFont(font);
                 updateLayout();
             }
             /*!
                 Sets the \a brush used for rendering the title text.
             */
             void QChart::setChartTitleBrush(const QBrush &brush)
             {
                 createChartTitleItem();
                 m_titleItem->setBrush(brush);
                 updateLayout();
             }
             /*!
                 Returns the brush used for rendering the title text.
             */
             QBrush QChart::chartTitleBrush()
             {
                 createChartTitleItem();
                 return m_titleItem->brush();
             }
             void QChart::createChartBackgroundItem()
             {
                 if(!m_backgroundItem) {
                     m_backgroundItem = new QGraphicsRectItem(this);
                     m_backgroundItem->setPen(Qt::NoPen);
                     m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void QChart::createChartTitleItem()
             {
                 if(!m_titleItem) {
                     m_titleItem = new QGraphicsSimpleTextItem(this);
                     m_titleItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             /*!
                 Returns the chart margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
                 \sa setMargin()
             */
             int QChart::margin() const
             {
                 return m_presenter->margin();
             }
             /*!
                 Sets the chart \a margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
                 \sa margin()
             */
             void QChart::setMargin(int margin)
             {
                 m_presenter->setMargin(margin);
                 updateLayout();
             }
             /*!
                 Sets the \a theme used by the chart for rendering the graphical representation of the data
                 \sa ChartTheme, chartTheme()
             */
             void QChart::setChartTheme(QChart::ChartTheme theme)
             {
                 m_presenter->setChartTheme(theme);
             }
             /*!
                 Returns the theme enum used by the chart.
                 \sa ChartTheme, setChartTheme()
             */
             QChart::ChartTheme QChart::chartTheme() const
             {
                 return m_presenter->chartTheme();
             }
             /*!
                 Zooms in the view by a factor of 2
             */
             void QChart::zoomIn()
             {
                 m_presenter->zoomIn();
             }
             /*!
                 Zooms in the view to a maximum level at which \a rect is still fully visible.
             */
             void QChart::zoomIn(const QRectF& rect)
             {
                 if(!rect.isValid()) return;
                 m_presenter->zoomIn(rect);
             }
             /*!
                 Restores the view zoom level to the previous one.
             */
             void QChart::zoomOut()
             {
                 m_presenter->zoomOut();
             }
             /*!
                 Resets to the default view.
             */
             void QChart::zoomReset()
             {
                 m_presenter->zoomReset();
             }
             /*!
                 Returns the pointer to the x axis object of the chart
             */
             QChartAxis* QChart::axisX() const
             {
                 return m_dataset->axisX();
             }
             /*!
                 Returns the pointer to the y axis object of the chart
             */
             QChartAxis* QChart::axisY() const
             {
                 return m_dataset->axisY();
             }
             /*!
                 Returns the legend object of the chart
             */
             QLegend* QChart::legend()
             {
                 return m_legend;
             }
             /*!
                 Resizes and updates the chart area using the \a event data
             */
             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
             {
                 m_rect = QRectF(QPoint(0,0),event->newSize());
                 updateLayout();
                 QGraphicsWidget::resizeEvent(event);
                 update();
             }
             /*!
                 Sets animation \a options for the chart
             */
             void QChart::setAnimationOptions(AnimationOptions options)
             {
                 m_presenter->setAnimationOptions(options);
             }
             /*!
                 Returns animation options for the chart
             */
             QChart::AnimationOptions QChart::animationOptions() const
             {
                 return m_presenter->animationOptions();
             }
             void QChart::scroll(int dx,int dy)
             {
             	//temporary
             	if(dx>0)
             	 m_presenter->scroll(m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
             	if(dx<0)
             	 m_presenter->scroll(-m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
             	if(dy>0)
             	 m_presenter->scroll(0,m_presenter->geometry().width()/(axisY()->ticksCount()-1));
             	if(dy<0)
             	 m_presenter->scroll(0,-m_presenter->geometry().width()/(axisY()->ticksCount()-1));
             }
             void QChart::updateLayout()
             {
                 if(!m_rect.isValid()) return;
                 QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                 // recalculate title position
                 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_backgroundItem) {
                     m_backgroundItem->setRect(rect);
                 }
                 // recalculate legend position
                 // TODO: better layout
                 if (m_legend) {
                     QRectF boundingRect(m_rect.adjusted(margin(),
                                                         rect.height() + margin() + margin()/2 - m_legend->minimumSize().height()/2,
                                                         -margin(),
                                                         -margin()/2 + m_legend->minimumSize().height()/2));
                     m_legend->handleGeometryChanged(boundingRect);
                     qDebug() << "legend rect:" << m_legend->boundingRect();
                 }
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +1 0

             #ifndef QCHART_H
             #define QCHART_H
             #include <qchartglobal.h>
             #include <qseries.h>
             #include <QGraphicsWidget>
             #include <QLinearGradient>
             #include <QFont>
             class QGraphicsSceneResizeEvent;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AxisItem;
             class QSeries;
             class PlotDomain;
             class BarPresenter;
             class QChartAxis;
             class ChartTheme;
             class ChartItem;
             class ChartDataSet;
             class ChartPresenter;
             class QLegend;
             class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
             {
                 Q_OBJECT
             public:
                 enum ChartTheme {
                     ChartThemeDefault,
                     ChartThemeVanilla,
                     ChartThemeIcy,
                     ChartThemeGrayscale,
                     ChartThemeScientific,
                     ChartThemeBlueCerulean,
+                    ChartThemeLight,
                     ChartThemeCount
                 };
                 enum  AnimationOption {
                     NoAnimation = 0x0,
                     GridAxisAnimations = 0x1,
                     SeriesAnimations =0x2,
                     AllAnimations = 0x3
                     };
                     Q_DECLARE_FLAGS(AnimationOptions, AnimationOption)
             public:
                 QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~QChart();
                 void addSeries(QSeries* series, QChartAxis* axisY = 0);
                 void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
                 void removeAllSeries(); // deletes series and axis
                 void setMargin(int margin);
                 int margin() const;
                 void setChartTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme chartTheme() const;
                 void setChartTitle(const QString& title);
                 QString chartTitle() const;
                 void setChartTitleFont(const QFont& font);
                 void setChartTitleBrush(const QBrush &brush);
                 QBrush chartTitleBrush();
                 void setChartBackgroundBrush(const QBrush& brush);
                 void setChartBackgroundPen(const QPen& pen);
                 void setAnimationOptions(AnimationOptions options);
                 AnimationOptions animationOptions() const;
                 void zoomIn();
                 void zoomIn(const QRectF& rect);
                 void zoomOut();
                 void zoomReset();
                 void scroll(int dx,int dy);
                 QChartAxis* axisX() const;
                 QChartAxis* axisY() const;
                 QLegend* legend();
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);
             private:
                 inline void createChartBackgroundItem();
                 inline void createChartTitleItem();
                 void updateLayout();
             private:
                 Q_DISABLE_COPY(QChart)
                 QGraphicsRectItem* m_backgroundItem;
                 QGraphicsSimpleTextItem* m_titleItem;
                 QRectF m_rect;
                 QLegend* m_legend;
                 ChartDataSet *m_dataset;
                 ChartPresenter *m_presenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             Q_DECLARE_OPERATORS_FOR_FLAGS(QTCOMMERCIALCHART_NAMESPACE::QChart::AnimationOptions)
             #endif

src/qchartview.cpp +17 -6

             #include "qchartview.h"
             #include "qchart.h"
             #include "qchartaxis.h"
             #include <QGraphicsView>
             #include <QGraphicsScene>
             #include <QRubberBand>
             #include <QResizeEvent>
             #include <QDebug>
             /*!
                 \enum QChartView::RubberBandPolicy
                 This enum describes the different types of rubber bands that can be used for zoom rect selection
                 \value NoRubberBand
                 \value VerticalRubberBand
                 \value HorizonalRubberBand
                 \value RectangleRubberBand
             */
             /*!
                 \class QChartView
                 \brief Standalone charting widget.
                 QChartView is a standalone widget that can display charts. It does not require separate
                 QGraphicsScene to work. It manages the graphical representation of different types of
                 QChartSeries and other chart related objects like QChartAxis and QChartLegend. If you want to
                 display a chart in your existing QGraphicsScene, you can use the QChart class instead.
                 \sa QChart
             */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 Constructs a chartView object which is a child of a\a parent.
             */
             QChartView::QChartView(QWidget *parent) :
-            QGraphicsView(parent),
+                QGraphicsView(parent),
-            m_scene(new QGraphicsScene(this)),
+                m_scene(new QGraphicsScene(this)),
-            m_chart(new QChart()),
+                m_chart(new QChart()),
-            m_rubberBand(0),
+                m_rubberBand(0),
-            m_verticalRubberBand(false),
+                m_verticalRubberBand(false),
-            m_horizonalRubberBand(false)
+                m_horizonalRubberBand(false)
             {
                 setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setScene(m_scene);
                 m_chart->setMargin(50);
                 m_scene->addItem(m_chart);
                 setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
             }
             /*!
                 Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.
             */
             QChartView::~QChartView()
             {
             }
             /*!
                 Resizes and updates the chart area using the \a event data
             */
             void QChartView::resizeEvent(QResizeEvent *event)
             {
                 m_scene->setSceneRect(0,0,size().width(),size().height());
                 m_chart->resize(size());
                 QWidget::resizeEvent(event);
             }
             /*!
                 Adds the \a series and optional \a axisY onto the chart and takes the ownership of the objects.
                 If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
                 the y axis).
                 \sa removeSeries(), removeAllSeries()
             */
             void QChartView::addSeries(QSeries* series,QChartAxis *axisY)
             {
                 m_chart->addSeries(series,axisY);
             }
             /*!
                 Removes the \a series specified in a perameter from the QChartView.
                 It releses its ownership of the specified QChartSeries object.
                 It does not delete the pointed QChartSeries data object
                 \sa addSeries(), removeAllSeries()
             */
             void QChartView::removeSeries(QSeries* series)
             {
                 m_chart->removeSeries(series);
             }
             /*!
                 Removes all the QChartSeries that have been added to the QChartView
                 It also deletes the pointed QChartSeries data objects
                 \sa addSeries(), removeSeries()
             */
             void QChartView::removeAllSeries()
             {
                 m_chart->removeAllSeries();
             }
             /*!
                 Zooms in the view by a factor of 2
             */
             void QChartView::zoomIn()
             {
                 m_chart->zoomIn();
             }
             /*!
                 Zooms in the view to a maximum level at which \a rect is still fully visible.
             */
             void QChartView::zoomIn(const QRect& rect)
             {
                 m_chart->zoomIn(rect);
             }
             /*!
                 Restores the view zoom level to the previous one.
             */
             void QChartView::zoomOut()
             {
                 m_chart->zoomOut();
             }
             /*!
                 Returns the chart margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
             */
             int QChartView::margin() const
             {
                 return m_chart->margin();
             }
             /*!
                 Sets the chart \a title. A description text that is drawn above the chart.
             */
             void QChartView::setChartTitle(const QString& title)
             {
                 m_chart->setChartTitle(title);
             }
             /*!
                 Returns the chart's title. A description text that is drawn above the chart.
             */
             QString QChartView::chartTitle() const
             {
                 return m_chart->chartTitle();
             }
             /*!
                 Sets the \a font that is used for rendering the description text that is rendered above the chart.
             */
             void QChartView::setChartTitleFont(const QFont& font)
             {
                 m_chart->setChartTitleFont(font);
             }
             /*!
                 Sets the \a brush used for rendering the title text.
             */
             void QChartView::setChartTitleBrush(const QBrush &brush)
             {
                 m_chart->setChartTitleBrush(brush);
             }
             /*!
                 Returns the brush used for rendering the title text.
             */
             QBrush QChartView::chartTitleBrush()
             {
                 return m_chart->chartTitleBrush();
             }
             /*!
                 Sets the \a brush that is used for painting the background of the chart area of the QChartView widget.
             */
             void QChartView::setChartBackgroundBrush(const QBrush& brush)
             {
                 m_chart->setChartBackgroundBrush(brush);
             }
             /*!
                 Sets the \a pen that is used for painting the background of the chart area of the QChartView widget.
             */
             void QChartView::setChartBackgroundPen(const QPen& pen)
             {
                 m_chart->setChartBackgroundPen(pen);
             }
             /*!
                 Sets the RubberBandPlicy to \a policy. Selected policy determines the way zooming is performed.
             */
             void QChartView::setRubberBandPolicy(const RubberBandPolicy policy)
             {
                 switch(policy) {
                     case VerticalRubberBand:
                     m_verticalRubberBand = true;
                     m_horizonalRubberBand = false;
                     break;
                     case HorizonalRubberBand:
                     m_verticalRubberBand = false;
                     m_horizonalRubberBand = true;
                     break;
                     case RectangleRubberBand:
                     m_verticalRubberBand = true;
                     m_horizonalRubberBand = true;
                     break;
                     case NoRubberBand:
                     default:
                     delete m_rubberBand;
                     m_rubberBand=0;
                     m_horizonalRubberBand = false;
                     m_verticalRubberBand = false;
                     return;
                 }
                 if(!m_rubberBand) {
                     m_rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
                     m_rubberBand->setEnabled(true);
                 }
             }
             /*!
                 Returns the RubberBandPolicy that is currently being used by the widget.
             */
             QChartView::RubberBandPolicy QChartView::rubberBandPolicy() const
             {
                 if(m_horizonalRubberBand && m_verticalRubberBand) return RectangleRubberBand;
                 if(m_horizonalRubberBand) return HorizonalRubberBand;
                 if(m_verticalRubberBand) return VerticalRubberBand;
                 return NoRubberBand;
             }
             /*!
                 If Left mouse button is pressed and the RubberBandPolicy is enabled the \a event is accepted and the rubber band is displayed on the screen allowing the user to select the zoom area.
                 If different mouse button is pressed and/or the RubberBandPolicy is disabled then the \a event is passed to QGraphicsView::mousePressEvent() implementation.
             */
             void QChartView::mousePressEvent(QMouseEvent *event)
             {
                 if(m_rubberBand && m_rubberBand->isEnabled() && event->button() == Qt::LeftButton) {
                     int margin = m_chart->margin();
                     QRect rect(margin, margin, width() - 2 * margin, height() - 2 * margin);
                     if (rect.contains(event->pos())) {
                         m_rubberBandOrigin = event->pos();
                         m_rubberBand->setGeometry(QRect(m_rubberBandOrigin, QSize()));
                         m_rubberBand->show();
                         event->accept();
                     }
                 }
                 else {
                     QGraphicsView::mousePressEvent(event);
                 }
             }
             /*!
                 If RubberBand rectange specification has been initiated in pressEvent then \a event data is used to update RubberBand geometry.
                 In other case the defualt QGraphicsView::mouseMoveEvent implementation is called.
             */
             void QChartView::mouseMoveEvent(QMouseEvent *event)
             {
                 if(m_rubberBand && m_rubberBand->isVisible()) {
                     int margin = m_chart->margin();
                     QRect rect(margin, margin, width() - 2 * margin, height() - 2 * margin);
                     int width = event->pos().x() - m_rubberBandOrigin.x();
                     int height = event->pos().y() - m_rubberBandOrigin.y();
                     if(!m_verticalRubberBand) {
                         m_rubberBandOrigin.setY(rect.top());
                         height = rect.height();
                     }
                     if(!m_horizonalRubberBand) {
                         m_rubberBandOrigin.setX(rect.left());
                         width= rect.width();
                     }
                     m_rubberBand->setGeometry(QRect(m_rubberBandOrigin.x(),m_rubberBandOrigin.y(), width,height).normalized());
                 }
                 else {
                     QGraphicsView::mouseMoveEvent(event);
                 }
             }
             /*!
                 If left mouse button is release and RubberBand is enabled then \a event is accepted and the view is zoomed in to rect specified by RubberBand
                 If it is the right mouse button \a event then RubberBand is dissmissed and zoom is canceled.
             */
             void QChartView::mouseReleaseEvent(QMouseEvent *event)
             {
                 if(m_rubberBand) {
                     if (event->button() == Qt::LeftButton && m_rubberBand->isVisible()) {
                         m_rubberBand->hide();
                         QRect rect = m_rubberBand->geometry();
                         m_chart->zoomIn(rect);
                         event->accept();
                     }
                     if(event->button()==Qt::RightButton)
                     m_chart->zoomReset();
                 }
                 else {
                     QGraphicsView::mouseReleaseEvent(event);
                 }
             }
             /*!
                 Pressing + and - keys performs zoomIn() and zoomOut() respectivly.
                 In other \a event is passed to the QGraphicsView::keyPressEvent() implementation
             */
             void QChartView::keyPressEvent(QKeyEvent *event)
             {
                 switch (event->key()) {
                     case Qt::Key_Plus:
                     zoomIn();
                     break;
                     case Qt::Key_Minus:
                     zoomOut();
                     break;
                     default:
                     QGraphicsView::keyPressEvent(event);
                     break;
                 }
             }
             /*!
                 Sets the \a theme used by the chart for rendering the graphical representation of the data
                 \sa QChart::ChartTheme, chartTheme()
             */
             void QChartView::setChartTheme(QChart::ChartTheme theme)
             {
+                if (theme == QChart::ChartThemeBlueCerulean) {
+                    QLinearGradient backgroundGradient;
+                    backgroundGradient.setColorAt(0.0, QRgb(0x056188));
+                    backgroundGradient.setColorAt(1.0, QRgb(0x101a33));
+                    backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
+                    setBackgroundBrush(backgroundGradient);
+                } else {
+                    setBackgroundBrush(Qt::NoBrush);
+                }
                 m_chart->setChartTheme(theme);
             }
             /*!
                 Returns the theme enum used by the chart.
                 \sa setChartTheme()
             */
             QChart::ChartTheme QChartView::chartTheme() const
             {
                 return m_chart->chartTheme();
             }
             /*!
                 Returns the pointer to the x axis object of the chart
             */
             QChartAxis* QChartView::axisX() const
             {
                 return m_chart->axisX();
             }
             /*!
                 Returns the pointer to the y axis object of the chart
             */
             QChartAxis* QChartView::axisY() const
             {
                 return m_chart->axisY();
             }
             /*!
                 Returns the pointer to legend object of the chart
             */
             QLegend* QChartView::legend() const
             {
                 return m_chart->legend();
             }
             /*!
                 Sets animation \a options for the chart
             */
             void QChartView::setAnimationOptions(QChart::AnimationOptions options)
             {
                 m_chart->setAnimationOptions(options);
             }
             /*!
                 Returns animation options for the chart
             */
             QChart::AnimationOptions QChartView::animationOptions() const
             {
                 return m_chart->animationOptions();
             }
             void QChartView::scroll(int dx,int dy)
             {
             	m_chart->scroll(dx,dy);
             }
+            #include "moc_qchartview.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h +2 -3

             #ifndef QCHARTWIDGET_H
             #define QCHARTWIDGET_H
             #include "qchartglobal.h"
             #include "qchartaxis.h"
             #include "qseries.h"
             #include "qchart.h"
             #include <QGraphicsView>
             class QGraphicsScene;
             class QRubberBand;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class QTCOMMERCIALCHART_EXPORT QChartView : public QGraphicsView
             {
+                Q_OBJECT
             public:
                 enum  RubberBandPolicy { NoRubberBand, VerticalRubberBand, HorizonalRubberBand, RectangleRubberBand };
                 explicit QChartView(QWidget *parent = 0);
                 ~QChartView();
                 //implement from QWidget
                 void resizeEvent(QResizeEvent *event);
                 void addSeries(QSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
                 void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
                 void removeAllSeries(); // deletes series and axis
                 int margin() const;
                 void setChartTitle(const QString& title);
                 QString chartTitle() const;
                 void setChartTitleFont(const QFont& font);
                 void setChartTitleBrush(const QBrush &brush);
                 QBrush chartTitleBrush();
                 void setChartBackgroundBrush(const QBrush& brush);
                 void setChartBackgroundPen(const QPen& pen);
                 void zoomIn();
                 void zoomIn(const QRect& rect);
                 void zoomOut();
                 void scroll(int dx,int dy);
                 void setRubberBandPolicy(const RubberBandPolicy );
                 RubberBandPolicy rubberBandPolicy() const;
                 void setChartTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme chartTheme() const;
                 void setAnimationOptions(QChart::AnimationOptions options);
                 QChart::AnimationOptions animationOptions() const;
                 QChartAxis* axisX() const;
                 QChartAxis* axisY() const;
                 QLegend* legend() const;
             protected:
                 void mousePressEvent(QMouseEvent *event);
                 void mouseMoveEvent(QMouseEvent *event);
                 void mouseReleaseEvent(QMouseEvent *event);
                 void keyPressEvent(QKeyEvent *event);
             private:
                 QGraphicsScene *m_scene;
                 QChart* m_chart;
                 QPoint m_rubberBandOrigin;
                 QRubberBand* m_rubberBand;
                 bool m_verticalRubberBand;
                 bool m_horizonalRubberBand;
                 Q_DISABLE_COPY(QChartView)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QCHARTWIDGET_H

src/src.pro +3 -1

             !include( ../common.pri ):error( Couldn't find the common.pri file! )
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
                 chartdataset.cpp \
                 chartpresenter.cpp \
                 charttheme.cpp \
                 domain.cpp \
                 qchart.cpp \
                 qchartview.cpp \
                 qseries.cpp \
                 qlegend.cpp \
                 legendmarker.cpp
             PRIVATE_HEADERS += \
                 chartdataset_p.h \
                 chartitem_p.h \
                 chartpresenter_p.h \
                 charttheme_p.h \
                 domain_p.h \
                 legendmarker_p.h
             PUBLIC_HEADERS += \
                 qchart.h \
                 qchartglobal.h \
                 qseries.h \
                 qchartview.h \
                 qlegend.h
             include(animations/animations.pri)
             include(axis/axis.pri)
             include(xychart/xychart.pri)
             include(linechart/linechart.pri)
             include(areachart/areachart.pri)
             include(barchart/barchart.pri)
             include(piechart/piechart.pri)
             include(scatterseries/scatter.pri)
             include(splinechart/splinechart.pri)
             THEMES += themes/chartthemedefault_p.h \
                 themes/chartthemeicy_p.h \
                 themes/chartthemegrayscale_p.h \
                 themes/chartthemescientific_p.h \
                 themes/chartthemevanilla_p.h \
-                themes/chartthemebluecerulean_p.h
+                themes/chartthemebluecerulean_p.h \
+                themes/chartthemelight_p.h
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             INCLUDEPATH += linechart \
                 barchart \
                 themes \
                 .
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target \
                 public_headers
             install_build_public_headers.name = bild_public_headers
             install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_public_headers.input = PUBLIC_HEADERS
             install_build_public_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PUBLIC_HEADER_DIR
             install_build_public_headers.CONFIG += target_predeps \
                 no_link
             install_build_private_headers.name = bild_private_headers
             install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_private_headers.input = PRIVATE_HEADERS
             install_build_private_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PRIVATE_HEADER_DIR
             install_build_private_headers.CONFIG += target_predeps \
                 no_link
             QMAKE_EXTRA_COMPILERS += install_build_public_headers \
                 install_build_private_headers
             chartversion.target = qchartversion_p.h
             chartversion.commands = @echo \
                 "build_time" \
                 > \
                 $$chartversion.target;
             chartversion.depends = $$HEADERS \
                 $$SOURCES
             PRE_TARGETDEPS += qchartversion_p.h
             QMAKE_CLEAN += qchartversion_p.h
             QMAKE_EXTRA_TARGETS += chartversion
             unix:QMAKE_DISTCLEAN += -r \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR

src/themes/chartthemebluecerulean_p.h +6 -10

             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeBlueCerulean: public ChartTheme
             {
             public:
                 ChartThemeBlueCerulean() : ChartTheme(QChart::ChartThemeBlueCerulean)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0xc7e85b);
                     m_seriesColors << QRgb(0x5dbe9b);
                     m_seriesColors << QRgb(0x4fbef3);
                     generateSeriesGradients();
-                    // Background
+                    // No chart background, chart view specifies a background
-                    QLinearGradient backgroundGradient;
+                    // TODO: what if the chart is drawn on custom graphics scene instead of QChartView?
-                    backgroundGradient.setColorAt(0.0, QRgb(0x056188));
-                    backgroundGradient.setColorAt(1.0, QRgb(0x101a33));
-                    backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
-                    m_axisLinePen = QPen(QRgb(0x0f0f0f));
+                    m_axisLinePen = QPen(QRgb(0xf7f7ff));
                     m_axisLinePen.setWidth(2);
-                    m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
+                    m_axisLabelBrush = QBrush(QRgb(0xf7f7ff));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
                     m_backgroundShades = BackgroundShadesNone;
-                    m_gridLinePen = QPen(QRgb(0x0f0f0f));
+                    m_gridLinePen = QPen(QRgb(0xf7f7ff));
-                    m_gridLinePen.setWidth(2);
+                    m_gridLinePen.setWidth(1);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/themes/chartthemedefault_p.h +1 -1

             #include "charttheme_p.h"
             #ifdef Q_OS_WIN
             #include <windows.h>
             #include <stdio.h>
             #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeDefault: public ChartTheme
             {
             public:
                 ChartThemeDefault():ChartTheme(QChart::ChartThemeDefault)
                 {
             #ifdef Q_OS_WIN
                     // TODO: use theme specific window frame color as a series base color (it would give more
                     // variation to the base colors in addition to the blue and black used now)
                     // TODO: COLOR_WINDOWTEXT for text color?
                     // TODO: COLOR_INFOTEXT for tooltip text color?
                     // TODO: COLOR_INFOBK for tooltip background color?
                     // First series base color from COLOR_HIGHLIGHT
                     DWORD colorHighlight;
                     colorHighlight = GetSysColor(COLOR_HIGHLIGHT);
                     m_seriesColors.append(QColor(GetRValue(colorHighlight),
                                                  GetGValue(colorHighlight),
                                                  GetBValue(colorHighlight)));
                     // Second series base color from COLOR_WINDOWFRAME
                     DWORD colorWindowFrame;
                     colorWindowFrame = GetSysColor(COLOR_WINDOWFRAME);
                     m_seriesColors.append(QColor(GetRValue(colorWindowFrame),
                                                  GetGValue(colorWindowFrame),
                                                  GetBValue(colorWindowFrame)));
                     // Third series base color from the middle of the COLOR_ACTIVECAPTION /
                     // COLOR_GRADIENTACTIVECAPTION gradient
                     DWORD colorGradientActiveCaptionLeft;
                     colorGradientActiveCaptionLeft = GetSysColor(COLOR_ACTIVECAPTION);
                     DWORD colorGradientActiveCaptionRight;
                     colorGradientActiveCaptionRight = GetSysColor(COLOR_GRADIENTACTIVECAPTION);
                     QLinearGradient g;
                     QColor start = QColor(GetRValue(colorGradientActiveCaptionLeft),
                                           GetGValue(colorGradientActiveCaptionLeft),
                                           GetBValue(colorGradientActiveCaptionLeft));
                     g.setColorAt(0.0, start);
                     QColor end = QColor(GetRValue(colorGradientActiveCaptionRight),
                                           GetGValue(colorGradientActiveCaptionRight),
                                           GetBValue(colorGradientActiveCaptionRight));
                     g.setColorAt(1.0, end);
                     m_seriesColors.append(colorAt(g, 0.5));
                     // Generate gradients from the base colors
                     generateSeriesGradients();
                     // Background fill color from COLOR_WINDOW
                     QLinearGradient backgroundGradient;
                     DWORD colorWindow;
                     colorWindow = GetSysColor(COLOR_WINDOW);
                     backgroundGradient.setColorAt(0.0, QColor(GetRValue(colorWindow),
                                                               GetGValue(colorWindow),
                                                               GetBValue(colorWindow)));
                     backgroundGradient.setColorAt(1.0, QColor(GetRValue(colorWindow),
                                                               GetGValue(colorWindow),
                                                               GetBValue(colorWindow)));
                     // Axes and other
                     m_masterFont = QFont();
                     m_masterFont.setPointSizeF(10.0);
                     m_axisLinePen = QPen(Qt::black);
                     m_axisLinePen.setWidth(2);
                     m_axisLabelBrush = QBrush(Qt::black);
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
                     m_backgroundShadesBrush = QBrush(QColor(0xaf, 0xaf, 0xaf, 0x50));
                     m_backgroundShades = BackgroundShadesVertical;
             #elif defined(Q_OS_LINUX)
                     // TODO: replace this dummy theme with linux specific theme
                     m_seriesColors << QRgb(0x60a6e6);
                     m_seriesColors << QRgb(0x92ca66);
                     m_seriesColors << QRgb(0xeba85f);
                     m_seriesColors << QRgb(0xfc5751);
                     generateSeriesGradients();
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xe9e9e9));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_backgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_masterFont.setPointSizeF(10.0);
                     m_axisLinePen = QPen(Qt::black);
                     m_axisLinePen.setWidth(2);
                     m_axisLabelBrush = QBrush(Qt::black);
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
                     m_backgroundShadesBrush = QBrush(QColor(0xaf, 0xaf, 0xaf, 0x50));
                     m_backgroundShades = BackgroundShadesVertical;
             #elif defined(Q_OS_MAC)
                     // TODO: replace this dummy theme with OSX specific theme
                     m_seriesColors << QRgb(0x60a6e6);
                     m_seriesColors << QRgb(0x92ca66);
                     m_seriesColors << QRgb(0xeba85f);
                     m_seriesColors << QRgb(0xfc5751);
                     generateSeriesGradients();
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xe9e9e9));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_masterFont.setPointSizeF(10.0);
                     m_axisLinePen = QPen(Qt::black);
                     m_axisLinePen.setWidth(2);
                     m_axisLabelBrush = QBrush(Qt::black);
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
                     m_backgroundShadesBrush = QBrush(QColor(0xaf, 0xaf, 0xaf, 0x50));
                     m_backgroundShades = BackgroundShadesVertical;
             #else
                     // TODO: replace this dummy theme with generic (not OS specific) theme
                     m_seriesColors << QRgb(0x60a6e6);
                     m_seriesColors << QRgb(0x92ca66);
                     m_seriesColors << QRgb(0xeba85f);
                     m_seriesColors << QRgb(0xfc5751);
                     generateSeriesGradients();
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xafafaf));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_backgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_masterFont.setPointSizeF(10.0);
                     m_axisLinePen = QPen(Qt::black);
                     m_axisLinePen.setWidth(2);
                     m_axisLabelBrush = QBrush(Qt::black);
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
                     m_backgroundShadesBrush = QBrush(QColor(0xaf, 0xaf, 0xaf, 0x50));
                     m_backgroundShades = BackgroundShadesVertical;
             #endif
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/themes/chartthemegrayscale_p.h +2 -1

             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeGrayscale: public ChartTheme
             {
             public:
                 ChartThemeGrayscale():ChartTheme(QChart::ChartThemeGrayscale)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0x869299);
                     m_seriesColors << QRgb(0xa5bdcc);
                     m_seriesColors << QRgb(0xe8fffc);
                     m_seriesColors << QRgb(0xccc2c2);
                     generateSeriesGradients();
                     // Background
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xe0e3e5));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_axisLinePen = QPen(QRgb(0x0f0f0f));
                     m_axisLinePen.setWidth(2);
                     m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
+                    m_backgroundShades = BackgroundShadesNone;
                     m_gridLinePen = QPen(QRgb(0x0f0f0f));
                     m_gridLinePen.setWidth(2);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/themes/chartthemeicy_p.h +2 -1

             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeIcy: public ChartTheme
             {
             public:
                 ChartThemeIcy():ChartTheme(QChart::ChartThemeIcy)
                 {
                     // Series
                     m_seriesColors << QRgb(0x0d2673);
                     m_seriesColors << QRgb(0x2685bf);
                     m_seriesColors << QRgb(0x3dadd9);
                     m_seriesColors << QRgb(0x62c3d9);
                     generateSeriesGradients();
                     // Background
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xebebeb));
                     backgroundGradient.setColorAt(1.0, QRgb(0xf8f9fb));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_axisLinePen = QPen(QRgb(0x0f0f0f));
                     m_axisLinePen.setWidth(2);
                     m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
+                    m_backgroundShades = BackgroundShadesNone;
                     m_gridLinePen = QPen(QRgb(0x0f0f0f));
                     m_gridLinePen.setWidth(2);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/themes/chartthemescientific_p.h +1 -1

             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeScientific: public ChartTheme
             {
             public:
                 ChartThemeScientific():ChartTheme(QChart::ChartThemeScientific)
                 {
                     // Series
                     m_seriesColors << QRgb(0xFFAD00);
                     m_seriesColors << QRgb(0x596A75);
                     m_seriesColors << QRgb(0x202020);
                     m_seriesColors << QRgb(0x474747);
                     generateSeriesGradients();
                     // Background
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xfffefc));
                     backgroundGradient.setColorAt(1.0, QRgb(0xfffefc));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_axisLinePen = QPen(QRgb(0x0f0f0f));
                     m_axisLinePen.setWidth(2);
                     m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
             //        m_backgroundShadesBrush = QBrush(QColor(0x0f, 0x0f, 0x0f, 0x80));
                     m_backgroundShadesBrush = QBrush(QColor(0xff, 0xad, 0x00, 0x50));
                     m_backgroundShades = BackgroundShadesHorizontal;
                     m_gridLinePen = QPen(QRgb(0x0f0f0f));
                     m_gridLinePen.setWidth(2);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/themes/chartthemevanilla_p.h +2 -1

             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeVanilla: public ChartTheme
             {
             public:
                 ChartThemeVanilla():ChartTheme(QChart::ChartThemeVanilla)
                 {
                     // Series
                     m_seriesColors << QRgb(0xd9c574);
                     m_seriesColors << QRgb(0xd6a896);
                     m_seriesColors << QRgb(0xa0a071);
                     m_seriesColors << QRgb(0xd2d234);
                     m_seriesColors << QRgb(0x88723a);
                     generateSeriesGradients();
                     // Background
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xfbf9f1));
                     backgroundGradient.setColorAt(1.0, QRgb(0xf5f0dc));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_axisLinePen = QPen(QRgb(0x0f0f0f));
                     m_axisLinePen.setWidth(2);
                     m_axisLabelBrush = QBrush(QRgb(0xa0a071));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
+                    m_backgroundShades = BackgroundShadesNone;
                     m_gridLinePen = QPen(QRgb(0x0f0f0f));
                     m_gridLinePen.setWidth(2);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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