HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r358:543ce926fdb7

Fixing review findings in QScatterSeries

Tero Ahola -

r358:543ce926fdb7

parent child

Context file:

r358:543ce926fdb7

Collapse all files

doc/src/index.qdoc +6 -3

             /*!
                 \page index.html
                 \keyword About
             	\raw HTML
                 <div class="qchart">
                  <img src="images/qt_commercial_logo.png" alt="qtcommercial"/>
                  <p>
-                 QCharts is a part of Qt Commercial addons package. It provides a set of simple chart components which are available for Qt Commercial customers.
+                 QCharts is a part of Qt Commercial addons package. It provides a set of easy to use chart
-                 It uses Qt Graphics View Framework, therefore charts can be easily integrated 2D modern user interfaces. QCharts can be used as QWidgets, QGraphicsWidget or QML elements.
+            	 components which are available for Qt Commercial customers. It uses Qt Graphics View
-                 Users can easily create impressive graphs by selecting one of the charts themes.
+            	 Framework, therefore charts can be easily integrated to modern 2D user interfaces. QCharts can
+            	 be used as QWidgets, QGraphicsWidget or QML elements. Users can easily create impressive
+            	 graphs by selecting one of the charts themes.
                  </p>
                 <table><tr>
                 <td><img src="images/linechart.png" alt="linechart" /></td>
                 <td><img src="images/chartview_example_bar.jpg " alt="barchart" /></td>
                 <td><img src="images/chartview_example_pie.jpg " alt="piechart" /></td>
                 </tr>
                 <tr>
                 <td><img src="images/chartview_example.jpg " alt="linechart" /></td>
                 <td><img src="images/chartview_example_scatter.jpg " alt="scatterchart" /></td>
                 <td><img src="images/chartview_example_theme.jpg " alt="themechart" /></td>
                 </tr>
                 </table>
                  </div>
             	\endraw
             */

example/scatter/main.cpp +4 -9

             #include <QtGui/QApplication>
             #include <QMainWindow>
             #include <qchartglobal.h>
             #include <qchartview.h>
             #include <qscatterseries.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 //! [1]
                 // Create chart view
                 QChartView *chartView = new QChartView();
                 chartView->setChartTheme(QChart::ChartThemeIcy);
                 // Add scatter series with simple test data
                 QScatterSeries *scatter = new QScatterSeries();
                 *scatter << QPointF(0.5, 5.0)
                          << QPointF(1.0, 4.5)
                          << QPointF(1.0, 5.5)
                          << QPointF(1.5, 5.0)
                          << QPointF(2.0, 4.5)
                          << QPointF(2.5, 5.0);
                 // Chart takes ownership
                 chartView->addSeries(scatter);
                 //! [1]
-                // Add some more data
-                //! [2]
-                scatter->addData(QPointF(2.0, 5.5));
-                //! [2]
                 // And more
                 //! [3]
-                *scatter << QPointF(2.0, 5.5);
+                *scatter << QPointF(2.0, 5.5) << QPointF(2.2, 5.4);
                 //! [3]
                 // Add another scatter series (re-use the previous pointer)
                 // - more data with random component
                 scatter = new QScatterSeries();
                 for (qreal i(0.0); i < 20; i += 0.15) {
                     (*scatter) << QPointF(i + (qreal)(rand() % 100) / 100.0,
                                            i + (qreal)(rand() % 100) / 100.0);
                 }
                 //! [4]
                 QBrush brush(QColor(255, 0, 0, 100), Qt::SolidPattern);
-                scatter->setMarkerBrush(brush);
+                scatter->setBrush(brush);
                 //! [4]
                 //! [5]
                 QPen pen(QColor(0, 255, 0, 80), 3);
-                scatter->setMarkerPen(pen);
+                scatter->setPen(pen);
                 //! [5]
                 //! [6]
-                scatter->setMarkerShape(QScatterSeries::MarkerShapeRectangle);
+                scatter->setShape(QScatterSeries::MarkerShapeRectangle);
                 //! [6]
                 chartView->addSeries(scatter);
                 // Use the chart widget as the central widget
                 QMainWindow w;
                 w.resize(640, 480);
                 w.setCentralWidget(chartView);
                 w.show();
                 return a.exec();
             }

qmlplugin/declarativescatterseries.cpp +1 -1

             #include "declarativescatterseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qscatterseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeScatterSeries::DeclarativeScatterSeries(QDeclarativeItem *parent) :
                 QDeclarativeItem(parent),
                 m_chart(0),
                 m_series(0)
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
                 connect(this, SIGNAL(parentChanged()),
                         this, SLOT(setParentForSeries()));
             }
             void DeclarativeScatterSeries::setParentForSeries()
             {
                 if (!m_series)
                     initSeries();
             }
             void DeclarativeScatterSeries::initSeries()
             {
                 Q_ASSERT(!m_series);
                 DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
                 if (declarativeChart) {
                     QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
                     qDebug() << "creating scatter series for chart: " << chart;
                     Q_ASSERT(chart);
                     m_series = new QScatterSeries();
                     Q_ASSERT(m_series);
                     for (int i(0); i < m_data.count(); i++) {
                         ScatterElement *element = m_data.at(i);
                         *m_series << QPointF(element->x(), element->y());
                     }
                     chart->addSeries(m_series);
                 }
             }
             QDeclarativeListProperty<ScatterElement> DeclarativeScatterSeries::data()
             {
                 return QDeclarativeListProperty<ScatterElement>(this, 0,
                                                                 &DeclarativeScatterSeries::appendData);
             }
             void DeclarativeScatterSeries::appendData(QDeclarativeListProperty<ScatterElement> *list,
                                                       ScatterElement *element)
             {
                 DeclarativeScatterSeries *series = qobject_cast<DeclarativeScatterSeries *>(list->object);
                 qDebug() << "appendData: " << series;
                 qDebug() << "appendData: " << element;
                 qDebug() << "appendData: " << element->x();
                 qDebug() << "appendData: " << element->y();
                 qDebug() << "appendData: " << series->m_series;
                 if (series) {
                     series->m_data.append(element);
                     if (series->m_series)
-                        series->m_series->addData(QPointF(element->x(), element->y()));
+                        series->m_series->add(element->x(), element->y());
                 }
             }
             #include "moc_declarativescatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/qscatterseries.cpp +21 -24

             #include "qscatterseries.h"
             #include "scatterseries_p.h"
             #include "qchart.h"
             /*!
                 \class QScatterSeries
                 \brief QtCommercial Chart series API for showing scatter series.
                 \mainclass
                 Example on how to create a chart with scatter series:
                 \snippet ../example/scatter/main.cpp 1
                 The example code would result the following:
                 \image scatter_example1.jpg
             */
             /*!
                 \enum QScatterSeries::MarkerShape
                 This enum describes the shape used when rendering marker items.
                 \value MarkerShapeDefault
                 \value MarkerShapePoint
                 \value MarkerShapeX
                 \value MarkerShapeRectangle
                 \value MarkerShapeTiltedRectangle
                 \value MarkerShapeTriangle
                 \value MarkerShapeCircle
             */
             /*!
                 \fn QChartSeriesType QScatterSeries::type() const
                 \brief Returns QChartSeries::SeriesTypeScatter.
             */
             /*!
                 \fn void QScatterSeries::clicked()
                 \brief TODO
             */
             /*!
-                \fn void QScatterSeries::hoverEnter()
-                \brief TODO
-            */
-            /*!
-                \fn void QScatterSeries::hoverLeave()
-                \brief TODO
-            */
-            /*!
                 \fn void QScatterSeries::changed()
                 \brief TODO
             */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QScatterSeriesPrivate::QScatterSeriesPrivate() :
                 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);
             }
             /*!
                 Constructs a series object which is a child of \a parent.
             */
             QScatterSeries::QScatterSeries(QObject *parent) :
                 QChartSeries(parent),
                 d(new QScatterSeriesPrivate())
             {
             }
             /*!
                 Destroys the object. Note that adding series to QChart transfers the ownership to the chart.
             */
             QScatterSeries::~QScatterSeries()
             {
                 delete d;
             }
             /*!
+                Add single data point with \a x and \a y coordinates to the series.
+            */
+            void QScatterSeries::add(qreal x, qreal y)
+            {
+                d->m_data.append(QPointF(x, y));
+                emit changed();
+            }
+            /*!
                 Add single data point with \a value to the series.
-                For example:
-                \snippet ../example/scatter/main.cpp 2
             */
-            void QScatterSeries::addData(QPointF value)
+            void QScatterSeries::add(QPointF value)
             {
                 d->m_data.append(value);
                 emit changed();
             }
             /*!
                 Add list of \a points to the series.
             */
-            void QScatterSeries::addData(QList<QPointF> points)
+            void QScatterSeries::add(QList<QPointF> points)
             {
                 d->m_data.append(points);
                 emit changed();
             }
             /*!
                 Stream operator for adding a data point with \a value to the series.
-                \sa addData()
+                \sa add()
                 For example:
                 \snippet ../example/scatter/main.cpp 3
             */
             QScatterSeries& QScatterSeries::operator << (const QPointF &value)
             {
                 d->m_data.append(value);
                 emit changed();
                 return *this;
             }
             /*!
                 Stream operator for adding a list of points to the series.
-                \sa addData()
+                \sa add()
             */
             QScatterSeries& QScatterSeries::operator << (QList<QPointF> value)
             {
                 d->m_data.append(value);
                 emit changed();
                 return *this;
             }
             /*!
                 Replaces the data of the series with the given list of data \a points.
             */
             void QScatterSeries::setData(QList<QPointF> points)
             {
                 d->m_data = points;
                 emit changed();
             }
             /*!
                 Returns the current list of data points of the series.
             */
             QList<QPointF> QScatterSeries::data()
             {
                 return d->m_data;
             }
             /*!
                 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.
                 For example:
                 \snippet ../example/scatter/main.cpp 5
                 Would present your scatter markers with an opaque, uglyish green outlines instead of the
                 beatiful markers defined by the chart's theme:
                 \image scatter_example_pen.jpg
-                \sa setMarkerBrush()
+                \sa setBrush()
                 \sa QChart::setChartTheme()
             */
-            void QScatterSeries::setMarkerPen(QPen pen)
+            void QScatterSeries::setPen(QPen pen)
             {
                 d->m_markerPen = pen;
             }
             /*!
                 Returns the pen used for drawing markers.
             */
-            QPen QScatterSeries::markerPen()
+            QPen QScatterSeries::pen()
             {
                 return d->m_markerPen;
             }
             /*!
                 Overrides the default brush of the marker items with a user defined \a brush. The default brush
                 is defined by chart theme setting.
                 For example:
                 \snippet ../example/scatter/main.cpp 4
                 Would fill your scatter markers with an opaque red color:
                 \image scatter_example_brush.jpg
-                \sa setMarkerPen()
+                \sa setPen()
                 \sa QChart::setChartTheme()
             */
-            void QScatterSeries::setMarkerBrush(QBrush brush)
+            void QScatterSeries::setBrush(QBrush brush)
             {
                 d->m_markerBrush = brush;
             }
             /*!
                 Returns the brush used for drawing markers.
             */
-            QBrush QScatterSeries::markerBrush()
+            QBrush QScatterSeries::brush()
             {
                 return d->m_markerBrush;
             }
             /*!
                 Overrides the default shape of the marker items with a user defined \a shape. The default shape
                 is defined by chart theme setting.
                 For example:
                 \snippet ../example/scatter/main.cpp 6
                 Would make your scatter marker items rectangle:
                 \image scatter_example_shape.jpg
             */
-            void QScatterSeries::setMarkerShape(MarkerShape shape)
+            void QScatterSeries::setShape(MarkerShape shape)
             {
                 d->m_markerShape = shape;
             }
             /*!
                 Returns the shape used for drawing markers.
             */
-            QScatterSeries::MarkerShape QScatterSeries::markerShape()
+            QScatterSeries::MarkerShape QScatterSeries::shape()
             {
                 return (QScatterSeries::MarkerShape) d->m_markerShape;
             }
             #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/qscatterseries.h +10 -13

             #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(QObject *parent = 0);
                 ~QScatterSeries();
             public: // from QChartSeries
                 QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
             public:
-                void addData(QPointF value);
+                void add(qreal x, qreal y);
-                void addData(QList<QPointF> points);
+                void add(QPointF value);
+                void add(QList<QPointF> points);
                 void setData(QList<QPointF> points);
                 QScatterSeries& operator << (const QPointF &value);
                 QScatterSeries& operator << (QList<QPointF> points);
                 QList<QPointF> data();
-                //TODO: insertData?
+                //TODO: insert, replace, remove, clear...?
-                QPen markerPen();
+                QPen pen();
-                QBrush markerBrush();
+                void setPen(QPen pen);
-                MarkerShape markerShape();
+                QBrush brush();
+                void setBrush(QBrush brush);
+                MarkerShape shape();
+                void setShape(MarkerShape shape);
                 // TODO: marker size?
-            public Q_SLOTS:
-                void setMarkerPen(QPen pen);
-                void setMarkerBrush(QBrush brush);
-                void setMarkerShape(MarkerShape shape);
             Q_SIGNALS:
                 void clicked(/* TODO: parameters? */);
-                void hoverEnter(/* TODO: parameters? */);
-                void hoverLeave(/* TODO: parameters? */);
                 // 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;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QSCATTERSERIES_H

src/scatterseries/scatterpresenter.cpp +8 -13

             #include "scatterpresenter_p.h"
             #include "qscatterseries.h"
             #include <QPen>
             #include <QPainter>
             #include <QGraphicsScene>
             #include <QGraphicsSceneMouseEvent>
             #include <QGraphicsDropShadowEffect>
             #include <QDebug>
             #include <QTime>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ScatterPresenter::ScatterPresenter(QScatterSeries *series, QGraphicsObject *parent) :
                 ChartItem(parent),
                 m_series(series),
                 m_boundingRect(),
                 m_visibleChartArea()
             {
                 if (parent)
                     m_boundingRect = parent->boundingRect();
                 if (series) {
                     connect(series, SIGNAL(changed()), this, SLOT(handleModelChanged()));
                 }
                 QGraphicsDropShadowEffect *dropShadow = new QGraphicsDropShadowEffect();
                 dropShadow->setOffset(2.0);
+                dropShadow->setBlurRadius(2.0);
                 setGraphicsEffect(dropShadow);
             }
             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*/)
             {
                 painter->save();
                 painter->setClipRect(m_boundingRect);
                 // Paint the shape
                 // The custom settings in series override those defined by the theme
                 QPen pen = m_markerPen;
-                if (m_series->markerPen().color().isValid())
+                if (m_series->pen().color().isValid())
-                    pen = m_series->markerPen();
+                    pen = m_series->pen();
-                if (m_series->markerBrush().color().isValid())
+                if (m_series->brush().color().isValid())
-                    painter->setBrush(m_series->markerBrush());
+                    painter->setBrush(m_series->brush());
                 else
                     painter->setBrush(m_markerBrush);
                 painter->setPen(pen);
                 painter->drawPath(m_path);
                 painter->restore();
             }
             void ScatterPresenter::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 qDebug() << "ScatterPresenter::mousePressEvent" << event << " cont: "
                     << m_path.contains(event->lastPos());
                 if (m_path.contains(event->lastPos()))
                     emit clicked();
             }
             void ScatterPresenter::changeGeometry()
             {
                 if (m_boundingRect.isValid()) {
                     prepareGeometryChange();
                     qreal scalex = m_boundingRect.width() / m_visibleChartArea.spanX();
                     qreal scaley = m_boundingRect.height() / m_visibleChartArea.spanY();
-                    int shape = m_series->markerShape();
+                    int shape = m_series->shape();
                     m_path = QPainterPath();
                     foreach (QPointF point, m_series->data()) {
                         // Convert relative coordinates to absolute pixel coordinates that can be used for drawing
                         qreal x = m_boundingRect.left() + point.x() * scalex - m_visibleChartArea.m_minX * scalex;
                         qreal y = m_boundingRect.bottom() - point.y() * scaley + m_visibleChartArea.m_minY * scaley;
                         if (scene()->width() > x && scene()->height() > y) {
                             switch (shape) {
                             case QScatterSeries::MarkerShapeDefault:
                                 // Fallthrough, defaults to circle
                             case QScatterSeries::MarkerShapeCircle:
                                 m_path.addEllipse(x, y, 9, 9);
                                 break;
                             case QScatterSeries::MarkerShapePoint:
                                 m_path.addEllipse(x, y, 2, 2);
                                 break;
                             case QScatterSeries::MarkerShapeRectangle:
                                 m_path.addRect(x, y, 9, 9);
                                 break;
                             case QScatterSeries::MarkerShapeTiltedRectangle: {
-                                // TODO:
+                                // TODO: tilt the rectangle
-            //                    static const QPointF points[4] = {
+                                m_path.addRect(x, y, 9, 9);
-            //                        QPointF(-1.0 + x, 0.0 + y),
-            //                        QPointF(0.0 + x, 1.0 + y),
-            //                        QPointF(1.0 + x, 0.0 + y),
-            //                        QPointF(0.0 + x, -1.0 + y)
-            //                    };
-                                //m_path.addPolygon(QPolygon(4, &points));
                                 break;
                             }
                             default:
                                 // TODO: implement the rest of the shapes
                                 Q_ASSERT(false);
                                 break;
                             }
                         }
                     }
                 }
             }
             #include "moc_scatterpresenter_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