summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2/declarativesurface.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-09-12 13:35:08 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-09-12 13:35:35 +0300
commit77ac34f3584bd4712c303cac7ec1486c1ef74b4b (patch)
treeadfb1fa672b6dfc5088cf4c4ce2ea0281a28d7e6 /src/datavisualizationqml2/declarativesurface.cpp
parent7f8966b035c9fd73d2cde04521c92892feefc0f9 (diff)
Added getters
Task-number: QTRD-2243 Change-Id: I13ba560a853c2c39fc24c6dc373e50d56f8c33ef Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/declarativesurface.cpp')
-rw-r--r--src/datavisualizationqml2/declarativesurface.cpp15
1 files changed, 6 insertions, 9 deletions
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<Q3DValueAxis *>(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