summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2/declarativeseries.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualizationqml2/declarativeseries.cpp')
-rw-r--r--src/datavisualizationqml2/declarativeseries.cpp19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp
index 56601f83..57610c1a 100644
--- a/src/datavisualizationqml2/declarativeseries.cpp
+++ b/src/datavisualizationqml2/declarativeseries.cpp
@@ -54,7 +54,7 @@ void DeclarativeBar3DSeries::setSelectedBar(const QPointF &position)
QPointF DeclarativeBar3DSeries::selectedBar() const
{
- return QBar3DSeries::selectedBar();
+ return QPointF(QBar3DSeries::selectedBar());
}
QPointF DeclarativeBar3DSeries::invalidSelectionPosition() const
@@ -87,12 +87,29 @@ void DeclarativeScatter3DSeries::appendSeriesChildren(QQmlListProperty<QObject>
DeclarativeSurface3DSeries::DeclarativeSurface3DSeries(QObject *parent)
: QSurface3DSeries(parent)
{
+ QObject::connect(this, &QSurface3DSeries::selectedPointChanged, this,
+ &DeclarativeSurface3DSeries::selectedPointChanged);
}
DeclarativeSurface3DSeries::~DeclarativeSurface3DSeries()
{
}
+void DeclarativeSurface3DSeries::setSelectedPoint(const QPointF &position)
+{
+ QSurface3DSeries::setSelectedPoint(position.toPoint());
+}
+
+QPointF DeclarativeSurface3DSeries::selectedPoint() const
+{
+ return QPointF(QSurface3DSeries::selectedPoint());
+}
+
+QPointF DeclarativeSurface3DSeries::invalidSelectionPosition() const
+{
+ return QPointF(QSurface3DSeries::invalidSelectionPosition());
+}
+
QQmlListProperty<QObject> DeclarativeSurface3DSeries::seriesChildren()
{
return QQmlListProperty<QObject>(this, this, &DeclarativeSurface3DSeries::appendSeriesChildren