diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-23 13:57:47 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-24 09:50:51 +0300 |
commit | f842e21c7fa44d806c06a1463c723632b10e6172 (patch) | |
tree | 544b03ec20521c203a884cf74809972410532730 /src/datavisualization/utils/surfaceobject.cpp | |
parent | ac789c99ad04e5e907365d408d5f94df1685a668 (diff) |
Made surface axis ranges adjustable.
If the surface is partially off the visible range, only grids
that are fully within the visible range will be drawn.
If only one row or column is within visible range, surface is
not drawn.
Task-number: QTRD-2320
Change-Id: If2691577cde61dfd270d79c32b9d6f69984966ba
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/utils/surfaceobject.cpp')
-rw-r--r-- | src/datavisualization/utils/surfaceobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index a0ed292a..d28ad447 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -29,13 +29,14 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE SurfaceObject::SurfaceObject() { m_indicesType = GL_UNSIGNED_INT; + initializeOpenGLFunctions(); } SurfaceObject::~SurfaceObject() { } -void SurfaceObject::setUpSmoothData(const QSurfaceDataArray &dataArray, QRect space, GLfloat yRange, bool changeGeometry) +void SurfaceObject::setUpSmoothData(const QSurfaceDataArray &dataArray, const QRect &space, GLfloat yRange, bool changeGeometry) { int columns = space.width(); int rows = space.height(); @@ -129,7 +130,7 @@ void SurfaceObject::setUpSmoothData(const QSurfaceDataArray &dataArray, QRect sp } -void SurfaceObject::setUpData(const QSurfaceDataArray &dataArray, QRect space, GLfloat yRange, bool changeGeometry) +void SurfaceObject::setUpData(const QSurfaceDataArray &dataArray, const QRect &space, GLfloat yRange, bool changeGeometry) { int columns = space.width(); int rows = space.height(); @@ -226,7 +227,6 @@ void SurfaceObject::createBuffers(const QVector<QVector3D> &vertices, const QVec const QVector<QVector3D> &normals, const GLint *indices, const GLint *gridIndices, bool changeGeometry) { - initializeOpenGLFunctions(); if (m_meshDataLoaded) { // Delete old data glDeleteBuffers(1, &m_vertexbuffer); |