HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r461:5973afc43f62

Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts

Marek Rosa -

r461:5973afc43f62

parent child

Context file:

r461:5973afc43f62

Collapse all files

doc/images/chartview_example_scatter.jpg binary modified 0 0

NO CONTENT: modified file, binary diff hidden

src/chartpresenter.cpp 0 -2

                 case QSeries::SeriesTypeScatter: {
                     QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
                     ScatterPresenter *scatterPresenter = new ScatterPresenter(scatterSeries, m_chart);
-                    QObject::connect(scatterPresenter, SIGNAL(clicked(QPointF)),
-                                     scatterSeries, SIGNAL(clicked(QPointF)));
                     QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)),
                                      scatterPresenter, SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),

src/scatterseries/qscatterseries.cpp +42 -35

                 \value MarkerShapeDefault
                 \value MarkerShapeX
                 \value MarkerShapeRectangle
+                \value MarkerShapeRoundedRectangle
                 \value MarkerShapeTiltedRectangle
                 \value MarkerShapeTriangle
                 \value MarkerShapeCircle
                 data point you can use closestPoint().
             */
-            /*!
-                \fn void QScatterSeries::changed()
-                \brief TODO
-            */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            QScatterSeriesPrivate::QScatterSeriesPrivate() :
+            QScatterSeriesPrivate::QScatterSeriesPrivate(QObject *parent) :
+                QObject(parent),
                 m_data(QList<QPointF>()),
                 m_markerPen(QPen(QColor::Invalid)),
                 m_markerBrush(QBrush(QColor::Invalid)),
             {
             }
+            void QScatterSeriesPrivate::emitChanged()
+            {
+                emit changed();
+            }
+            #include "moc_scatterseries_p.cpp"
             /*!
                 Constructs a series object which is a child of \a parent.
             */
             QScatterSeries::QScatterSeries(QObject *parent) :
                 QSeries(parent),
-                d(new QScatterSeriesPrivate())
+                d(new QScatterSeriesPrivate(this))
             {
             }
             void QScatterSeries::add(qreal x, qreal y)
             {
                 d->m_data.append(QPointF(x, y));
-                emit changed();
+                d->emitChanged();
             }
             /*!
             void QScatterSeries::add(QPointF value)
             {
                 d->m_data.append(value);
-                emit changed();
+                d->emitChanged();
             }
             /*!
             void QScatterSeries::add(QList<QPointF> points)
             {
                 d->m_data.append(points);
-                emit changed();
+                d->emitChanged();
             }
             /*!
             QScatterSeries& QScatterSeries::operator << (const QPointF &value)
             {
                 d->m_data.append(value);
-                emit changed();
+                d->emitChanged();
                 return *this;
             }
             QScatterSeries& QScatterSeries::operator << (QList<QPointF> value)
             {
                 d->m_data.append(value);
-                emit changed();
+                d->emitChanged();
                 return *this;
             }
             void QScatterSeries::setData(QList<QPointF> points)
             {
                 d->m_data = points;
-                emit changed();
+                d->emitChanged();
             }
             /*!
             {
                 if (index >= 0 && index < d->m_data.count()) {
                     d->m_data.replace(index, newPoint);
-                    emit changed();
+                    d->emitChanged();
                     return true;
                 }
                 return false;
             {
                 if (index >=0 && index < d->m_data.count()) {
                     d->m_data.removeAt(index);
-                    emit changed();
+                    d->emitChanged();
                     return true;
                 }
                 return false;
             int QScatterSeries::removeAll(QPointF point)
             {
                 int count = d->m_data.removeAll(point);
-                emit changed();
+                d->emitChanged();
                 return count;
             }
             void QScatterSeries::clear()
             {
                 d->m_data.clear();
-                emit changed();
+                d->emitChanged();
             }
             /*!
             }
             /*!
+                Returns the pen used for drawing markers.
+            */
+            QPen QScatterSeries::pen() const
+            {
+                return d->m_markerPen;
+            }
+            /*!
                 Overrides the default pen used for drawing a marker item with a user defined \a pen. The
                 default pen is defined by chart theme setting.
                 \sa setBrush()
                 \sa QChart::setChartTheme()
             */
-            void QScatterSeries::setPen(QPen pen)
+            void QScatterSeries::setPen(const QPen &pen)
             {
                 d->m_markerPen = pen;
+                d->emitChanged();
             }
             /*!
-                Returns the pen used for drawing markers.
+                Returns the brush used for drawing markers.
             */
-            QPen QScatterSeries::pen()
+            QBrush QScatterSeries::brush() const
             {
-                return d->m_markerPen;
+                return d->m_markerBrush;
             }
             /*!
                 \sa setPen()
                 \sa QChart::setChartTheme()
             */
-            void QScatterSeries::setBrush(QBrush brush)
+            void QScatterSeries::setBrush(const QBrush &brush)
             {
                 d->m_markerBrush = brush;
+                d->emitChanged();
             }
             /*!
-                Returns the brush used for drawing markers.
+                Returns the shape used for drawing markers.
             */
-            QBrush QScatterSeries::brush()
+            QScatterSeries::MarkerShape QScatterSeries::shape() const
             {
-                return d->m_markerBrush;
+                return (QScatterSeries::MarkerShape) d->m_markerShape;
             }
             /*!
             void QScatterSeries::setShape(MarkerShape shape)
             {
                 d->m_markerShape = shape;
+                d->emitChanged();
-            /*!
-                Returns the shape used for drawing markers.
-            */
-            QScatterSeries::MarkerShape QScatterSeries::shape()
-                return (QScatterSeries::MarkerShape) d->m_markerShape;
             }
             /*!
                 Returns the size of the marker items.
             */
-            qreal QScatterSeries::size()
+            qreal QScatterSeries::size() const
             {
                 return d->m_markerSize;
             }
             void QScatterSeries::setSize(qreal size)
             {
                 d->m_markerSize = size;
-                emit changed();
+                d->emitChanged();
             }
             #include "moc_qscatterseries.cpp"

src/scatterseries/qscatterseries.h +9 -11

                     MarkerShapeDefault = 0,
                     MarkerShapeX,
                     MarkerShapeRectangle,
+                    MarkerShapeRoundedRectangle,
                     MarkerShapeTiltedRectangle,
                     MarkerShapeTriangle,
                     MarkerShapeCircle
                 int closestPoint(QPointF coordinate);
                 //TODO: insert, replace...?
-                QPen pen();
+                QPen pen() const;
-                void setPen(QPen pen);
+                void setPen(const QPen &pen);
-                QBrush brush();
+                QBrush brush() const;
-                void setBrush(QBrush brush);
+                void setBrush(const QBrush &brush);
-                MarkerShape shape();
+                MarkerShape shape() const;
                 void setShape(MarkerShape shape);
-                qreal size();
+                qreal size() const;
                 void setSize(qreal size);
             Q_SIGNALS:
                 void clicked(QPointF coordinate);
-                // TODO: move to PIMPL for simplicity or does the user ever need changed signals?
-                // TODO: more finegrained signaling for performance reasons
-                // (check QPieSeries implementation with change sets)
-                void changed();
             private:
                 Q_DECLARE_PRIVATE(QScatterSeries)
                 Q_DISABLE_COPY(QScatterSeries)
-                QScatterSeriesPrivate *const d;
+                friend class ScatterPresenter;
+                QScatterSeriesPrivate *d;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/scatterpresenter.cpp +16 -6

             #include "scatterpresenter_p.h"
             #include "qscatterseries.h"
+            #include "scatterseries_p.h"
             #include "chartpresenter_p.h"
             #include <QPen>
             #include <QPainter>
                 m_series(series),
                 m_clippingRect()
             {
-                if (parent)
+                Q_ASSERT(parent);
-                    m_clippingRect = parent->boundingRect();
+                Q_ASSERT(series);
-                if (series) {
-                    connect(series, SIGNAL(changed()), this, SLOT(handleModelChanged()));
+                m_clippingRect = parent->boundingRect();
+                connect(series->d, SIGNAL(changed()), this, SLOT(handleModelChanged()));
+                connect(this, SIGNAL(clicked(QPointF)), series, SIGNAL(clicked(QPointF)));
                 setZValue(ChartPresenter::ScatterSeriesZValue);
                 // TODO: how to draw a drop shadow?
                             case QScatterSeries::MarkerShapeRectangle:
                                 m_path.addRect(x, y, size, size);
                                 break;
+                            case QScatterSeries::MarkerShapeRoundedRectangle:
+                                m_path.addRoundedRect(x, y, size, size, size / 4.0, size / 4.0);
+                                break;
                             case QScatterSeries::MarkerShapeTiltedRectangle: {
                                 // TODO: tilt the rectangle
                                 m_path.addRect(x, y, size, size);
                                 break;
                             }
+                            case QScatterSeries::MarkerShapeTriangle: {
+                                QPolygonF polygon;
+                                polygon << QPointF(0.0, -size) << QPointF(size / 2.0, 0.0) << QPointF(-size / 2, 0.0);
+                                // TODO: the position is not exactly right...
+                                m_path.addPolygon(polygon.translated(x + size / 2.0, y + size));
+                                break;
+                            }
                             default:
                                 // TODO: implement the rest of the shapes
                                 Q_ASSERT(false);

src/scatterseries/scatterseries_p.h +11 -2

             #include "qchartglobal.h"
             #include "qseries.h"
+            #include <QObject>
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
              * The PIMPL class of QScatterSeries.
              */
-            class QScatterSeriesPrivate
+            class QScatterSeriesPrivate : public QObject
             {
+                Q_OBJECT
             public:
-                QScatterSeriesPrivate();
+                QScatterSeriesPrivate(QObject *parent);
+                void emitChanged();
+            Q_SIGNALS:
+                // TODO: more finegrained signaling for performance reasons
+                // (see for example QPieSeries implementation with change sets)
+                void changed();
             public:
                 QList<QPointF> m_data;

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