diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-12 13:35:08 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-12 13:35:35 +0300 |
| commit | 77ac34f3584bd4712c303cac7ec1486c1ef74b4b (patch) | |
| tree | adfb1fa672b6dfc5088cf4c4ce2ea0281a28d7e6 /src/datavisualizationqml2/declarativescatter.cpp | |
| parent | 7f8966b035c9fd73d2cde04521c92892feefc0f9 (diff) | |
Added getters
Task-number: QTRD-2243
Change-Id: I13ba560a853c2c39fc24c6dc373e50d56f8c33ef
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/declarativescatter.cpp')
| -rw-r--r-- | src/datavisualizationqml2/declarativescatter.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp index 64bd324f..3c3b1371 100644 --- a/src/datavisualizationqml2/declarativescatter.cpp +++ b/src/datavisualizationqml2/declarativescatter.cpp @@ -28,7 +28,6 @@ DeclarativeScatter::DeclarativeScatter(QQuickItem *parent) : QQuickItem(parent), m_shared(0), m_initialisedSize(0, 0), - m_cameraPreset(QDataVis::NoPreset), m_theme(QDataVis::ThemeDefault) { setFlags(QQuickItem::ItemHasContents); @@ -84,10 +83,9 @@ void DeclarativeScatter::setCameraPosition(qreal horizontal, qreal vertical, int m_shared->setCameraPosition(GLfloat(horizontal), GLfloat(vertical), GLint(distance)); } -void DeclarativeScatter::setObjectColor(const QColor &baseColor, const QColor &heightColor, - const QColor &depthColor, bool uniform) +void DeclarativeScatter::setObjectColor(const QColor &baseColor, bool uniform) { - m_shared->setObjectColor(baseColor, heightColor, depthColor, uniform); + m_shared->setObjectColor(baseColor, uniform); } QScatterDataProxy *DeclarativeScatter::dataProxy() const @@ -181,15 +179,12 @@ QString DeclarativeScatter::meshFileName() void DeclarativeScatter::setCameraPreset(QDataVis::CameraPreset preset) { - // TODO: Implement correctly once "improved camera api" (QTRD-2122) is implemented - // We need to save this locally, as there are no getters for it in controller - m_cameraPreset = preset; m_shared->setCameraPreset(preset); } QDataVis::CameraPreset DeclarativeScatter::cameraPreset() { - return m_cameraPreset; + return m_shared->cameraPreset(); } void DeclarativeScatter::setTheme(QDataVis::ColorTheme theme) |