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

                  <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>

example/scatter/main.cpp +4 -9

                 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)
                 }
                 //! [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);

qmlplugin/declarativescatterseries.cpp +1 -1

                 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());
                 }
             }

src/scatterseries/qscatterseries.cpp +21 -24

             */
             /*!
-                \fn void QScatterSeries::hoverEnter()
-                \brief TODO
-            */
-            /*!
-                \fn void QScatterSeries::hoverLeave()
-                \brief TODO
-            */
-            /*!
                 \fn void QScatterSeries::changed()
                 \brief TODO
             */
             }
             /*!
+                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
             /*!
                 Stream operator for adding a list of points to the series.
-                \sa addData()
+                \sa add()
             */
             QScatterSeries& QScatterSeries::operator << (QList<QPointF> value)
             {
                 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;
             }
                 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;
             }
                 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;
             }

src/scatterseries/qscatterseries.h +10 -13

                 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)

src/scatterseries/scatterpresenter.cpp +8 -13

                 QGraphicsDropShadowEffect *dropShadow = new QGraphicsDropShadowEffect();
                 dropShadow->setOffset(2.0);
+                dropShadow->setBlurRadius(2.0);
                 setGraphicsEffect(dropShadow);
             }
                 // 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);
                     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()) {
                                 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:

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