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/multigraphs | |
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/multigraphs')
-rw-r--r-- | tests/multigraphs/australia.png | bin | 414991 -> 0 bytes | |||
-rw-r--r-- | tests/multigraphs/data.cpp | 329 | ||||
-rw-r--r-- | tests/multigraphs/data.h | 101 | ||||
-rw-r--r-- | tests/multigraphs/main.cpp | 159 | ||||
-rw-r--r-- | tests/multigraphs/multigraphs.pro | 12 | ||||
-rw-r--r-- | tests/multigraphs/multigraphs.qrc | 5 |
6 files changed, 0 insertions, 606 deletions
diff --git a/tests/multigraphs/australia.png b/tests/multigraphs/australia.png Binary files differdeleted file mode 100644 index a839b6b9..00000000 --- a/tests/multigraphs/australia.png +++ /dev/null diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp deleted file mode 100644 index 783deaf1..00000000 --- a/tests/multigraphs/data.cpp +++ /dev/null @@ -1,329 +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$ -** -******************************************************************************/ - -#define NOMINMAX - -#include "data.h" -#include <QtDataVisualization/QValue3DAxis> -#include <QtDataVisualization/Q3DCamera> -#include <QtDataVisualization/QBar3DSeries> -#include <QtDataVisualization/QScatter3DSeries> -#include <QtDataVisualization/QSurface3DSeries> -#include <QtDataVisualization/Q3DTheme> -#include <QScrollBar> -#include <QSize> -#include <QImage> - -using namespace QtDataVisualization; - -Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, - QTextEdit *statusArea, QWidget *widget) : - m_surface(surface), - m_scatter(scatter), - m_bars(bars), - m_statusArea(statusArea), - m_widget(widget), - m_resize(true), - m_resolution(QSize(300, 300)), - m_resolutionLevel(0), - m_mode(Surface), - m_scatterDataArray(0), - m_barDataArray(0), - m_started(false) -{ - // Initialize surface - m_surface->activeTheme()->setType(Q3DTheme::ThemeIsabelle); - QLinearGradient gradient; - gradient.setColorAt(0.0, Qt::black); - gradient.setColorAt(0.33, Qt::blue); - gradient.setColorAt(0.67, Qt::red); - gradient.setColorAt(1.0, Qt::yellow); - m_surface->setSelectionMode(QAbstract3DGraph::SelectionNone); - m_surface->activeTheme()->setGridEnabled(false); - m_surface->activeTheme()->setBackgroundEnabled(false); - m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150.0); - QSurface3DSeries *series1 = new QSurface3DSeries(new QHeightMapSurfaceDataProxy()); - series1->setFlatShadingEnabled(true); - series1->setDrawMode(QSurface3DSeries::DrawSurface); - series1->setColorStyle(Q3DTheme::ColorStyleRangeGradient); - series1->setBaseGradient(gradient); - m_surface->addSeries(series1); - - // Initialize scatter - m_scatter->activeTheme()->setType(Q3DTheme::ThemeStoneMoss); - m_scatter->setSelectionMode(QAbstract3DGraph::SelectionNone); - m_scatter->activeTheme()->setGridEnabled(false); - m_scatter->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow); - m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 85.0, 150.0); - QScatter3DSeries *series2 = new QScatter3DSeries; - series2->setMesh(QAbstract3DSeries::MeshPoint); - m_scatter->addSeries(series2); - - // Initialize bars - m_bars->activeTheme()->setType(Q3DTheme::ThemeQt); - m_bars->setSelectionMode(QAbstract3DGraph::SelectionItemAndRow | QAbstract3DGraph::SelectionSlice); - m_bars->activeTheme()->setGridEnabled(false); - m_bars->setShadowQuality(QAbstract3DGraph::ShadowQualityLow); - m_bars->setBarSpacing(QSizeF(0.0, 0.0)); - m_bars->scene()->activeCamera()->setCameraPosition(0.0, 75.0, 150.0); - QBar3DSeries *series3 = new QBar3DSeries; - series3->setMesh(QAbstract3DSeries::MeshBar); - m_bars->addSeries(series3); - - // Hide scroll bar - m_statusArea->verticalScrollBar()->setVisible(false); -} - -Data::~Data() -{ - delete m_bars; - delete m_surface; - delete m_scatter; - delete m_widget; - delete m_scatterDataArray; // only portion of this array is set to graph -} - -void Data::updateData() -{ - if (!m_started) { - m_statusArea->append(QStringLiteral("<i>We are stopped. The changes will take effect once started.</i>")); - return; - } - QImage depthMap = QImage(":/australia.png"); - if (m_resize) // Resize for better performance - depthMap = depthMap.scaled(m_resolution); - if (m_mode != Surface) - setData(depthMap); - else - static_cast<QHeightMapSurfaceDataProxy *>(m_surface->seriesList().at(0)->dataProxy())->setHeightMap( - depthMap); -} - -void Data::clearData() -{ - m_bars->seriesList().at(0)->dataProxy()->resetArray(0); - m_scatter->seriesList().at(0)->dataProxy()->resetArray(0); - m_surface->seriesList().at(0)->dataProxy()->resetArray(0); -} - -void Data::setResolution(int selection) -{ - m_resolutionLevel = selection; - switch (selection) { - case 0: { - m_resize = true; - m_resolution = QSize(300, 300); - break; - } - case 1: { - m_resize = true; - m_resolution = QSize(600, 600); - break; - } - case 2: { - m_resize = true; - m_resolution = QSize(800, 800); - break; - } - case 3: { - m_resize = false; - m_resolution = QSize(1020, 1020); // image size - break; - } - }; - if (m_mode == Scatter) { - m_resize = true; - m_resolution /= 3; - delete m_scatterDataArray; - m_scatterDataArray = new QScatterDataArray; - m_scatterDataArray->resize(m_resolution.width() * m_resolution.height()); - } else if (m_mode == Bars) { - m_resize = true; - m_resolution /= 6; - m_barDataArray = new QBarDataArray; - m_barDataArray->reserve(m_resolution.height()); - for (int i = 0; i < m_resolution.height(); i++) { - QBarDataRow *newProxyRow = new QBarDataRow(m_resolution.width()); - m_barDataArray->append(newProxyRow); - } - } - - m_statusArea->append(QString(QStringLiteral("<b>Resolution:</b> %1 x %2")).arg( - m_resolution.width()).arg(m_resolution.height())); - - updateData(); -} - -void Data::scrollDown() -{ - QScrollBar *scrollbar = m_statusArea->verticalScrollBar(); - scrollbar->setValue(scrollbar->maximum()); -} - -void Data::useGradientOne() -{ - m_surface->activeTheme()->setType(Q3DTheme::ThemeIsabelle); - QLinearGradient gradient; - gradient.setColorAt(0.0, Qt::black); - gradient.setColorAt(0.33, Qt::blue); - gradient.setColorAt(0.67, Qt::red); - gradient.setColorAt(1.0, Qt::yellow); - m_surface->seriesList().at(0)->setBaseGradient(gradient); - m_surface->seriesList().at(0)->setColorStyle(Q3DTheme::ColorStyleRangeGradient); - m_statusArea->append(QStringLiteral("<b>Colors:</b> Thermal image imitation")); -} - -void Data::useGradientTwo() -{ - m_surface->activeTheme()->setType(Q3DTheme::ThemeQt); - QLinearGradient gradient; - gradient.setColorAt(0.0, Qt::white); - gradient.setColorAt(0.8, Qt::red); - gradient.setColorAt(1.0, Qt::green); - m_surface->seriesList().at(0)->setBaseGradient(gradient); - m_surface->seriesList().at(0)->setColorStyle(Q3DTheme::ColorStyleRangeGradient); - m_statusArea->append(QStringLiteral("<b>Colors:</b> Highlight foreground")); -} - -void Data::setData(const QImage &image) -{ - QImage heightImage = image; - - uchar *bits = heightImage.bits(); - - int imageHeight = heightImage.height(); - int imageWidth = heightImage.width(); - int bitCount = imageWidth * 4 * (imageHeight - 1); - int widthBits = imageWidth * 4; - - if (m_mode == Scatter) { - QScatterDataItem *ptrToDataArray = &m_scatterDataArray->first(); - - int limitsX = imageWidth / 2; - int limitsZ = imageHeight / 2; - float height = 0; - int count = 0; - - for (int i = -limitsZ; i < limitsZ; i++, bitCount -= widthBits) { - for (int j = -limitsX; j < limitsX; j++) { - height = float(bits[bitCount + ((j + limitsX) * 4)]) - 128.0; - if (height > -128) { - ptrToDataArray->setPosition(QVector3D(float(j), height, float(i))); - ptrToDataArray++; - count++; - } - } - } - - QScatterDataArray *dataArray = new QScatterDataArray(m_scatterDataArray->mid(0, count)); - m_scatter->seriesList().at(0)->dataProxy()->resetArray(dataArray); - } else { - QBarDataArray *dataArray = m_barDataArray; - for (int i = 0; i < imageHeight; i++, bitCount -= widthBits) { - QBarDataRow &newRow = *dataArray->at(i); - for (int j = 0; j < imageWidth; j++) - newRow[j] = float(bits[bitCount + (j * 4)]); - } - - m_bars->seriesList().at(0)->dataProxy()->resetArray(dataArray); - } -} - -void Data::changeMode(int mode) -{ - m_mode = VisualizationMode(mode); - switch (m_mode) { - case Surface: { - m_statusArea->append(QStringLiteral("<b>Visualization Type:</b> Surface")); - break; - } - case Scatter: { - m_statusArea->append(QStringLiteral("<b>Visualization Type:</b> Scatter")); - break; - } - default: { - m_statusArea->append(QStringLiteral("<b>Visualization Type:</b> Bars")); - break; - } - } - // Reset resolution after mode change - setResolution(m_resolutionLevel); -} - -void Data::start() -{ - m_started = true; - // Reset resolution before starting (otherwise restart will crash due to empty data) - setResolution(m_resolutionLevel); - updateData(); - m_statusArea->append(QStringLiteral("<b>Started<\b>")); -} - -void Data::stop() -{ - m_started = false; - clearData(); - m_statusArea->append(QStringLiteral("<b>Stopped<\b>")); -} - -ContainerChanger::ContainerChanger(QWidget *surface, QWidget *scatter, QWidget *bars, - QWidget *buttonOne, QWidget *buttonTwo) - : m_surface(surface), - m_scatter(scatter), - m_bars(bars), - m_button1(buttonOne), - m_button2(buttonTwo) -{ -} - -ContainerChanger::~ContainerChanger() -{ -} - -void ContainerChanger::changeContainer(int container) -{ - switch (container) { - case 0: { - m_scatter->setVisible(false); - m_bars->setVisible(false); - m_surface->setVisible(true); - m_button1->setEnabled(true); - m_button2->setEnabled(true); - break; - } - case 1: { - m_surface->setVisible(false); - m_bars->setVisible(false); - m_scatter->setVisible(true); - m_button1->setEnabled(false); - m_button2->setEnabled(false); - break; - } - case 2: { - m_surface->setVisible(false); - m_scatter->setVisible(false); - m_bars->setVisible(true); - m_button1->setEnabled(false); - m_button2->setEnabled(false); - break; - } - } -} diff --git a/tests/multigraphs/data.h b/tests/multigraphs/data.h deleted file mode 100644 index 63f5beff..00000000 --- a/tests/multigraphs/data.h +++ /dev/null @@ -1,101 +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 DATA_H -#define DATA_H - -#include <QtDataVisualization/Q3DScatter> -#include <QtDataVisualization/Q3DBars> -#include <QtDataVisualization/Q3DSurface> -#include <QtDataVisualization/QScatterDataProxy> -#include <QtDataVisualization/QBarDataProxy> -#include <QtDataVisualization/QHeightMapSurfaceDataProxy> -#include <QTextEdit> - -using namespace QtDataVisualization; - -class Data : public QObject -{ - Q_OBJECT - -public: - explicit Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, - QTextEdit *statusLabel, QWidget *widget); - ~Data(); - - void start(); - void stop(); - - void updateData(); - void clearData(); - - void scrollDown(); - void setData(const QImage &image); - void useGradientOne(); - void useGradientTwo(); - -public: - enum VisualizationMode { - Surface = 0, - Scatter, - Bars - }; - -public Q_SLOTS: - void setResolution(int selection); - void changeMode(int mode); - -private: - Q3DSurface *m_surface; - Q3DScatter *m_scatter; - Q3DBars *m_bars; - QTextEdit *m_statusArea; - QWidget *m_widget; - bool m_resize; - QSize m_resolution; - int m_resolutionLevel; - VisualizationMode m_mode; - QScatterDataArray *m_scatterDataArray; - QBarDataArray *m_barDataArray; - bool m_started; -}; - -class ContainerChanger : public QObject -{ - Q_OBJECT - -public: - explicit ContainerChanger(QWidget *surface, QWidget *scatter, QWidget *bars, - QWidget *buttonOne, QWidget *buttonTwo); - ~ContainerChanger(); - -public Q_SLOTS: - void changeContainer(int container); - -private: - QWidget *m_surface; - QWidget *m_scatter; - QWidget *m_bars; - QWidget *m_button1; - QWidget *m_button2; -}; - -#endif diff --git a/tests/multigraphs/main.cpp b/tests/multigraphs/main.cpp deleted file mode 100644 index 2c539d1f..00000000 --- a/tests/multigraphs/main.cpp +++ /dev/null @@ -1,159 +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$ -** -******************************************************************************/ - -#include "data.h" - -#include <QApplication> -#include <QWidget> -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QPushButton> -#include <QLabel> -#include <QComboBox> -#include <QSlider> -#include <QTextEdit> -#include <QScreen> -#include <QPainter> - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - - QWidget *widget = new QWidget(); - QHBoxLayout *hLayout = new QHBoxLayout(widget); - QVBoxLayout *vLayout = new QVBoxLayout(); - - Q3DSurface *surface = new Q3DSurface(); - Q3DScatter *scatter = new Q3DScatter(); - Q3DBars *bars = new Q3DBars(); - - QSize screenSize = surface->screen()->size(); - - QWidget *containerSurface = QWidget::createWindowContainer(surface); - containerSurface->setMinimumSize(QSize(screenSize.height() / 1.2, screenSize.height() / 1.2)); - containerSurface->setMaximumSize(screenSize); - containerSurface->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - containerSurface->setFocusPolicy(Qt::StrongFocus); - - QWidget *containerScatter = QWidget::createWindowContainer(scatter); - containerScatter->setMinimumSize(QSize(screenSize.height() / 1.2, screenSize.height() / 1.2)); - containerScatter->setMaximumSize(screenSize); - containerScatter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - containerScatter->setFocusPolicy(Qt::StrongFocus); - containerScatter->setVisible(false); - - QWidget *containerBars = QWidget::createWindowContainer(bars); - containerBars->setMinimumSize(QSize(screenSize.height() / 1.2, screenSize.height() / 1.2)); - containerBars->setMaximumSize(screenSize); - containerBars->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - containerBars->setFocusPolicy(Qt::StrongFocus); - containerBars->setVisible(false); - - widget->setWindowTitle(QStringLiteral("Test switching graphs on the fly")); - - hLayout->addWidget(containerSurface, 1); - hLayout->addWidget(containerScatter, 1); - hLayout->addWidget(containerBars, 1); - hLayout->addLayout(vLayout); - - QPushButton *startButton = new QPushButton(widget); - startButton->setText(QStringLiteral("Start")); - - QPushButton *stopButton = new QPushButton(widget); - stopButton->setText(QStringLiteral("Stop")); - - QComboBox *resolutionBox = new QComboBox(widget); - resolutionBox->addItem(QStringLiteral("Low")); - resolutionBox->addItem(QStringLiteral("Medium")); - resolutionBox->addItem(QStringLiteral("High")); - resolutionBox->addItem(QStringLiteral("Max")); // Comment this out if demo machine is low-perf - resolutionBox->setCurrentIndex(0); - - QComboBox *modeBox = new QComboBox(widget); - modeBox->addItem(QStringLiteral("Surface Plot")); - modeBox->addItem(QStringLiteral("Scatter Chart")); - modeBox->addItem(QStringLiteral("Bar Chart")); - modeBox->setCurrentIndex(0); - - QLinearGradient gradientOne(0, 0, 200, 1); - gradientOne.setColorAt(0.0, Qt::black); - gradientOne.setColorAt(0.33, Qt::blue); - gradientOne.setColorAt(0.67, Qt::red); - gradientOne.setColorAt(1.0, Qt::yellow); - - QPixmap pm(200, 24); - QPainter pmp(&pm); - pmp.setBrush(QBrush(gradientOne)); - pmp.setPen(Qt::NoPen); - pmp.drawRect(0, 0, 200, 24); - - QPushButton *gradientOneButton = new QPushButton(widget); - gradientOneButton->setIcon(QIcon(pm)); - gradientOneButton->setIconSize(QSize(200, 24)); - gradientOneButton->setToolTip(QStringLiteral("Colors: Thermal Imitation")); - - QLinearGradient gradientTwo(0, 0, 200, 1); - gradientTwo.setColorAt(0.0, Qt::white); - gradientTwo.setColorAt(0.8, Qt::red); - gradientTwo.setColorAt(1.0, Qt::green); - - pmp.setBrush(QBrush(gradientTwo)); - pmp.setPen(Qt::NoPen); - pmp.drawRect(0, 0, 200, 24); - - QPushButton *gradientTwoButton = new QPushButton(widget); - gradientTwoButton->setIcon(QIcon(pm)); - gradientTwoButton->setIconSize(QSize(200, 24)); - gradientTwoButton->setToolTip(QStringLiteral("Colors: Highlight Foreground")); - - QTextEdit *status = new QTextEdit(QStringLiteral("<b>Ready</b><br>"), widget); - status->setReadOnly(true); - - vLayout->addWidget(startButton); - vLayout->addWidget(stopButton); - vLayout->addWidget(new QLabel(QStringLiteral("Change resolution"))); - vLayout->addWidget(resolutionBox); - vLayout->addWidget(new QLabel(QStringLiteral("Change visualization type"))); - vLayout->addWidget(modeBox); - vLayout->addWidget(new QLabel(QStringLiteral("Change color scheme"))); - vLayout->addWidget(gradientOneButton); - vLayout->addWidget(gradientTwoButton); - vLayout->addWidget(status, 1, Qt::AlignBottom); - - widget->show(); - - Data datagen(surface, scatter, bars, status, widget); - ContainerChanger changer(containerSurface, containerScatter, containerBars, - gradientOneButton, gradientTwoButton); - - QObject::connect(startButton, &QPushButton::clicked, &datagen, &Data::start); - QObject::connect(stopButton, &QPushButton::clicked, &datagen, &Data::stop); - QObject::connect(resolutionBox, SIGNAL(activated(int)), &datagen, SLOT(setResolution(int))); - QObject::connect(modeBox, SIGNAL(activated(int)), &changer, SLOT(changeContainer(int))); - QObject::connect(modeBox, SIGNAL(activated(int)), &datagen, SLOT(changeMode(int))); - QObject::connect(status, &QTextEdit::textChanged, &datagen, &Data::scrollDown); - QObject::connect(gradientOneButton, &QPushButton::clicked, &datagen, - &Data::useGradientOne); - QObject::connect(gradientTwoButton, &QPushButton::clicked, &datagen, - &Data::useGradientTwo); - - return app.exec(); -} diff --git a/tests/multigraphs/multigraphs.pro b/tests/multigraphs/multigraphs.pro deleted file mode 100644 index f1a7cffe..00000000 --- a/tests/multigraphs/multigraphs.pro +++ /dev/null @@ -1,12 +0,0 @@ -!include( ../tests.pri ) { - error( "Couldn't find the tests.pri file!" ) -} - -SOURCES += main.cpp \ - data.cpp -HEADERS += data.h - -QT += widgets - -RESOURCES += \ - multigraphs.qrc diff --git a/tests/multigraphs/multigraphs.qrc b/tests/multigraphs/multigraphs.qrc deleted file mode 100644 index bd924255..00000000 --- a/tests/multigraphs/multigraphs.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>australia.png</file> - </qresource> -</RCC> |