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/declarativebars.cpp | 11 +++-------- src/datavisualizationqml2/declarativebars_p.h | 4 +--- src/datavisualizationqml2/declarativescatter.cpp | 11 +++-------- src/datavisualizationqml2/declarativescatter_p.h | 4 +--- src/datavisualizationqml2/declarativesurface.cpp | 15 ++++++--------- src/datavisualizationqml2/declarativesurface_p.h | 1 - 6 files changed, 14 insertions(+), 32 deletions(-) (limited to 'src/datavisualizationqml2') diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index 3da8e416..7eee3e6d 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -29,7 +29,6 @@ DeclarativeBars::DeclarativeBars(QQuickItem *parent) : QQuickItem(parent), m_shared(0), m_initialisedSize(0, 0), - m_cameraPreset(QDataVis::NoPreset), m_theme(QDataVis::ThemeDefault) { setFlags(QQuickItem::ItemHasContents); @@ -86,10 +85,9 @@ void DeclarativeBars::setDataWindow(int rowCount, int columnCount) m_shared->setDataWindow(rowCount, columnCount); } -void DeclarativeBars::setBarColor(const QColor &baseColor, const QColor &heightColor, - const QColor &depthColor, bool uniform) +void DeclarativeBars::setBarColor(const QColor &baseColor, bool uniform) { - m_shared->setObjectColor(baseColor, heightColor, depthColor, uniform); + m_shared->setObjectColor(baseColor, uniform); } void DeclarativeBars::setCameraPosition(qreal horizontal, qreal vertical, int distance) @@ -218,15 +216,12 @@ QString DeclarativeBars::meshFileName() void DeclarativeBars::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 DeclarativeBars::cameraPreset() { - return m_cameraPreset; + return m_shared->cameraPreset(); } void DeclarativeBars::setTheme(QDataVis::ColorTheme theme) diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index f86efe79..a85bc2da 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -84,8 +84,7 @@ public: // Set color if you don't want to use themes. Set uniform to false if you want the (height) // color to change from bottom to top - Q_INVOKABLE void setBarColor(const QColor &baseColor, const QColor &heightColor, - const QColor &depthColor, bool uniform = true); + Q_INVOKABLE void setBarColor(const QColor &baseColor, bool uniform = true); // Set camera rotation if you don't want to use the presets (in horizontal (-180...180) and // vertical (0...90) (or (-90...90) if there are negative values) angles and distance in @@ -193,7 +192,6 @@ protected: private: QSize m_initialisedSize; - QDataVis::CameraPreset m_cameraPreset; QDataVis::ColorTheme m_theme; }; 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) diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index 80137507..6c70a146 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -77,8 +77,7 @@ public: // Set color if you don't want to use themes. Set uniform to false if you want the (height) // color to change from bottom to top - Q_INVOKABLE void setObjectColor(const QColor &baseColor, const QColor &heightColor, - const QColor &depthColor, bool uniform = true); + Q_INVOKABLE void setObjectColor(const QColor &baseColor, bool uniform = true); QScatterDataProxy *dataProxy() const; void setDataProxy(QScatterDataProxy *dataProxy); @@ -158,7 +157,6 @@ protected: private: QSize m_initialisedSize; - QDataVis::CameraPreset m_cameraPreset; QDataVis::ColorTheme m_theme; }; diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index c3c5dd09..d238c9ad 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -27,7 +27,6 @@ DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) : QQuickItem(parent), m_shared(0), m_initialisedSize(0, 0), - m_cameraPreset(QDataVis::NoPreset), m_theme(QDataVis::ThemeDefault) { setFlags(QQuickItem::ItemHasContents); @@ -96,12 +95,15 @@ QSurfaceDataProxy *DeclarativeSurface::dataProxy() const void DeclarativeSurface::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 DeclarativeSurface::cameraPreset() +{ + return m_shared->cameraPreset(); + +} + Q3DValueAxis *DeclarativeSurface::axisX() const { return static_cast(m_shared->axisX()); @@ -132,11 +134,6 @@ void DeclarativeSurface::setAxisZ(Q3DValueAxis *axis) m_shared->setAxisZ(axis); } -QDataVis::CameraPreset DeclarativeSurface::cameraPreset() -{ - return m_cameraPreset; -} - void DeclarativeSurface::setTheme(QDataVis::ColorTheme theme) { // TODO: Implement correctly once "user-modifiable themes" (QTRD-2120) is implemented diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index 180e1cc4..cc20449d 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -147,7 +147,6 @@ protected: private: QSize m_initialisedSize; - QDataVis::CameraPreset m_cameraPreset; QDataVis::ColorTheme m_theme; }; -- cgit v1.2.3