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/main.cpp | |
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/main.cpp')
-rw-r--r-- | tests/multigraphs/main.cpp | 159 |
1 files changed, 0 insertions, 159 deletions
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(); -} |