HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r195:3f425cc48265

Scatter series marker visuals

Tero Ahola -

r195:3f425cc48265

parent child

Context file:

r195:3f425cc48265

Collapse all files

example/scatter/main.cpp +26 -8

             #include <QtGui/QApplication>
             #include <QMainWindow>
             #include <cmath>
             #include <qchartglobal.h>
             #include <qchartview.h>
             #include <qscatterseries.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 // Create chart widget
                 QChartView *chartWidget = new QChartView();
-                // Create scatter series with simple test data
+                // Add scatter series with simple test data
                 QScatterSeries *scatter = new QScatterSeries();
-                *scatter << QPointF(0.5, 2.0)
+                *scatter << QPointF(0.5, 5.0)
-                         << QPointF(1.0, 2.5)
+                         << QPointF(1.0, 4.5)
-                         << QPointF(1.5, 2.0)
+                         << QPointF(1.0, 5.5)
-                         << QPointF(2.0, 2.5);
+                         << QPointF(1.5, 5.0)
+                         << QPointF(2.0, 4.5)
+                         << QPointF(2.0, 5.5)
+                         << QPointF(2.5, 5.0);
                 chartWidget->addSeries(scatter);
-                // Add another scatter series with more complex data with random component
+                // Add another scatter series
+                // - more data with random component
                 QScatterSeries *scatter2 = new QScatterSeries();
-                for (qreal i(0.0); i < 20; i += 0.5)
+                for (qreal i(0.0); i < 20; i += 0.05) {
                     (*scatter2) << QPointF(i + (qreal)(rand() % 100) / 100.0,
-                                       i + (qreal)(rand() % 100) / 100.0);
+                                           i + (qreal)(rand() % 100) / 100.0);
+                }
                 chartWidget->addSeries(scatter2);
+                // Custom pen and brush (not those defined by the chart theme)
+                // - uses opaque color
+                QColor color("#2685BF");
+                color.setAlpha(80);
+                QBrush brush(Qt::SolidPattern);
+                brush.setColor(color);
+                scatter2->setMarkerBrush(brush);
+                QPen pen;
+                pen.setColor(color);
+                pen.setWidth(2);
+                scatter2->setMarkerPen(pen);
+                // use a rectangle as the marker shape
+                scatter2->setMarkerShape(QScatterSeries::MarkerShapeRectangle);
                 // Use the chart widget as the central widget
                 QMainWindow w;
                 w.resize(640, 480);
                 w.setCentralWidget(chartWidget);
                 w.show();
                 return a.exec();
             }

src/chartpresenter.cpp 0 -3

             #include "qchart.h"
             #include "qchartaxis.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             //series
             #include "barchartseries.h"
             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
             #include "qlinechartseries.h"
             #include "qpieseries.h"
             #include "qscatterseries.h"
             //items
             #include "axisitem_p.h"
             #include "bargroup.h"
             #include "stackedbargroup.h"
             #include "linechartitem_p.h"
             #include "percentbargroup.h"
             #include "linechartanimationitem_p.h"
             #include "piepresenter.h"
             #include "scatterpresenter_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartPresenter::ChartPresenter(QChart* chart,ChartDataSet* dataset):QObject(chart),
             m_chart(chart),
             m_dataset(dataset),
             m_chartTheme(0),
             m_axisXItem(new AxisItem(AxisItem::X_AXIS,m_chart)),
             m_axisYItem(new AxisItem(AxisItem::Y_AXIS,m_chart)),
             m_domainIndex(0),
             m_marginSize(0),
             m_rect(QRectF(QPoint(0,0),m_chart->size()))
             {
                 setChartTheme(QChart::ChartThemeDefault);
                 createConnections();
             }
             ChartPresenter::~ChartPresenter()
             {
             }
             void ChartPresenter::createConnections()
             {
                 QObject::connect(m_chart,SIGNAL(geometryChanged()),this,SLOT(handleGeometryChanged()));
                 QObject::connect(m_dataset,SIGNAL(seriesAdded(QChartSeries*)),this,SLOT(handleSeriesAdded(QChartSeries*)));
                 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),m_axisXItem,SLOT(handleGeometryChanged(const QRectF&)));
                 QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),m_axisXItem,SLOT(handleDomainChanged(const Domain&)));
                 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),m_axisYItem,SLOT(handleGeometryChanged(const QRectF&)));
                 QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),m_axisYItem,SLOT(handleDomainChanged(const Domain&)));
             }
             void ChartPresenter::handleGeometryChanged()
             {
                 m_rect = QRectF(QPoint(0,0),m_chart->size());
                 m_rect.adjust(m_marginSize,m_marginSize, -m_marginSize, -m_marginSize);
                 Q_ASSERT(m_rect.isValid());
                 emit geometryChanged(m_rect);
             }
             int ChartPresenter::margin() const
             {
                 return m_marginSize;
             }
             void ChartPresenter::setMargin(int margin)
             {
                 m_marginSize = margin;
             }
             void ChartPresenter::handleSeriesAdded(QChartSeries* series)
             {
                 qDebug() << " ChartPresenter::handleSeriesAdded";
                 switch(series->type())
                 {
                     case QChartSeries::SeriesTypeLine: {
                         QLineChartSeries* lineSeries = static_cast<QLineChartSeries*>(series);
                         LineChartItem* item = new LineChartAnimationItem(this,lineSeries,m_chart);
                         m_chartTheme->decorate(item,lineSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),item,SLOT(handleDomainChanged(const Domain&)));
                         QObject::connect(lineSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
                         m_chartItems.insert(series,item);
                         break;
                     }
                     case QChartSeries::SeriesTypeBar: {
                         BarChartSeries* barSeries = static_cast<BarChartSeries*>(series);
                         BarGroup* item = new BarGroup(barSeries->model(),m_chart);
                         m_chartTheme->decorate(item,barSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),item,SLOT(handleDomainChanged(const Domain&)));
                         QObject::connect(barSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
                         m_chartItems.insert(series,item);
                         // m_axisXItem->setVisible(false);
                         break;
                     }
                     case QChartSeries::SeriesTypeStackedBar: {
                         StackedBarChartSeries* stackedBarSeries = static_cast<StackedBarChartSeries*>(series);
                         StackedBarGroup* item = new StackedBarGroup(stackedBarSeries->model(),m_chart);
                         m_chartTheme->decorate(item,stackedBarSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),item,SLOT(handleDomainChanged(const Domain&)));
                         QObject::connect(stackedBarSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
                         m_chartItems.insert(series,item);
                         break;
                     }
                     case QChartSeries::SeriesTypePercentBar: {
                         PercentBarChartSeries* percentBarSeries = static_cast<PercentBarChartSeries*>(series);
                         PercentBarGroup* item = new PercentBarGroup(percentBarSeries->model(),m_chart);
                         m_chartTheme->decorate(item,percentBarSeries ,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),item,SLOT(handleDomainChanged(const Domain&)));
                         QObject::connect(percentBarSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
                         m_chartItems.insert(series,item);
                         break;
                     }
                     case QChartSeries::SeriesTypeScatter: {
                         QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
                         ScatterPresenter *scatterPresenter = new ScatterPresenter(scatterSeries, m_chart);
                         QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)),
                                          scatterPresenter, SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset, SIGNAL(domainChanged(const Domain&)),
                                          scatterPresenter, SLOT(handleDomainChanged(const Domain&)));
                         m_chartTheme->decorate(scatterPresenter, scatterSeries, m_chartItems.count());
-            //            scatterSeries->d->m_theme = m_chartTheme->themeForSeries();
-            //            scatterSeries->d->setParentItem(this);
-            //            scatterSeries->d->m_boundingRect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                         m_chartItems.insert(scatterSeries, scatterPresenter);
                         break;
                     }
                     case QChartSeries::SeriesTypePie: {
                         QPieSeries *s = qobject_cast<QPieSeries *>(series);
                         PiePresenter* pie = new PiePresenter(m_chart, s);
                         m_chartTheme->decorate(pie, s, m_chartItems.count());
                         QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), pie, SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset, SIGNAL(domainChanged(const Domain&)), pie, SLOT(handleDomainChanged(const Domain&)));
                         m_chartItems.insert(series, pie);
                         break;
                     }
                     default: {
                         qDebug()<< "Series type" << series->type() << "not implemented.";
                         break;
                     }
                 }
                 if(m_rect.isValid()) emit geometryChanged(m_rect);
             }
             void ChartPresenter::handleSeriesChanged(QChartSeries* series)
             {
                 //TODO:
             }
             void ChartPresenter::zoomInToRect(const QRectF& rect)
             {
                 if(!rect.isValid()) return;
                 QRectF r = rect.normalized();
                 r.translate(-m_marginSize, -m_marginSize);
                 Domain domain (m_dataset->domain().subDomain(r,m_rect.width(),m_rect.height()));
                 m_dataset->addDomain(domain);
             }
             void ChartPresenter::zoomIn()
             {
                 if (!m_dataset->nextDomain()) {
                     QRectF rect = m_rect;
                     rect.setWidth(rect.width()/2);
                     rect.setHeight(rect.height()/2);
                     rect.moveCenter(m_rect.center());
                     Domain domain (m_dataset->domain().subDomain(rect,m_rect.width(),m_rect.height()));
                     m_dataset->addDomain(domain);
                 }
             }
             void ChartPresenter::zoomOut()
             {
                 m_dataset->previousDomain();
             }
             void ChartPresenter::zoomReset()
             {
                 m_dataset->clearDomains();
             }
             void ChartPresenter::setChartTheme(QChart::ChartTheme theme)
             {
                 delete m_chartTheme;
                 m_chartTheme = ChartTheme::createTheme(theme);
                 m_chartTheme->decorate(m_chart);
                 QMapIterator<QChartSeries*,ChartItem*> i(m_chartItems);
                 int index=0;
                 while (i.hasNext()) {
                     i.next();
                     index++;
                     m_chartTheme->decorate(i.value(),i.key(),index);
                 }
                 m_chartTheme->decorate(m_axisX, m_axisXItem);
                 m_chartTheme->decorate(m_axisY, m_axisYItem);
             }
             QChart::ChartTheme ChartPresenter::chartTheme()
             {
                 return m_chartTheme->id();
             }
             void ChartPresenter::setDefaultAxisX(const QChartAxis& axis)
             {
                 //if(m_axisX != axis) {
                     m_axisX = axis;
                     m_axisXItem->handleAxisChanged(m_axisX);
                 //}
             }
             void ChartPresenter::setDefaultAxisY(const QChartAxis& axis)
             {
                 // if(m_axisY != axis) {
                     m_axisY = axis;
                     m_axisYItem->handleAxisChanged(m_axisY);
                 //}
             }
             QChartAxis ChartPresenter::defaultAxisX() const
             {
                 return m_axisX;
             }
             QChartAxis ChartPresenter::defaultAxisY() const
             {
                 return m_axisY;
             }
             QChartAxis ChartPresenter::axisY(int id) const
             {
                 return m_axis.value(id);
             }
             int ChartPresenter::addAxisY(const QChartAxis& axis)
             {
                 int key =0 ;
                 while(m_axis.contains(key)){
                     key++;
                     //TODO overflow
                 }
                 m_axis.insert(key,axis);
                 m_axisItems.insert(key,new AxisItem(AxisItem::Y_AXIS,m_chart));
                 return key;
             }
             void ChartPresenter::removeAxisY(int id)
             {
                 m_axis.remove(id);
                 delete m_axisItems.take(id);
             }
             #include "moc_chartpresenter_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/charttheme.cpp +17 -9

             #include "charttheme_p.h"
             #include "qchart.h"
             #include "qchartaxis.h"
             //series
             #include "barchartseries.h"
             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
             #include "qlinechartseries.h"
             #include "qscatterseries.h"
             #include "qpieseries.h"
             //items
             #include "axisitem_p.h"
             #include "bargroup.h"
             #include "stackedbargroup.h"
             #include "linechartitem_p.h"
             #include "percentbargroup.h"
             #include "scatterpresenter_p.h"
             #include "piepresenter.h"
             //themes
             #include "chartthemevanilla_p.h"
             #include "chartthemeicy_p.h"
             #include "chartthemegrayscale_p.h"
             #include "chartthemescientific_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));
             }
             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 ChartThemeIcy();
                     case QChart::ChartThemeGrayscale:
                         return new ChartThemeGrayscale();
                     case QChart::ChartThemeScientific:
                         return new ChartThemeScientific();
                 }
             }
             void ChartTheme::decorate(QChart* chart)
             {
                 QLinearGradient 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, QChartSeries* series,int count)
             {
                 switch(series->type())
                 {
                     case QChartSeries::SeriesTypeLine: {
                         QLineChartSeries* s = static_cast<QLineChartSeries*>(series);
                         LineChartItem* i = static_cast<LineChartItem*>(item);
                         decorate(i,s,count);
                         break;
                     }
                     case QChartSeries::SeriesTypeBar: {
                         BarChartSeries* b = static_cast<BarChartSeries*>(series);
                         BarGroup* i = static_cast<BarGroup*>(item);
                         decorate(i,b,count);
                         break;
                     }
                     case QChartSeries::SeriesTypeStackedBar: {
                         StackedBarChartSeries* s = static_cast<StackedBarChartSeries*>(series);
                         StackedBarGroup* i = static_cast<StackedBarGroup*>(item);
                         decorate(i,s,count);
                         break;
                     }
                     case QChartSeries::SeriesTypePercentBar: {
                         PercentBarChartSeries* s = static_cast<PercentBarChartSeries*>(series);
                         PercentBarGroup* i = static_cast<PercentBarGroup*>(item);
                         decorate(i,s,count);
                         break;
                     }
+                    case QChartSeries::SeriesTypeScatter: {
+                        QScatterSeries* s = qobject_cast<QScatterSeries*>(series);
+                        Q_ASSERT(s);
+                        ScatterPresenter* i = static_cast<ScatterPresenter*>(item);
+                        Q_ASSERT(i);
+                        decorate(i, s, count);
+                        break;
+                    }
                     case QChartSeries::SeriesTypePie: {
                         QPieSeries* s = static_cast<QPieSeries*>(series);
                         PiePresenter* i = static_cast<PiePresenter*>(item);
                         decorate(i,s,count);
                         break;
                     }
                     default:
                     qDebug()<<"Wrong item to be decorated by theme";
                     break;
                 }
             }
             void ChartTheme::decorate(LineChartItem* item, QLineChartSeries* series,int count)
             {
                 QPen pen;
                 if(pen != series->pen()){
                     item->setPen(series->pen());
                     return;
                 }
                 pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
                 pen.setWidthF(2);
                 item->setPen(pen);
             }
             void ChartTheme::decorate(BarGroup* item, BarChartSeries* series,int count)
             {
                 // TODO: better way to descide series color and remove hard coded colors.
                 item->resetBrushes();
                 for (int i=0; i<m_seriesColor.count(); i++) {
                     QBrush brush(m_seriesColor.at(i));
                     item->addBrush(brush);
                 }
                 item->addBrush(QBrush(QColor(255,0,0,128)));
                 item->addBrush(QBrush(QColor(255,255,0,128)));
                 item->addBrush(QBrush(QColor(0,255,0,128)));
                 item->addBrush(QBrush(QColor(0,0,255,128)));
                 item->addBrush(QBrush(QColor(255,128,0,128)));
             }
             void ChartTheme::decorate(StackedBarGroup* item, StackedBarChartSeries* series,int count)
             {
                 // TODO: better way to descide series color and remove hard coded colors.
                 item->resetBrushes();
                 for (int i=0; i<m_seriesColor.count(); i++) {
                     QBrush brush(m_seriesColor.at(i));
                     item->addBrush(brush);
                 }
                 item->addBrush(QBrush(QColor(255,0,0,128)));
                 item->addBrush(QBrush(QColor(255,255,0,128)));
                 item->addBrush(QBrush(QColor(0,255,0,128)));
                 item->addBrush(QBrush(QColor(0,0,255,128)));
                 item->addBrush(QBrush(QColor(255,128,0,128)));
             }
             void ChartTheme::decorate(PercentBarGroup* item, PercentBarChartSeries* series,int count)
             {
                 // TODO: better way to descide series color and remove hard coded colors.
                 item->resetBrushes();
                 for (int i=0; i<m_seriesColor.count(); i++) {
                     QBrush brush(m_seriesColor.at(i));
                     item->addBrush(brush);
                 }
                 item->addBrush(QBrush(QColor(255,0,0,128)));
                 item->addBrush(QBrush(QColor(255,255,0,128)));
                 item->addBrush(QBrush(QColor(0,255,0,128)));
                 item->addBrush(QBrush(QColor(0,0,255,128)));
                 item->addBrush(QBrush(QColor(255,128,0,128)));
             }
             void ChartTheme::decorate(ScatterPresenter* presenter, QScatterSeries* series, int count)
             {
                 Q_ASSERT(presenter);
                 Q_ASSERT(series);
-                presenter->m_markerPen.setColor(m_seriesColor.at(count % m_seriesColor.size()));
+                QColor color = m_seriesColor.at(count % m_seriesColor.size());
+                // TODO: define alpha in the theme? or in the series?
+                color.setAlpha(120);
+                QBrush brush(color, Qt::SolidPattern);
+                presenter->m_markerBrush = brush;
-            //    QPen pen;
+                QPen pen(brush, 1);
-            //    if(pen != series->pen()){
+                pen.setColor(color);
-            //        item->setPen(series->pen());
+                presenter->m_markerPen = pen;
-            //        return;
-            //    }
-            //    pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
-            //    pen.setWidthF(2);
-            //    item->setPen(pen);
             }
             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;
                 while (colors.count() < series->count()) {
                     // get base color
                     QColor c = m_seriesColor[i++];
                     i = i % m_seriesColor.count();
                     // -1 means achromatic color -> cannot manipulate lightness
                     // TODO: find a better way to randomize lightness
                     if (c.toHsv().hue() == -1)
                         qWarning() << "ChartTheme::decorate() warning: achromatic theme color";
                     // randomize lightness
                     qreal f = 50 + (qrand() % 100); // 50 is 50% darker, 100 is the same, 150 is 50% lighter
                     c = c.lighter(f);
                     // find duplicates
                     bool isUnique = true;
                     foreach (QColor color, colors) {
                         if (c == color)
                             isUnique = false;
                     }
                     // add to array if unique
                     //if (isUnique)
                         colors << c;
                 }
                 // finally update colors
                 foreach (QPieSliceId id, series->ids()) {
                     QPieSlice s = series->slice(id);
                     s.setPen(QPen(Qt::black)); // TODO: get from theme
                     s.setBrush(colors.takeFirst());
                     series->update(s);
                 }
             }
             void ChartTheme::decorate(QChartAxis& axis,AxisItem* item)
             {
                 //TODO: dummy defults for now
                 axis.setLabelsBrush(Qt::black);
                 axis.setLabelsPen(Qt::NoPen);
                 axis.setShadesPen(Qt::NoPen);
                 axis.setShadesOpacity(0.5);
                 item->handleAxisChanged(axis);
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/qscatterseries.cpp +27 -1

             #include "qscatterseries.h"
             #include "scatterseries_p.h"
             #include "qchart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QScatterSeriesPrivate::QScatterSeriesPrivate() :
-                m_data(QList<QPointF>())
+                m_data(QList<QPointF>()),
+                m_markerPen(QPen()),
+                m_markerBrush(QBrush()),
+                m_markerShape(QScatterSeries::MarkerShapeDefault)
             {
+                // Initialize pen color to invalid to use a theme color by default
+                m_markerPen.setColor(QColor::Invalid);
+                m_markerBrush.setColor(QColor::Invalid);
             }
             QScatterSeries::QScatterSeries(QObject *parent) :
                 QChartSeries(parent),
                 d(new QScatterSeriesPrivate())
             {
             }
             QScatterSeries::~QScatterSeries()
             {
                 delete d;
             }
             void QScatterSeries::addData(QPointF value)
             {
                 d->m_data.append(value);
                 emit changed();
             }
             QScatterSeries& QScatterSeries::operator << (const QPointF &value)
             {
                 d->m_data.append(value);
                 emit changed();
                 return *this;
             }
             void QScatterSeries::setData(QList<QPointF> data)
             {
                 d->m_data = data;
                 emit changed();
             }
             QList<QPointF> QScatterSeries::data()
             {
                 return d->m_data;
             }
             void QScatterSeries::setMarkerPen(QPen pen)
             {
                 d->m_markerPen = pen;
             }
             QPen QScatterSeries::markerPen()
             {
                 return d->m_markerPen;
             }
+            void QScatterSeries::setMarkerBrush(QBrush brush)
+            {
+                d->m_markerBrush = brush;
+            }
+            QBrush QScatterSeries::markerBrush()
+            {
+                return d->m_markerBrush;
+            }
+            void QScatterSeries::setMarkerShape(MarkerShape shape)
+            {
+                d->m_markerShape = shape;
+            }
+            QScatterSeries::MarkerShape QScatterSeries::markerShape()
+            {
+                return (QScatterSeries::MarkerShape) d->m_markerShape;
+            }
             #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/qscatterseries.h +22 -6

             #ifndef QSCATTERSERIES_H
             #define QSCATTERSERIES_H
             #include "qchartseries.h"
             #include <QRectF>
             #include <QColor>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
             {
                 Q_OBJECT
+            public:
+                enum MarkerShape {
+                    // TODO: to be defined by the graphics design
+                    // TODO: marker shapes: "x", star, rectangle, tilted rect, triangle, circle, dot
+                    MarkerShapeDefault = 0,
+                    MarkerShapePoint,
+                    MarkerShapeX,
+                    MarkerShapeRectangle,
+                    MarkerShapeTiltedRectangle,
+                    MarkerShapeTriangle,
+                    MarkerShapeCircle
+                };
             public:
-                //QScatterSeries(QSeriesData *data, QObject *chart);
                 QScatterSeries(QObject *parent = 0);
                 ~QScatterSeries();
             public: // from QChartSeries
                 QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
             public:
                 // TODO: the name of the function? addPoint? addData? addValue?
                 void addData(QPointF value);
                 QScatterSeries& operator << (const QPointF &value);
                 void setData(QList<QPointF> data);
                 QList<QPointF> data();
+                //TODO: insertData?
-                //TODO? void insertData(int index, QPointF data);
                 void setMarkerPen(QPen pen);
                 QPen markerPen();
-                // TODO: marker shapes: "x", star, rectangle, tilted rect, triangle, circle, dot
+                void setMarkerBrush(QBrush brush);
-                //void setMarkerShape(MarkerShape shape);
+                QBrush markerBrush();
+                void setMarkerShape(MarkerShape shape);
+                MarkerShape markerShape();
+                // TODO: marker size?
             Q_SIGNALS:
-                // TODO: move to PIMPL?
+                // TODO: move to PIMPL for simplicity or does the user ever need these signals?
                 // TODO: more finegrained signaling for performance reasons
+                // (check QPieSeries implementation with change sets)
                 void changed();
             //public Q_SLOTS:
             private:
                 Q_DECLARE_PRIVATE(QScatterSeries)
                 Q_DISABLE_COPY(QScatterSeries)
                 QScatterSeriesPrivate *const d;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QSCATTERSERIES_H

src/scatterseries/scatterpresenter.cpp +38 -21

             #include "scatterpresenter_p.h"
             #include "qscatterseries.h"
             #include <QPen>
             #include <QPainter>
             #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ScatterPresenter::ScatterPresenter(QScatterSeries *series, QGraphicsObject *parent) :
                 ChartItem(parent),
                 m_series(series),
                 m_boundingRect(),
                 //m_markerColor(QColor()),
             //    m_markerColor(QColor(255, 0, 0)),
                 m_visibleChartArea()
             {
                 if (parent)
                     m_boundingRect = parent->boundingRect();
                 if (series) {
                     connect(series, SIGNAL(changed()), this, SLOT(handleModelChanged()));
                 }
             }
             void ScatterPresenter::handleDomainChanged(const Domain& domain)
             {
                 m_visibleChartArea = domain;
                 changeGeometry();
             }
             void ScatterPresenter::handleGeometryChanged(const QRectF& rect)
             {
                 m_boundingRect = rect;
                 changeGeometry();
             }
             void ScatterPresenter::handleModelChanged()
             {
                 // TODO: more fine grained modelChanged signaling
                 changeGeometry();
             }
             void ScatterPresenter::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/, QWidget */*widget*/)
             {
-                // TODO: The opacity should be user definable?
+                // TODO: Optimization: avoid setting on every paint method call?
-                //brush.setColor(QColor(255, 82, 0, 100));
+                // The custom settings in series override those defined by the theme
-                //if (m_series->markerPen().isValid()) {
+                if (m_series->markerPen().color().isValid()) {
-                if (false) {
+                    painter->setPen(m_series->markerPen());
-                    QPen pen = painter->pen();
+                    painter->setBrush(m_series->markerBrush());
-                    QBrush brush = pen.brush();
+                } else {
-                    brush.setColor(m_series->markerPen().color());
+                    painter->setPen(m_markerPen);
-                    pen.setBrush(brush);
+                    painter->setBrush(m_markerBrush);
-                    pen.setWidth(4);
-                    painter->setPen(pen);
-                else {
-                    // TODO: fix this
-                    QPen pen = painter->pen();
-                    QBrush brush = pen.brush();
-                    brush.setColor(m_markerPen.color());
-                    pen.setBrush(brush);
-                    pen.setWidth(4);
-                    painter->setPen(pen);
                 }
+                int shape = m_series->markerShape();
                 for (int i(0); i < m_scenex.count() && i < m_sceney.count(); i++) {
                     if (scene()->width() > m_scenex.at(i) && scene()->height() > m_sceney.at(i))
-                        //painter->drawArc(m_scenex.at(i), m_sceney.at(i), 2, 2, 0, 5760);
+                        // Paint a shape
-                        painter->drawPoint(m_scenex.at(i), m_sceney.at(i));
+                        switch (shape) {
+                        case QScatterSeries::MarkerShapeDefault:
+                            // Fallthrough, defaults to circle
+                        case QScatterSeries::MarkerShapeCircle:
+                            painter->drawChord(m_scenex.at(i), m_sceney.at(i), 9, 9, 0, 5760);
+                            break;
+                        case QScatterSeries::MarkerShapePoint:
+                            painter->drawPoint(m_scenex.at(i), m_sceney.at(i));
+                            break;
+                        case QScatterSeries::MarkerShapeRectangle:
+                            painter->drawRect(m_scenex.at(i), m_sceney.at(i), 9, 9);
+                            break;
+                        case QScatterSeries::MarkerShapeTiltedRectangle:
+                            // TODO:
+                            static const QPointF points[4] = {
+                                QPointF(-1.0 + m_scenex.at(i), 0.0 + m_sceney.at(i)),
+                                QPointF(0.0 + m_scenex.at(i), 1.0 + m_sceney.at(i)),
+                                QPointF(1.0 + m_scenex.at(i), 0.0 + m_sceney.at(i)),
+                                QPointF(0.0 + m_scenex.at(i), -1.0 + m_sceney.at(i))
+                            };
+                            painter->drawPolygon(points, 4);
+                            break;
+                        default:
+                            // TODO: implement the rest of the shapes
+                            Q_ASSERT(false);
+                            break;
+                        }
                 }
             }
             void ScatterPresenter::changeGeometry()
             {
                 if (m_boundingRect.isValid()) {
                     prepareGeometryChange();
                     qreal scalex = m_boundingRect.width() / m_visibleChartArea.spanX();
                     qreal scaley = m_boundingRect.height() / m_visibleChartArea.spanY();
                     m_scenex.clear();
                     m_sceney.clear();
                     // Convert relative coordinates to absolute pixel coordinates that can be used for drawing
                     foreach (QPointF point, m_series->data()) {
                         m_scenex.append(m_boundingRect.left() + point.x() * scalex - m_visibleChartArea.m_minX * scalex);
                         m_sceney.append(m_boundingRect.bottom() - point.y() * scaley + m_visibleChartArea.m_minY * scaley);
                     }
                 }
             }
             #include "moc_scatterpresenter_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/scatterpresenter_p.h +1 0

             #ifndef SCATTERPRESENTER_H
             #define SCATTERPRESENTER_H
             #include "qchartglobal.h"
             #include "chartitem_p.h"
             #include <QObject>
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeries;
             /*!
              * The "business logic" of scatter series. This is a QObject that does not have a parent QObject.
              * The QGraphicsItem parent owns the object instead.
              */
             class ScatterPresenter : public QObject, public ChartItem
             {
                 Q_OBJECT
             public:
                 explicit ScatterPresenter(QScatterSeries *series, QGraphicsObject *parent = 0);
             public: // from ChartItem
                 QRectF boundingRect() const { return m_boundingRect; }
                 void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
             signals:
             public Q_SLOTS:
                 void handleDomainChanged(const Domain& domain);
                 void handleGeometryChanged(const QRectF& rect);
                 void handleModelChanged();
             public:
                 void changeGeometry();
                 QScatterSeries *m_series;
                 QRectF m_boundingRect;
                 QList<qreal> m_scenex;
                 QList<qreal> m_sceney;
                 Domain m_visibleChartArea;
                 QPen m_markerPen;
+                QBrush m_markerBrush;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // SCATTERPRESENTER_H

src/scatterseries/scatterseries_p.h +2 0

             #ifndef QSCATTERSERIESPRIVATE_H
             #define QSCATTERSERIESPRIVATE_H
             #include "qchartglobal.h"
             #include "qchartseries.h"
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
              * The PIMPL class of QScatterSeries.
              */
             class QScatterSeriesPrivate
             {
             public:
                 QScatterSeriesPrivate();
             public:
                 QList<QPointF> m_data;
                 QPen m_markerPen;
+                QBrush m_markerBrush;
+                int m_markerShape;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QSCATTERSERIESPRIVATE_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages