HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r661:4756f59398b8

Bar series to use theme base colors. Pie brush minor fix....

Tero Ahola -

r661:4756f59398b8

parent child

Context file:

r661:4756f59398b8

Collapse all files

demos/chartthemes/main.cpp +5 -1

             #include <qchartview.h>
             #include <qpieseries.h>
             #include <qpieslice.h>
+            #include <qbarseries.h>
             #include <qpercentbarseries.h>
+            #include <qstackedbarseries.h>
             #include <qbarset.h>
             #include <QGridLayout>
             #include <QFormLayout>
                         // TODO: categories
                         for (int i(0); i < valueCount; i++)
                             categories << QString::number(i);
-                        QPercentBarSeries* series = new QPercentBarSeries(categories, chart);
+            //            QBarSeries* series = new QBarSeries(categories, chart);
+            //            QPercentBarSeries* series = new QPercentBarSeries(categories, chart);
+                        QStackedBarSeries* series = new QStackedBarSeries(categories, chart);
                         for (int i(0); i < m_dataTable.count(); i++) {
                             QBarSet *set = new QBarSet("Set" + QString::number(i));
                             foreach (Data data, m_dataTable[i])

src/barchart/barpresenter.cpp +1 0

                         // TODO: width settable per bar?
                         bar->resize(mBarWidth, barHeight);
+                        bar->setPen(mSeries->barsetAt(set)->pen());
                         bar->setBrush(mSeries->barsetAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;

src/barchart/stackedbarpresenter.cpp +1 0

                         Bar* bar = mBars.at(itemIndex);
                         bar->resize(mBarWidth, barHeight);
+                        bar->setPen(mSeries->barsetAt(set)->pen());
                         bar->setBrush(mSeries->barsetAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;

src/charttheme.cpp +22 -9

                 QPen pen;
                 QList<QBarSet*> sets = series->barSets();
-                for (int i(0); i < sets.count(); i++) {
+                qreal takeAtPos = 0.5;
-                    qreal pos = 0.5;
+                qreal step = 0.2;
-                    if (sets.count() > 1)
+                if (sets.count() > 1 ) {
-                        pos = (qreal) i / (qreal) (sets.count() - 1);
+                    step = 1.0 / (qreal) sets.count();
+                    if (sets.count() % m_seriesGradients.count())
+                        step *= m_seriesGradients.count();
+                    else
+                        step *= (m_seriesGradients.count() - 1);
+                }
-                    if (brush == sets.at(i)->brush() || force ) {
+                for (int i(0); i < sets.count(); i++) {
-                        QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
+                    int colorIndex = (index + i) % m_seriesGradients.count();
-                        sets.at(i)->setBrush(QBrush(c));
+                    if (i > 0 && i % m_seriesGradients.count() == 0) {
+                        // There is no dedicated base color for each sets, generate more colors
+                        takeAtPos += step;
+                        if (takeAtPos == 1.0)
+                            takeAtPos += step;
+                        takeAtPos -= (int) takeAtPos;
                     }
+                    qDebug() << "pos:" << takeAtPos;
+                    if (brush == sets.at(i)->brush() || force )
+                        sets.at(i)->setBrush(colorAt(m_seriesGradients.at(colorIndex), takeAtPos));
                     // Pick label color from the opposite end of the gradient.
                     // 0.3 as a boundary seems to work well.
-                    if (pos < 0.3)
+                    if (takeAtPos < 0.3)
                         sets.at(i)->setFloatingValuePen(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1));
                     else
                         sets.at(i)->setFloatingValuePen(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0));
                     }
                     // Get color for a slice from a gradient linearly, beginning from the start of the gradient
-                    qreal pos = (qreal) i / (qreal) series->count();
+                    qreal pos = (qreal) (i + 1) / (qreal) series->count();
                     if (brush == series->slices().at(i)->sliceBrush() || force) {
                         QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                         series->slices().at(i)->setSliceBrush(brushColor);

test/chartwidgettest/dataseriedialog.cpp +3 0

                 layout->addWidget(radio);
                 layout->addWidget(new QRadioButton("2"));
                 layout->addWidget(new QRadioButton("3"));
+                layout->addWidget(new QRadioButton("4"));
                 layout->addWidget(new QRadioButton("5"));
+                layout->addWidget(new QRadioButton("8"));
                 layout->addWidget(new QRadioButton("10"));
                 layout->addWidget(new QRadioButton("100"));
                 layout->addWidget(new QRadioButton("50"));
                 layout->addWidget(new QRadioButton("100"));
                 layout->addWidget(new QRadioButton("10000"));
+                layout->addWidget(new QRadioButton("100000"));
                 layout->addWidget(new QRadioButton("1000000"));
                 QGroupBox *groupBox = new QGroupBox("Row count");

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