From 0d102fc3030e3c96144261a57a5e03c050cdf97c Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 7 Oct 2014 15:03:35 +0300 Subject: [PATCH] Fix minor issues found in testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If40f10043951409b3d6597776b60d7eb55c73eec Reviewed-by: Mika Salmela Reviewed-by: Tomi Korpipää --- examples/datavisualization/volumetric/volumetric.cpp | 2 +- src/datavisualization/utils/texturehelper.cpp | 3 +++ tests/barstest/main.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/datavisualization/volumetric/volumetric.cpp b/examples/datavisualization/volumetric/volumetric.cpp index ade74fb2..788ada7a 100644 --- a/examples/datavisualization/volumetric/volumetric.cpp +++ b/examples/datavisualization/volumetric/volumetric.cpp @@ -42,7 +42,7 @@ const int mineShaftDiameter(1); const int airColorIndex(254); const int mineShaftColorIndex(255); const int layerColorThickness(60); -const int heightToColorDiv(128); +const int heightToColorDiv(140); const int magmaColorsMin(0); const int magmaColorsMax(layerColorThickness); const int aboveWaterGroundColorsMin(magmaColorsMax + 1); diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp index 9dbf0613..1d8de71d 100644 --- a/src/datavisualization/utils/texturehelper.cpp +++ b/src/datavisualization/utils/texturehelper.cpp @@ -45,6 +45,9 @@ TextureHelper::TextureHelper() TextureHelper::~TextureHelper() { +#if !defined(QT_OPENGL_ES_2) + delete m_openGlFunctions_2_1; +#endif } GLuint TextureHelper::create2DTexture(const QImage &image, bool useTrilinearFiltering, diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index a468cb57..9a791c5b 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/main.cpp @@ -236,7 +236,7 @@ int main(int argc, char **argv) QCheckBox *inputHandlerZoomAtTargetCheckBox = new QCheckBox(widget); inputHandlerZoomAtTargetCheckBox->setText("IH: setZoomAtTarget"); - inputHandlerZoomAtTargetCheckBox->setChecked(false); + inputHandlerZoomAtTargetCheckBox->setChecked(true); QSlider *rotationSliderX = new QSlider(Qt::Horizontal, widget); rotationSliderX->setTickInterval(1);