Invalid point/selection as constant property in qml

Also fixed 0,0 QPoint -> QPointF conversion issue for Q3DScene

Task-number: QTRD-2688
Change-Id: I3778081bb6ef2b5dbfcaad7502a4e164286c2646
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>

1 files changed, 16 insertions, 3 deletions

diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h
index c9c3dc7a..8d191703 100644
--- a/src/datavisualizationqml2/declarativeseries_p.h
+++ b/src/datavisualizationqml2/declarativeseries_p.h
@@ -48,13 +48,16 @@ class DeclarativeBar3DSeries : public QBar3DSeries
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
-    // selectedBar property is overloaded to use QPointF instead of QPoint to work around qml bug
+    // This property is overloaded to use QPointF instead of QPoint to work around qml bug
     // where Qt.point(0, 0) can't be assigned due to error "Cannot assign QPointF to QPoint".
     Q_PROPERTY(QPointF selectedBar READ selectedBar WRITE setSelectedBar NOTIFY selectedBarChanged)
+    // This is static method in parent class, overload as constant property for qml.
+    Q_PROPERTY(QPointF invalidSelectionPosition READ invalidSelectionPosition CONSTANT)
     Q_PROPERTY(ColorGradient *baseGradient READ baseGradient WRITE setBaseGradient NOTIFY baseGradientChanged)
     Q_PROPERTY(ColorGradient *singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged)
     Q_PROPERTY(ColorGradient *multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
+
 public:
     DeclarativeBar3DSeries(QObject *parent = 0);
     virtual ~DeclarativeBar3DSeries();
@@ -64,7 +67,7 @@ public:
 
     void setSelectedBar(const QPointF &position);
     QPointF selectedBar() const;
-    Q_INVOKABLE QPointF invalidSelectionPosition() const;
+    QPointF invalidSelectionPosition() const;
 
     void setBaseGradient(ColorGradient *gradient);
     ColorGradient *baseGradient() const;
@@ -97,7 +100,10 @@ class DeclarativeScatter3DSeries : public QScatter3DSeries
     Q_PROPERTY(ColorGradient *baseGradient READ baseGradient WRITE setBaseGradient NOTIFY baseGradientChanged)
     Q_PROPERTY(ColorGradient *singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged)
     Q_PROPERTY(ColorGradient *multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
+    // This is static method in parent class, overload as constant property for qml.
+    Q_PROPERTY(int invalidSelectionIndex READ invalidSelectionIndex CONSTANT)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
+
 public:
     DeclarativeScatter3DSeries(QObject *parent = 0);
     virtual ~DeclarativeScatter3DSeries();
@@ -112,6 +118,8 @@ public:
     void setMultiHighlightGradient(ColorGradient *gradient);
     ColorGradient *multiHighlightGradient() const;
 
+    int invalidSelectionIndex() const;
+
 public slots:
     void handleBaseGradientUpdate();
     void handleSingleHighlightGradientUpdate();
@@ -132,18 +140,23 @@ class DeclarativeSurface3DSeries : public QSurface3DSeries
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
+    // This property is overloaded to use QPointF instead of QPoint to work around qml bug
+    // where Qt.point(0, 0) can't be assigned due to error "Cannot assign QPointF to QPoint".
     Q_PROPERTY(QPointF selectedPoint READ selectedPoint WRITE setSelectedPoint NOTIFY selectedPointChanged)
+    // This is static method in parent class, overload as constant property for qml.
+    Q_PROPERTY(QPointF invalidSelectionPosition READ invalidSelectionPosition CONSTANT)
     Q_PROPERTY(ColorGradient *baseGradient READ baseGradient WRITE setBaseGradient NOTIFY baseGradientChanged)
     Q_PROPERTY(ColorGradient *singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged)
     Q_PROPERTY(ColorGradient *multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
+
 public:
     DeclarativeSurface3DSeries(QObject *parent = 0);
     virtual ~DeclarativeSurface3DSeries();
 
     void setSelectedPoint(const QPointF &position);
     QPointF selectedPoint() const;
-    Q_INVOKABLE QPointF invalidSelectionPosition() const;
+    QPointF invalidSelectionPosition() const;
 
     QQmlListProperty<QObject> seriesChildren();
     static void appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element);