HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r494:43cfc69dc4bb

Adding list of series gradients to theme.

Jani Honkonen -

r494:43cfc69dc4bb

parent child

Context file:

r494:43cfc69dc4bb

Collapse all files

src/themes/chartthemedefault_p.h created 644 +26 0

@@ -0,0 +1,26
	1	#include "charttheme_p.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4
	5	class ChartThemeDefault: public ChartTheme
	6	{
	7	public:
	8	ChartThemeDefault():ChartTheme(QChart::ChartThemeDefault)
	9	{
	10	m_seriesColors << QRgb(0xff000000);
	11	m_seriesColors << QRgb(0xff707070);
	12
	13	QLinearGradient g1;
	14	g1.setColorAt(0.0, m_seriesColors.at(0));
	15	g1.setColorAt(1.0, m_seriesColors.at(1));
	16	m_seriesGradients << g1;
	17
	18	QLinearGradient backgroundGradient;
	19	backgroundGradient.setColorAt(0.0, QRgb(0xffffffff));
	20	backgroundGradient.setColorAt(1.0, QRgb(0xffafafaf));
	21	backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
	22	m_backgroundGradient = backgroundGradient;
	23	}
	24	};
	25
	26	QTCOMMERCIALCHART_END_NAMESPACE

src/charttheme.cpp +78 -89

             #include "splinechartitem_p.h"
             //themes
+            #include "chartthemedefault_p.h"
             #include "chartthemevanilla_p.h"
             #include "chartthemeicy_p.h"
             #include "chartthemegrayscale_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            /* TODO
-                case QChart::ChartThemeUnnamed1:
-                    m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xff3fa9f5)), 2));
-                    m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xff7AC943)), 2));
-                    m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xffFF931E)), 2));
-                    m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xffFF1D25)), 2));
-                    m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xffFF7BAC)), 2));
-                    m_gradientStartColor = QColor(QRgb(0xfff3dc9e));
-                    m_gradientEndColor = QColor(QRgb(0xffafafaf));
-            */
             ChartTheme::ChartTheme(QChart::ChartTheme id)
             {
                 m_id = id;
-                m_seriesColor.append(QRgb(0xff000000));
-                m_seriesColor.append(QRgb(0xff707070));
-                m_gradientStartColor = QColor(QRgb(0xffffffff));
-                m_gradientEndColor = QColor(QRgb(0xffafafaf));
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
             }
             ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme)
             {
                 switch(theme) {
-                    case QChart::ChartThemeDefault:
-                        return new ChartTheme();
                     case QChart::ChartThemeVanilla:
                         return new ChartThemeVanilla();
                     case QChart::ChartThemeIcy:
                         return new ChartThemeGrayscale();
                     case QChart::ChartThemeScientific:
                         return new ChartThemeScientific();
+                    default:
+                        return new ChartThemeDefault();
                 }
             }
             void ChartTheme::decorate(QChart* chart)
             {
-                QLinearGradient backgroundGradient;
+                chart->setChartBackgroundBrush(m_backgroundGradient);
-                backgroundGradient.setColorAt(0.0, m_gradientStartColor);
-                backgroundGradient.setColorAt(1.0, m_gradientEndColor);
-                backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                chart->setChartBackgroundBrush(backgroundGradient);
             }
             //TODO helper to by removed later
             void ChartTheme::decorate(ChartItem* item, QSeries* series,int count)
                 if(pen != series->pen()){
                    item->setPen(series->pen());
                 }else{
-                    pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
+                    pen.setColor(m_seriesColors.at(count%m_seriesColors.size()));
                     pen.setWidthF(2);
                     item->setPen(pen);
                 }
                 if(brush != series->brush()){
                    item->setBrush(series->brush());
                 }else{
-                   QBrush brush(m_seriesColor.at(count%m_seriesColor.size()));
+                   QBrush brush(m_seriesColors.at(count%m_seriesColors.size()));
                    item->setBrush(brush);
                 }
             }
                     item->setLinePen(series->pen());
                     return;
                 }
-                pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
+                pen.setColor(m_seriesColors.at(count%m_seriesColors.size()));
                 pen.setWidthF(2);
                 item->setLinePen(pen);
             }
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<series->barsetCount(); i++) {
-                    sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
+                    sets.at(i)->setBrush(QBrush(m_seriesColors.at(i%m_seriesColors.count())));
                 }
             }
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<series->barsetCount(); i++) {
-                    sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
+                    sets.at(i)->setBrush(QBrush(m_seriesColors.at(i%m_seriesColors.count())));
                 }
             }
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<series->barsetCount(); i++) {
-                    sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
+                    sets.at(i)->setBrush(QBrush(m_seriesColors.at(i%m_seriesColors.count())));
                 }
             }
                 Q_ASSERT(item);
                 Q_ASSERT(series);
-                QColor color = m_seriesColor.at(count % m_seriesColor.size());
+                QColor color = m_seriesColors.at(count % m_seriesColors.size());
                 // TODO: define alpha in the theme? or in the series?
                 //color.setAlpha(120);
                 item->setPen(pen);
             }
-            void ChartTheme::decorate(PiePresenter* item, QPieSeries* series, int /*count*/)
+            void ChartTheme::decorate(PiePresenter* item, QPieSeries* series, int count)
             {
                 // create a list of slice colors based on current theme
                 int i = 0;
                 QList<QColor> colors;
+                bool toggle = false;
                 while (colors.count() < series->count()) {
-                    // get base color
+                    qreal pos = (qreal) colors.count() / (qreal) series->count();
-                    QColor c = m_seriesColor[i++];
+                    if (toggle)
-                    i = i % m_seriesColor.count();
+                        pos += 0.5;
+                    toggle = !toggle;
+                    if (pos > 1.0)
+                        pos = pos - 1.0;
-                    // dont use black colors... looks bad
+                    //qreal pos = (qreal) (qrand() % series->count()) / (qreal) series->count();
-                    if (c == Qt::black)
-                        continue;
-                    // by default use the "raw" theme color
+                    QColor c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), pos);
-                    if (!colors.contains(c)) {
-                        colors << c;
-                        continue;
-                    // ...ok we need to generate something that looks like the same color
-                    // but different lightness
-                    int tryCount = 0;
-                    while (tryCount++ < 100) {
-                        // find maximum value we can raise the lightness
-                        int lMax = 255;
-                        if (lMax > 255 - c.red())
-                            lMax = 255 - c.red();
-                        if (lMax > 255 - c.green())
-                            lMax = 255 - c.green();
-                        if (lMax > 255 - c.blue())
-                            lMax = 255 - c.blue();
-                        // find maximum value we can make it darker
-                        int dMax = 255;
-                        if (dMax > c.red())
-                            dMax = c.red();
-                        if (dMax > c.green())
-                            dMax = c.green();
-                        if (dMax > c.blue())
-                            dMax = c.blue();
-                        int max = dMax + lMax;
-                        if (max == 0) {
-                            // no room to make color lighter or darker...
-                            qDebug() << "cannot generate a color for pie!";
-                            break;
-                        // generate random color
-                        int r = c.red() - dMax;
-                        int g = c.green() - dMax;
-                        int b = c.blue() - dMax;
-                        int d = qrand() % max;
-                        c.setRgb(r+d, g+d, b+d);
-                        // found a unique color?
-                        if (!colors.contains(c))
-                            break;
-                    qDebug() << "generated a color for pie" << c;
                     colors << c;
                 }
             }
-            void ChartTheme::decorate(QChartAxis* axis,AxisItem* item)
+            void ChartTheme::decorate(QChartAxis* axis, AxisItem* item)
             {
                 //TODO: dummy defults for now
                 axis->setLabelsBrush(Qt::black);
                 if(pen != series->pen()){
                     item->setLinePen(series->pen());
                 }else{
-                    pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
+                    pen.setColor(m_seriesColors.at(count%m_seriesColors.size()));
                     pen.setWidthF(series->pen().widthF());
                     item->setLinePen(series->pen());
                 }
-            //    QColor color = m_seriesColor.at(count % m_seriesColor.size());
+            //    QColor color = m_seriesColors.at(count % m_seriesColors.size());
                 // TODO: define alpha in the theme? or in the series?
                 //color.setAlpha(120);
             //    presenter->m_markerPen = pen;
             }
+            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 +8 -4

             #include "qchartglobal.h"
             #include "qchart.h"
             #include <QColor>
+            #include <QGradientStops>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 void decorate(QChartAxis* axis,AxisItem* item);
                 void decorate(SplineChartItem* presenter, QSplineSeries* series, int count);
+            public: // utils
+                static QColor colorAt(const QColor &start, const QColor &end, qreal pos);
+                static QColor colorAt(const QGradient &gradient, qreal pos);
             protected:
                 QChart::ChartTheme m_id;
-                QColor m_gradientStartColor;
+                QList<QColor> m_seriesColors;
-                QColor m_gradientEndColor;
+                QList<QGradient> m_seriesGradients;
-                QList<QColor> m_seriesColor;
+                QLinearGradient m_backgroundGradient;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/src.pro +2 -1

             include(scatterseries/scatter.pri)
             include(splinechart/splinechart.pri)
-            THEMES += themes/chartthemeicy_p.h \
+            THEMES += themes/chartthemedefault_p.h \
+                themes/chartthemeicy_p.h \
                 themes/chartthemegrayscale_p.h \
                 themes/chartthemescientific_p.h \
                 themes/chartthemevanilla_p.h

src/themes/chartthemegrayscale_p.h +24 -6

@@ -7,13 +7,31 class ChartThemeGrayscale: public ChartTheme
7	public:	7	public:
8	ChartThemeGrayscale():ChartTheme(QChart::ChartThemeGrayscale)	8	ChartThemeGrayscale():ChartTheme(QChart::ChartThemeGrayscale)
9	{	9	{
10	m_seriesColor.~~append~~(QRgb(0xFF869299));	10	m_seriesColors << QRgb(0xFF869299);
11	m_seriesColor.~~append~~(QRgb(0xFFA5BDCC));	11	m_seriesColors << QRgb(0xFFA5BDCC);
12	m_seriesColor.~~append~~(QRgb(0xFFE8FFFC));	12	m_seriesColors << QRgb(0xFFE8FFFC);
13	m_seriesColor.~~append~~(QRgb(0xFFCCC2C2));	13	m_seriesColors << QRgb(0xFFCCC2C2);
14		14
15	m_gradientStartColor = QColor(QRgb(0xffffffff));	15	QLinearGradient g1;
16	m_gradientEndColor = QColor(QRgb(0xffafafaf));	16	g1.setColorAt(0.0, m_seriesColors.at(0));
		17	g1.setColorAt(1.0, m_seriesColors.at(1));
		18	m_seriesGradients << g1;
		19
		20	QLinearGradient g2;
		21	g2.setColorAt(0.0, m_seriesColors.at(1));
		22	g2.setColorAt(1.0, m_seriesColors.at(2));
		23	m_seriesGradients << g2;
		24
		25	QLinearGradient g3;
		26	g3.setColorAt(0.0, m_seriesColors.at(2));
		27	g3.setColorAt(1.0, m_seriesColors.at(3));
		28	m_seriesGradients << g3;
		29
		30	QLinearGradient backgroundGradient;
		31	backgroundGradient.setColorAt(0.0, QRgb(0xffffffff));
		32	backgroundGradient.setColorAt(1.0, QRgb(0xffafafaf));
		33	backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
		34	m_backgroundGradient = backgroundGradient;
17	}	35	}
18	};	36	};
19		37

src/themes/chartthemeicy_p.h +24 -6

@@ -7,13 +7,31 class ChartThemeIcy: public ChartTheme
7	public:	7	public:
8	ChartThemeIcy():ChartTheme(QChart::ChartThemeIcy)	8	ChartThemeIcy():ChartTheme(QChart::ChartThemeIcy)
9	{	9	{
10	m_seriesColor.~~append~~(QRgb(0xFF0D2673));	10	m_seriesColors << QRgb(0xFF0D2673);
11	m_seriesColor.~~append~~(QRgb(0xFF2685BF));	11	m_seriesColors << QRgb(0xFF2685BF);
12	m_seriesColor.~~append~~(QRgb(0xFF3DADD9));	12	m_seriesColors << QRgb(0xFF3DADD9);
13	m_seriesColor.~~append~~(QRgb(0xFF62C3D9));	13	m_seriesColors << QRgb(0xFF62C3D9);
14		14
15	m_gradientStartColor = QColor(QRgb(0xffBDE3F2));	15	QLinearGradient g1;
16	m_gradientEndColor = QColor(QRgb(0xffafafaf));	16	g1.setColorAt(0.0, m_seriesColors.at(0));
		17	g1.setColorAt(1.0, m_seriesColors.at(1));
		18	m_seriesGradients << g1;
		19
		20	QLinearGradient g2;
		21	g2.setColorAt(0.0, m_seriesColors.at(1));
		22	g2.setColorAt(1.0, m_seriesColors.at(2));
		23	m_seriesGradients << g2;
		24
		25	QLinearGradient g3;
		26	g3.setColorAt(0.0, m_seriesColors.at(2));
		27	g3.setColorAt(1.0, m_seriesColors.at(3));
		28	m_seriesGradients << g3;
		29
		30	QLinearGradient backgroundGradient;
		31	backgroundGradient.setColorAt(0.0, QRgb(0xffBDE3F2));
		32	backgroundGradient.setColorAt(1.0, QRgb(0xffafafaf));
		33	backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
		34	m_backgroundGradient = backgroundGradient;
17	}	35	}
18	};	36	};
19		37

src/themes/chartthemescientific_p.h +24 -6

@@ -7,13 +7,31 class ChartThemeScientific: public ChartTheme
7	public:	7	public:
8	ChartThemeScientific():ChartTheme(QChart::ChartThemeScientific)	8	ChartThemeScientific():ChartTheme(QChart::ChartThemeScientific)
9	{	9	{
10	m_seriesColor.~~append~~(QRgb(0xFF000000));	10	m_seriesColors << QRgb(0xFF000000);
11	m_seriesColor.~~append~~(QRgb(0xFFFFAD00));	11	m_seriesColors << QRgb(0xFFFFAD00);
12	m_seriesColor.~~append~~(QRgb(0xFF596A75));	12	m_seriesColors << QRgb(0xFF596A75);
13	m_seriesColor.~~append~~(QRgb(0xFF474747));	13	m_seriesColors << QRgb(0xFF474747);
14		14
15	m_gradientStartColor = QColor(QRgb(0xffafafaf));	15	QLinearGradient g1;
16	m_gradientEndColor = QColor(QRgb(0xffafafaf));	16	g1.setColorAt(0.0, m_seriesColors.at(0));
		17	g1.setColorAt(1.0, m_seriesColors.at(1));
		18	m_seriesGradients << g1;
		19
		20	QLinearGradient g2;
		21	g2.setColorAt(0.0, m_seriesColors.at(1));
		22	g2.setColorAt(1.0, m_seriesColors.at(2));
		23	m_seriesGradients << g2;
		24
		25	QLinearGradient g3;
		26	g3.setColorAt(0.0, m_seriesColors.at(2));
		27	g3.setColorAt(1.0, m_seriesColors.at(3));
		28	m_seriesGradients << g3;
		29
		30	QLinearGradient backgroundGradient;
		31	backgroundGradient.setColorAt(0.0, QRgb(0xffafafaf));
		32	backgroundGradient.setColorAt(1.0, QRgb(0xffafafaf));
		33	backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
		34	m_backgroundGradient = backgroundGradient;
17	}	35	}
18	};	36	};
19		37

src/themes/chartthemevanilla_p.h +31 -8

@@ -7,14 +7,37 class ChartThemeVanilla: public ChartTheme
7	public:	7	public:
8	ChartThemeVanilla():ChartTheme(QChart::ChartThemeVanilla)	8	ChartThemeVanilla():ChartTheme(QChart::ChartThemeVanilla)
9	{	9	{
10	m_seriesColor.~~append~~(QColor(217, 197, 116));	10	m_seriesColors << QColor(217, 197, 116);
11	m_seriesColor.~~append~~(QColor(214, 168, 150));	11	m_seriesColors << QColor(214, 168, 150);
12	m_seriesColor.~~append~~(QColor(160, 160, 113));	12	m_seriesColors << QColor(160, 160, 113);
13	m_seriesColor.~~append~~(QColor(210, 210, 52));	13	m_seriesColors << QColor(210, 210, 52);
14	m_seriesColor.~~append~~(QColor(136, 114, 58));	14	m_seriesColors << QColor(136, 114, 58);
15		15
16	m_gradientStartColor = QColor(QRgb(0xff9d844d));	16	QLinearGradient g1;
17	m_gradientEndColor = QColor(QRgb(0xffafafaf));	17	g1.setColorAt(0.0, m_seriesColors.at(0));
		18	g1.setColorAt(1.0, m_seriesColors.at(1));
		19	m_seriesGradients << g1;
		20
		21	QLinearGradient g2;
		22	g2.setColorAt(0.0, m_seriesColors.at(1));
		23	g2.setColorAt(1.0, m_seriesColors.at(2));
		24	m_seriesGradients << g2;
		25
		26	QLinearGradient g3;
		27	g3.setColorAt(0.0, m_seriesColors.at(2));
		28	g3.setColorAt(1.0, m_seriesColors.at(3));
		29	m_seriesGradients << g3;
		30
		31	QLinearGradient g4;
		32	g4.setColorAt(0.0, m_seriesColors.at(3));
		33	g4.setColorAt(1.0, m_seriesColors.at(4));
		34	m_seriesGradients << g4;
		35
		36	QLinearGradient backgroundGradient;
		37	backgroundGradient.setColorAt(0.0, QRgb(0xff9d844d));
		38	backgroundGradient.setColorAt(1.0, QRgb(0xffafafaf));
		39	backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
		40	m_backgroundGradient = backgroundGradient;
18	}	41	}
19	};	42	};
20		43

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