HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r577:d1f00b1c0524

Fixed colors in spline

Marek Rosa -

r577:d1f00b1c0524

parent child

Context file:

r577:d1f00b1c0524

Collapse all files

examples/splinechart/splinewidget.cpp +18 -6

             #include "splinewidget.h"
             #include "qchartview.h"
             #include "qlineseries.h"
             #include <QGridLayout>
             #include <QPushButton>
             #include "qchartaxis.h"
             #include <qmath.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             SplineWidget::SplineWidget(QWidget *parent)
                 : QWidget(parent)
             {
             //    qsrand(time(NULL));
                 //! [1]
                 //create QSplineSeries
-                series = new QSplineSeries;
+                series = new QSplineSeries(this);
                 //! [1]
                 //! [2]
                 // customize the series presentation settings
                 QPen seriesPen(Qt::blue);
                 seriesPen.setWidth(3);
-                series->setPen(seriesPen);
+            //    series->setPen(seriesPen);
                 //! [2]
                 //! [add points to series]
                 //add data points to the series
                 series->add(QPointF(150, 100));
                 series->add(QPointF(200, 130));
                 series->add(QPointF(250, 120));
                 series->add(QPointF(300, 140));
                 series->add(QPointF(350, 160));
                 //! [add points to series]
-            //    series->add(QPointF(400, 120));
-            //    series->add(QPointF(450, 150));
+                QSplineSeries* series2 = new QSplineSeries;
-            //    series->add(QPointF(500, 145));
-            //    series->add(QPointF(550, 170));
+                series2->add(QPointF(400, 120));
+                series2->add(QPointF(450, 150));
+                series2->add(QPointF(500, 145));
+                series2->add(QPointF(550, 170));
             //    series->add(QPointF(600, 190));
             //    series->add(QPointF(650, 210));
             //    series->add(QPointF(700, 190));
             //    series->add(QPointF(750, 180));
             //    series->add(QPointF(800, 170));
+                QSplineSeries* series3 = new QSplineSeries;
+                    series3->add(QPointF(600, 190));
+                    series3->add(QPointF(650, 210));
+                    series3->add(QPointF(700, 190));
+                    series3->add(QPointF(750, 180));
+                    series3->add(QPointF(800, 170));
                 //! [3]
                 // create chart view
                 QChartView* chart = new QChartView;
                 chart->addSeries(series);
+                chart->addSeries(series2);
+                chart->addSeries(series3);
                 chart->setChartTitle("Spline chart example");
                 chart->axisX()->setMax(1500);
                 chart->axisY()->setMax(500);
                 chart->setMinimumSize(800,600);
                 //! [3]
                 //! [4]
                 //add new data point button
                 QPushButton* addButton = new QPushButton("Add new point");
                 connect(addButton, SIGNAL(clicked()), this, SLOT(addNewPoint()));
                 // remove the last data point in the series
                 QPushButton* removeButton = new QPushButton("Remove point");
                 connect(removeButton, SIGNAL(clicked()), this, SLOT(removePoint()));
                 //! [4]
                 //! [5]
                 //butttons layout
                 QVBoxLayout* buttonsLayout = new QVBoxLayout;
                 buttonsLayout->addWidget(addButton);
                 buttonsLayout->addWidget(removeButton);
                 buttonsLayout->addStretch();
                 QGridLayout* mainLayout = new QGridLayout;
                 mainLayout->addWidget(chart, 1, 0);
                 mainLayout->addLayout(buttonsLayout, 1, 1);
                 setLayout(mainLayout);
                 //! [5]
             }
             //! [add point]
             void SplineWidget::addNewPoint()
             {
                 if (series->count() > 0)
                     series->add(QPointF(series->x(series->count() - 1) + 40 + qrand()%40, qAbs(series->y(series->count() - 1) - 50 + qrand()%100)));
                 else
                     series->add(QPointF(50, 50 + qrand()%50));
             }
             //! [add point]
             //! [remove point]
             void SplineWidget::removePoint()
             {
                 if (series->count() > 0)
                     series->remove(QPointF(series->x(series->count() - 1), series->y(series->count() - 1)));
             }
             //! [remove point]
             SplineWidget::~SplineWidget()
             {
             }

src/charttheme.cpp 0 -1

             #include "charttheme_p.h"
             #include "qchart.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"
             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();
                     default:
                         return new ChartThemeDefault();
                 }
             }
             void ChartTheme::decorate(QChart* chart)
             {
                 chart->setChartBackgroundBrush(m_backgroundGradient);
                 chart->setChartTitleFont(m_masterFont);
             }
             void ChartTheme::decorate(QLegend* legend)
             {
                 legend->setBackgroundBrush(m_backgroundGradient);
             }
             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/splinechart/splinechartitem.cpp +20 -20

             #include "splinechartitem_p.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             SplineChartItem::SplineChartItem(QSplineSeries* series, QGraphicsItem *parent) :
             XYChartItem(series, parent),
             m_series(series)
             {
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(series,SIGNAL(updated()),this,SLOT(handleUpdated()));
                 handleUpdated();
             }
             QRectF SplineChartItem::boundingRect() const
             {
                 return m_rect;
             }
             QPainterPath SplineChartItem::shape() const
             {
                 return m_path;
             }
             QPointF SplineChartItem::calculateGeometryControlPoint(int index) const
             {
                 return XYChartItem::calculateGeometryPoint(m_series->controlPoint(index));
             }
             void SplineChartItem::setLayout(QVector<QPointF>& points)
             {
                 if(points.size()==0)
                 {
                     XYChartItem::setLayout(points);
                     return;
                 }
                 QPainterPath splinePath;
                 const QPointF& point = points.at(0);
                 splinePath.moveTo(point);
                 for (int i = 0; i < points.size() - 1; i++)
                 {
                     const QPointF& point = points.at(i + 1);
                     splinePath.cubicTo(calculateGeometryControlPoint(2 * i), calculateGeometryControlPoint(2 * i + 1), point);
                 }
                 prepareGeometryChange();
                 m_path = splinePath;
                 m_rect = splinePath.boundingRect();
                 XYChartItem::setLayout(points);
             }
             //handlers
             void SplineChartItem::handleUpdated()
             {
-                //m_items.setVisible(m_series->pointsVisible());
                 m_pen = m_series->pen();
                 update();
             }
             //painter
             void SplineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(widget);
                 Q_UNUSED(option);
                 painter->save();
                 painter->setClipRect(clipRect());
-                painter->setPen(m_pen);
+            //    painter->setPen(m_pen);
+                painter->setPen(m_series->pen());
                 painter->drawPath(m_path);
-                const QVector<QPointF> points =  XYChartItem::points();
+            //    const QVector<QPointF> points =  XYChartItem::points();
-                for (int i = 0; i < points.size() - 1; i++)
+            //    for (int i = 0; i < points.size() - 1; i++)
+            //    {
-                    painter->setPen(Qt::red);
+            //        painter->setPen(Qt::red);
-                    painter->drawEllipse(points[i], 2, 2);
+            //        painter->drawEllipse(points[i], 2, 2);
-                    painter->setPen(Qt::blue);
+            //        painter->setPen(Qt::blue);
-                    //        painter->drawLine(m_series->at(i), m_series->controlPoint(2 * i));
+            //        //        painter->drawLine(m_series->at(i), m_series->controlPoint(2 * i));
-                    //        painter->drawLine(m_series->at(i + 1), m_series->controlPoint(2 * i + 1));
+            //        //        painter->drawLine(m_series->at(i + 1), m_series->controlPoint(2 * i + 1));
-                    //        painter->drawEllipse(calculateGeometryControlPoint(2 * i), 4, 4);
+            //        //        painter->drawEllipse(calculateGeometryControlPoint(2 * i), 4, 4);
-                    //        painter->drawEllipse(calculateGeometryControlPoint(2 * i + 1), 4, 4);
+            //        //        painter->drawEllipse(calculateGeometryControlPoint(2 * i + 1), 4, 4);
+            //    }
-                if (points.count() > 0)
+            //    if (points.count() > 0)
+            //    {
-                    painter->setPen(Qt::red);
+            //        painter->setPen(Qt::red);
-                    painter->drawEllipse(points[points.count() - 1], 2, 2);
+            //        painter->drawEllipse(points[points.count() - 1], 2, 2);
+            //    }
                 painter->restore();
             }
             #include "moc_splinechartitem_p.cpp"
             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