diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-30 11:05:22 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-30 11:41:49 +0300 |
commit | 4d107b5280fbc056568674e6a8cf1d588a9d0d99 (patch) | |
tree | b78a3cd716fad03297a0d7c4cd20ddfd2c58ba5f /src/datavisualization/engine/surface3drenderer.cpp | |
parent | 62bcc7affd7ca0cda298f1e373c441e6b2cde53c (diff) |
Fix surface selection texture generation
Task-number: QTRD-3157
Change-Id: Ida6cdac83a9f233a57ab5a621799bd1af2dd0cfc
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Diffstat (limited to 'src/datavisualization/engine/surface3drenderer.cpp')
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index ea750c78..0628a77e 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -2205,15 +2205,15 @@ void Surface3DRenderer::updateSelectionTextures() void Surface3DRenderer::createSelectionTexture(SurfaceSeriesRenderCache *cache, uint &lastSelectionId) { - // Create the selection ID image. Each grid corner gets 2x2 pixel area of // ID color so that each vertex (data point) has 4x4 pixel area of ID color const QRect &sampleSpace = cache->sampleSpace(); int idImageWidth = (sampleSpace.width() - 1) * 4; int idImageHeight = (sampleSpace.height() - 1) * 4; - if (idImageHeight < 0 || idImageWidth < 0) { + if (idImageHeight <= 0 || idImageWidth <= 0) { cache->setSelectionIdRange(-1, -1); + cache->setSelectionTexture(0); return; } @@ -2245,7 +2245,7 @@ void Surface3DRenderer::createSelectionTexture(SurfaceSeriesRenderCache *cache, cache->setSelectionIdRange(idStart, lastSelectionId - 1); // Move the ID image (bits) to the texture - QImage image = QImage(bits, idImageWidth, idImageHeight, QImage::Format_RGB32); + QImage image = QImage(bits, idImageWidth, idImageHeight, QImage::Format_ARGB32); GLuint selectionTexture = m_textureHelper->create2DTexture(image, false, false, false); cache->setSelectionTexture(selectionTexture); |