diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-22 09:26:46 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-22 09:59:10 +0200 |
| commit | fe2e12ffd7bb495634a66dc9c3e0d0fcbcfeb0df (patch) | |
| tree | c67b57f7a0a82a81f165f007b8d44a2e16aa0db5 /src/datavisualizationqml2/declarativeseries.cpp | |
| parent | 4588556895bc14803e3ad884e89eb988b751e6be (diff) | |
Multi series selection part 3: surface
Task-number: QTRD-2556
Change-Id: I3a465c1bfff95f6c89d2f473f9e235c6079b8116
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/declarativeseries.cpp')
| -rw-r--r-- | src/datavisualizationqml2/declarativeseries.cpp | 19 |
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 |