HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r397:e3d058df67ba

doc/images/scatter_example_custom.jpg created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

doc/images/scatter_example1.jpg binary modified 0 0

NO CONTENT: modified file, binary diff hidden

example/scatter/main.cpp +16 -24

                  //! [1]
                  // Create chart view
                  QChartView *chartView = new QChartView();
-                 chartView->setChartTheme(QChart::ChartThemeIcy);
-                 // Add scatter series with simple test data
+                 chartView->setRenderHint(QPainter::Antialiasing);
+                 chartView->setChartTheme(QChart::ChartThemeScientific);
+                 // Add scatter series with linear test data with random "noise"
                  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);
+                 for (qreal i(0.0); i < 20; i += 0.25) {
+                     qreal x = i + (qreal)(rand() % 100) / 100.0;
+                     qreal y = i + (qreal)(rand() % 100) / 100.0;
+                     (*scatter) << QPointF(x, y);
+                 }
                  // Chart takes ownership
                  chartView->addSeries(scatter);
                  //! [1]
-             //    scatter->replace(0, QPointF(0.75, 5.0));
                  // And more
-                 //! [3]
-                 *scatter << QPointF(2.0, 5.5) << QPointF(2.2, 5.4);
-                 //! [3]
+                 //! [2]
+                 //*scatter << QPointF(2.0, 5.5) << QPointF(2.2, 5.4);
+                 //! [2]
-                 // Add another scatter series (re-use the previous pointer because the code used as snippets
-                 // in the docs)
-                 // - 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);
+                 //! [3]
+                 QBrush brush(QColor(255, 0, 0, 80), Qt::SolidPattern);
                  scatter->setBrush(brush);
-                 //! [4]
-                 //! [5]
-                 QPen pen(QColor(0, 255, 0, 80), 3);
+                 QPen pen(QColor(0, 255, 0, 60), 3);
                  scatter->setPen(pen);
-                 //! [5]
-                 //! [6]
                  scatter->setShape(QScatterSeries::MarkerShapeRectangle);
-                 //! [6]
-                 chartView->addSeries(scatter);
+                 scatter->setSize(15.0);
+                 //! [3]
                  // Use the chart widget as the central widget
                  QMainWindow w;

src/scatterseries/qscatterseries.cpp +29 -22

                  The example code would result the following:
                  \image scatter_example1.jpg
+                 To customize the graphical representation of the series, you can modify pen, brush, shape and
+                 size of the marker items. For example:
+                 \snippet ../example/scatter/main.cpp 3
+                 Would present your scatter markers as big rectangles with opaque, uglyish green outlines and
+                 opaque red filling instead of the beatiful markers defined by the chart's theme:
+                 \image scatter_example_custom.jpg
              */
              /*!
                  This enum describes the shape used when rendering marker items.
                  \value MarkerShapeDefault
-                 \value MarkerShapePoint
                  \value MarkerShapeX
                  \value MarkerShapeRectangle
                  \value MarkerShapeTiltedRectangle
                  m_data(QList<QPointF>()),
                  m_markerPen(QPen(QColor::Invalid)),
                  m_markerBrush(QBrush(QColor::Invalid)),
-                 m_markerShape(QScatterSeries::MarkerShapeDefault)
+                 m_markerShape(QScatterSeries::MarkerShapeDefault),
+                 m_markerSize(9.0)
              {
              }
                  \sa add()
                  For example:
-                 \snippet ../example/scatter/main.cpp 3
+                 \snippet ../example/scatter/main.cpp 2
              */
              QScatterSeries& QScatterSeries::operator << (const QPointF &value)
              {
                  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 setBrush()
                  \sa QChart::setChartTheme()
              */
                  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 setPen()
                  \sa QChart::setChartTheme()
              */
              /*!
                  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::setShape(MarkerShape shape)
              {
                  return (QScatterSeries::MarkerShape) d->m_markerShape;
              }
+             /*!
+                 Returns the size of the marker items.
+             */
+             qreal QScatterSeries::size()
+             {
+                 return d->m_markerSize;
+             }
+             /*!
+                 Set the \a size of the marker items. The default size is 9.0.
+             */
+             void QScatterSeries::setSize(qreal size)
+             {
+                 d->m_markerSize = size;
+                 emit changed();
+             }
              #include "moc_qscatterseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/qscatterseries.h +2 -2

                      // 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,
                  void setBrush(QBrush brush);
                  MarkerShape shape();
                  void setShape(MarkerShape shape);
-                 // TODO: marker size?
+                 qreal size();
+                 void setSize(qreal size);
              Q_SIGNALS:
                  void clicked(QPointF coordinate);

src/scatterseries/scatterpresenter.cpp +1 -4

                      int shape = m_series->shape();
                      m_path = QPainterPath();
                      m_path.setFillRule(Qt::WindingFill);
-                     const qreal size(9); // TODO: user defined size?
+                     const qreal size = m_series->size();
                      foreach (QPointF point, m_series->data()) {
                          // Convert relative coordinates to absolute pixel coordinates that can be used for drawing
                              case QScatterSeries::MarkerShapeCircle:
                                  m_path.addEllipse(x, y, size, size);
                                  break;
-                             case QScatterSeries::MarkerShapePoint:
-                                 m_path.addEllipse(x, y, 2, 2);
-                                 break;
                              case QScatterSeries::MarkerShapeRectangle:
                                  m_path.addRect(x, y, size, size);
                                  break;

src/scatterseries/scatterseries_p.h +1 0

                  QPen m_markerPen;
                  QBrush m_markerBrush;
                  int m_markerShape;
+                 qreal m_markerSize;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

doc/images/scatter_example_brush.jpg removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

doc/images/scatter_example_pen.jpg removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

doc/images/scatter_example_shape.jpg removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

	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