diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-20 13:18:59 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-22 10:08:51 +0000 |
commit | 31f9c57bc50ae053cfaf039a1dfdb128e2494458 (patch) | |
tree | 316138cb73c49877f5a80a8496c2f1b737122fb5 /tests/volumetrictest/volumetrictest.h | |
parent | 4162ddeb02ee41fd4217d7f3d93d45cab3313ba8 (diff) |
Fix issues with COIN builds
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Diffstat (limited to 'tests/volumetrictest/volumetrictest.h')
-rw-r--r-- | tests/volumetrictest/volumetrictest.h | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/tests/volumetrictest/volumetrictest.h b/tests/volumetrictest/volumetrictest.h deleted file mode 100644 index 93d0ffae..00000000 --- a/tests/volumetrictest/volumetrictest.h +++ /dev/null @@ -1,83 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ - -#ifndef VOLUMETRICMODIFIER_H -#define VOLUMETRICMODIFIER_H - -#include <QtDataVisualization/qcustom3dvolume.h> -#include <QtDataVisualization/qcustom3ditem.h> -#include <QtDataVisualization/q3dscatter.h> -#include <QtDataVisualization/q3dsurface.h> -#include <QtDataVisualization/q3dbars.h> - -class QLabel; - -using namespace QtDataVisualization; - -class VolumetricModifier : public QObject -{ - Q_OBJECT -public: - explicit VolumetricModifier(QAbstract3DGraph *scatter); - ~VolumetricModifier(); - - void setFpsLabel(QLabel *fpsLabel); - void setSliceLabels(QLabel *xLabel, QLabel *yLabel, QLabel *zLabel); - -public Q_SLOTS: - void sliceX(int enabled); - void sliceY(int enabled); - void sliceZ(int enabled); - void adjustSliceX(int value); - void adjustSliceY(int value); - void adjustSliceZ(int value); - void handleFpsChange(); - void testSubtextureSetting(); - void adjustRangeX(int value); - void adjustRangeY(int value); - void adjustRangeZ(int value); - void testBoundsSetting(); - -private: - void createVolume(); - void createAnotherVolume(); - void createYetAnotherVolume(); - void checkRenderCase(int id, Qt::Axis axis, int index, const QVector<uchar> &dataBefore, - QCustom3DVolume *volumeItem); - - QAbstract3DGraph *m_graph; - Q3DScatter *m_scatterGraph; - Q3DSurface *m_surfaceGraph; - Q3DBars *m_barGraph; - QCustom3DVolume *m_volumeItem; - QCustom3DVolume *m_volumeItem2; - QCustom3DVolume *m_volumeItem3; - QCustom3DItem *m_plainItem; - int m_sliceIndexX; - int m_sliceIndexY; - int m_sliceIndexZ; - QLabel *m_fpsLabel; - QLabel *m_sliceLabelX; - QLabel *m_sliceLabelY; - QLabel *m_sliceLabelZ; -}; - -#endif |