From 77ac34f3584bd4712c303cac7ec1486c1ef74b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 12 Sep 2013 13:35:08 +0300 Subject: Added getters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2243 Change-Id: I13ba560a853c2c39fc24c6dc373e50d56f8c33ef Reviewed-by: Tomi Korpipää --- src/datavisualizationqml2/declarativescatter.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/datavisualizationqml2/declarativescatter.cpp') 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) -- cgit v1.2.3