HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1276:2661cb767b8b

demos/qmlcustomizations/qml/qmlcustomizations/main.qml +1 0

                             interval = splineSeries.at(__activeIndex).y;
                             scatterSeries.append(__activeIndex, interval);
                             scatterSeries.color = Qt.tint(scatterSeries.color, "#05FF0000");
+                            scatterSeries.markerSize += 0.5;
                         } else {
                             // Switch the colors of the slice and the border
                             wheelOfFortune.at(index).borderWidth = 2;

demos/qmlcustommodel/customtablemodel.h 0 -1

                 Qt::ItemFlags flags ( const QModelIndex & index ) const;
                 void insertColumn(int column, const QModelIndex &parent = QModelIndex());
                 void insertRow(int row, const QModelIndex &parent = QModelIndex());
-                /*Q_INVOKABLE*/ //bool removeRow(int row, const QModelIndex &parent = QModelIndex());
                 Q_INVOKABLE bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex());
                 Q_INVOKABLE bool removeRow (int row, const QModelIndex &parent = QModelIndex());

examples/scatterchart/chartview.cpp +4 -4

                 //![1]
                 QScatterSeries *series0 = new QScatterSeries();
                 series0->setName("scatter1");
-                series0->setShape(QScatterSeries::MarkerShapeCircle);
+                series0->setMarkerShape(QScatterSeries::MarkerShapeCircle);
-                series0->setSize(15.0);
+                series0->setMarkerSize(15.0);
                 QScatterSeries *series1 = new QScatterSeries();
                 series1->setName("scatter2");
-                series1->setShape(QScatterSeries::MarkerShapeCircle);
+                series1->setMarkerShape(QScatterSeries::MarkerShapeCircle);
-                series1->setSize(20.0);
+                series1->setMarkerSize(20.0);
                 //![1]
                 //![2]

plugins/declarative/plugin.cpp +3 0

                     qmlRegisterType<DeclarativePieSlice>(uri, 1, 0, "PieSlice");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
+                    qmlRegisterUncreatableType<QScatterSeries>(uri, 1, 0, "QScatterSeries",
+                                                      QLatin1String("Trying to create uncreatable: QScatterSeries."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
                                                       QLatin1String("Trying to create uncreatable: QPieSeries."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",

src/linechart/qlineseries.cpp +2 0

                 return line;
             }
+            #include "moc_qlineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/qlineseries.h +2 -2

             class QTCOMMERCIALCHART_EXPORT QLineSeries : public QXYSeries
             {
+                Q_OBJECT
             public:
                 explicit QLineSeries(QObject *parent = 0);
                 ~QLineSeries();
                 QAbstractSeries::SeriesType type() const;
             protected:
                 Q_DECLARE_PRIVATE(QLineSeries)
                 Q_DISABLE_COPY(QLineSeries)
                 friend class LineChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterchart/qscatterseries.cpp +5 -4

             /*!
                 Returns the shape used for drawing markers.
             */
-            QScatterSeries::MarkerShape QScatterSeries::shape() const
+            QScatterSeries::MarkerShape QScatterSeries::markerShape() const
             {
                 Q_D(const QScatterSeries);
                 return d->m_shape;
                 Overrides the default shape of the marker items with a user defined \a shape. The default shape
                 is defined by chart theme setting.
             */
-            void QScatterSeries::setShape(MarkerShape shape)
+            void QScatterSeries::setMarkerShape(MarkerShape shape)
             {
                 Q_D(QScatterSeries);
                 if (d->m_shape != shape) {
             /*!
                 Returns the size of the marker items.
             */
-            qreal QScatterSeries::size() const
+            qreal QScatterSeries::markerSize() const
             {
                 Q_D(const QScatterSeries);
                 return d->m_size;
             /*!
                 Set the \a size of the marker items. The default size is 15.
             */
-            void QScatterSeries::setSize(qreal size)
+            void QScatterSeries::setMarkerSize(qreal size)
             {
                 Q_D(QScatterSeries);
                 return scatter;
             }
+            #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterchart/qscatterseries.h +8 -6

             class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QXYSeries
             {
+                Q_OBJECT
+                Q_PROPERTY(MarkerShape markerShape READ markerShape WRITE setMarkerShape)
+                Q_PROPERTY(qreal markerSize READ markerSize WRITE setMarkerSize)
+                Q_ENUMS(MarkerShape)
             public:
                 enum MarkerShape {
             public:
                 explicit QScatterSeries(QObject *parent = 0);
                 ~QScatterSeries();
                 QAbstractSeries::SeriesType type() const;
+                MarkerShape markerShape() const;
-                MarkerShape shape() const;
+                void setMarkerShape(MarkerShape shape);
-                void setShape(MarkerShape shape);
+                qreal markerSize() const;
-                qreal size() const;
+                void setMarkerSize(qreal size);
-                void setSize(qreal size);
             private:
                 Q_DECLARE_PRIVATE(QScatterSeries)

src/scatterchart/scatterchartitem.cpp +7 -6

             void ScatterChartItem::handleUpdated()
             {
                 int count = m_items.childItems().count();
                 if(count==0) return;
-                bool recreate = m_size != m_series->size() || m_shape != m_series->shape();
+                bool recreate = m_size != m_series->markerSize() || m_shape != m_series->markerShape();
-                //TODO: only rewrite on size change
-                m_size = m_series->size();
+                m_size = m_series->markerSize();
-                m_shape = m_series->shape();
+                m_shape = m_series->markerShape();
                 if(recreate) {
+                    // TODO: optimize handleUpdate to recreate points only in case shape changed
                     deletePoints(count);
                     createPoints(count);
+                    // Updating geometry is now safe, because it won't call handleUpdated unless it creates/deletes points
+                    updateGeometry();
                 }
                 setPen(m_series->pen());

src/splinechart/qsplineseries.h +1 -1

             class QTCOMMERCIALCHART_EXPORT QSplineSeries : public QLineSeries
             {
                 Q_OBJECT
-            public:
+            public:
                 explicit QSplineSeries(QObject *parent = 0);
                 ~QSplineSeries();
                 QAbstractSeries::SeriesType type() const;

tests/chartwidgettest/dataseriedialog.cpp +1 0

                 layout->addWidget(radio);
                 layout->addWidget(new QRadioButton("50"));
                 layout->addWidget(new QRadioButton("100"));
+                layout->addWidget(new QRadioButton("1000"));
                 layout->addWidget(new QRadioButton("10000"));
                 layout->addWidget(new QRadioButton("100000"));
                 layout->addWidget(new QRadioButton("1000000"));

	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