diff options
Diffstat (limited to 'tests')
128 files changed, 17639 insertions, 240 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro new file mode 100644 index 00000000..df2943a4 --- /dev/null +++ b/tests/auto/auto.pro @@ -0,0 +1,7 @@ +TEMPLATE = subdirs + +SUBDIRS += cpptest + +qtHaveModule(quick): SUBDIRS += qmltest + +installed_cmake.depends = cmake diff --git a/tests/auto/cpptest/cpptest.pro b/tests/auto/cpptest/cpptest.pro new file mode 100644 index 00000000..abd8f38e --- /dev/null +++ b/tests/auto/cpptest/cpptest.pro @@ -0,0 +1,26 @@ +TEMPLATE = subdirs +SUBDIRS = q3dbars \ + q3dbars-proxy \ + q3dbars-modelproxy \ + q3dbars-series \ + q3dscatter \ + q3dscatter-proxy \ + q3dscatter-modelproxy \ + q3dscatter-series \ + q3dsurface \ + q3dsurface-proxy \ + q3dsurface-modelproxy \ + q3dsurface-heightproxy \ + q3dsurface-series \ + q3daxis-category \ + q3daxis-logvalue \ + q3daxis-value \ + q3dscene \ + q3dscene-camera \ + q3dscene-light \ + q3dtheme \ + q3dinput \ + q3dinput-touch \ + q3dcustom \ + q3dcustom-label \ + q3dcustom-volume diff --git a/tests/auto/cpptest/q3daxis-category/q3daxis-category.pro b/tests/auto/cpptest/q3daxis-category/q3daxis-category.pro new file mode 100644 index 00000000..74415397 --- /dev/null +++ b/tests/auto/cpptest/q3daxis-category/q3daxis-category.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_axis.cpp diff --git a/tests/auto/cpptest/q3daxis-category/tst_axis.cpp b/tests/auto/cpptest/q3daxis-category/tst_axis.cpp new file mode 100644 index 00000000..800a0953 --- /dev/null +++ b/tests/auto/cpptest/q3daxis-category/tst_axis.cpp @@ -0,0 +1,133 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QCategory3DAxis> + +using namespace QtDataVisualization; + +class tst_axis: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + +private: + QCategory3DAxis *m_axis; +}; + +void tst_axis::initTestCase() +{ +} + +void tst_axis::cleanupTestCase() +{ +} + +void tst_axis::init() +{ + m_axis = new QCategory3DAxis(); +} + +void tst_axis::cleanup() +{ + delete m_axis; +} + +void tst_axis::construct() +{ + QCategory3DAxis *axis = new QCategory3DAxis(); + QVERIFY(axis); + delete axis; +} + +void tst_axis::initialProperties() +{ + QVERIFY(m_axis); + + QCOMPARE(m_axis->labels().length(), 0); + + // Common (from QAbstract3DAxis) + QCOMPARE(m_axis->isAutoAdjustRange(), true); + QCOMPARE(m_axis->labelAutoRotation(), 0.0f); + QCOMPARE(m_axis->max(), 10.0f); + QCOMPARE(m_axis->min(), 0.0f); + QCOMPARE(m_axis->orientation(), QAbstract3DAxis::AxisOrientationNone); + QCOMPARE(m_axis->title(), QString("")); + QCOMPARE(m_axis->isTitleFixed(), true); + QCOMPARE(m_axis->isTitleVisible(), false); + QCOMPARE(m_axis->type(), QAbstract3DAxis::AxisTypeCategory); +} + +void tst_axis::initializeProperties() +{ + QVERIFY(m_axis); + + m_axis->setLabels(QStringList() << "first" << "second"); + + QCOMPARE(m_axis->labels().length(), 2); + QCOMPARE(m_axis->labels().at(1), QString("second")); + + // Common (from QAbstract3DAxis) + m_axis->setAutoAdjustRange(false); + m_axis->setLabelAutoRotation(15.0f); + m_axis->setMax(25.0f); + m_axis->setMin(5.0f); + m_axis->setTitle("title"); + m_axis->setTitleFixed(false); + m_axis->setTitleVisible(true); + + QCOMPARE(m_axis->isAutoAdjustRange(), false); + QCOMPARE(m_axis->labelAutoRotation(), 15.0f); + QCOMPARE(m_axis->max(), 25.0f); + QCOMPARE(m_axis->min(), 5.0f); + QCOMPARE(m_axis->title(), QString("title")); + QCOMPARE(m_axis->isTitleFixed(), false); + QCOMPARE(m_axis->isTitleVisible(), true); +} + +void tst_axis::invalidProperties() +{ + m_axis->setLabelAutoRotation(-15.0f); + QCOMPARE(m_axis->labelAutoRotation(), 0.0f); + + m_axis->setLabelAutoRotation(100.0f); + QCOMPARE(m_axis->labelAutoRotation(), 90.0f); + + m_axis->setMax(-10.0f); + QCOMPARE(m_axis->max(), 0.0f); + QCOMPARE(m_axis->min(), 0.0f); + + m_axis->setMin(10.0f); + QCOMPARE(m_axis->max(), 11.0f); + QCOMPARE(m_axis->min(), 10.0f); +} + +QTEST_MAIN(tst_axis) +#include "tst_axis.moc" diff --git a/tests/auto/cpptest/q3daxis-logvalue/q3daxis-logvalue.pro b/tests/auto/cpptest/q3daxis-logvalue/q3daxis-logvalue.pro new file mode 100644 index 00000000..74415397 --- /dev/null +++ b/tests/auto/cpptest/q3daxis-logvalue/q3daxis-logvalue.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_axis.cpp diff --git a/tests/auto/cpptest/q3daxis-logvalue/tst_axis.cpp b/tests/auto/cpptest/q3daxis-logvalue/tst_axis.cpp new file mode 100644 index 00000000..adbedb24 --- /dev/null +++ b/tests/auto/cpptest/q3daxis-logvalue/tst_axis.cpp @@ -0,0 +1,102 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QLogValue3DAxisFormatter> + +using namespace QtDataVisualization; + +class tst_axis: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + +private: + QLogValue3DAxisFormatter *m_formatter; +}; + +void tst_axis::initTestCase() +{ +} + +void tst_axis::cleanupTestCase() +{ +} + +void tst_axis::init() +{ + m_formatter = new QLogValue3DAxisFormatter(); +} + +void tst_axis::cleanup() +{ + delete m_formatter; +} + +void tst_axis::construct() +{ + QLogValue3DAxisFormatter *formatter = new QLogValue3DAxisFormatter(); + QVERIFY(formatter); + delete formatter; +} + +void tst_axis::initialProperties() +{ + QVERIFY(m_formatter); + + QCOMPARE(m_formatter->autoSubGrid(), true); + QCOMPARE(m_formatter->base(), 10.0); + QCOMPARE(m_formatter->showEdgeLabels(), true); +} + +void tst_axis::initializeProperties() +{ + QVERIFY(m_formatter); + + m_formatter->setAutoSubGrid(false); + m_formatter->setBase(0.1); + m_formatter->setShowEdgeLabels(false); + + QCOMPARE(m_formatter->autoSubGrid(), false); + QCOMPARE(m_formatter->base(), 0.1); + QCOMPARE(m_formatter->showEdgeLabels(), false); +} + +void tst_axis::invalidProperties() +{ + m_formatter->setBase(-1.0); + QCOMPARE(m_formatter->base(), 10.0); + + m_formatter->setBase(1.0); + QCOMPARE(m_formatter->base(), 10.0); +} + +QTEST_MAIN(tst_axis) +#include "tst_axis.moc" diff --git a/tests/auto/cpptest/q3daxis-value/q3daxis-value.pro b/tests/auto/cpptest/q3daxis-value/q3daxis-value.pro new file mode 100644 index 00000000..74415397 --- /dev/null +++ b/tests/auto/cpptest/q3daxis-value/q3daxis-value.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_axis.cpp diff --git a/tests/auto/cpptest/q3daxis-value/tst_axis.cpp b/tests/auto/cpptest/q3daxis-value/tst_axis.cpp new file mode 100644 index 00000000..92029f13 --- /dev/null +++ b/tests/auto/cpptest/q3daxis-value/tst_axis.cpp @@ -0,0 +1,158 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QValue3DAxis> + +using namespace QtDataVisualization; + +class tst_axis: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + +private: + QValue3DAxis *m_axis; +}; + +void tst_axis::initTestCase() +{ +} + +void tst_axis::cleanupTestCase() +{ +} + +void tst_axis::init() +{ + m_axis = new QValue3DAxis(); +} + +void tst_axis::cleanup() +{ + delete m_axis; +} + +void tst_axis::construct() +{ + QValue3DAxis *axis = new QValue3DAxis(); + QVERIFY(axis); + delete axis; +} + +void tst_axis::initialProperties() +{ + QVERIFY(m_axis); + + QCOMPARE(m_axis->labelFormat(), QString("%.2f")); + QCOMPARE(m_axis->reversed(), false); + QCOMPARE(m_axis->segmentCount(), 5); + QCOMPARE(m_axis->subSegmentCount(), 1); + + // Common (from QAbstract3DAxis) + QCOMPARE(m_axis->isAutoAdjustRange(), true); + QCOMPARE(m_axis->labelAutoRotation(), 0.0f); + QCOMPARE(m_axis->labels().length(), 6); + QCOMPARE(m_axis->labels().at(0), QString("0.00")); + QCOMPARE(m_axis->labels().at(1), QString("2.00")); + QCOMPARE(m_axis->labels().at(2), QString("4.00")); + QCOMPARE(m_axis->labels().at(3), QString("6.00")); + QCOMPARE(m_axis->labels().at(4), QString("8.00")); + QCOMPARE(m_axis->labels().at(5), QString("10.00")); + QCOMPARE(m_axis->max(), 10.0f); + QCOMPARE(m_axis->min(), 0.0f); + QCOMPARE(m_axis->orientation(), QAbstract3DAxis::AxisOrientationNone); + QCOMPARE(m_axis->title(), QString("")); + QCOMPARE(m_axis->isTitleFixed(), true); + QCOMPARE(m_axis->isTitleVisible(), false); + QCOMPARE(m_axis->type(), QAbstract3DAxis::AxisTypeValue); +} + +void tst_axis::initializeProperties() +{ + QVERIFY(m_axis); + + m_axis->setLabelFormat("%.0fm"); + m_axis->setReversed(true); + m_axis->setSegmentCount(2); + m_axis->setSubSegmentCount(5); + + QCOMPARE(m_axis->labelFormat(), QString("%.0fm")); + QCOMPARE(m_axis->reversed(), true); + QCOMPARE(m_axis->segmentCount(), 2); + QCOMPARE(m_axis->subSegmentCount(), 5); + + // Common (from QAbstract3DAxis) + m_axis->setAutoAdjustRange(false); + m_axis->setLabelAutoRotation(15.0f); + m_axis->setMax(25.0f); + m_axis->setMin(5.0f); + m_axis->setTitle("title"); + m_axis->setTitleFixed(false); + m_axis->setTitleVisible(true); + + QCOMPARE(m_axis->isAutoAdjustRange(), false); + QCOMPARE(m_axis->labelAutoRotation(), 15.0f); + QCOMPARE(m_axis->labels().length(), 3); + QCOMPARE(m_axis->labels().at(0), QString("5m")); + QCOMPARE(m_axis->labels().at(1), QString("15m")); + QCOMPARE(m_axis->labels().at(2), QString("25m")); + QCOMPARE(m_axis->max(), 25.0f); + QCOMPARE(m_axis->min(), 5.0f); + QCOMPARE(m_axis->title(), QString("title")); + QCOMPARE(m_axis->isTitleFixed(), false); + QCOMPARE(m_axis->isTitleVisible(), true); +} + +void tst_axis::invalidProperties() +{ + m_axis->setSegmentCount(-1); + QCOMPARE(m_axis->segmentCount(), 1); + + m_axis->setSubSegmentCount(-1); + QCOMPARE(m_axis->subSegmentCount(), 1); + + m_axis->setLabelAutoRotation(-15.0f); + QCOMPARE(m_axis->labelAutoRotation(), 0.0f); + + m_axis->setLabelAutoRotation(100.0f); + QCOMPARE(m_axis->labelAutoRotation(), 90.0f); + + m_axis->setMax(-10.0f); + QCOMPARE(m_axis->max(), -10.0f); + QCOMPARE(m_axis->min(), -11.0f); + + m_axis->setMin(10.0f); + QCOMPARE(m_axis->max(), 11.0f); + QCOMPARE(m_axis->min(), 10.0f); +} + +QTEST_MAIN(tst_axis) +#include "tst_axis.moc" diff --git a/tests/auto/cpptest/q3dbars-modelproxy/q3dbars-modelproxy.pro b/tests/auto/cpptest/q3dbars-modelproxy/q3dbars-modelproxy.pro new file mode 100644 index 00000000..c383ec25 --- /dev/null +++ b/tests/auto/cpptest/q3dbars-modelproxy/q3dbars-modelproxy.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization widgets + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_proxy.cpp diff --git a/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp new file mode 100644 index 00000000..c65e151b --- /dev/null +++ b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp @@ -0,0 +1,267 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QItemModelBarDataProxy> +#include <QtDataVisualization/Q3DBars> +#include <QtWidgets/QTableWidget> + +using namespace QtDataVisualization; + +class tst_proxy: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + + void multiMatch(); + +private: + QItemModelBarDataProxy *m_proxy; +}; + +void tst_proxy::initTestCase() +{ +} + +void tst_proxy::cleanupTestCase() +{ +} + +void tst_proxy::init() +{ + m_proxy = new QItemModelBarDataProxy(); +} + +void tst_proxy::cleanup() +{ + delete m_proxy; +} + +void tst_proxy::construct() +{ + QItemModelBarDataProxy *proxy = new QItemModelBarDataProxy(); + QVERIFY(proxy); + delete proxy; + + QTableWidget *table = new QTableWidget(); + + proxy = new QItemModelBarDataProxy(table->model()); + QVERIFY(proxy); + delete proxy; + + proxy = new QItemModelBarDataProxy(table->model(), "val"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("")); + QCOMPARE(proxy->columnRole(), QString("")); + QCOMPARE(proxy->valueRole(), QString("val")); + QCOMPARE(proxy->rotationRole(), QString("")); + QCOMPARE(proxy->rowCategories().length(), 0); + QCOMPARE(proxy->columnCategories().length(), 0); + delete proxy; + + proxy = new QItemModelBarDataProxy(table->model(), "row", "col", "val"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("row")); + QCOMPARE(proxy->columnRole(), QString("col")); + QCOMPARE(proxy->valueRole(), QString("val")); + QCOMPARE(proxy->rotationRole(), QString("")); + QCOMPARE(proxy->rowCategories().length(), 0); + QCOMPARE(proxy->columnCategories().length(), 0); + delete proxy; + + proxy = new QItemModelBarDataProxy(table->model(), "row", "col", "val", "rot"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("row")); + QCOMPARE(proxy->columnRole(), QString("col")); + QCOMPARE(proxy->valueRole(), QString("val")); + QCOMPARE(proxy->rotationRole(), QString("rot")); + QCOMPARE(proxy->rowCategories().length(), 0); + QCOMPARE(proxy->columnCategories().length(), 0); + delete proxy; + + proxy = new QItemModelBarDataProxy(table->model(), "row", "col", "val", + QStringList() << "rowCat", QStringList() << "colCat"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("row")); + QCOMPARE(proxy->columnRole(), QString("col")); + QCOMPARE(proxy->valueRole(), QString("val")); + QCOMPARE(proxy->rotationRole(), QString("")); + QCOMPARE(proxy->rowCategories().length(), 1); + QCOMPARE(proxy->columnCategories().length(), 1); + delete proxy; + + proxy = new QItemModelBarDataProxy(table->model(), "row", "col", "val", "rot", + QStringList() << "rowCat", QStringList() << "colCat"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("row")); + QCOMPARE(proxy->columnRole(), QString("col")); + QCOMPARE(proxy->valueRole(), QString("val")); + QCOMPARE(proxy->rotationRole(), QString("rot")); + QCOMPARE(proxy->rowCategories().length(), 1); + QCOMPARE(proxy->columnCategories().length(), 1); + delete proxy; +} + +void tst_proxy::initialProperties() +{ + QVERIFY(m_proxy); + + QCOMPARE(m_proxy->autoColumnCategories(), true); + QCOMPARE(m_proxy->autoRowCategories(), true); + QCOMPARE(m_proxy->columnCategories(), QStringList()); + QCOMPARE(m_proxy->columnRole(), QString()); + QCOMPARE(m_proxy->columnRolePattern(), QRegExp()); + QCOMPARE(m_proxy->columnRoleReplace(), QString()); + QVERIFY(!m_proxy->itemModel()); + QCOMPARE(m_proxy->multiMatchBehavior(), QItemModelBarDataProxy::MMBLast); + QCOMPARE(m_proxy->rotationRole(), QString()); + QCOMPARE(m_proxy->rotationRolePattern(), QRegExp()); + QCOMPARE(m_proxy->rotationRoleReplace(), QString()); + QCOMPARE(m_proxy->rowCategories(), QStringList()); + QCOMPARE(m_proxy->rowRole(), QString()); + QCOMPARE(m_proxy->rowRolePattern(), QRegExp()); + QCOMPARE(m_proxy->rowRoleReplace(), QString()); + QCOMPARE(m_proxy->useModelCategories(), false); + QCOMPARE(m_proxy->valueRole(), QString()); + QCOMPARE(m_proxy->valueRolePattern(), QRegExp()); + QCOMPARE(m_proxy->valueRoleReplace(), QString()); + + QCOMPARE(m_proxy->columnLabels().count(), 0); + QCOMPARE(m_proxy->rowCount(), 0); + QCOMPARE(m_proxy->rowLabels().count(), 0); + QVERIFY(!m_proxy->series()); + + QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeBar); +} + +void tst_proxy::initializeProperties() +{ + QVERIFY(m_proxy); + + QTableWidget *table = new QTableWidget(); + + m_proxy->setAutoColumnCategories(false); + m_proxy->setAutoRowCategories(false); + m_proxy->setColumnCategories(QStringList() << "col1" << "col2"); + m_proxy->setColumnRole("column"); + m_proxy->setColumnRolePattern(QRegExp("/^.*-(\\d\\d)$/")); + m_proxy->setColumnRoleReplace("\\\\1"); + m_proxy->setItemModel(table->model()); + m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBAverage); + m_proxy->setRotationRole("rotation"); + m_proxy->setRotationRolePattern(QRegExp("/-/")); + m_proxy->setRotationRoleReplace("\\\\1"); + m_proxy->setRowCategories(QStringList() << "row1" << "row2"); + m_proxy->setRowRole("row"); + m_proxy->setRowRolePattern(QRegExp("/^(\\d\\d\\d\\d).*$/")); + m_proxy->setRowRoleReplace("\\\\1"); + m_proxy->setUseModelCategories(true); + m_proxy->setValueRole("value"); + m_proxy->setValueRolePattern(QRegExp("/-/")); + m_proxy->setValueRoleReplace("\\\\1"); + + QCOMPARE(m_proxy->autoColumnCategories(), false); + QCOMPARE(m_proxy->autoRowCategories(), false); + QCOMPARE(m_proxy->columnCategories().count(), 2); + QCOMPARE(m_proxy->columnRole(), QString("column")); + QCOMPARE(m_proxy->columnRolePattern(), QRegExp("/^.*-(\\d\\d)$/")); + QCOMPARE(m_proxy->columnRoleReplace(), QString("\\\\1")); + QVERIFY(m_proxy->itemModel()); + QCOMPARE(m_proxy->multiMatchBehavior(), QItemModelBarDataProxy::MMBAverage); + QCOMPARE(m_proxy->rotationRole(), QString("rotation")); + QCOMPARE(m_proxy->rotationRolePattern(), QRegExp("/-/")); + QCOMPARE(m_proxy->rotationRoleReplace(), QString("\\\\1")); + QCOMPARE(m_proxy->rowCategories().count(), 2); + QCOMPARE(m_proxy->rowRole(), QString("row")); + QCOMPARE(m_proxy->rowRolePattern(), QRegExp("/^(\\d\\d\\d\\d).*$/")); + QCOMPARE(m_proxy->rowRoleReplace(), QString("\\\\1")); + QCOMPARE(m_proxy->useModelCategories(), true); + QCOMPARE(m_proxy->valueRole(), QString("value")); + QCOMPARE(m_proxy->valueRolePattern(), QRegExp("/-/")); + QCOMPARE(m_proxy->valueRoleReplace(), QString("\\\\1")); +} + +void tst_proxy::multiMatch() +{ + Q3DBars *graph = new Q3DBars(); + + QTableWidget *table = new QTableWidget(); + QStringList rows; + rows << "row 1" << "row 2" << "row 3"; + QStringList columns; + columns << "col 1"; + const char *values[1][3] = {{"0/0/3.5/30", "0/0/5.0/30", "0/0/6.5/30"}}; + + table->setRowCount(1); + table->setColumnCount(3); + + for (int col = 0; col < columns.size(); col++) { + for (int row = 0; row < rows.size(); row++) { + QModelIndex index = table->model()->index(col, row); + table->model()->setData(index, values[col][row]); + } + } + + m_proxy->setItemModel(table->model()); + m_proxy->setRowRole(table->model()->roleNames().value(Qt::DisplayRole)); + m_proxy->setColumnRole(table->model()->roleNames().value(Qt::DisplayRole)); + m_proxy->setRowRolePattern(QRegExp(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$"))); + m_proxy->setRowRoleReplace(QStringLiteral("\\2")); + m_proxy->setValueRolePattern(QRegExp(QStringLiteral("^\\d*(\\/)(\\d*)\\/(\\d*[\\.\\,]?\\d*)\\/\\d*[\\.\\,]?\\d*$"))); + m_proxy->setValueRoleReplace(QStringLiteral("\\3")); + m_proxy->setColumnRolePattern(QRegExp(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$"))); + m_proxy->setColumnRoleReplace(QStringLiteral("\\1")); + + QBar3DSeries *series = new QBar3DSeries(m_proxy); + + graph->addSeries(series); + + QCoreApplication::processEvents(); + QCOMPARE(graph->valueAxis()->max(), 6.5f); + m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBFirst); + QCoreApplication::processEvents(); + QCOMPARE(graph->valueAxis()->max(), 3.5f); + m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBLast); + QCoreApplication::processEvents(); + QCOMPARE(graph->valueAxis()->max(), 6.5f); + m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBAverage); + QCoreApplication::processEvents(); + QCOMPARE(graph->valueAxis()->max(), 5.0f); + m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBCumulative); + QCoreApplication::processEvents(); + QCOMPARE(graph->valueAxis()->max(), 15.0f); + + QCOMPARE(m_proxy->columnLabels().count(), 1); + QCOMPARE(m_proxy->rowCount(), 1); + QCOMPARE(m_proxy->rowLabels().count(), 1); + QVERIFY(m_proxy->series()); +} + +QTEST_MAIN(tst_proxy) +#include "tst_proxy.moc" diff --git a/tests/auto/cpptest/q3dbars-proxy/q3dbars-proxy.pro b/tests/auto/cpptest/q3dbars-proxy/q3dbars-proxy.pro new file mode 100644 index 00000000..b0b5d361 --- /dev/null +++ b/tests/auto/cpptest/q3dbars-proxy/q3dbars-proxy.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_proxy.cpp diff --git a/tests/auto/cpptest/q3dbars-proxy/tst_proxy.cpp b/tests/auto/cpptest/q3dbars-proxy/tst_proxy.cpp new file mode 100644 index 00000000..8d64ed54 --- /dev/null +++ b/tests/auto/cpptest/q3dbars-proxy/tst_proxy.cpp @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QBarDataProxy> + +using namespace QtDataVisualization; + +class tst_proxy: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + +private: + QBarDataProxy *m_proxy; +}; + +void tst_proxy::initTestCase() +{ +} + +void tst_proxy::cleanupTestCase() +{ +} + +void tst_proxy::init() +{ + m_proxy = new QBarDataProxy(); +} + +void tst_proxy::cleanup() +{ + delete m_proxy; +} + +void tst_proxy::construct() +{ + QBarDataProxy *proxy = new QBarDataProxy(); + QVERIFY(proxy); + delete proxy; +} + +void tst_proxy::initialProperties() +{ + QVERIFY(m_proxy); + + QCOMPARE(m_proxy->columnLabels().count(), 0); + QCOMPARE(m_proxy->rowCount(), 0); + QCOMPARE(m_proxy->rowLabels().count(), 0); + QVERIFY(!m_proxy->series()); + + QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeBar); +} + +void tst_proxy::initializeProperties() +{ + QVERIFY(m_proxy); + + m_proxy->setColumnLabels(QStringList() << "1" << "2" << "3"); + QBarDataRow *data = new QBarDataRow; + *data << 1.0f << 3.0f << 7.5f; + m_proxy->addRow(data); + m_proxy->setRowLabels(QStringList() << "1"); + + QCOMPARE(m_proxy->columnLabels().count(), 3); + QCOMPARE(m_proxy->rowCount(), 1); + QCOMPARE(m_proxy->rowLabels().count(), 1); +} + +QTEST_MAIN(tst_proxy) +#include "tst_proxy.moc" diff --git a/tests/auto/cpptest/q3dbars-series/q3dbars-series.pro b/tests/auto/cpptest/q3dbars-series/q3dbars-series.pro new file mode 100644 index 00000000..481653ef --- /dev/null +++ b/tests/auto/cpptest/q3dbars-series/q3dbars-series.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_series.cpp diff --git a/tests/auto/cpptest/q3dbars-series/tst_series.cpp b/tests/auto/cpptest/q3dbars-series/tst_series.cpp new file mode 100644 index 00000000..e2a40ae7 --- /dev/null +++ b/tests/auto/cpptest/q3dbars-series/tst_series.cpp @@ -0,0 +1,169 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QBar3DSeries> + +using namespace QtDataVisualization; + +class tst_series: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + +private: + QBar3DSeries *m_series; +}; + +void tst_series::initTestCase() +{ +} + +void tst_series::cleanupTestCase() +{ +} + +void tst_series::init() +{ + m_series = new QBar3DSeries(); +} + +void tst_series::cleanup() +{ + delete m_series; +} + +void tst_series::construct() +{ + QBar3DSeries *series = new QBar3DSeries(); + QVERIFY(series); + delete series; + + QBarDataProxy *proxy = new QBarDataProxy(); + + series = new QBar3DSeries(proxy); + QVERIFY(series); + QCOMPARE(series->dataProxy(), proxy); + delete series; +} + +void tst_series::initialProperties() +{ + QVERIFY(m_series); + + QVERIFY(m_series->dataProxy()); + QCOMPARE(m_series->meshAngle(), 0.0f); + QCOMPARE(m_series->selectedBar(), m_series->invalidSelectionPosition()); + + // Common properties + QCOMPARE(m_series->baseColor(), QColor(Qt::black)); + QCOMPARE(m_series->baseGradient(), QLinearGradient()); + QCOMPARE(m_series->colorStyle(), Q3DTheme::ColorStyleUniform); + QCOMPARE(m_series->itemLabel(), QString("")); + QCOMPARE(m_series->itemLabelFormat(), QString("@valueLabel")); + QCOMPARE(m_series->isItemLabelVisible(), true); + QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshBevelBar); + QCOMPARE(m_series->meshRotation(), QQuaternion(1, 0, 0, 0)); + QCOMPARE(m_series->isMeshSmooth(), false); + QCOMPARE(m_series->multiHighlightColor(), QColor(Qt::black)); + QCOMPARE(m_series->multiHighlightGradient(), QLinearGradient()); + QCOMPARE(m_series->name(), QString("")); + QCOMPARE(m_series->singleHighlightColor(), QColor(Qt::black)); + QCOMPARE(m_series->singleHighlightGradient(), QLinearGradient()); + QCOMPARE(m_series->type(), QAbstract3DSeries::SeriesTypeBar); + QCOMPARE(m_series->userDefinedMesh(), QString("")); + QCOMPARE(m_series->isVisible(), true); +} + +void tst_series::initializeProperties() +{ + QVERIFY(m_series); + + m_series->setDataProxy(new QBarDataProxy()); + m_series->setMeshAngle(15.0f); + m_series->setSelectedBar(QPoint(0, 0)); + + QCOMPARE(m_series->meshAngle(), 15.0f); + QCOMPARE(m_series->selectedBar(), QPoint(0, 0)); + + QLinearGradient gradient1; + gradient1.setColorAt(0.0, Qt::red); + gradient1.setColorAt(1.0, Qt::blue); + QLinearGradient gradient2; + gradient2.setColorAt(0.0, Qt::yellow); + gradient2.setColorAt(1.0, Qt::green); + QLinearGradient gradient3; + gradient3.setColorAt(0.0, Qt::white); + gradient3.setColorAt(1.0, Qt::gray); + + // Common properties + m_series->setBaseColor(QColor(Qt::blue)); + m_series->setBaseGradient(gradient1); + m_series->setColorStyle(Q3DTheme::ColorStyleRangeGradient); + m_series->setItemLabelFormat("%f"); + m_series->setItemLabelVisible(false); + m_series->setMesh(QAbstract3DSeries::MeshCone); + m_series->setMeshSmooth(true); + m_series->setMultiHighlightColor(QColor(Qt::green)); + m_series->setMultiHighlightGradient(gradient2); + m_series->setName("name"); + m_series->setSingleHighlightColor(QColor(Qt::red)); + m_series->setSingleHighlightGradient(gradient3); + m_series->setUserDefinedMesh(":/customitem.obj"); + m_series->setVisible(false); + + QCOMPARE(m_series->baseColor(), QColor(Qt::blue)); + QCOMPARE(m_series->baseGradient(), gradient1); + QCOMPARE(m_series->baseGradient().stops().at(0).second, QColor(Qt::red)); + QCOMPARE(m_series->colorStyle(), Q3DTheme::ColorStyleRangeGradient); + QCOMPARE(m_series->itemLabelFormat(), QString("%f")); + QCOMPARE(m_series->isItemLabelVisible(), false); + QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshCone); + QCOMPARE(m_series->isMeshSmooth(), true); + QCOMPARE(m_series->multiHighlightColor(), QColor(Qt::green)); + QCOMPARE(m_series->multiHighlightGradient(), gradient2); + QCOMPARE(m_series->multiHighlightGradient().stops().at(0).second, QColor(Qt::yellow)); + QCOMPARE(m_series->name(), QString("name")); + QCOMPARE(m_series->singleHighlightColor(), QColor(Qt::red)); + QCOMPARE(m_series->singleHighlightGradient(), gradient3); + QCOMPARE(m_series->singleHighlightGradient().stops().at(0).second, QColor(Qt::white)); + QCOMPARE(m_series->userDefinedMesh(), QString(":/customitem.obj")); + QCOMPARE(m_series->isVisible(), false); +} + +void tst_series::invalidProperties() +{ + m_series->setMesh(QAbstract3DSeries::MeshMinimal); + + QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshBevelBar); +} + +QTEST_MAIN(tst_series) +#include "tst_series.moc" diff --git a/tests/auto/cpptest/q3dbars/q3dbars.pro b/tests/auto/cpptest/q3dbars/q3dbars.pro new file mode 100644 index 00000000..a7f7c809 --- /dev/null +++ b/tests/auto/cpptest/q3dbars/q3dbars.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_bars.cpp diff --git a/tests/auto/cpptest/q3dbars/tst_bars.cpp b/tests/auto/cpptest/q3dbars/tst_bars.cpp new file mode 100644 index 00000000..6910e4fa --- /dev/null +++ b/tests/auto/cpptest/q3dbars/tst_bars.cpp @@ -0,0 +1,401 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/Q3DBars> +#include <QtDataVisualization/QCustom3DItem> +#include <QtDataVisualization/Q3DInputHandler> +#include <QtDataVisualization/QTouch3DInputHandler> + +using namespace QtDataVisualization; + +class tst_bars: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + + void addSeries(); + void addMultipleSeries(); + void selectSeries(); + void removeSeries(); + void removeMultipleSeries(); + + // The following tests are not required for scatter or surface, as they are handled identically + void addInputHandler(); + void removeInputHandler(); + + void addTheme(); + void removeTheme(); + + void addCustomItem(); + void removeCustomItem(); + + void renderToImage(); + +private: + Q3DBars *m_graph; +}; + +QBar3DSeries *newSeries() +{ + QBar3DSeries *series = new QBar3DSeries; + QBarDataRow *data = new QBarDataRow; + *data << -1.0f << 3.0f << 7.5f << 5.0f << 2.2f; + series->dataProxy()->addRow(data); + return series; +} + +void tst_bars::initTestCase() +{ +} + +void tst_bars::cleanupTestCase() +{ +} + +void tst_bars::init() +{ + m_graph = new Q3DBars(); +} + +void tst_bars::cleanup() +{ + delete m_graph; +} + +void tst_bars::construct() +{ + Q3DBars *graph = new Q3DBars(); + QVERIFY(graph); + delete graph; + + graph = new Q3DBars(new QSurfaceFormat()); + QVERIFY(graph); + delete graph; +} + +void tst_bars::initialProperties() +{ + QVERIFY(m_graph); + QCOMPARE(m_graph->isMultiSeriesUniform(), false); + QCOMPARE(m_graph->barThickness(), 1.0); + QCOMPARE(m_graph->barSpacing(), QSizeF(1.0f, 1.0f)); + QCOMPARE(m_graph->isBarSpacingRelative(), true); + QCOMPARE(m_graph->seriesList().length(), 0); + QVERIFY(!m_graph->selectedSeries()); + QVERIFY(!m_graph->primarySeries()); + QCOMPARE(m_graph->floorLevel(), 0.0); + QCOMPARE(m_graph->columnAxis()->orientation(), QAbstract3DAxis::AxisOrientationX); + QCOMPARE(m_graph->valueAxis()->orientation(), QAbstract3DAxis::AxisOrientationY); + QCOMPARE(m_graph->rowAxis()->orientation(), QAbstract3DAxis::AxisOrientationZ); + + // Common properties + QCOMPARE(m_graph->activeTheme()->type(), Q3DTheme::ThemeQt); + QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem); + QCOMPARE(m_graph->shadowQuality(), QAbstract3DGraph::ShadowQualityMedium); + QVERIFY(m_graph->scene()); + QCOMPARE(m_graph->measureFps(), false); + QCOMPARE(m_graph->isOrthoProjection(), false); + QCOMPARE(m_graph->selectedElement(), QAbstract3DGraph::ElementNone); + QCOMPARE(m_graph->aspectRatio(), 2.0); + QCOMPARE(m_graph->optimizationHints(), QAbstract3DGraph::OptimizationDefault); + QCOMPARE(m_graph->isPolar(), false); + QCOMPARE(m_graph->radialLabelOffset(), 1.0); + QCOMPARE(m_graph->horizontalAspectRatio(), 0.0); + QCOMPARE(m_graph->isReflection(), false); + QCOMPARE(m_graph->reflectivity(), 0.5); + QCOMPARE(m_graph->locale(), QLocale("C")); + QCOMPARE(m_graph->queriedGraphPosition(), QVector3D(0, 0, 0)); + QCOMPARE(m_graph->margin(), -1.0); +} + +void tst_bars::initializeProperties() +{ + QVERIFY(m_graph); + + m_graph->setMultiSeriesUniform(true); + m_graph->setBarThickness(0.2f); + m_graph->setBarSpacing(QSizeF(0.1f, 0.1f)); + m_graph->setBarSpacingRelative(false); + m_graph->setFloorLevel(1.0f); + + QCOMPARE(m_graph->isMultiSeriesUniform(), true); + QCOMPARE(m_graph->barThickness(), 0.2f); + QCOMPARE(m_graph->barSpacing(), QSizeF(0.1f, 0.1f)); + QCOMPARE(m_graph->isBarSpacingRelative(), false); + QCOMPARE(m_graph->floorLevel(), 1.0f); + + Q3DTheme *theme = new Q3DTheme(Q3DTheme::ThemeDigia); + m_graph->setActiveTheme(theme); + m_graph->setSelectionMode(QAbstract3DGraph::SelectionItem | QAbstract3DGraph::SelectionRow | QAbstract3DGraph::SelectionSlice); + m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftHigh); + QCOMPARE(m_graph->shadowQuality(), QAbstract3DGraph::ShadowQualitySoftHigh); + m_graph->setMeasureFps(true); + m_graph->setOrthoProjection(true); + m_graph->setAspectRatio(1.0); + m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationStatic); + m_graph->setPolar(true); + m_graph->setRadialLabelOffset(0.1f); + m_graph->setHorizontalAspectRatio(1.0); + m_graph->setReflection(true); + m_graph->setReflectivity(0.1); + m_graph->setLocale(QLocale("FI")); + m_graph->setMargin(1.0); + + QCOMPARE(m_graph->activeTheme()->type(), Q3DTheme::ThemeDigia); + QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem | QAbstract3DGraph::SelectionRow | QAbstract3DGraph::SelectionSlice); + QCOMPARE(m_graph->shadowQuality(), QAbstract3DGraph::ShadowQualityNone); // Ortho disables shadows + QCOMPARE(m_graph->measureFps(), true); + QCOMPARE(m_graph->isOrthoProjection(), true); + QCOMPARE(m_graph->aspectRatio(), 1.0); + QCOMPARE(m_graph->optimizationHints(), QAbstract3DGraph::OptimizationStatic); + QCOMPARE(m_graph->isPolar(), true); + QCOMPARE(m_graph->radialLabelOffset(), 0.1f); + QCOMPARE(m_graph->horizontalAspectRatio(), 1.0); + QCOMPARE(m_graph->isReflection(), true); + QCOMPARE(m_graph->reflectivity(), 0.1); + QCOMPARE(m_graph->locale(), QLocale("FI")); + QCOMPARE(m_graph->margin(), 1.0); +} + +void tst_bars::invalidProperties() +{ + m_graph->setSelectionMode(QAbstract3DGraph::SelectionColumn | QAbstract3DGraph::SelectionRow | QAbstract3DGraph::SelectionSlice); + m_graph->setAspectRatio(-1.0); + m_graph->setHorizontalAspectRatio(-1.0); + m_graph->setReflectivity(-1.0); + m_graph->setLocale(QLocale("XX")); + + QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem); + QCOMPARE(m_graph->aspectRatio(), -1.0/*2.0*/); // TODO: Fix once QTRD-3367 is done + QCOMPARE(m_graph->horizontalAspectRatio(), -1.0/*0.0*/); // TODO: Fix once QTRD-3367 is done + QCOMPARE(m_graph->reflectivity(), -1.0/*0.5*/); // TODO: Fix once QTRD-3367 is done + QCOMPARE(m_graph->locale(), QLocale("C")); +} + +void tst_bars::addSeries() +{ + QBar3DSeries *series = newSeries(); + + m_graph->addSeries(series); + + QCOMPARE(m_graph->seriesList().length(), 1); + QVERIFY(!m_graph->selectedSeries()); + QCOMPARE(m_graph->primarySeries(), series); +} + +void tst_bars::addMultipleSeries() +{ + QBar3DSeries *series = newSeries(); + QBar3DSeries *series2 = newSeries(); + QBar3DSeries *series3 = newSeries(); + + m_graph->addSeries(series); + m_graph->addSeries(series2); + m_graph->addSeries(series3); + + QCOMPARE(m_graph->seriesList().length(), 3); + QCOMPARE(m_graph->primarySeries(), series); + + m_graph->setPrimarySeries(series2); + + QCOMPARE(m_graph->primarySeries(), series2); +} + +void tst_bars::selectSeries() +{ + QBar3DSeries *series = newSeries(); + + m_graph->addSeries(series); + m_graph->primarySeries()->setSelectedBar(QPoint(0, 0)); + + QCOMPARE(m_graph->seriesList().length(), 1); + QCOMPARE(m_graph->selectedSeries(), series); + + m_graph->clearSelection(); + QVERIFY(!m_graph->selectedSeries()); +} + +void tst_bars::removeSeries() +{ + QBar3DSeries *series = newSeries(); + + m_graph->addSeries(series); + m_graph->removeSeries(series); + QCOMPARE(m_graph->seriesList().length(), 0); +} + +void tst_bars::removeMultipleSeries() +{ + QBar3DSeries *series = newSeries(); + QBar3DSeries *series2 = newSeries(); + QBar3DSeries *series3 = newSeries(); + + m_graph->addSeries(series); + m_graph->addSeries(series2); + m_graph->addSeries(series3); + + m_graph->primarySeries()->setSelectedBar(QPoint(0, 0)); + QCOMPARE(m_graph->selectedSeries(), series); + + m_graph->removeSeries(series); + QCOMPARE(m_graph->seriesList().length(), 2); + QCOMPARE(m_graph->primarySeries(), series2); + QVERIFY(!m_graph->selectedSeries()); + + m_graph->removeSeries(series2); + QCOMPARE(m_graph->seriesList().length(), 1); + QCOMPARE(m_graph->primarySeries(), series3); + + m_graph->removeSeries(series3); + QCOMPARE(m_graph->seriesList().length(), 0); +} + +// The following tests are not required for scatter or surface, as they are handled identically +void tst_bars::addInputHandler() +{ + Q3DInputHandler *handler = new Q3DInputHandler(); + QTouch3DInputHandler *handler2 = new QTouch3DInputHandler(); + QAbstract3DInputHandler *initialHandler = m_graph->activeInputHandler(); + + m_graph->addInputHandler(handler); + m_graph->addInputHandler(handler2); + + QCOMPARE(m_graph->inputHandlers().length(), 3); // Default, as it is still active, plus added ones + QCOMPARE(m_graph->activeInputHandler(), initialHandler); + m_graph->setActiveInputHandler(handler2); + QCOMPARE(m_graph->activeInputHandler(), handler2); + + m_graph->setActiveInputHandler(NULL); + QVERIFY(!m_graph->activeInputHandler()); + QCOMPARE(m_graph->inputHandlers().length(), 2); +} + +void tst_bars::removeInputHandler() +{ + Q3DInputHandler *handler = new Q3DInputHandler(); + QTouch3DInputHandler *handler2 = new QTouch3DInputHandler(); + + m_graph->addInputHandler(handler); + m_graph->addInputHandler(handler2); + + m_graph->setActiveInputHandler(handler2); + QCOMPARE(m_graph->inputHandlers().length(), 2); // Default handler removed by previous call + QCOMPARE(m_graph->activeInputHandler(), handler2); + m_graph->releaseInputHandler(handler2); + QCOMPARE(m_graph->inputHandlers().length(), 1); + m_graph->releaseInputHandler(handler); + QCOMPARE(m_graph->inputHandlers().length(), 0); + + delete handler2; + delete handler; +} + +void tst_bars::addTheme() +{ + Q3DTheme *theme = new Q3DTheme(Q3DTheme::ThemeDigia); + Q3DTheme *theme2 = new Q3DTheme(); + Q3DTheme *initialTheme = m_graph->activeTheme(); + m_graph->addTheme(theme); + m_graph->addTheme(theme2); + + QCOMPARE(m_graph->themes().length(), 3); // Default, plus added ones + QCOMPARE(m_graph->activeTheme(), initialTheme); + m_graph->setActiveTheme(theme2); + QCOMPARE(m_graph->activeTheme(), theme2); +} + +void tst_bars::removeTheme() +{ + Q3DTheme *theme = new Q3DTheme(Q3DTheme::ThemeDigia); + Q3DTheme *theme2 = new Q3DTheme(); + m_graph->addTheme(theme); + m_graph->addTheme(theme2); + + m_graph->setActiveTheme(theme2); + QCOMPARE(m_graph->activeTheme(), theme2); + m_graph->releaseTheme(theme2); + QCOMPARE(m_graph->themes().length(), 2); + m_graph->releaseTheme(theme); + QCOMPARE(m_graph->themes().length(), 1); // Default theme remains + + delete theme2; + delete theme; +} + +void tst_bars::addCustomItem() +{ + QCustom3DItem *item = new QCustom3DItem(); + QCustom3DItem *item2 = new QCustom3DItem(); + + m_graph->addCustomItem(item); + QCOMPARE(m_graph->customItems().length(), 1); + m_graph->addCustomItem(item2); + QCOMPARE(m_graph->customItems().length(), 2); +} + +void tst_bars::removeCustomItem() +{ + QCustom3DItem *item = new QCustom3DItem(); + QCustom3DItem *item2 = new QCustom3DItem(); + QCustom3DItem *item3 = new QCustom3DItem(); + item3->setPosition(QVector3D(1, 1, 1)); + + m_graph->addCustomItem(item); + m_graph->addCustomItem(item2); + m_graph->addCustomItem(item3); + + m_graph->releaseCustomItem(item); + QCOMPARE(m_graph->customItems().length(), 2); + m_graph->removeCustomItem(item2); + QCOMPARE(m_graph->customItems().length(), 1); + m_graph->addCustomItem(item); + m_graph->removeCustomItemAt(QVector3D(1, 1, 1)); + QCOMPARE(m_graph->customItems().length(), 1); + m_graph->removeCustomItems(); + QCOMPARE(m_graph->customItems().length(), 0); +} + +void tst_bars::renderToImage() +{ + m_graph->addSeries(newSeries()); + + QImage image = m_graph->renderToImage(); + QCOMPARE(image.size(), m_graph->size()); + + image = m_graph->renderToImage(8); + QCOMPARE(image.size(), m_graph->size()); + + image = m_graph->renderToImage(4, QSize(300, 300)); + QCOMPARE(image.size(), QSize(300, 300)); +} + +QTEST_MAIN(tst_bars) +#include "tst_bars.moc" diff --git a/tests/auto/cpptest/q3dcustom-label/q3dcustom-label.pro b/tests/auto/cpptest/q3dcustom-label/q3dcustom-label.pro new file mode 100644 index 00000000..af584baa --- /dev/null +++ b/tests/auto/cpptest/q3dcustom-label/q3dcustom-label.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_custom.cpp diff --git a/tests/auto/cpptest/q3dcustom-label/tst_custom.cpp b/tests/auto/cpptest/q3dcustom-label/tst_custom.cpp new file mode 100644 index 00000000..40bd5eac --- /dev/null +++ b/tests/auto/cpptest/q3dcustom-label/tst_custom.cpp @@ -0,0 +1,158 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QCustom3DLabel> + +using namespace QtDataVisualization; + +class tst_custom: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + +private: + QCustom3DLabel *m_custom; +}; + +void tst_custom::initTestCase() +{ +} + +void tst_custom::cleanupTestCase() +{ +} + +void tst_custom::init() +{ + m_custom = new QCustom3DLabel(); +} + +void tst_custom::cleanup() +{ + delete m_custom; +} + +void tst_custom::construct() +{ + QCustom3DLabel *custom = new QCustom3DLabel(); + QVERIFY(custom); + delete custom; + + custom = new QCustom3DLabel("label", QFont("Times New Roman", 10.0), QVector3D(1.0, 1.0, 1.0), + QVector3D(1.0, 1.0, 1.0), QQuaternion(1.0, 1.0, 10.0, 100.0)); + QVERIFY(custom); + QCOMPARE(custom->backgroundColor(), QColor(Qt::gray)); + QCOMPARE(custom->isBackgroundEnabled(), true); + QCOMPARE(custom->isBorderEnabled(), true); + QCOMPARE(custom->isFacingCamera(), false); + QCOMPARE(custom->font(), QFont("Times New Roman", 10)); + QCOMPARE(custom->text(), QString("label")); + QCOMPARE(custom->textColor(), QColor(Qt::white)); + QCOMPARE(custom->meshFile(), QString(":/defaultMeshes/plane")); + QCOMPARE(custom->position(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(custom->isPositionAbsolute(), false); + QCOMPARE(custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0)); + QCOMPARE(custom->scaling(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(custom->isScalingAbsolute(), true); + QCOMPARE(custom->isShadowCasting(), false); + QCOMPARE(custom->textureFile(), QString()); + QCOMPARE(custom->isVisible(), true); + delete custom; +} + +void tst_custom::initialProperties() +{ + QVERIFY(m_custom); + + QCOMPARE(m_custom->backgroundColor(), QColor(Qt::gray)); + QCOMPARE(m_custom->isBackgroundEnabled(), true); + QCOMPARE(m_custom->isBorderEnabled(), true); + QCOMPARE(m_custom->isFacingCamera(), false); + QCOMPARE(m_custom->font(), QFont("Arial", 20)); + QCOMPARE(m_custom->text(), QString()); + QCOMPARE(m_custom->textColor(), QColor(Qt::white)); + + // Common (from QCustom3DItem) + QCOMPARE(m_custom->meshFile(), QString(":/defaultMeshes/plane")); + QCOMPARE(m_custom->position(), QVector3D()); + QCOMPARE(m_custom->isPositionAbsolute(), false); + QCOMPARE(m_custom->rotation(), QQuaternion()); + QCOMPARE(m_custom->scaling(), QVector3D(0.1f, 0.1f, 0.1f)); + QCOMPARE(m_custom->isScalingAbsolute(), true); + QCOMPARE(m_custom->isShadowCasting(), false); + QCOMPARE(m_custom->textureFile(), QString()); + QCOMPARE(m_custom->isVisible(), true); +} + +void tst_custom::initializeProperties() +{ + QVERIFY(m_custom); + + m_custom->setBackgroundColor(QColor(Qt::red)); + m_custom->setBackgroundEnabled(false); + m_custom->setBorderEnabled(false); + m_custom->setFacingCamera(true); + m_custom->setFont(QFont("Times New Roman", 10)); + m_custom->setText(QString("This is a Custom Label")); + m_custom->setTextColor(QColor(Qt::blue)); + + QCOMPARE(m_custom->backgroundColor(), QColor(Qt::red)); + QCOMPARE(m_custom->isBackgroundEnabled(), false); + QCOMPARE(m_custom->isBorderEnabled(), false); + QCOMPARE(m_custom->isFacingCamera(), true); + QCOMPARE(m_custom->font(), QFont("Times New Roman", 10)); + QCOMPARE(m_custom->text(), QString("This is a Custom Label")); + QCOMPARE(m_custom->textColor(), QColor(Qt::blue)); + + // Common (from QCustom3DItem) + m_custom->setPosition(QVector3D(1.0, 1.0, 1.0)); + m_custom->setPositionAbsolute(true); + m_custom->setRotation(QQuaternion(1.0, 1.0, 10.0, 100.0)); + m_custom->setScaling(QVector3D(1.0, 1.0, 1.0)); + m_custom->setShadowCasting(true); + m_custom->setVisible(false); + + QCOMPARE(m_custom->position(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(m_custom->isPositionAbsolute(), true); + QCOMPARE(m_custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0)); + QCOMPARE(m_custom->scaling(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(m_custom->isShadowCasting(), true); + QCOMPARE(m_custom->isVisible(), false); +} + +void tst_custom::invalidProperties() +{ + m_custom->setScalingAbsolute(false); + QCOMPARE(m_custom->isScalingAbsolute(), true); +} + +QTEST_MAIN(tst_custom) +#include "tst_custom.moc" diff --git a/tests/auto/cpptest/q3dcustom-volume/q3dcustom-volume.pro b/tests/auto/cpptest/q3dcustom-volume/q3dcustom-volume.pro new file mode 100644 index 00000000..af584baa --- /dev/null +++ b/tests/auto/cpptest/q3dcustom-volume/q3dcustom-volume.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_custom.cpp diff --git a/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp b/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp new file mode 100644 index 00000000..372e8ecf --- /dev/null +++ b/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp @@ -0,0 +1,204 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QCustom3DVolume> + +using namespace QtDataVisualization; + +class tst_custom: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + +private: + QCustom3DVolume *m_custom; +}; + +void tst_custom::initTestCase() +{ +} + +void tst_custom::cleanupTestCase() +{ +} + +void tst_custom::init() +{ + m_custom = new QCustom3DVolume(); +} + +void tst_custom::cleanup() +{ + delete m_custom; +} + +void tst_custom::construct() +{ + QCustom3DVolume *custom = new QCustom3DVolume(); + QVERIFY(custom); + delete custom; + + QVector<uchar> *tdata = new QVector<uchar>(1000); + + QVector<QRgb> table; + table << QRgb(0xff00ff) << QRgb(0x00ff00); + + custom = new QCustom3DVolume(QVector3D(1.0, 1.0, 1.0), QVector3D(1.0, 1.0, 1.0), + QQuaternion(1.0, 1.0, 10.0, 100.0), 10, 10, 10, + tdata, QImage::Format_ARGB32, table); + QVERIFY(custom); + QCOMPARE(custom->alphaMultiplier(), 1.0f); + QCOMPARE(custom->drawSliceFrames(), false); + QCOMPARE(custom->drawSliceFrames(), false); + QCOMPARE(custom->preserveOpacity(), true); + QCOMPARE(custom->sliceFrameColor(), QColor(Qt::black)); + QCOMPARE(custom->sliceFrameGaps(), QVector3D(0.01f, 0.01f, 0.01f)); + QCOMPARE(custom->sliceFrameThicknesses(), QVector3D(0.01f, 0.01f, 0.01f)); + QCOMPARE(custom->sliceFrameWidths(), QVector3D(0.01f, 0.01f, 0.01f)); + QCOMPARE(custom->sliceIndexX(), -1); + QCOMPARE(custom->sliceIndexY(), -1); + QCOMPARE(custom->sliceIndexZ(), -1); + QCOMPARE(custom->useHighDefShader(), true); + QCOMPARE(custom->textureData()->length(), 1000); + QCOMPARE(custom->textureDataWidth(), 40); + QCOMPARE(custom->textureFormat(), QImage::Format_ARGB32); + QCOMPARE(custom->textureHeight(), 10); + QCOMPARE(custom->textureWidth(), 10); + QCOMPARE(custom->textureDepth(), 10); + QCOMPARE(custom->meshFile(), QString(":/defaultMeshes/barFull")); + QCOMPARE(custom->position(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(custom->isPositionAbsolute(), false); + QCOMPARE(custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0)); + QCOMPARE(custom->scaling(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(custom->isScalingAbsolute(), true); + QCOMPARE(custom->isShadowCasting(), false); + QCOMPARE(custom->textureFile(), QString()); + QCOMPARE(custom->isVisible(), true); + delete custom; +} + +void tst_custom::initialProperties() +{ + QVERIFY(m_custom); + + QCOMPARE(m_custom->alphaMultiplier(), 1.0f); + QCOMPARE(m_custom->drawSliceFrames(), false); + QCOMPARE(m_custom->drawSliceFrames(), false); + QCOMPARE(m_custom->preserveOpacity(), true); + QCOMPARE(m_custom->sliceFrameColor(), QColor(Qt::black)); + QCOMPARE(m_custom->sliceFrameGaps(), QVector3D(0.01f, 0.01f, 0.01f)); + QCOMPARE(m_custom->sliceFrameThicknesses(), QVector3D(0.01f, 0.01f, 0.01f)); + QCOMPARE(m_custom->sliceFrameWidths(), QVector3D(0.01f, 0.01f, 0.01f)); + QCOMPARE(m_custom->sliceIndexX(), -1); + QCOMPARE(m_custom->sliceIndexY(), -1); + QCOMPARE(m_custom->sliceIndexZ(), -1); + QCOMPARE(m_custom->useHighDefShader(), true); + + // Common (from QCustom3DVolume) + QCOMPARE(m_custom->meshFile(), QString(":/defaultMeshes/barFull")); + QCOMPARE(m_custom->position(), QVector3D()); + QCOMPARE(m_custom->isPositionAbsolute(), false); + QCOMPARE(m_custom->rotation(), QQuaternion()); + QCOMPARE(m_custom->scaling(), QVector3D(0.1f, 0.1f, 0.1f)); + QCOMPARE(m_custom->isScalingAbsolute(), true); + QCOMPARE(m_custom->isShadowCasting(), true); + QCOMPARE(m_custom->textureFile(), QString()); + QCOMPARE(m_custom->isVisible(), true); +} + +void tst_custom::initializeProperties() +{ + QVERIFY(m_custom); + + m_custom->setAlphaMultiplier(0.1f); + m_custom->setDrawSliceFrames(true); + m_custom->setDrawSliceFrames(true); + m_custom->setPreserveOpacity(false); + m_custom->setSliceFrameColor(QColor(Qt::red)); + m_custom->setSliceFrameGaps(QVector3D(2.0f, 2.0f, 2.0f)); + m_custom->setSliceFrameThicknesses(QVector3D(2.0f, 2.0f, 2.0f)); + m_custom->setSliceFrameWidths(QVector3D(2.0f, 2.0f, 2.0f)); + m_custom->setSliceIndexX(0); + m_custom->setSliceIndexY(0); + m_custom->setSliceIndexZ(0); + m_custom->setUseHighDefShader(false); + + QCOMPARE(m_custom->alphaMultiplier(), 0.1f); + QCOMPARE(m_custom->drawSliceFrames(), true); + QCOMPARE(m_custom->drawSliceFrames(), true); + QCOMPARE(m_custom->preserveOpacity(), false); + QCOMPARE(m_custom->sliceFrameColor(), QColor(Qt::red)); + QCOMPARE(m_custom->sliceFrameGaps(), QVector3D(2.0f, 2.0f, 2.0f)); + QCOMPARE(m_custom->sliceFrameThicknesses(), QVector3D(2.0f, 2.0f, 2.0f)); + QCOMPARE(m_custom->sliceFrameWidths(), QVector3D(2.0f, 2.0f, 2.0f)); + QCOMPARE(m_custom->sliceIndexX(), 0); + QCOMPARE(m_custom->sliceIndexY(), 0); + QCOMPARE(m_custom->sliceIndexZ(), 0); + QCOMPARE(m_custom->useHighDefShader(), false); + + // Common (from QCustom3DVolume) + m_custom->setPosition(QVector3D(1.0, 1.0, 1.0)); + m_custom->setPositionAbsolute(true); + m_custom->setRotation(QQuaternion(1.0, 1.0, 10.0, 100.0)); + m_custom->setScaling(QVector3D(1.0, 1.0, 1.0)); + m_custom->setScalingAbsolute(false); + m_custom->setShadowCasting(false); + m_custom->setVisible(false); + + QCOMPARE(m_custom->position(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(m_custom->isPositionAbsolute(), true); + QCOMPARE(m_custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0)); + QCOMPARE(m_custom->scaling(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(m_custom->isScalingAbsolute(), false); + QCOMPARE(m_custom->isShadowCasting(), false); + QCOMPARE(m_custom->isVisible(), false); +} + +void tst_custom::invalidProperties() +{ + m_custom->setAlphaMultiplier(-1.0f); + QCOMPARE(m_custom->alphaMultiplier(), 1.0f); + + m_custom->setSliceFrameGaps(QVector3D(-0.1f, -0.1f, -0.1f)); + QCOMPARE(m_custom->sliceFrameGaps(), QVector3D(0.01f, 0.01f, 0.01f)); + + m_custom->setSliceFrameThicknesses(QVector3D(-0.1f, -0.1f, -0.1f)); + QCOMPARE(m_custom->sliceFrameThicknesses(), QVector3D(0.01f, 0.01f, 0.01f)); + + m_custom->setSliceFrameWidths(QVector3D(-0.1f, -0.1f, -0.1f)); + QCOMPARE(m_custom->sliceFrameWidths(), QVector3D(0.01f, 0.01f, 0.01f)); + + m_custom->setTextureFormat(QImage::Format_ARGB8555_Premultiplied); + QCOMPARE(m_custom->textureFormat(), QImage::Format_ARGB32); +} + +QTEST_MAIN(tst_custom) +#include "tst_custom.moc" diff --git a/tests/auto/cpptest/q3dcustom/q3dcustom.pro b/tests/auto/cpptest/q3dcustom/q3dcustom.pro new file mode 100644 index 00000000..af584baa --- /dev/null +++ b/tests/auto/cpptest/q3dcustom/q3dcustom.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_custom.cpp diff --git a/tests/auto/cpptest/q3dcustom/tst_custom.cpp b/tests/auto/cpptest/q3dcustom/tst_custom.cpp new file mode 100644 index 00000000..abc088f9 --- /dev/null +++ b/tests/auto/cpptest/q3dcustom/tst_custom.cpp @@ -0,0 +1,128 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QCustom3DItem> + +using namespace QtDataVisualization; + +class tst_custom: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + +private: + QCustom3DItem *m_custom; +}; + +void tst_custom::initTestCase() +{ +} + +void tst_custom::cleanupTestCase() +{ +} + +void tst_custom::init() +{ + m_custom = new QCustom3DItem(); +} + +void tst_custom::cleanup() +{ + delete m_custom; +} + +void tst_custom::construct() +{ + QCustom3DItem *custom = new QCustom3DItem(); + QVERIFY(custom); + delete custom; + + custom = new QCustom3DItem(":/customitem.obj", QVector3D(1.0, 1.0, 1.0), + QVector3D(1.0, 1.0, 1.0), QQuaternion(1.0, 1.0, 10.0, 100.0), + QImage(":/customtexture.jpg")); + QVERIFY(custom); + QCOMPARE(custom->meshFile(), QString(":/customitem.obj")); + QCOMPARE(custom->position(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(custom->isPositionAbsolute(), false); + QCOMPARE(custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0)); + QCOMPARE(custom->scaling(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(custom->isScalingAbsolute(), true); + QCOMPARE(custom->isShadowCasting(), true); + QCOMPARE(custom->textureFile(), QString()); + QCOMPARE(custom->isVisible(), true); + delete custom; +} + +void tst_custom::initialProperties() +{ + QVERIFY(m_custom); + + QCOMPARE(m_custom->meshFile(), QString()); + QCOMPARE(m_custom->position(), QVector3D()); + QCOMPARE(m_custom->isPositionAbsolute(), false); + QCOMPARE(m_custom->rotation(), QQuaternion()); + QCOMPARE(m_custom->scaling(), QVector3D(0.1f, 0.1f, 0.1f)); + QCOMPARE(m_custom->isScalingAbsolute(), true); + QCOMPARE(m_custom->isShadowCasting(), true); + QCOMPARE(m_custom->textureFile(), QString()); + QCOMPARE(m_custom->isVisible(), true); +} + +void tst_custom::initializeProperties() +{ + QVERIFY(m_custom); + + m_custom->setMeshFile(":/customitem.obj"); + m_custom->setPosition(QVector3D(1.0, 1.0, 1.0)); + m_custom->setPositionAbsolute(true); + m_custom->setRotation(QQuaternion(1.0, 1.0, 10.0, 100.0)); + m_custom->setScaling(QVector3D(1.0, 1.0, 1.0)); + m_custom->setScalingAbsolute(false); + m_custom->setShadowCasting(false); + m_custom->setTextureFile(":/customtexture.jpg"); + m_custom->setVisible(false); + + QCOMPARE(m_custom->meshFile(), QString(":/customitem.obj")); + QCOMPARE(m_custom->position(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(m_custom->isPositionAbsolute(), true); + QCOMPARE(m_custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0)); + QCOMPARE(m_custom->scaling(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(m_custom->isScalingAbsolute(), false); + QCOMPARE(m_custom->isShadowCasting(), false); + QCOMPARE(m_custom->textureFile(), QString(":/customtexture.jpg")); + QCOMPARE(m_custom->isVisible(), false); + + m_custom->setTextureImage(QImage(QSize(10, 10), QImage::Format_ARGB32)); + QCOMPARE(m_custom->textureFile(), QString()); +} + +QTEST_MAIN(tst_custom) +#include "tst_custom.moc" diff --git a/tests/auto/cpptest/q3dinput-touch/q3dinput-touch.pro b/tests/auto/cpptest/q3dinput-touch/q3dinput-touch.pro new file mode 100644 index 00000000..2de48158 --- /dev/null +++ b/tests/auto/cpptest/q3dinput-touch/q3dinput-touch.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_input.cpp diff --git a/tests/auto/cpptest/q3dinput-touch/tst_input.cpp b/tests/auto/cpptest/q3dinput-touch/tst_input.cpp new file mode 100644 index 00000000..53d760ae --- /dev/null +++ b/tests/auto/cpptest/q3dinput-touch/tst_input.cpp @@ -0,0 +1,106 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QTouch3DInputHandler> + +using namespace QtDataVisualization; + +class tst_input: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + +private: + QTouch3DInputHandler *m_input; +}; + +void tst_input::initTestCase() +{ +} + +void tst_input::cleanupTestCase() +{ +} + +void tst_input::init() +{ + m_input = new QTouch3DInputHandler(); +} + +void tst_input::cleanup() +{ + delete m_input; +} + +void tst_input::construct() +{ + QTouch3DInputHandler *input = new QTouch3DInputHandler(); + QVERIFY(input); + delete input; +} + +void tst_input::initialProperties() +{ + QVERIFY(m_input); + + // Common (from Q3DInputHandler and QAbstract3DInputHandler) + QCOMPARE(m_input->isRotationEnabled(), true); + QCOMPARE(m_input->isSelectionEnabled(), true); + QCOMPARE(m_input->isZoomAtTargetEnabled(), true); + QCOMPARE(m_input->isZoomEnabled(), true); + QCOMPARE(m_input->inputPosition(), QPoint(0, 0)); + QCOMPARE(m_input->inputView(), QAbstract3DInputHandler::InputViewNone); + QVERIFY(!m_input->scene()); +} + +void tst_input::initializeProperties() +{ + QVERIFY(m_input); + + // Common (from Q3DInputHandler and QAbstract3DInputHandler) + m_input->setRotationEnabled(false); + m_input->setSelectionEnabled(false); + m_input->setZoomAtTargetEnabled(false); + m_input->setZoomEnabled(false); + m_input->setInputPosition(QPoint(100, 100)); + m_input->setInputView(QAbstract3DInputHandler::InputViewOnPrimary); + + QCOMPARE(m_input->isRotationEnabled(), false); + QCOMPARE(m_input->isSelectionEnabled(), false); + QCOMPARE(m_input->isZoomAtTargetEnabled(), false); + QCOMPARE(m_input->isZoomEnabled(), false); + QCOMPARE(m_input->inputPosition(), QPoint(100, 100)); + QCOMPARE(m_input->inputView(), QAbstract3DInputHandler::InputViewOnPrimary); +} + +// TODO: QTRD-3380 (mouse/touch events) + +QTEST_MAIN(tst_input) +#include "tst_input.moc" diff --git a/tests/auto/cpptest/q3dinput/q3dinput.pro b/tests/auto/cpptest/q3dinput/q3dinput.pro new file mode 100644 index 00000000..2de48158 --- /dev/null +++ b/tests/auto/cpptest/q3dinput/q3dinput.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_input.cpp diff --git a/tests/auto/cpptest/q3dinput/tst_input.cpp b/tests/auto/cpptest/q3dinput/tst_input.cpp new file mode 100644 index 00000000..68b2225c --- /dev/null +++ b/tests/auto/cpptest/q3dinput/tst_input.cpp @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/Q3DInputHandler> + +using namespace QtDataVisualization; + +class tst_input: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + +private: + Q3DInputHandler *m_input; +}; + +void tst_input::initTestCase() +{ +} + +void tst_input::cleanupTestCase() +{ +} + +void tst_input::init() +{ + m_input = new Q3DInputHandler(); +} + +void tst_input::cleanup() +{ + delete m_input; +} + +void tst_input::construct() +{ + Q3DInputHandler *input = new Q3DInputHandler(); + QVERIFY(input); + delete input; +} + +void tst_input::initialProperties() +{ + QVERIFY(m_input); + + QCOMPARE(m_input->isRotationEnabled(), true); + QCOMPARE(m_input->isSelectionEnabled(), true); + QCOMPARE(m_input->isZoomAtTargetEnabled(), true); + QCOMPARE(m_input->isZoomEnabled(), true); + + // Common (from QAbstract3DInputHandler) + QCOMPARE(m_input->inputPosition(), QPoint(0, 0)); + QCOMPARE(m_input->inputView(), QAbstract3DInputHandler::InputViewNone); + QVERIFY(!m_input->scene()); +} + +void tst_input::initializeProperties() +{ + QVERIFY(m_input); + + m_input->setRotationEnabled(false); + m_input->setSelectionEnabled(false); + m_input->setZoomAtTargetEnabled(false); + m_input->setZoomEnabled(false); + + QCOMPARE(m_input->isRotationEnabled(), false); + QCOMPARE(m_input->isSelectionEnabled(), false); + QCOMPARE(m_input->isZoomAtTargetEnabled(), false); + QCOMPARE(m_input->isZoomEnabled(), false); + + // Common (from QAbstract3DInputHandler) + m_input->setInputPosition(QPoint(100, 100)); + m_input->setInputView(QAbstract3DInputHandler::InputViewOnPrimary); + + QCOMPARE(m_input->inputPosition(), QPoint(100, 100)); + QCOMPARE(m_input->inputView(), QAbstract3DInputHandler::InputViewOnPrimary); +} + +// TODO: QTRD-3380 (mouse events) + +QTEST_MAIN(tst_input) +#include "tst_input.moc" diff --git a/tests/auto/cpptest/q3dscatter-modelproxy/q3dscatter-modelproxy.pro b/tests/auto/cpptest/q3dscatter-modelproxy/q3dscatter-modelproxy.pro new file mode 100644 index 00000000..c383ec25 --- /dev/null +++ b/tests/auto/cpptest/q3dscatter-modelproxy/q3dscatter-modelproxy.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization widgets + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_proxy.cpp diff --git a/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp new file mode 100644 index 00000000..9d5cea90 --- /dev/null +++ b/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp @@ -0,0 +1,193 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QItemModelScatterDataProxy> +#include <QtDataVisualization/Q3DScatter> +#include <QtWidgets/QTableWidget> + +using namespace QtDataVisualization; + +class tst_proxy: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + + void addModel(); + +private: + QItemModelScatterDataProxy *m_proxy; +}; + +void tst_proxy::initTestCase() +{ +} + +void tst_proxy::cleanupTestCase() +{ +} + +void tst_proxy::init() +{ + m_proxy = new QItemModelScatterDataProxy(); +} + +void tst_proxy::cleanup() +{ + delete m_proxy; +} + +void tst_proxy::construct() +{ + QItemModelScatterDataProxy *proxy = new QItemModelScatterDataProxy(); + QVERIFY(proxy); + delete proxy; + + QTableWidget *table = new QTableWidget(); + + proxy = new QItemModelScatterDataProxy(table->model()); + QVERIFY(proxy); + delete proxy; + + proxy = new QItemModelScatterDataProxy(table->model(), "x", "y", "z"); + QVERIFY(proxy); + QCOMPARE(proxy->xPosRole(), QString("x")); + QCOMPARE(proxy->yPosRole(), QString("y")); + QCOMPARE(proxy->zPosRole(), QString("z")); + QCOMPARE(proxy->rotationRole(), QString("")); + delete proxy; + + proxy = new QItemModelScatterDataProxy(table->model(), "x", "y", "z", "rot"); + QVERIFY(proxy); + QCOMPARE(proxy->xPosRole(), QString("x")); + QCOMPARE(proxy->yPosRole(), QString("y")); + QCOMPARE(proxy->zPosRole(), QString("z")); + QCOMPARE(proxy->rotationRole(), QString("rot")); + delete proxy; +} + +void tst_proxy::initialProperties() +{ + QVERIFY(m_proxy); + + QVERIFY(!m_proxy->itemModel()); + QCOMPARE(m_proxy->rotationRole(), QString()); + QCOMPARE(m_proxy->rotationRolePattern(), QRegExp()); + QCOMPARE(m_proxy->rotationRoleReplace(), QString()); + QCOMPARE(m_proxy->xPosRole(), QString()); + QCOMPARE(m_proxy->xPosRolePattern(), QRegExp()); + QCOMPARE(m_proxy->xPosRoleReplace(), QString()); + QCOMPARE(m_proxy->yPosRole(), QString()); + QCOMPARE(m_proxy->yPosRolePattern(), QRegExp()); + QCOMPARE(m_proxy->yPosRoleReplace(), QString()); + QCOMPARE(m_proxy->zPosRole(), QString()); + QCOMPARE(m_proxy->zPosRolePattern(), QRegExp()); + QCOMPARE(m_proxy->zPosRoleReplace(), QString()); + + QCOMPARE(m_proxy->itemCount(), 0); + QVERIFY(!m_proxy->series()); + + QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeScatter); +} + +void tst_proxy::initializeProperties() +{ + QVERIFY(m_proxy); + + QTableWidget *table = new QTableWidget(); + + m_proxy->setItemModel(table->model()); + m_proxy->setRotationRole("rotation"); + m_proxy->setRotationRolePattern(QRegExp("/-/")); + m_proxy->setRotationRoleReplace("\\\\1"); + m_proxy->setXPosRole("X"); + m_proxy->setXPosRolePattern(QRegExp("/-/")); + m_proxy->setXPosRoleReplace("\\\\1"); + m_proxy->setYPosRole("Y"); + m_proxy->setYPosRolePattern(QRegExp("/-/")); + m_proxy->setYPosRoleReplace("\\\\1"); + m_proxy->setZPosRole("Z"); + m_proxy->setZPosRolePattern(QRegExp("/-/")); + m_proxy->setZPosRoleReplace("\\\\1"); + + QVERIFY(m_proxy->itemModel()); + QCOMPARE(m_proxy->rotationRole(), QString("rotation")); + QCOMPARE(m_proxy->rotationRolePattern(), QRegExp("/-/")); + QCOMPARE(m_proxy->rotationRoleReplace(), QString("\\\\1")); + QCOMPARE(m_proxy->xPosRole(), QString("X")); + QCOMPARE(m_proxy->xPosRolePattern(), QRegExp("/-/")); + QCOMPARE(m_proxy->xPosRoleReplace(), QString("\\\\1")); + QCOMPARE(m_proxy->yPosRole(), QString("Y")); + QCOMPARE(m_proxy->yPosRolePattern(), QRegExp("/-/")); + QCOMPARE(m_proxy->yPosRoleReplace(), QString("\\\\1")); + QCOMPARE(m_proxy->zPosRole(), QString("Z")); + QCOMPARE(m_proxy->zPosRolePattern(), QRegExp("/-/")); + QCOMPARE(m_proxy->zPosRoleReplace(), QString("\\\\1")); +} + +void tst_proxy::addModel() +{ + QTableWidget *table = new QTableWidget(); + QStringList rows; + rows << "row 1"; + QStringList columns; + columns << "col 1"; + const char *values[1][2] = {{"0/0/5.5/30", "0/0/10.5/30"}}; + + table->setRowCount(2); + table->setColumnCount(1); + + for (int col = 0; col < columns.size(); col++) { + for (int row = 0; row < rows.size(); row++) { + QModelIndex index = table->model()->index(col, row); + table->model()->setData(index, values[col][row]); + } + } + + m_proxy->setItemModel(table->model()); + m_proxy->setXPosRole(table->model()->roleNames().value(Qt::DisplayRole)); + m_proxy->setZPosRole(table->model()->roleNames().value(Qt::DisplayRole)); + m_proxy->setXPosRolePattern(QRegExp(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$"))); + m_proxy->setXPosRoleReplace(QStringLiteral("\\2")); + m_proxy->setYPosRolePattern(QRegExp(QStringLiteral("^\\d*(\\/)(\\d*)\\/(\\d*[\\.\\,]?\\d*)\\/\\d*[\\.\\,]?\\d*$"))); + m_proxy->setYPosRoleReplace(QStringLiteral("\\3")); + m_proxy->setZPosRolePattern(QRegExp(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$"))); + m_proxy->setZPosRoleReplace(QStringLiteral("\\1")); + + QScatter3DSeries *series = new QScatter3DSeries(m_proxy); + Q_UNUSED(series) + + QCoreApplication::processEvents(); + + QCOMPARE(m_proxy->itemCount(), 2); + QVERIFY(m_proxy->series()); +} + +QTEST_MAIN(tst_proxy) +#include "tst_proxy.moc" diff --git a/tests/auto/cpptest/q3dscatter-proxy/q3dscatter-proxy.pro b/tests/auto/cpptest/q3dscatter-proxy/q3dscatter-proxy.pro new file mode 100644 index 00000000..b0b5d361 --- /dev/null +++ b/tests/auto/cpptest/q3dscatter-proxy/q3dscatter-proxy.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_proxy.cpp diff --git a/tests/auto/cpptest/q3dscatter-proxy/tst_proxy.cpp b/tests/auto/cpptest/q3dscatter-proxy/tst_proxy.cpp new file mode 100644 index 00000000..436350dc --- /dev/null +++ b/tests/auto/cpptest/q3dscatter-proxy/tst_proxy.cpp @@ -0,0 +1,91 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QScatterDataProxy> + +using namespace QtDataVisualization; + +class tst_proxy: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + +private: + QScatterDataProxy *m_proxy; +}; + +void tst_proxy::initTestCase() +{ +} + +void tst_proxy::cleanupTestCase() +{ +} + +void tst_proxy::init() +{ + m_proxy = new QScatterDataProxy(); +} + +void tst_proxy::cleanup() +{ + delete m_proxy; +} + +void tst_proxy::construct() +{ + QScatterDataProxy *proxy = new QScatterDataProxy(); + QVERIFY(proxy); + delete proxy; +} + +void tst_proxy::initialProperties() +{ + QVERIFY(m_proxy); + + QCOMPARE(m_proxy->itemCount(), 0); + QVERIFY(!m_proxy->series()); + + QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeScatter); +} + +void tst_proxy::initializeProperties() +{ + QVERIFY(m_proxy); + + QScatterDataArray data; + data << QVector3D(0.5f, 0.5f, 0.5f) << QVector3D(-0.3f, -0.5f, -0.4f); + m_proxy->addItems(data); + + QCOMPARE(m_proxy->itemCount(), 2); +} + +QTEST_MAIN(tst_proxy) +#include "tst_proxy.moc" diff --git a/tests/auto/cpptest/q3dscatter-series/q3dscatter-series.pro b/tests/auto/cpptest/q3dscatter-series/q3dscatter-series.pro new file mode 100644 index 00000000..481653ef --- /dev/null +++ b/tests/auto/cpptest/q3dscatter-series/q3dscatter-series.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_series.cpp diff --git a/tests/auto/cpptest/q3dscatter-series/tst_series.cpp b/tests/auto/cpptest/q3dscatter-series/tst_series.cpp new file mode 100644 index 00000000..df290579 --- /dev/null +++ b/tests/auto/cpptest/q3dscatter-series/tst_series.cpp @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QScatter3DSeries> + +using namespace QtDataVisualization; + +class tst_series: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + +private: + QScatter3DSeries *m_series; +}; + +void tst_series::initTestCase() +{ +} + +void tst_series::cleanupTestCase() +{ +} + +void tst_series::init() +{ + m_series = new QScatter3DSeries(); +} + +void tst_series::cleanup() +{ + delete m_series; +} + +void tst_series::construct() +{ + QScatter3DSeries *series = new QScatter3DSeries(); + QVERIFY(series); + delete series; + + QScatterDataProxy *proxy = new QScatterDataProxy(); + + series = new QScatter3DSeries(proxy); + QVERIFY(series); + QCOMPARE(series->dataProxy(), proxy); + delete series; +} + +void tst_series::initialProperties() +{ + QVERIFY(m_series); + + QVERIFY(m_series->dataProxy()); + QCOMPARE(m_series->itemSize(), 0.0f); + QCOMPARE(m_series->selectedItem(), m_series->invalidSelectionIndex()); + + // Common properties. The ones identical between different series are tested in QBar3DSeries tests + QCOMPARE(m_series->itemLabelFormat(), QString("@xLabel, @yLabel, @zLabel")); + QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshSphere); + QCOMPARE(m_series->type(), QAbstract3DSeries::SeriesTypeScatter); +} + +void tst_series::initializeProperties() +{ + QVERIFY(m_series); + + m_series->setDataProxy(new QScatterDataProxy()); + m_series->setItemSize(0.5f); + m_series->setSelectedItem(0); + + QCOMPARE(m_series->itemSize(), 0.5f); + QCOMPARE(m_series->selectedItem(), 0); + + // Common properties. The ones identical between different series are tested in QBar3DSeries tests + m_series->setMesh(QAbstract3DSeries::MeshPoint); + m_series->setMeshRotation(QQuaternion(1, 1, 10, 20)); + + QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshPoint); + QCOMPARE(m_series->meshRotation(), QQuaternion(1, 1, 10, 20)); +} + +QTEST_MAIN(tst_series) +#include "tst_series.moc" diff --git a/tests/auto/cpptest/q3dscatter/q3dscatter.pro b/tests/auto/cpptest/q3dscatter/q3dscatter.pro new file mode 100644 index 00000000..9f356ebc --- /dev/null +++ b/tests/auto/cpptest/q3dscatter/q3dscatter.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_scatter.cpp diff --git a/tests/auto/cpptest/q3dscatter/tst_scatter.cpp b/tests/auto/cpptest/q3dscatter/tst_scatter.cpp new file mode 100644 index 00000000..5a3b6550 --- /dev/null +++ b/tests/auto/cpptest/q3dscatter/tst_scatter.cpp @@ -0,0 +1,237 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/Q3DScatter> + +using namespace QtDataVisualization; + +class tst_scatter: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + + void addSeries(); + void addMultipleSeries(); + void selectSeries(); + void removeSeries(); + void removeMultipleSeries(); + +private: + Q3DScatter *m_graph; +}; + +QScatter3DSeries *newSeries() +{ + QScatter3DSeries *series = new QScatter3DSeries; + QScatterDataArray data; + data << QVector3D(0.5f, 0.5f, 0.5f) << QVector3D(-0.3f, -0.5f, -0.4f) << QVector3D(0.0f, -0.3f, 0.2f); + series->dataProxy()->addItems(data); + return series; +} + +void tst_scatter::initTestCase() +{ +} + +void tst_scatter::cleanupTestCase() +{ +} + +void tst_scatter::init() +{ + m_graph = new Q3DScatter(); +} + +void tst_scatter::cleanup() +{ + delete m_graph; +} + +void tst_scatter::construct() +{ + Q3DScatter *graph = new Q3DScatter(); + QVERIFY(graph); + delete graph; + + graph = new Q3DScatter(new QSurfaceFormat()); + QVERIFY(graph); + delete graph; +} + +void tst_scatter::initialProperties() +{ + QVERIFY(m_graph); + QCOMPARE(m_graph->seriesList().length(), 0); + QVERIFY(!m_graph->selectedSeries()); + QCOMPARE(m_graph->axisX()->orientation(), QAbstract3DAxis::AxisOrientationX); + QCOMPARE(m_graph->axisY()->orientation(), QAbstract3DAxis::AxisOrientationY); + QCOMPARE(m_graph->axisZ()->orientation(), QAbstract3DAxis::AxisOrientationZ); + + // Common properties + QCOMPARE(m_graph->activeTheme()->type(), Q3DTheme::ThemeQt); + QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem); + QCOMPARE(m_graph->shadowQuality(), QAbstract3DGraph::ShadowQualityMedium); + QVERIFY(m_graph->scene()); + QCOMPARE(m_graph->measureFps(), false); + QCOMPARE(m_graph->isOrthoProjection(), false); + QCOMPARE(m_graph->selectedElement(), QAbstract3DGraph::ElementNone); + QCOMPARE(m_graph->aspectRatio(), 2.0); + QCOMPARE(m_graph->optimizationHints(), QAbstract3DGraph::OptimizationDefault); + QCOMPARE(m_graph->isPolar(), false); + QCOMPARE(m_graph->radialLabelOffset(), 1.0); + QCOMPARE(m_graph->horizontalAspectRatio(), 0.0); + QCOMPARE(m_graph->isReflection(), false); + QCOMPARE(m_graph->reflectivity(), 0.5); + QCOMPARE(m_graph->locale(), QLocale("C")); + QCOMPARE(m_graph->queriedGraphPosition(), QVector3D(0, 0, 0)); + QCOMPARE(m_graph->margin(), -1.0); +} + +void tst_scatter::initializeProperties() +{ + Q3DTheme *theme = new Q3DTheme(Q3DTheme::ThemeDigia); + m_graph->setActiveTheme(theme); + m_graph->setSelectionMode(QAbstract3DGraph::SelectionNone); + m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftHigh); + QCOMPARE(m_graph->shadowQuality(), QAbstract3DGraph::ShadowQualitySoftHigh); + m_graph->setMeasureFps(true); + m_graph->setOrthoProjection(true); + m_graph->setAspectRatio(1.0); + m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationStatic); + m_graph->setPolar(true); + m_graph->setRadialLabelOffset(0.1f); + m_graph->setHorizontalAspectRatio(1.0); + m_graph->setReflection(true); + m_graph->setReflectivity(0.1); + m_graph->setLocale(QLocale("FI")); + m_graph->setMargin(1.0); + + QCOMPARE(m_graph->activeTheme()->type(), Q3DTheme::ThemeDigia); + QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionNone); + QCOMPARE(m_graph->shadowQuality(), QAbstract3DGraph::ShadowQualityNone); // Ortho disables shadows + QCOMPARE(m_graph->measureFps(), true); + QCOMPARE(m_graph->isOrthoProjection(), true); + QCOMPARE(m_graph->aspectRatio(), 1.0); + QCOMPARE(m_graph->optimizationHints(), QAbstract3DGraph::OptimizationStatic); + QCOMPARE(m_graph->isPolar(), true); + QCOMPARE(m_graph->radialLabelOffset(), 0.1f); + QCOMPARE(m_graph->horizontalAspectRatio(), 1.0); + QCOMPARE(m_graph->isReflection(), true); + QCOMPARE(m_graph->reflectivity(), 0.1); + QCOMPARE(m_graph->locale(), QLocale("FI")); + QCOMPARE(m_graph->margin(), 1.0); +} + +void tst_scatter::invalidProperties() +{ + m_graph->setSelectionMode(QAbstract3DGraph::SelectionColumn | QAbstract3DGraph::SelectionRow | QAbstract3DGraph::SelectionSlice); + m_graph->setAspectRatio(-1.0); + m_graph->setHorizontalAspectRatio(-1.0); + m_graph->setReflectivity(-1.0); + m_graph->setLocale(QLocale("XX")); + + QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem); + QCOMPARE(m_graph->aspectRatio(), -1.0/*2.0*/); // TODO: Fix once QTRD-3367 is done + QCOMPARE(m_graph->horizontalAspectRatio(), -1.0/*0.0*/); // TODO: Fix once QTRD-3367 is done + QCOMPARE(m_graph->reflectivity(), -1.0/*0.5*/); // TODO: Fix once QTRD-3367 is done + QCOMPARE(m_graph->locale(), QLocale("C")); +} + +void tst_scatter::addSeries() +{ + m_graph->addSeries(newSeries()); + + QCOMPARE(m_graph->seriesList().length(), 1); + QVERIFY(!m_graph->selectedSeries()); +} + +void tst_scatter::addMultipleSeries() +{ + QScatter3DSeries *series = newSeries(); + QScatter3DSeries *series2 = newSeries(); + QScatter3DSeries *series3 = newSeries(); + + m_graph->addSeries(series); + m_graph->addSeries(series2); + m_graph->addSeries(series3); + + QCOMPARE(m_graph->seriesList().length(), 3); +} + +void tst_scatter::selectSeries() +{ + QScatter3DSeries *series = newSeries(); + + m_graph->addSeries(series); + m_graph->seriesList()[0]->setSelectedItem(1); + + QCOMPARE(m_graph->seriesList().length(), 1); + QCOMPARE(m_graph->selectedSeries(), series); + + m_graph->clearSelection(); + QVERIFY(!m_graph->selectedSeries()); +} + +void tst_scatter::removeSeries() +{ + QScatter3DSeries *series = newSeries(); + + m_graph->addSeries(series); + m_graph->removeSeries(series); + QCOMPARE(m_graph->seriesList().length(), 0); +} + +void tst_scatter::removeMultipleSeries() +{ + QScatter3DSeries *series = newSeries(); + QScatter3DSeries *series2 = newSeries(); + QScatter3DSeries *series3 = newSeries(); + + m_graph->addSeries(series); + m_graph->addSeries(series2); + m_graph->addSeries(series3); + + m_graph->seriesList()[0]->setSelectedItem(1); + QCOMPARE(m_graph->selectedSeries(), series); + + m_graph->removeSeries(series); + QCOMPARE(m_graph->seriesList().length(), 2); + QVERIFY(!m_graph->selectedSeries()); + + m_graph->removeSeries(series2); + QCOMPARE(m_graph->seriesList().length(), 1); + + m_graph->removeSeries(series3); + QCOMPARE(m_graph->seriesList().length(), 0); +} + +QTEST_MAIN(tst_scatter) +#include "tst_scatter.moc" diff --git a/tests/auto/cpptest/q3dscene-camera/q3dscene-camera.pro b/tests/auto/cpptest/q3dscene-camera/q3dscene-camera.pro new file mode 100644 index 00000000..c575a55e --- /dev/null +++ b/tests/auto/cpptest/q3dscene-camera/q3dscene-camera.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_camera.cpp diff --git a/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp b/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp new file mode 100644 index 00000000..ee321b22 --- /dev/null +++ b/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp @@ -0,0 +1,179 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/Q3DCamera> + +using namespace QtDataVisualization; + +class tst_camera: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + + void changePresets(); + +private: + Q3DCamera *m_camera; +}; + +void tst_camera::initTestCase() +{ +} + +void tst_camera::cleanupTestCase() +{ +} + +void tst_camera::init() +{ + m_camera = new Q3DCamera(); +} + +void tst_camera::cleanup() +{ + delete m_camera; +} + +void tst_camera::construct() +{ + Q3DCamera *camera = new Q3DCamera(); + QVERIFY(camera); + delete camera; +} + +void tst_camera::initialProperties() +{ + QVERIFY(m_camera); + + QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetNone); + QCOMPARE(m_camera->maxZoomLevel(), 500.0f); + QCOMPARE(m_camera->minZoomLevel(), 10.0f); + QCOMPARE(m_camera->target(), QVector3D(0.0, 0.0, 0.0)); + QCOMPARE(m_camera->wrapXRotation(), true); + QCOMPARE(m_camera->wrapYRotation(), false); + QCOMPARE(m_camera->xRotation(), 0.0f); + QCOMPARE(m_camera->yRotation(), 0.0f); + QCOMPARE(m_camera->zoomLevel(), 100.0f); + + // Common (from Q3DObject) + QVERIFY(!m_camera->parentScene()); + QCOMPARE(m_camera->position(), QVector3D(0, 0, 0)); +} + +void tst_camera::initializeProperties() +{ + QVERIFY(m_camera); + + m_camera->setMaxZoomLevel(1000.0f); + m_camera->setMinZoomLevel(100.0f); + m_camera->setTarget(QVector3D(1.0, -1.0, 1.0)); + m_camera->setWrapXRotation(false); + m_camera->setWrapYRotation(true); + m_camera->setXRotation(30.0f); + m_camera->setYRotation(30.0f); + m_camera->setZoomLevel(500.0f); + + QCOMPARE(m_camera->maxZoomLevel(), 1000.0f); + QCOMPARE(m_camera->minZoomLevel(), 100.0f); + QCOMPARE(m_camera->target(), QVector3D(1.0, -1.0, 1.0)); + QCOMPARE(m_camera->wrapXRotation(), false); + QCOMPARE(m_camera->wrapYRotation(), true); + QCOMPARE(m_camera->xRotation(), 30.0f); + QCOMPARE(m_camera->yRotation(), 30.0f); + QCOMPARE(m_camera->zoomLevel(), 500.0f); + + m_camera->setPosition(QVector3D(1.0, 1.0, 1.0)); + + // Common (from Q3DObject) + QCOMPARE(m_camera->position(), QVector3D(1.0, 1.0, 1.0)); +} + +void tst_camera::invalidProperties() +{ + m_camera->setTarget(QVector3D(-1.5, -1.5, -1.5)); + QCOMPARE(m_camera->target(), QVector3D(-1.0, -1.0, -1.0)); + + m_camera->setTarget(QVector3D(1.5, 1.5, 1.5)); + QCOMPARE(m_camera->target(), QVector3D(1.0, 1.0, 1.0)); + + m_camera->setMinZoomLevel(0.1f); + QCOMPARE(m_camera->minZoomLevel(), 1.0f); +} + +void tst_camera::changePresets() +{ + m_camera->setCameraPreset(Q3DCamera::CameraPresetBehind); // Will be overridden by the the following sets + m_camera->setMaxZoomLevel(1000.0f); + m_camera->setMinZoomLevel(100.0f); + m_camera->setTarget(QVector3D(1.0, -1.0, 1.0)); + m_camera->setWrapXRotation(false); + m_camera->setWrapYRotation(true); + m_camera->setXRotation(30.0f); + m_camera->setYRotation(30.0f); + m_camera->setZoomLevel(500.0f); + + QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetNone); + QCOMPARE(m_camera->maxZoomLevel(), 1000.0f); + QCOMPARE(m_camera->minZoomLevel(), 100.0f); + QCOMPARE(m_camera->target(), QVector3D(1.0, -1.0, 1.0)); + QCOMPARE(m_camera->wrapXRotation(), false); + QCOMPARE(m_camera->wrapYRotation(), true); + QCOMPARE(m_camera->xRotation(), 30.0f); + QCOMPARE(m_camera->yRotation(), 30.0f); + QCOMPARE(m_camera->zoomLevel(), 500.0f); + + m_camera->setCameraPreset(Q3DCamera::CameraPresetBehind); // Sets target and rotations + + QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetBehind); + QCOMPARE(m_camera->maxZoomLevel(), 1000.0f); + QCOMPARE(m_camera->minZoomLevel(), 100.0f); + QCOMPARE(m_camera->target(), QVector3D(0.0, 0.0, 0.0)); + QCOMPARE(m_camera->wrapXRotation(), false); + QCOMPARE(m_camera->wrapYRotation(), true); + QCOMPARE(m_camera->xRotation(), 180.0f); + QCOMPARE(m_camera->yRotation(), 22.5f); + QCOMPARE(m_camera->zoomLevel(), 500.0f); + + m_camera->setCameraPosition(10.0f, 15.0f, 125.0f); // Overrides preset + + QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetNone); + QCOMPARE(m_camera->maxZoomLevel(), 1000.0f); + QCOMPARE(m_camera->minZoomLevel(), 100.0f); + QCOMPARE(m_camera->target(), QVector3D(0.0, 0.0, 0.0)); + QCOMPARE(m_camera->wrapXRotation(), false); + QCOMPARE(m_camera->wrapYRotation(), true); + QCOMPARE(m_camera->xRotation(), 10.0f); + QCOMPARE(m_camera->yRotation(), 15.0f); + QCOMPARE(m_camera->zoomLevel(), 125.0f); +} + +QTEST_MAIN(tst_camera) +#include "tst_camera.moc" diff --git a/tests/auto/cpptest/q3dscene-light/q3dscene-light.pro b/tests/auto/cpptest/q3dscene-light/q3dscene-light.pro new file mode 100644 index 00000000..21a3c934 --- /dev/null +++ b/tests/auto/cpptest/q3dscene-light/q3dscene-light.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_light.cpp diff --git a/tests/auto/cpptest/q3dscene-light/tst_light.cpp b/tests/auto/cpptest/q3dscene-light/tst_light.cpp new file mode 100644 index 00000000..4568b01e --- /dev/null +++ b/tests/auto/cpptest/q3dscene-light/tst_light.cpp @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/Q3DLight> + +using namespace QtDataVisualization; + +class tst_light: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + +private: + Q3DLight *m_light; +}; + +void tst_light::initTestCase() +{ +} + +void tst_light::cleanupTestCase() +{ +} + +void tst_light::init() +{ + m_light = new Q3DLight(); +} + +void tst_light::cleanup() +{ + delete m_light; +} + +void tst_light::construct() +{ + Q3DLight *light = new Q3DLight(); + QVERIFY(light); + delete light; +} + +void tst_light::initialProperties() +{ + QVERIFY(m_light); + + // TODO: Has no adjustable properties yet. + // Keeping this as a placeholder for future implementations (QTRD-2406) + + // Common (from Q3DObject) + QVERIFY(!m_light->parentScene()); + QCOMPARE(m_light->position(), QVector3D(0, 0, 0)); +} + +void tst_light::initializeProperties() +{ + QVERIFY(m_light); + + m_light->setPosition(QVector3D(1.0, 1.0, 1.0)); + + // Common (from Q3DObject) + QCOMPARE(m_light->position(), QVector3D(1.0, 1.0, 1.0)); +} + +QTEST_MAIN(tst_light) +#include "tst_light.moc" diff --git a/tests/auto/cpptest/q3dscene/q3dscene.pro b/tests/auto/cpptest/q3dscene/q3dscene.pro new file mode 100644 index 00000000..b9be69c0 --- /dev/null +++ b/tests/auto/cpptest/q3dscene/q3dscene.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_scene.cpp diff --git a/tests/auto/cpptest/q3dscene/tst_scene.cpp b/tests/auto/cpptest/q3dscene/tst_scene.cpp new file mode 100644 index 00000000..7d1ecad3 --- /dev/null +++ b/tests/auto/cpptest/q3dscene/tst_scene.cpp @@ -0,0 +1,170 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/Q3DScene> +#include <QtDataVisualization/Q3DBars> + +using namespace QtDataVisualization; + +class tst_scene: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + + void subViews(); + +private: + Q3DScene *m_scene; +}; + +void tst_scene::initTestCase() +{ +} + +void tst_scene::cleanupTestCase() +{ +} + +void tst_scene::init() +{ + m_scene = new Q3DScene(); +} + +void tst_scene::cleanup() +{ + delete m_scene; +} + +void tst_scene::construct() +{ + Q3DScene *scene = new Q3DScene(); + QVERIFY(scene); + delete scene; +} + +void tst_scene::initialProperties() +{ + QVERIFY(m_scene); + + QVERIFY(m_scene->activeCamera()); + QVERIFY(m_scene->activeLight()); + QCOMPARE(m_scene->devicePixelRatio(), 1.0f); + QCOMPARE(m_scene->graphPositionQuery(), m_scene->invalidSelectionPoint()); + QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 0, 0)); + QCOMPARE(m_scene->secondarySubViewport(), QRect(0, 0, 0, 0)); + QCOMPARE(m_scene->isSecondarySubviewOnTop(), true); + QCOMPARE(m_scene->selectionQueryPosition(), m_scene->invalidSelectionPoint()); + QCOMPARE(m_scene->isSlicingActive(), false); + QCOMPARE(m_scene->viewport(), QRect(0, 0, 0, 0)); +} + +void tst_scene::initializeProperties() +{ + QVERIFY(m_scene); + + Q3DCamera *camera1 = new Q3DCamera(); + Q3DLight *light1 = new Q3DLight(); + + m_scene->setActiveCamera(camera1); + m_scene->setActiveLight(light1); + m_scene->setDevicePixelRatio(2.0f); + m_scene->setGraphPositionQuery(QPoint(0, 0)); + m_scene->setPrimarySubViewport(QRect(0, 0, 50, 50)); + m_scene->setSecondarySubViewport(QRect(50, 50, 100, 100)); + m_scene->setSecondarySubviewOnTop(false); + m_scene->setSelectionQueryPosition(QPoint(0, 0)); + m_scene->setSlicingActive(true); + + QCOMPARE(m_scene->activeCamera(), camera1); + QCOMPARE(m_scene->activeLight(), light1); + QCOMPARE(m_scene->devicePixelRatio(), 2.0f); + QCOMPARE(m_scene->graphPositionQuery(), QPoint(0, 0)); // TODO: When doing signal checks, add tests to check that queries return something (asynchronously) + // TODO: subviewports are not set (QTRD-2435) + //QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 50, 50)); + //QCOMPARE(m_scene->secondarySubViewport(), QRect(50, 50, 100, 100)); + QCOMPARE(m_scene->isSecondarySubviewOnTop(), false); + QCOMPARE(m_scene->selectionQueryPosition(), QPoint(0, 0)); // TODO: When doing signal checks, add tests to check that queries return something (asynchronously) + QCOMPARE(m_scene->isSlicingActive(), true); + // TODO: viewport is not set by subviewports (QTRD-2435) + //QCOMPARE(m_scene->viewport(), QRect(0, 0, 100, 100)); +} + +void tst_scene::invalidProperties() +{ + m_scene->setPrimarySubViewport(QRect(0, 0, -50, -50)); + m_scene->setSecondarySubViewport(QRect(-50, -50, -100, -100)); + QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 0, 0)); + QCOMPARE(m_scene->secondarySubViewport(), QRect(0, 0, 0, 0)); +} + +void tst_scene::subViews() +{ + Q3DBars *graph = new Q3DBars(); + graph->setPosition(QPoint(0, 0)); + graph->setWidth(200); + graph->setHeight(200); + + Q3DScene *scene = graph->scene(); + + QCoreApplication::processEvents(); + + QCOMPARE(scene->viewport(), QRect(0, 0, 200, 200)); + QCOMPARE(scene->primarySubViewport(), QRect(0, 0, 200, 200)); + QCOMPARE(scene->secondarySubViewport(), QRect(0, 0, 0, 0)); + + QCOMPARE(scene->isSecondarySubviewOnTop(), true); + QCOMPARE(scene->isPointInPrimarySubView(QPoint(100, 100)), true); + QCOMPARE(scene->isPointInPrimarySubView(QPoint(201, 201)), false); + QCOMPARE(scene->isPointInSecondarySubView(QPoint(100, 100)), false); + + scene->setSlicingActive(true); + + QCOMPARE(scene->isSecondarySubviewOnTop(), false); + QCOMPARE(scene->primarySubViewport(), QRect(0, 0, 40, 40)); + QCOMPARE(scene->secondarySubViewport(), QRect(0, 0, 200, 200)); + QCOMPARE(scene->isPointInPrimarySubView(QPoint(100, 100)), false); + QCOMPARE(scene->isPointInPrimarySubView(QPoint(30, 30)), true); + QCOMPARE(scene->isPointInSecondarySubView(QPoint(100, 100)), true); + QCOMPARE(scene->isPointInSecondarySubView(QPoint(30, 30)), false); + + scene->setSecondarySubviewOnTop(true); + + QCOMPARE(scene->isSecondarySubviewOnTop(), true); + QCOMPARE(scene->primarySubViewport(), QRect(0, 0, 40, 40)); + QCOMPARE(scene->secondarySubViewport(), QRect(0, 0, 200, 200)); + QCOMPARE(scene->isPointInPrimarySubView(QPoint(100, 100)), false); + QCOMPARE(scene->isPointInPrimarySubView(QPoint(30, 30)), false); + QCOMPARE(scene->isPointInSecondarySubView(QPoint(100, 100)), true); + QCOMPARE(scene->isPointInSecondarySubView(QPoint(30, 30)), true); +} + +QTEST_MAIN(tst_scene) +#include "tst_scene.moc" diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/customtexture.jpg b/tests/auto/cpptest/q3dsurface-heightproxy/customtexture.jpg Binary files differnew file mode 100644 index 00000000..2580f5bd --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-heightproxy/customtexture.jpg diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.pro b/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.pro new file mode 100644 index 00000000..56a964d0 --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.pro @@ -0,0 +1,11 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_proxy.cpp + +RESOURCES += \ + q3dsurface-heightproxy.qrc diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.qrc b/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.qrc new file mode 100644 index 00000000..b83c7ef9 --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>customtexture.jpg</file> + </qresource> +</RCC> diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp new file mode 100644 index 00000000..20ed1aeb --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp @@ -0,0 +1,156 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QHeightMapSurfaceDataProxy> + +using namespace QtDataVisualization; + +class tst_proxy: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + +private: + QHeightMapSurfaceDataProxy *m_proxy; +}; + +void tst_proxy::initTestCase() +{ +} + +void tst_proxy::cleanupTestCase() +{ +} + +void tst_proxy::init() +{ + m_proxy = new QHeightMapSurfaceDataProxy(); +} + +void tst_proxy::cleanup() +{ + delete m_proxy; +} + +void tst_proxy::construct() +{ + QHeightMapSurfaceDataProxy *proxy = new QHeightMapSurfaceDataProxy(); + QVERIFY(proxy); + delete proxy; + + proxy = new QHeightMapSurfaceDataProxy(QImage(QSize(10, 10), QImage::Format_ARGB32)); + QVERIFY(proxy); + QCoreApplication::processEvents(); + QCOMPARE(proxy->columnCount(), 10); + QCOMPARE(proxy->rowCount(), 10); + delete proxy; + + proxy = new QHeightMapSurfaceDataProxy(":/customtexture.jpg"); + QVERIFY(proxy); + QCoreApplication::processEvents(); + QCOMPARE(proxy->columnCount(), 24); + QCOMPARE(proxy->rowCount(), 24); + delete proxy; +} + +void tst_proxy::initialProperties() +{ + QVERIFY(m_proxy); + + QCOMPARE(m_proxy->heightMap(), QImage()); + QCOMPARE(m_proxy->heightMapFile(), QString("")); + QCOMPARE(m_proxy->maxXValue(), 10.0f); + QCOMPARE(m_proxy->maxZValue(), 10.0f); + QCOMPARE(m_proxy->minXValue(), 0.0f); + QCOMPARE(m_proxy->minZValue(), 0.0f); + + QCOMPARE(m_proxy->columnCount(), 0); + QCOMPARE(m_proxy->rowCount(), 0); + QVERIFY(!m_proxy->series()); + + QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeSurface); +} + +void tst_proxy::initializeProperties() +{ + QVERIFY(m_proxy); + + m_proxy->setHeightMapFile(":/customtexture.jpg"); + m_proxy->setMaxXValue(11.0f); + m_proxy->setMaxZValue(11.0f); + m_proxy->setMinXValue(-10.0f); + m_proxy->setMinZValue(-10.0f); + + QCoreApplication::processEvents(); + + QCOMPARE(m_proxy->heightMapFile(), QString(":/customtexture.jpg")); + QCOMPARE(m_proxy->maxXValue(), 11.0f); + QCOMPARE(m_proxy->maxZValue(), 11.0f); + QCOMPARE(m_proxy->minXValue(), -10.0f); + QCOMPARE(m_proxy->minZValue(), -10.0f); + + QCOMPARE(m_proxy->columnCount(), 24); + QCOMPARE(m_proxy->rowCount(), 24); + + m_proxy->setHeightMapFile(""); + + QCoreApplication::processEvents(); + + QCOMPARE(m_proxy->columnCount(), 0); + QCOMPARE(m_proxy->rowCount(), 0); + + m_proxy->setHeightMap(QImage(":/customtexture.jpg")); + + QCoreApplication::processEvents(); + + QCOMPARE(m_proxy->columnCount(), 24); + QCOMPARE(m_proxy->rowCount(), 24); +} + +void tst_proxy::invalidProperties() +{ + m_proxy->setMaxXValue(-10.0f); + m_proxy->setMaxZValue(-10.0f); + QCOMPARE(m_proxy->maxXValue(), -10.0f); + QCOMPARE(m_proxy->maxZValue(), -10.0f); + QCOMPARE(m_proxy->minXValue(), -11.0f); + QCOMPARE(m_proxy->minZValue(), -11.0f); + + m_proxy->setMinXValue(10.0f); + m_proxy->setMinZValue(10.0f); + QCOMPARE(m_proxy->maxXValue(), 11.0f); + QCOMPARE(m_proxy->maxZValue(), 11.0f); + QCOMPARE(m_proxy->minXValue(), 10.0f); + QCOMPARE(m_proxy->minZValue(), 10.0f); +} + +QTEST_MAIN(tst_proxy) +#include "tst_proxy.moc" diff --git a/tests/auto/cpptest/q3dsurface-modelproxy/q3dsurface-modelproxy.pro b/tests/auto/cpptest/q3dsurface-modelproxy/q3dsurface-modelproxy.pro new file mode 100644 index 00000000..c383ec25 --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-modelproxy/q3dsurface-modelproxy.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization widgets + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_proxy.cpp diff --git a/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp new file mode 100644 index 00000000..6bef9478 --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp @@ -0,0 +1,283 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QItemModelSurfaceDataProxy> +#include <QtDataVisualization/Q3DSurface> +#include <QtWidgets/QTableWidget> + +using namespace QtDataVisualization; + +class tst_proxy: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + + void multiMatch(); + +private: + QItemModelSurfaceDataProxy *m_proxy; +}; + +void tst_proxy::initTestCase() +{ +} + +void tst_proxy::cleanupTestCase() +{ +} + +void tst_proxy::init() +{ + m_proxy = new QItemModelSurfaceDataProxy(); +} + +void tst_proxy::cleanup() +{ + delete m_proxy; +} + + +void tst_proxy::construct() +{ + QItemModelSurfaceDataProxy *proxy = new QItemModelSurfaceDataProxy(); + QVERIFY(proxy); + delete proxy; + + QTableWidget *table = new QTableWidget(); + + proxy = new QItemModelSurfaceDataProxy(table->model()); + QVERIFY(proxy); + delete proxy; + + proxy = new QItemModelSurfaceDataProxy(table->model(), "y"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("")); + QCOMPARE(proxy->columnRole(), QString("")); + QCOMPARE(proxy->xPosRole(), QString("")); + QCOMPARE(proxy->yPosRole(), QString("y")); + QCOMPARE(proxy->zPosRole(), QString("")); + QCOMPARE(proxy->rowCategories().length(), 0); + QCOMPARE(proxy->columnCategories().length(), 0); + delete proxy; + + proxy = new QItemModelSurfaceDataProxy(table->model(), "row", "column", "y"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("row")); + QCOMPARE(proxy->columnRole(), QString("column")); + QCOMPARE(proxy->xPosRole(), QString("column")); + QCOMPARE(proxy->yPosRole(), QString("y")); + QCOMPARE(proxy->zPosRole(), QString("row")); + QCOMPARE(proxy->rowCategories().length(), 0); + QCOMPARE(proxy->columnCategories().length(), 0); + delete proxy; + + proxy = new QItemModelSurfaceDataProxy(table->model(), "row", "column", "x", "y", "z"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("row")); + QCOMPARE(proxy->columnRole(), QString("column")); + QCOMPARE(proxy->xPosRole(), QString("x")); + QCOMPARE(proxy->yPosRole(), QString("y")); + QCOMPARE(proxy->zPosRole(), QString("z")); + QCOMPARE(proxy->rowCategories().length(), 0); + QCOMPARE(proxy->columnCategories().length(), 0); + delete proxy; + + proxy = new QItemModelSurfaceDataProxy(table->model(), "row", "column", "y", + QStringList() << "rowCat", QStringList() << "colCat"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("row")); + QCOMPARE(proxy->columnRole(), QString("column")); + QCOMPARE(proxy->xPosRole(), QString("column")); + QCOMPARE(proxy->yPosRole(), QString("y")); + QCOMPARE(proxy->zPosRole(), QString("row")); + QCOMPARE(proxy->rowCategories().length(), 1); + QCOMPARE(proxy->columnCategories().length(), 1); + delete proxy; + + proxy = new QItemModelSurfaceDataProxy(table->model(), "row", "column", "x", "y", "z", + QStringList() << "rowCat", QStringList() << "colCat"); + QVERIFY(proxy); + QCOMPARE(proxy->rowRole(), QString("row")); + QCOMPARE(proxy->columnRole(), QString("column")); + QCOMPARE(proxy->xPosRole(), QString("x")); + QCOMPARE(proxy->yPosRole(), QString("y")); + QCOMPARE(proxy->zPosRole(), QString("z")); + QCOMPARE(proxy->rowCategories().length(), 1); + QCOMPARE(proxy->columnCategories().length(), 1); + delete proxy; +} + +void tst_proxy::initialProperties() +{ + QVERIFY(m_proxy); + + QCOMPARE(m_proxy->autoColumnCategories(), true); + QCOMPARE(m_proxy->autoRowCategories(), true); + QCOMPARE(m_proxy->columnCategories(), QStringList()); + QCOMPARE(m_proxy->columnRole(), QString()); + QCOMPARE(m_proxy->columnRolePattern(), QRegExp()); + QCOMPARE(m_proxy->columnRoleReplace(), QString()); + QVERIFY(!m_proxy->itemModel()); + QCOMPARE(m_proxy->multiMatchBehavior(), QItemModelSurfaceDataProxy::MMBLast); + QCOMPARE(m_proxy->rowCategories(), QStringList()); + QCOMPARE(m_proxy->rowRole(), QString()); + QCOMPARE(m_proxy->rowRolePattern(), QRegExp()); + QCOMPARE(m_proxy->rowRoleReplace(), QString()); + QCOMPARE(m_proxy->useModelCategories(), false); + QCOMPARE(m_proxy->xPosRole(), QString()); + QCOMPARE(m_proxy->xPosRolePattern(), QRegExp()); + QCOMPARE(m_proxy->xPosRoleReplace(), QString()); + QCOMPARE(m_proxy->yPosRole(), QString()); + QCOMPARE(m_proxy->yPosRolePattern(), QRegExp()); + QCOMPARE(m_proxy->yPosRoleReplace(), QString()); + QCOMPARE(m_proxy->zPosRole(), QString()); + QCOMPARE(m_proxy->zPosRolePattern(), QRegExp()); + QCOMPARE(m_proxy->zPosRoleReplace(), QString()); + + QCOMPARE(m_proxy->columnCount(), 0); + QCOMPARE(m_proxy->rowCount(), 0); + QVERIFY(!m_proxy->series()); + + QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeSurface); +} + +void tst_proxy::initializeProperties() +{ + QVERIFY(m_proxy); + + QTableWidget *table = new QTableWidget(); + + m_proxy->setAutoColumnCategories(false); + m_proxy->setAutoRowCategories(false); + m_proxy->setColumnCategories(QStringList() << "col1" << "col2"); + m_proxy->setColumnRole("column"); + m_proxy->setColumnRolePattern(QRegExp("/^.*-(\\d\\d)$/")); + m_proxy->setColumnRoleReplace("\\\\1"); + m_proxy->setItemModel(table->model()); + m_proxy->setMultiMatchBehavior(QItemModelSurfaceDataProxy::MMBAverage); + m_proxy->setRowCategories(QStringList() << "row1" << "row2"); + m_proxy->setRowRole("row"); + m_proxy->setRowRolePattern(QRegExp("/^(\\d\\d\\d\\d).*$/")); + m_proxy->setRowRoleReplace("\\\\1"); + m_proxy->setUseModelCategories(true); + m_proxy->setXPosRole("X"); + m_proxy->setXPosRolePattern(QRegExp("/-/")); + m_proxy->setXPosRoleReplace("\\\\1"); + m_proxy->setYPosRole("Y"); + m_proxy->setYPosRolePattern(QRegExp("/-/")); + m_proxy->setYPosRoleReplace("\\\\1"); + m_proxy->setZPosRole("Z"); + m_proxy->setZPosRolePattern(QRegExp("/-/")); + m_proxy->setZPosRoleReplace("\\\\1"); + + QCOMPARE(m_proxy->autoColumnCategories(), false); + QCOMPARE(m_proxy->autoRowCategories(), false); + QCOMPARE(m_proxy->columnCategories().count(), 2); + QCOMPARE(m_proxy->columnRole(), QString("column")); + QCOMPARE(m_proxy->columnRolePattern(), QRegExp("/^.*-(\\d\\d)$/")); + QCOMPARE(m_proxy->columnRoleReplace(), QString("\\\\1")); + QVERIFY(m_proxy->itemModel()); + QCOMPARE(m_proxy->multiMatchBehavior(), QItemModelSurfaceDataProxy::MMBAverage); + QCOMPARE(m_proxy->rowCategories().count(), 2); + QCOMPARE(m_proxy->rowRole(), QString("row")); + QCOMPARE(m_proxy->rowRolePattern(), QRegExp("/^(\\d\\d\\d\\d).*$/")); + QCOMPARE(m_proxy->rowRoleReplace(), QString("\\\\1")); + QCOMPARE(m_proxy->useModelCategories(), true); + QCOMPARE(m_proxy->xPosRole(), QString("X")); + QCOMPARE(m_proxy->xPosRolePattern(), QRegExp("/-/")); + QCOMPARE(m_proxy->xPosRoleReplace(), QString("\\\\1")); + QCOMPARE(m_proxy->yPosRole(), QString("Y")); + QCOMPARE(m_proxy->yPosRolePattern(), QRegExp("/-/")); + QCOMPARE(m_proxy->yPosRoleReplace(), QString("\\\\1")); + QCOMPARE(m_proxy->zPosRole(), QString("Z")); + QCOMPARE(m_proxy->zPosRolePattern(), QRegExp("/-/")); + QCOMPARE(m_proxy->zPosRoleReplace(), QString("\\\\1")); +} + +void tst_proxy::multiMatch() +{ + Q3DSurface *graph = new Q3DSurface(); + + QTableWidget *table = new QTableWidget(); + QStringList rows; + rows << "row 1" << "row 2"; + QStringList columns; + columns << "col 1" << "col 2" << "col 3" << "col 4"; + const char *values[4][2] = {{"0/0/5.5/30", "0/0/10.5/30"}, + {"0/1/5.5/30", "0/1/0.5/30"}, + {"1/0/5.5/30", "1/0/0.5/30"}, + {"1/1/0.0/30", "1/1/0.0/30"}}; + + table->setRowCount(2); + table->setColumnCount(4); + + for (int col = 0; col < columns.size(); col++) { + for (int row = 0; row < rows.size(); row++) { + QModelIndex index = table->model()->index(col, row); + table->model()->setData(index, values[col][row]); + } + } + + m_proxy->setItemModel(table->model()); + m_proxy->setRowRole(table->model()->roleNames().value(Qt::DisplayRole)); + m_proxy->setColumnRole(table->model()->roleNames().value(Qt::DisplayRole)); + m_proxy->setRowRolePattern(QRegExp(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$"))); + m_proxy->setRowRoleReplace(QStringLiteral("\\2")); + m_proxy->setYPosRolePattern(QRegExp(QStringLiteral("^\\d*(\\/)(\\d*)\\/(\\d*[\\.\\,]?\\d*)\\/\\d*[\\.\\,]?\\d*$"))); + m_proxy->setYPosRoleReplace(QStringLiteral("\\3")); + m_proxy->setColumnRolePattern(QRegExp(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$"))); + m_proxy->setColumnRoleReplace(QStringLiteral("\\1")); + + QSurface3DSeries *series = new QSurface3DSeries(m_proxy); + + graph->addSeries(series); + + QCoreApplication::processEvents(); + QCOMPARE(graph->axisY()->max(), 10.5f); + m_proxy->setMultiMatchBehavior(QItemModelSurfaceDataProxy::MMBFirst); + QCoreApplication::processEvents(); + QCOMPARE(graph->axisY()->max(), 5.5f); + m_proxy->setMultiMatchBehavior(QItemModelSurfaceDataProxy::MMBLast); + QCoreApplication::processEvents(); + QCOMPARE(graph->axisY()->max(), 10.5f); + m_proxy->setMultiMatchBehavior(QItemModelSurfaceDataProxy::MMBAverage); + QCoreApplication::processEvents(); + QCOMPARE(graph->axisY()->max(), 8.0f); + m_proxy->setMultiMatchBehavior(QItemModelSurfaceDataProxy::MMBCumulativeY); + QCoreApplication::processEvents(); + QCOMPARE(graph->axisY()->max(), 16.0f); + + QCOMPARE(m_proxy->columnCount(), 2); + QCOMPARE(m_proxy->rowCount(), 3); + QVERIFY(m_proxy->series()); +} + +QTEST_MAIN(tst_proxy) +#include "tst_proxy.moc" diff --git a/tests/auto/cpptest/q3dsurface-proxy/q3dsurface-proxy.pro b/tests/auto/cpptest/q3dsurface-proxy/q3dsurface-proxy.pro new file mode 100644 index 00000000..b0b5d361 --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-proxy/q3dsurface-proxy.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_proxy.cpp diff --git a/tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp new file mode 100644 index 00000000..4274899d --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QSurfaceDataProxy> + +using namespace QtDataVisualization; + +class tst_proxy: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + +private: + QSurfaceDataProxy *m_proxy; +}; + +void tst_proxy::initTestCase() +{ +} + +void tst_proxy::cleanupTestCase() +{ +} + +void tst_proxy::init() +{ + m_proxy = new QSurfaceDataProxy(); +} + +void tst_proxy::cleanup() +{ + delete m_proxy; +} + +void tst_proxy::construct() +{ + QSurfaceDataProxy *proxy = new QSurfaceDataProxy(); + QVERIFY(proxy); + delete proxy; +} + +void tst_proxy::initialProperties() +{ + QVERIFY(m_proxy); + + QCOMPARE(m_proxy->columnCount(), 0); + QCOMPARE(m_proxy->rowCount(), 0); + QVERIFY(!m_proxy->series()); + + QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeSurface); +} + +void tst_proxy::initializeProperties() +{ + QVERIFY(m_proxy); + + QSurfaceDataArray *data = new QSurfaceDataArray; + QSurfaceDataRow *dataRow1 = new QSurfaceDataRow; + QSurfaceDataRow *dataRow2 = new QSurfaceDataRow; + *dataRow1 << QVector3D(0.0f, 0.1f, 0.5f) << QVector3D(1.0f, 0.5f, 0.5f); + *dataRow2 << QVector3D(0.0f, 1.8f, 1.0f) << QVector3D(1.0f, 1.2f, 1.0f); + *data << dataRow1 << dataRow2; + + m_proxy->resetArray(data); + + QCOMPARE(m_proxy->columnCount(), 2); + QCOMPARE(m_proxy->rowCount(), 2); +} + +QTEST_MAIN(tst_proxy) +#include "tst_proxy.moc" diff --git a/tests/auto/cpptest/q3dsurface-series/q3dsurface-series.pro b/tests/auto/cpptest/q3dsurface-series/q3dsurface-series.pro new file mode 100644 index 00000000..481653ef --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-series/q3dsurface-series.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_series.cpp diff --git a/tests/auto/cpptest/q3dsurface-series/tst_series.cpp b/tests/auto/cpptest/q3dsurface-series/tst_series.cpp new file mode 100644 index 00000000..50eed686 --- /dev/null +++ b/tests/auto/cpptest/q3dsurface-series/tst_series.cpp @@ -0,0 +1,120 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/QSurface3DSeries> + +using namespace QtDataVisualization; + +class tst_series: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + +private: + QSurface3DSeries *m_series; +}; + +void tst_series::initTestCase() +{ +} + +void tst_series::cleanupTestCase() +{ +} + +void tst_series::init() +{ + m_series = new QSurface3DSeries(); +} + +void tst_series::cleanup() +{ + delete m_series; +} + +void tst_series::construct() +{ + QSurface3DSeries *series = new QSurface3DSeries(); + QVERIFY(series); + delete series; + + QSurfaceDataProxy *proxy = new QSurfaceDataProxy(); + + series = new QSurface3DSeries(proxy); + QVERIFY(series); + QCOMPARE(series->dataProxy(), proxy); + delete series; +} + +void tst_series::initialProperties() +{ + QVERIFY(m_series); + + QVERIFY(m_series->dataProxy()); + QCOMPARE(m_series->drawMode(), QSurface3DSeries::DrawSurfaceAndWireframe); + QCOMPARE(m_series->isFlatShadingEnabled(), true); + QCOMPARE(m_series->isFlatShadingSupported(), true); + QCOMPARE(m_series->selectedPoint(), m_series->invalidSelectionPosition()); + + // Common properties. The ones identical between different series are tested in QBar3DSeries tests + QCOMPARE(m_series->itemLabelFormat(), QString("@xLabel, @yLabel, @zLabel")); + QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshSphere); + QCOMPARE(m_series->type(), QAbstract3DSeries::SeriesTypeSurface); +} + +void tst_series::initializeProperties() +{ + QVERIFY(m_series); + + m_series->setDataProxy(new QSurfaceDataProxy()); + m_series->setDrawMode(QSurface3DSeries::DrawWireframe); + m_series->setFlatShadingEnabled(false); + m_series->setSelectedPoint(QPoint(0, 0)); + + QCOMPARE(m_series->drawMode(), QSurface3DSeries::DrawWireframe); + QCOMPARE(m_series->isFlatShadingEnabled(), false); + QCOMPARE(m_series->selectedPoint(), QPoint(0, 0)); + + // Common properties. The ones identical between different series are tested in QBar3DSeries tests + m_series->setMesh(QAbstract3DSeries::MeshPyramid); + + QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshPyramid); +} + +void tst_series::invalidProperties() +{ + m_series->setMesh(QAbstract3DSeries::MeshPoint); + + QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshSphere); +} + +QTEST_MAIN(tst_series) +#include "tst_series.moc" diff --git a/tests/auto/cpptest/q3dsurface/q3dsurface.pro b/tests/auto/cpptest/q3dsurface/q3dsurface.pro new file mode 100644 index 00000000..b7a6bf08 --- /dev/null +++ b/tests/auto/cpptest/q3dsurface/q3dsurface.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_surface.cpp diff --git a/tests/auto/cpptest/q3dsurface/tst_surface.cpp b/tests/auto/cpptest/q3dsurface/tst_surface.cpp new file mode 100644 index 00000000..0ae0a326 --- /dev/null +++ b/tests/auto/cpptest/q3dsurface/tst_surface.cpp @@ -0,0 +1,247 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/Q3DSurface> + +using namespace QtDataVisualization; + +class tst_surface: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + + void addSeries(); + void addMultipleSeries(); + void selectSeries(); + void removeSeries(); + void removeMultipleSeries(); + +private: + Q3DSurface *m_graph; +}; + +QSurface3DSeries *newSeries() +{ + QSurface3DSeries *series = new QSurface3DSeries; + QSurfaceDataArray *data = new QSurfaceDataArray; + QSurfaceDataRow *dataRow1 = new QSurfaceDataRow; + QSurfaceDataRow *dataRow2 = new QSurfaceDataRow; + *dataRow1 << QVector3D(0.0f, 0.1f, 0.5f) << QVector3D(1.0f, 0.5f, 0.5f); + *dataRow2 << QVector3D(0.0f, 1.8f, 1.0f) << QVector3D(1.0f, 1.2f, 1.0f); + *data << dataRow1 << dataRow2; + series->dataProxy()->resetArray(data); + + return series; +} + +void tst_surface::initTestCase() +{ +} + +void tst_surface::cleanupTestCase() +{ +} + +void tst_surface::init() +{ + m_graph = new Q3DSurface(); +} + +void tst_surface::cleanup() +{ + delete m_graph; +} + +void tst_surface::construct() +{ + Q3DSurface *graph = new Q3DSurface(); + QVERIFY(graph); + delete graph; + + graph = new Q3DSurface(new QSurfaceFormat()); + QVERIFY(graph); + delete graph; +} + +void tst_surface::initialProperties() +{ + QVERIFY(m_graph); + QCOMPARE(m_graph->seriesList().length(), 0); + QVERIFY(!m_graph->selectedSeries()); + QCOMPARE(m_graph->flipHorizontalGrid(), false); + QCOMPARE(m_graph->axisX()->orientation(), QAbstract3DAxis::AxisOrientationX); + QCOMPARE(m_graph->axisY()->orientation(), QAbstract3DAxis::AxisOrientationY); + QCOMPARE(m_graph->axisZ()->orientation(), QAbstract3DAxis::AxisOrientationZ); + + // Common properties + QCOMPARE(m_graph->activeTheme()->type(), Q3DTheme::ThemeQt); + QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem); + QCOMPARE(m_graph->shadowQuality(), QAbstract3DGraph::ShadowQualityMedium); + QVERIFY(m_graph->scene()); + QCOMPARE(m_graph->measureFps(), false); + QCOMPARE(m_graph->isOrthoProjection(), false); + QCOMPARE(m_graph->selectedElement(), QAbstract3DGraph::ElementNone); + QCOMPARE(m_graph->aspectRatio(), 2.0); + QCOMPARE(m_graph->optimizationHints(), QAbstract3DGraph::OptimizationDefault); + QCOMPARE(m_graph->isPolar(), false); + QCOMPARE(m_graph->radialLabelOffset(), 1.0); + QCOMPARE(m_graph->horizontalAspectRatio(), 0.0); + QCOMPARE(m_graph->isReflection(), false); + QCOMPARE(m_graph->reflectivity(), 0.5); + QCOMPARE(m_graph->locale(), QLocale("C")); + QCOMPARE(m_graph->queriedGraphPosition(), QVector3D(0, 0, 0)); + QCOMPARE(m_graph->margin(), -1.0); +} + +void tst_surface::initializeProperties() +{ + m_graph->setFlipHorizontalGrid(true); + + QCOMPARE(m_graph->flipHorizontalGrid(), true); + + Q3DTheme *theme = new Q3DTheme(Q3DTheme::ThemeDigia); + m_graph->setActiveTheme(theme); + m_graph->setSelectionMode(QAbstract3DGraph::SelectionItem | QAbstract3DGraph::SelectionRow | QAbstract3DGraph::SelectionSlice); + m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftHigh); + QCOMPARE(m_graph->shadowQuality(), QAbstract3DGraph::ShadowQualitySoftHigh); + m_graph->setMeasureFps(true); + m_graph->setOrthoProjection(true); + m_graph->setAspectRatio(1.0); + m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationStatic); + m_graph->setPolar(true); + m_graph->setRadialLabelOffset(0.1f); + m_graph->setHorizontalAspectRatio(1.0); + m_graph->setReflection(true); + m_graph->setReflectivity(0.1); + m_graph->setLocale(QLocale("FI")); + m_graph->setMargin(1.0); + + QCOMPARE(m_graph->activeTheme()->type(), Q3DTheme::ThemeDigia); + QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem | QAbstract3DGraph::SelectionRow | QAbstract3DGraph::SelectionSlice); + QCOMPARE(m_graph->shadowQuality(), QAbstract3DGraph::ShadowQualityNone); // Ortho disables shadows + QCOMPARE(m_graph->measureFps(), true); + QCOMPARE(m_graph->isOrthoProjection(), true); + QCOMPARE(m_graph->aspectRatio(), 1.0); + QCOMPARE(m_graph->optimizationHints(), QAbstract3DGraph::OptimizationStatic); + QCOMPARE(m_graph->isPolar(), true); + QCOMPARE(m_graph->radialLabelOffset(), 0.1f); + QCOMPARE(m_graph->horizontalAspectRatio(), 1.0); + QCOMPARE(m_graph->isReflection(), true); + QCOMPARE(m_graph->reflectivity(), 0.1); + QCOMPARE(m_graph->locale(), QLocale("FI")); + QCOMPARE(m_graph->margin(), 1.0); +} + +void tst_surface::invalidProperties() +{ + m_graph->setSelectionMode(QAbstract3DGraph::SelectionColumn | QAbstract3DGraph::SelectionRow | QAbstract3DGraph::SelectionSlice); + m_graph->setAspectRatio(-1.0); + m_graph->setHorizontalAspectRatio(-1.0); + m_graph->setReflectivity(-1.0); + m_graph->setLocale(QLocale("XX")); + + QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem); + QCOMPARE(m_graph->aspectRatio(), -1.0/*2.0*/); // TODO: Fix once QTRD-3367 is done + QCOMPARE(m_graph->horizontalAspectRatio(), -1.0/*0.0*/); // TODO: Fix once QTRD-3367 is done + QCOMPARE(m_graph->reflectivity(), -1.0/*0.5*/); // TODO: Fix once QTRD-3367 is done + QCOMPARE(m_graph->locale(), QLocale("C")); +} + +void tst_surface::addSeries() +{ + m_graph->addSeries(newSeries()); + + QCOMPARE(m_graph->seriesList().length(), 1); + QVERIFY(!m_graph->selectedSeries()); +} + +void tst_surface::addMultipleSeries() +{ + QSurface3DSeries *series = newSeries(); + QSurface3DSeries *series2 = newSeries(); + QSurface3DSeries *series3 = newSeries(); + + m_graph->addSeries(series); + m_graph->addSeries(series2); + m_graph->addSeries(series3); + + QCOMPARE(m_graph->seriesList().length(), 3); +} + +void tst_surface::selectSeries() +{ + QSurface3DSeries *series = newSeries(); + + m_graph->addSeries(series); + m_graph->seriesList()[0]->setSelectedPoint(QPoint(0, 0)); + + QCOMPARE(m_graph->seriesList().length(), 1); + QCOMPARE(m_graph->selectedSeries(), series); + + m_graph->clearSelection(); + QVERIFY(!m_graph->selectedSeries()); +} + +void tst_surface::removeSeries() +{ + QSurface3DSeries *series = newSeries(); + + m_graph->addSeries(series); + m_graph->removeSeries(series); + QCOMPARE(m_graph->seriesList().length(), 0); +} + +void tst_surface::removeMultipleSeries() +{ + QSurface3DSeries *series = newSeries(); + QSurface3DSeries *series2 = newSeries(); + QSurface3DSeries *series3 = newSeries(); + + m_graph->addSeries(series); + m_graph->addSeries(series2); + m_graph->addSeries(series3); + + m_graph->seriesList()[0]->setSelectedPoint(QPoint(0, 0)); + QCOMPARE(m_graph->selectedSeries(), series); + + m_graph->removeSeries(series); + QCOMPARE(m_graph->seriesList().length(), 2); + QVERIFY(!m_graph->selectedSeries()); + + m_graph->removeSeries(series2); + QCOMPARE(m_graph->seriesList().length(), 1); + + m_graph->removeSeries(series3); + QCOMPARE(m_graph->seriesList().length(), 0); +} + +QTEST_MAIN(tst_surface) +#include "tst_surface.moc" diff --git a/tests/auto/cpptest/q3dtheme/q3dtheme.pro b/tests/auto/cpptest/q3dtheme/q3dtheme.pro new file mode 100644 index 00000000..30a4802c --- /dev/null +++ b/tests/auto/cpptest/q3dtheme/q3dtheme.pro @@ -0,0 +1,8 @@ +QT += testlib datavisualization + +TARGET = tst_cpptest +CONFIG += console testcase + +TEMPLATE = app + +SOURCES += tst_theme.cpp diff --git a/tests/auto/cpptest/q3dtheme/tst_theme.cpp b/tests/auto/cpptest/q3dtheme/tst_theme.cpp new file mode 100644 index 00000000..35945aef --- /dev/null +++ b/tests/auto/cpptest/q3dtheme/tst_theme.cpp @@ -0,0 +1,216 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtDataVisualization/Q3DTheme> + +using namespace QtDataVisualization; + +class tst_theme: public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void construct(); + + void initialProperties(); + void initializeProperties(); + void invalidProperties(); + +private: + Q3DTheme *m_theme; +}; + +void tst_theme::initTestCase() +{ +} + +void tst_theme::cleanupTestCase() +{ +} + +void tst_theme::init() +{ + m_theme = new Q3DTheme(); +} + +void tst_theme::cleanup() +{ + delete m_theme; +} + +void tst_theme::construct() +{ + Q3DTheme *theme = new Q3DTheme(); + QVERIFY(theme); + delete theme; + + theme = new Q3DTheme(Q3DTheme::ThemeEbony); + QVERIFY(theme); + QCOMPARE(theme->ambientLightStrength(), 0.5f); + QCOMPARE(theme->backgroundColor(), QColor(Qt::black)); + QCOMPARE(theme->isBackgroundEnabled(), true); + QCOMPARE(theme->baseColors().length(), 5); + QCOMPARE(theme->baseColors().at(0), QColor(Qt::white)); + QCOMPARE(theme->baseColors().at(4), QColor(QRgb(0x6b6b6b))); + QCOMPARE(theme->baseGradients().length(), 5); + QCOMPARE(theme->baseGradients().at(0).stops().at(1).second, QColor(Qt::white)); + QCOMPARE(theme->baseGradients().at(4).stops().at(1).second, QColor(QRgb(0x6b6b6b))); + QCOMPARE(theme->colorStyle(), Q3DTheme::ColorStyleUniform); + QCOMPARE(theme->font(), QFont("Arial")); + QCOMPARE(theme->isGridEnabled(), true); + QCOMPARE(theme->gridLineColor(), QColor(QRgb(0x35322f))); + QCOMPARE(theme->highlightLightStrength(), 5.0f); + QCOMPARE(theme->labelBackgroundColor(), QColor(0x00, 0x00, 0x00, 0xcd)); + QCOMPARE(theme->isLabelBackgroundEnabled(), true); + QCOMPARE(theme->isLabelBorderEnabled(), false); + QCOMPARE(theme->labelTextColor(), QColor(QRgb(0xaeadac))); + QCOMPARE(theme->lightColor(), QColor(Qt::white)); + QCOMPARE(theme->lightStrength(), 5.0f); + QCOMPARE(theme->multiHighlightColor(), QColor(QRgb(0xd72222))); + QCOMPARE(theme->multiHighlightGradient().stops().at(1).second, QColor(QRgb(0xd72222))); + QCOMPARE(theme->singleHighlightColor(), QColor(QRgb(0xf5dc0d))); + QCOMPARE(theme->singleHighlightGradient().stops().at(1).second, QColor(QRgb(0xf5dc0d))); + QCOMPARE(theme->type(), Q3DTheme::ThemeEbony); + QCOMPARE(theme->windowColor(), QColor(Qt::black)); + delete theme; +} + +void tst_theme::initialProperties() +{ + QVERIFY(m_theme); + + QCOMPARE(m_theme->ambientLightStrength(), 0.25f); + QCOMPARE(m_theme->backgroundColor(), QColor(Qt::black)); + QCOMPARE(m_theme->isBackgroundEnabled(), true); + QCOMPARE(m_theme->baseColors().length(), 1); + QCOMPARE(m_theme->baseColors().at(0), QColor(Qt::black)); + QCOMPARE(m_theme->baseGradients().length(), 1); + QCOMPARE(m_theme->baseGradients().at(0).stops().at(0).second, QColor(Qt::black)); + QCOMPARE(m_theme->baseGradients().at(0).stops().at(1).second, QColor(Qt::white)); + QCOMPARE(m_theme->colorStyle(), Q3DTheme::ColorStyleUniform); + QCOMPARE(m_theme->font(), QFont()); + QCOMPARE(m_theme->isGridEnabled(), true); + QCOMPARE(m_theme->gridLineColor(), QColor(Qt::white)); + QCOMPARE(m_theme->highlightLightStrength(), 7.5f); + QCOMPARE(m_theme->labelBackgroundColor(), QColor(Qt::gray)); + QCOMPARE(m_theme->isLabelBackgroundEnabled(), true); + QCOMPARE(m_theme->isLabelBorderEnabled(), true); + QCOMPARE(m_theme->labelTextColor(), QColor(Qt::white)); + QCOMPARE(m_theme->lightColor(), QColor(Qt::white)); + QCOMPARE(m_theme->lightStrength(), 5.0f); + QCOMPARE(m_theme->multiHighlightColor(), QColor(Qt::blue)); + QCOMPARE(m_theme->multiHighlightGradient().stops(), QLinearGradient().stops()); + QCOMPARE(m_theme->singleHighlightColor(), QColor(Qt::red)); + QCOMPARE(m_theme->singleHighlightGradient().stops(), QLinearGradient().stops()); + QCOMPARE(m_theme->type(), Q3DTheme::ThemeUserDefined); + QCOMPARE(m_theme->windowColor(), QColor(Qt::black)); +} + +void tst_theme::initializeProperties() +{ + QVERIFY(m_theme); + + QLinearGradient gradient1; + QLinearGradient gradient2; + QLinearGradient gradient3; + QLinearGradient gradient4; + + QList<QColor> basecolors; + basecolors << QColor(Qt::red) << QColor(Qt::blue); + + QList<QLinearGradient> basegradients; + basegradients << gradient1 << gradient2; + + m_theme->setType(Q3DTheme::ThemeQt); // We'll override default values with the following setters + m_theme->setAmbientLightStrength(0.3f); + m_theme->setBackgroundColor(QColor(Qt::red)); + m_theme->setBackgroundEnabled(false); + m_theme->setBaseColors(basecolors); + m_theme->setBaseGradients(basegradients); + m_theme->setColorStyle(Q3DTheme::ColorStyleRangeGradient); + m_theme->setFont(QFont("Arial")); + m_theme->setGridEnabled(false); + m_theme->setGridLineColor(QColor(Qt::green)); + m_theme->setHighlightLightStrength(5.0f); + m_theme->setLabelBackgroundColor(QColor(Qt::gray)); + m_theme->setLabelBackgroundEnabled(false); + m_theme->setLabelBorderEnabled(false); + m_theme->setLabelTextColor(QColor(Qt::cyan)); + m_theme->setLightColor(QColor(Qt::yellow)); + m_theme->setLightStrength(2.5f); + m_theme->setMultiHighlightColor(QColor(Qt::darkBlue)); + m_theme->setMultiHighlightGradient(gradient3); + m_theme->setSingleHighlightColor(QColor(Qt::darkRed)); + m_theme->setSingleHighlightGradient(gradient4); + m_theme->setWindowColor(QColor(Qt::darkYellow)); + + QCOMPARE(m_theme->ambientLightStrength(), 0.3f); + QCOMPARE(m_theme->backgroundColor(), QColor(Qt::red)); + QCOMPARE(m_theme->isBackgroundEnabled(), false); + QCOMPARE(m_theme->baseColors().length(), 2); + QCOMPARE(m_theme->baseColors().at(0), QColor(Qt::red)); + QCOMPARE(m_theme->baseColors().at(1), QColor(Qt::blue)); + QCOMPARE(m_theme->baseGradients().length(), 2); + QCOMPARE(m_theme->baseGradients().at(0), gradient1); + QCOMPARE(m_theme->baseGradients().at(0), gradient2); + QCOMPARE(m_theme->colorStyle(), Q3DTheme::ColorStyleRangeGradient); + QCOMPARE(m_theme->font(), QFont("Arial")); + QCOMPARE(m_theme->isGridEnabled(), false); + QCOMPARE(m_theme->gridLineColor(), QColor(Qt::green)); + QCOMPARE(m_theme->highlightLightStrength(), 5.0f); + QCOMPARE(m_theme->labelBackgroundColor(), QColor(Qt::gray)); + QCOMPARE(m_theme->isLabelBackgroundEnabled(), false); + QCOMPARE(m_theme->isLabelBorderEnabled(), false); + QCOMPARE(m_theme->labelTextColor(), QColor(Qt::cyan)); + QCOMPARE(m_theme->lightColor(), QColor(Qt::yellow)); + QCOMPARE(m_theme->lightStrength(), 2.5f); + QCOMPARE(m_theme->multiHighlightColor(), QColor(Qt::darkBlue)); + QCOMPARE(m_theme->multiHighlightGradient(), gradient3); + QCOMPARE(m_theme->singleHighlightColor(), QColor(Qt::darkRed)); + QCOMPARE(m_theme->singleHighlightGradient(), gradient4); + QCOMPARE(m_theme->type(), Q3DTheme::ThemeQt); + QCOMPARE(m_theme->windowColor(), QColor(Qt::darkYellow)); +} + +void tst_theme::invalidProperties() +{ + m_theme->setAmbientLightStrength(-1.0f); + QCOMPARE(m_theme->ambientLightStrength(), 0.25f); + m_theme->setAmbientLightStrength(1.1f); + QCOMPARE(m_theme->ambientLightStrength(), 0.25f); + + m_theme->setHighlightLightStrength(-1.0f); + QCOMPARE(m_theme->highlightLightStrength(), 7.5f); + m_theme->setHighlightLightStrength(10.1f); + QCOMPARE(m_theme->highlightLightStrength(), 7.5f); + + m_theme->setLightStrength(-1.0f); + QCOMPARE(m_theme->lightStrength(), 5.0f); + m_theme->setLightStrength(10.1f); + QCOMPARE(m_theme->lightStrength(), 5.0f); +} + +QTEST_MAIN(tst_theme) +#include "tst_theme.moc" diff --git a/tests/auto/qmltest/axis3d/tst_category.qml b/tests/auto/qmltest/axis3d/tst_category.qml new file mode 100644 index 00000000..318fa011 --- /dev/null +++ b/tests/auto/qmltest/axis3d/tst_category.qml @@ -0,0 +1,135 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + CategoryAxis3D { + id: initial + } + + CategoryAxis3D { + id: initialized + labels: ["first", "second"] + + autoAdjustRange: false + labelAutoRotation: 10.0 + max: 20 + min: 10 + title: "initialized" + titleFixed: false + titleVisible: true + } + + CategoryAxis3D { + id: change + } + + CategoryAxis3D { + id: invalid + } + + TestCase { + name: "CategoryAxis3D Initial" + + function test_initial() { + compare(initial.labels.length, 0) + + compare(initial.autoAdjustRange, true) + compare(initial.labelAutoRotation, 0.0) + compare(initial.max, 10) + compare(initial.min, 0) + compare(initial.orientation, AbstractAxis3D.AxisOrientationNone) + compare(initial.title, "") + compare(initial.titleFixed, true) + compare(initial.titleVisible, false) + compare(initial.type, AbstractAxis3D.AxisTypeCategory) + } + } + + TestCase { + name: "CategoryAxis3D Initialized" + + function test_initialized() { + compare(initialized.labels.length, 2) + compare(initialized.labels[0], "first") + compare(initialized.labels[1], "second") + + compare(initialized.autoAdjustRange, false) + compare(initialized.labelAutoRotation, 10.0) + compare(initialized.max, 20) + compare(initialized.min, 10) + compare(initialized.title, "initialized") + compare(initialized.titleFixed, false) + compare(initialized.titleVisible, true) + } + } + + TestCase { + name: "CategoryAxis3D Change" + + function test_change() { + change.labels = ["first"] + compare(change.labels.length, 1) + compare(change.labels[0], "first") + change.labels = ["first", "second"] + compare(change.labels.length, 2) + compare(change.labels[0], "first") + compare(change.labels[1], "second") + change.labels[1] = "another" + compare(change.labels[1], "another") + + change.autoAdjustRange = false + change.labelAutoRotation = 10.0 + change.max = 20 + change.min = 10 + change.title = "initialized" + change.titleFixed = false + change.titleVisible = true + + compare(change.autoAdjustRange, false) + compare(change.labelAutoRotation, 10.0) + compare(change.max, 20) + compare(change.min, 10) + compare(change.title, "initialized") + compare(change.titleFixed, false) + compare(change.titleVisible, true) + } + } + + TestCase { + name: "CategoryAxis3D Invalid" + + function test_invalid() { + invalid.labelAutoRotation = -10 + compare(invalid.labelAutoRotation, 0.0) + invalid.labelAutoRotation = 100 + compare(invalid.labelAutoRotation, 90.0) + invalid.max = -10 + compare(invalid.min, 0) + invalid.min = 10 + compare(invalid.max, 11) + } + } +} diff --git a/tests/auto/qmltest/axis3d/tst_logvalue.qml b/tests/auto/qmltest/axis3d/tst_logvalue.qml new file mode 100644 index 00000000..89228ad1 --- /dev/null +++ b/tests/auto/qmltest/axis3d/tst_logvalue.qml @@ -0,0 +1,91 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + LogValueAxis3DFormatter { + id: initial + } + + LogValueAxis3DFormatter { + id: initialized + autoSubGrid: false + base: 0.1 + showEdgeLabels: false + } + + LogValueAxis3DFormatter { + id: change + } + + LogValueAxis3DFormatter { + id: invalid + } + + TestCase { + name: "LogValueAxis3DFormatter Initial" + + function test_initial() { + compare(initial.autoSubGrid, true) + compare(initial.base, 10) + compare(initial.showEdgeLabels, true) + } + } + + TestCase { + name: "LogValueAxis3DFormatter Initialized" + + function test_initialized() { + compare(initialized.autoSubGrid, false) + compare(initialized.base, 0.1) + compare(initialized.showEdgeLabels, false) + } + } + + TestCase { + name: "LogValueAxis3DFormatter Change" + + function test_change() { + change.autoSubGrid = false + change.base = 0.1 + change.showEdgeLabels = false + + compare(change.autoSubGrid, false) + compare(change.base, 0.1) + compare(change.showEdgeLabels, false) + } + } + + TestCase { + name: "LogValueAxis3DFormatter Invalid" + + function test_invalid() { + invalid.base = 1 + compare(invalid.base, 10) + invalid.base = -1 + compare(invalid.base, 10) + } + } +} diff --git a/tests/auto/qmltest/axis3d/tst_value.qml b/tests/auto/qmltest/axis3d/tst_value.qml new file mode 100644 index 00000000..54189c8b --- /dev/null +++ b/tests/auto/qmltest/axis3d/tst_value.qml @@ -0,0 +1,154 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + ValueAxis3D { + id: initial + } + + ValueAxis3D { + id: initialized + formatter: ValueAxis3DFormatter { objectName: "formatter1" } + labelFormat: "%f" + reversed: true + segmentCount: 10 + subSegmentCount: 5 + + autoAdjustRange: false + labelAutoRotation: 10.0 + max: 20 + min: -10 + title: "initialized" + titleFixed: false + titleVisible: true + } + + ValueAxis3D { + id: change + } + + ValueAxis3D { + id: invalid + } + + TestCase { + name: "ValueAxis3D Initial" + + function test_initial() { + verify(initial.formatter) + compare(initial.labelFormat, "%.2f") + compare(initial.reversed, false) + compare(initial.segmentCount, 5) + compare(initial.subSegmentCount, 1) + + compare(initial.autoAdjustRange, true) + compare(initial.labelAutoRotation, 0.0) + compare(initial.max, 10) + compare(initial.min, 0) + compare(initial.orientation, AbstractAxis3D.AxisOrientationNone) + compare(initial.title, "") + compare(initial.titleFixed, true) + compare(initial.titleVisible, false) + compare(initial.type, AbstractAxis3D.AxisTypeValue) + } + } + + TestCase { + name: "ValueAxis3D Initialized" + + function test_initialized() { + compare(initialized.formatter.objectName, "formatter1") + compare(initialized.labelFormat, "%f") + compare(initialized.reversed, true) + compare(initialized.segmentCount, 10) + compare(initialized.subSegmentCount, 5) + + compare(initialized.autoAdjustRange, false) + compare(initialized.labelAutoRotation, 10.0) + compare(initialized.max, 20) + compare(initialized.min, -10) + compare(initialized.title, "initialized") + compare(initialized.titleFixed, false) + compare(initialized.titleVisible, true) + } + } + + TestCase { + name: "ValueAxis3D Change" + + ValueAxis3DFormatter { id: formatter1 } + + function test_change() { + change.formatter = formatter1 + change.labelFormat = "%f" + change.reversed = true + change.segmentCount = 10 + change.subSegmentCount = 5 + + compare(change.formatter, formatter1) + compare(change.labelFormat, "%f") + compare(change.reversed, true) + compare(change.segmentCount, 10) + compare(change.subSegmentCount, 5) + + change.autoAdjustRange = false + change.labelAutoRotation = 10.0 + change.max = 20 + change.min = -10 + change.title = "initialized" + change.titleFixed = false + change.titleVisible = true + + compare(change.autoAdjustRange, false) + compare(change.labelAutoRotation, 10.0) + compare(change.max, 20) + compare(change.min, -10) + compare(change.title, "initialized") + compare(change.titleFixed, false) + compare(change.titleVisible, true) + } + } + + TestCase { + name: "ValueAxis3D Invalid" + + function test_invalid() { + invalid.segmentCount = -1 + compare(invalid.segmentCount, 1) + invalid.subSegmentCount = -1 + compare(invalid.subSegmentCount, 1) + + invalid.labelAutoRotation = -10 + compare(invalid.labelAutoRotation, 0.0) + invalid.labelAutoRotation = 100 + compare(invalid.labelAutoRotation, 90.0) + invalid.max = -10 + compare(invalid.min, -11) + invalid.min = 10 + compare(invalid.max, 11) + } + } +} diff --git a/tests/auto/qmltest/bars3d/tst_bars.qml b/tests/auto/qmltest/bars3d/tst_bars.qml new file mode 100644 index 00000000..a64aaf1a --- /dev/null +++ b/tests/auto/qmltest/bars3d/tst_bars.qml @@ -0,0 +1,147 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + Bars3D { + id: series + anchors.fill: parent + } + + TestCase { + name: "Bars3D Series" + + Bar3DSeries { id: series1 } + Bar3DSeries { id: series2 } + + function test_1_add_series() { + series.seriesList = [series1, series2] + compare(series.seriesList.length, 2) + } + + function test_2_remove_series() { + series.seriesList = [series1] + compare(series.seriesList.length, 1) + } + + function test_3_remove_series() { + series.seriesList = [] + compare(series.seriesList.length, 0) + } + + function test_4_primary_series() { + series.seriesList = [series1, series2] + compare(series.primarySeries, series1) + series.primarySeries = series2 + compare(series.primarySeries, series2) + } + + function test_5_selected_series() { + series.seriesList[0].selectedBar = Qt.point(0, 0) + compare(series.selectedSeries, series1) + } + } + + // The following tests are not required for scatter or surface, as they are handled identically + Bars3D { + id: theme + anchors.fill: parent + } + + Bars3D { + id: input + anchors.fill: parent + } + + Custom3DItem { id: item1; meshFile: ":/customitem.obj" } + Custom3DItem { id: item2; meshFile: ":/customitem.obj" } + Custom3DItem { id: item3; meshFile: ":/customitem.obj" } + Custom3DItem { id: item4; meshFile: ":/customitem.obj"; position: Qt.vector3d(0.0, 1.0, 0.0) } + + Bars3D { + id: custom + anchors.fill: parent + customItemList: [item1, item2] + } + + TestCase { + name: "Bars3D Theme" + when: windowShown + + Theme3D { id: newTheme } + + function test_1_add_theme() { + theme.theme = newTheme + compare(theme.theme, newTheme) + } + + function test_2_change_theme() { + newTheme.type = Theme3D.ThemePrimaryColors + compare(theme.theme.type, Theme3D.ThemePrimaryColors) + } + } + + TestCase { + name: "Bars3D Input" + when: windowShown + + function test_1_remove_input() { + input.inputHandler = null + compare(input.inputHandler, null) + } + } + + TestCase { + name: "Bars3D Custom" + when: windowShown + + function test_1_custom_items() { + compare(custom.customItemList.length, 2) + } + + function test_2_add_custom_items() { + custom.addCustomItem(item3) + compare(custom.customItemList.length, 3) + custom.addCustomItem(item4) + compare(custom.customItemList.length, 4) + } + + function test_3_change_custom_items() { + item1.position = Qt.vector3d(1.0, 1.0, 1.0) + compare(custom.customItemList[0].position, Qt.vector3d(1.0, 1.0, 1.0)) + } + + function test_4_remove_custom_items() { + custom.removeCustomItemAt(Qt.vector3d(0.0, 1.0, 0.0)) + compare(custom.customItemList.length, 3) + custom.releaseCustomItem(item1) + compare(custom.customItemList[0], item2) + custom.releaseCustomItem(item2) + compare(custom.customItemList.length, 1) + custom.removeCustomItems() + compare(custom.customItemList.length, 0) + } + } +} diff --git a/tests/auto/qmltest/bars3d/tst_barseries.qml b/tests/auto/qmltest/bars3d/tst_barseries.qml new file mode 100644 index 00000000..7e303ab0 --- /dev/null +++ b/tests/auto/qmltest/bars3d/tst_barseries.qml @@ -0,0 +1,215 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + Bar3DSeries { + id: initial + } + + ColorGradient { + id: gradient1; + stops: [ + ColorGradientStop { color: "red"; position: 0 }, + ColorGradientStop { color: "blue"; position: 1 } + ] + } + + ColorGradient { + id: gradient2; + stops: [ + ColorGradientStop { color: "green"; position: 0 }, + ColorGradientStop { color: "red"; position: 1 } + ] + } + + ColorGradient { + id: gradient3; + stops: [ + ColorGradientStop { color: "gray"; position: 0 }, + ColorGradientStop { color: "darkgray"; position: 1 } + ] + } + + Bar3DSeries { + id: initialized + dataProxy: ItemModelBarDataProxy { + itemModel: ListModel { + ListElement{ year: "2012"; city: "Oulu"; expenses: "4200"; } + ListElement{ year: "2012"; city: "Rauma"; expenses: "2100"; } + } + rowRole: "city" + columnRole: "year" + valueRole: "expenses" + } + meshAngle: 15.0 + selectedBar: Qt.point(0, 0) + + baseColor: "blue" + baseGradient: gradient1 + colorStyle: Theme3D.ColorStyleObjectGradient + itemLabelFormat: "%f" + itemLabelVisible: false + mesh: Abstract3DSeries.MeshCone + meshSmooth: true + multiHighlightColor: "green" + multiHighlightGradient: gradient2 + name: "series1" + singleHighlightColor: "red" + singleHighlightGradient: gradient3 + userDefinedMesh: ":/customitem.obj" + visible: false + } + + ItemModelBarDataProxy { + id: proxy1 + itemModel: ListModel { + ListElement{ year: "2012"; city: "Oulu"; expenses: "4200"; } + ListElement{ year: "2012"; city: "Rauma"; expenses: "2100"; } + ListElement{ year: "2012"; city: "Helsinki"; expenses: "7040"; } + } + rowRole: "city" + columnRole: "year" + valueRole: "expenses" + } + + Bar3DSeries { + id: change + } + + TestCase { + name: "Bar3DSeries Initial" + + function test_1_initial() { + compare(initial.dataProxy.rowCount, 0) + compare(initial.invalidSelectionPosition, Qt.point(-1, -1)) + compare(initial.meshAngle, 0) + compare(initial.selectedBar, Qt.point(-1, -1)) + } + + function test_2_initial_common() { + // Common properties + compare(initial.baseColor, "#000000") + compare(initial.baseGradient, null) + compare(initial.colorStyle, Theme3D.ColorStyleUniform) + compare(initial.itemLabel, "") + compare(initial.itemLabelFormat, "@valueLabel") + compare(initial.itemLabelVisible, true) + compare(initial.mesh, Abstract3DSeries.MeshBevelBar) + compare(initial.meshRotation, Qt.quaternion(1, 0, 0, 0)) + compare(initial.meshSmooth, false) + compare(initial.multiHighlightColor, "#000000") + compare(initial.multiHighlightGradient, null) + compare(initial.name, "") + compare(initial.singleHighlightColor, "#000000") + compare(initial.singleHighlightGradient, null) + compare(initial.type, Abstract3DSeries.SeriesTypeBar) + compare(initial.userDefinedMesh, "") + compare(initial.visible, true) + } + } + + TestCase { + name: "Bar3DSeries Initialized" + + function test_1_initialized() { + compare(initialized.dataProxy.rowCount, 2) + fuzzyCompare(initialized.meshAngle, 15.0, 0.01) + compare(initialized.selectedBar, Qt.point(0, 0)) + } + + function test_2_initialized_common() { + // Common properties + compare(initialized.baseColor, "#0000ff") + compare(initialized.baseGradient, gradient1) + compare(initialized.colorStyle, Theme3D.ColorStyleObjectGradient) + compare(initialized.itemLabelFormat, "%f") + compare(initialized.itemLabelVisible, false) + compare(initialized.mesh, Abstract3DSeries.MeshCone) + compare(initialized.meshSmooth, true) + compare(initialized.multiHighlightColor, "#008000") + compare(initialized.multiHighlightGradient, gradient2) + compare(initialized.name, "series1") + compare(initialized.singleHighlightColor, "#ff0000") + compare(initialized.singleHighlightGradient, gradient3) + compare(initialized.userDefinedMesh, ":/customitem.obj") + compare(initialized.visible, false) + } + } + + TestCase { + name: "Bar3DSeries Change" + + function test_1_change() { + change.dataProxy = proxy1 + change.meshAngle = 15.0 + change.selectedBar = Qt.point(0, 0) + } + + function test_2_test_change() { + // This test has a dependency to the previous one due to asynchronous item model resolving + compare(change.dataProxy.rowCount, 3) + fuzzyCompare(change.meshAngle, 15.0, 0.01) + compare(change.selectedBar, Qt.point(0, 0)) + } + + function test_3_change_common() { + change.baseColor = "blue" + change.baseGradient = gradient1 + change.colorStyle = Theme3D.ColorStyleObjectGradient + change.itemLabelFormat = "%f" + change.itemLabelVisible = false + change.mesh = Abstract3DSeries.MeshCone + change.meshSmooth = true + change.multiHighlightColor = "green" + change.multiHighlightGradient = gradient2 + change.name = "series1" + change.singleHighlightColor = "red" + change.singleHighlightGradient = gradient3 + change.userDefinedMesh = ":/customitem.obj" + change.visible = false + + compare(change.baseColor, "#0000ff") + compare(change.baseGradient, gradient1) + compare(change.colorStyle, Theme3D.ColorStyleObjectGradient) + compare(change.itemLabelFormat, "%f") + compare(change.itemLabelVisible, false) + compare(change.mesh, Abstract3DSeries.MeshCone) + compare(change.meshSmooth, true) + compare(change.multiHighlightColor, "#008000") + compare(change.multiHighlightGradient, gradient2) + compare(change.name, "series1") + compare(change.singleHighlightColor, "#ff0000") + compare(change.singleHighlightGradient, gradient3) + compare(change.userDefinedMesh, ":/customitem.obj") + compare(change.visible, false) + } + + function test_4_change_gradient_stop() { + gradient1.stops[0].color = "yellow" + compare(change.baseGradient.stops[0].color, "#ffff00") + } + } +} diff --git a/tests/auto/qmltest/bars3d/tst_basic.qml b/tests/auto/qmltest/bars3d/tst_basic.qml new file mode 100644 index 00000000..bf27ae8c --- /dev/null +++ b/tests/auto/qmltest/bars3d/tst_basic.qml @@ -0,0 +1,240 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + Bars3D { + id: empty + } + + Bars3D { + id: basic + anchors.fill: parent + multiSeriesUniform: true + barThickness: 0.1 + barSpacing.width: 0.1 + barSpacing.height: 0.1 + barSpacingRelative: false + floorLevel: 1.0 + } + + Bars3D { + id: common + anchors.fill: parent + } + + Bars3D { + id: common_init + anchors.fill: parent + selectionMode: AbstractGraph3D.SelectionNone + shadowQuality: AbstractGraph3D.ShadowQualityLow + msaaSamples: 2 + theme: Theme3D { } + renderingMode: AbstractGraph3D.RenderIndirect + measureFps: true + orthoProjection: false + aspectRatio: 3.0 + optimizationHints: AbstractGraph3D.OptimizationStatic + polar: false + radialLabelOffset: 2 + horizontalAspectRatio: 0.2 + reflection: true + reflectivity: 0.1 + locale: Qt.locale("UK") + margin: 0.2 + } + + TestCase { + name: "Bars3D Empty" + + function test_empty() { + compare(empty.width, 0, "width") + compare(empty.height, 0, "height") + compare(empty.multiSeriesUniform, false, "multiSeriesUniform") + compare(empty.barThickness, 1.0, "barThickness") + compare(empty.barSpacing, Qt.size(0.2, 0.2), "barSpacing") + compare(empty.barSpacingRelative, true, "barSpacingRelative") + compare(empty.seriesList.length, 0, "seriesList") + compare(empty.selectedSeries, null, "selectedSeries") + compare(empty.primarySeries, null, "primarySeries") + compare(empty.floorLevel, 0.0, "floorLevel") + compare(empty.columnAxis.orientation, AbstractAxis3D.AxisOrientationX) + compare(empty.rowAxis.orientation, AbstractAxis3D.AxisOrientationZ) + compare(empty.valueAxis.orientation, AbstractAxis3D.AxisOrientationY) + compare(empty.columnAxis.type, AbstractAxis3D.AxisTypeCategory) + compare(empty.rowAxis.type, AbstractAxis3D.AxisTypeCategory) + compare(empty.valueAxis.type, AbstractAxis3D.AxisTypeValue) + } + } + + TestCase { + name: "Bars3D Basic" + when: windowShown + + function test_basic() { + compare(basic.width, 150, "width") + compare(basic.height, 150, "height") + compare(basic.multiSeriesUniform, true, "multiSeriesUniform") + compare(basic.barThickness, 0.1, "barThickness") + compare(basic.barSpacing, Qt.size(0.1, 0.1), "barSpacing") + compare(basic.barSpacingRelative, false, "barSpacingRelative") + compare(basic.floorLevel, 1.0, "floorLevel") + } + + function test_change_basic() { + basic.multiSeriesUniform = false + basic.barThickness = 0.5 + basic.barSpacing = Qt.size(1.0, 0.0) + basic.barSpacingRelative = true + basic.floorLevel = 0.2 + compare(basic.multiSeriesUniform, false, "multiSeriesUniform") + compare(basic.barThickness, 0.5, "barThickness") + compare(basic.barSpacing, Qt.size(1.0, 0.0), "barSpacing") + compare(basic.barSpacingRelative, true, "barSpacingRelative") + compare(basic.floorLevel, 0.2, "floorLevel") + } + + function test_change_invalid_basic() { + basic.barThickness = -1 + basic.barSpacing = Qt.size(-1.0, -1.0) + compare(basic.barThickness, -1/*0.5*/, "barThickness") // TODO: Fix once QTRD-3367 is done + compare(basic.barSpacing, Qt.size(1.0, 0.0), "barSpacing") + } + } + + TestCase { + name: "Bars3D Common" + when: windowShown + + function test_1_common() { + compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") + compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") + if (common.shadowsSupported === true) + compare(common.msaaSamples, 4, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") + compare(common.theme.type, Theme3D.ThemeQt, "theme") + compare(common.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") + compare(common.measureFps, false, "measureFps") + compare(common.customItemList.length, 0, "customItemList") + compare(common.orthoProjection, false, "orthoProjection") + compare(common.selectedElement, AbstractGraph3D.ElementNone, "selectedElement") + compare(common.aspectRatio, 2.0, "aspectRatio") + compare(common.optimizationHints, AbstractGraph3D.OptimizationDefault, "optimizationHints") + compare(common.polar, false, "polar") + compare(common.radialLabelOffset, 1, "radialLabelOffset") + compare(common.horizontalAspectRatio, 0, "horizontalAspectRatio") + compare(common.reflection, false, "reflection") + compare(common.reflectivity, 0.5, "reflectivity") + compare(common.locale, Qt.locale("C"), "locale") + compare(common.queriedGraphPosition, Qt.vector3d(0, 0, 0), "queriedGraphPosition") + compare(common.margin, -1, "margin") + } + + function test_2_change_common() { + common.selectionMode = AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice + common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh + compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") + common.msaaSamples = 8 + if (common.shadowsSupported === true) + compare(common.msaaSamples, 8, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") + common.theme.type = Theme3D.ThemeRetro + common.renderingMode = AbstractGraph3D.RenderDirectToBackground_NoClear + common.measureFps = true + common.orthoProjection = true + common.aspectRatio = 1.0 + common.optimizationHints = AbstractGraph3D.OptimizationStatic + common.polar = true + common.radialLabelOffset = 2 + common.horizontalAspectRatio = 1 + common.reflection = true + common.reflectivity = 1.0 + common.locale = Qt.locale("FI") + common.margin = 1.0 + compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode") + compare(common.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") // Ortho disables shadows + compare(common.msaaSamples, 0, "msaaSamples") // Rendering mode changes this to zero + compare(common.theme.type, Theme3D.ThemeRetro, "theme") + compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode") + compare(common.measureFps, true, "measureFps") + compare(common.orthoProjection, true, "orthoProjection") + compare(common.aspectRatio, 1.0, "aspectRatio") + compare(common.optimizationHints, AbstractGraph3D.OptimizationStatic, "optimizationHints") + compare(common.polar, true, "polar") + compare(common.radialLabelOffset, 2, "radialLabelOffset") + compare(common.horizontalAspectRatio, 1, "horizontalAspectRatio") + compare(common.reflection, true, "reflection") + compare(common.reflectivity, 1.0, "reflectivity") + compare(common.locale, Qt.locale("FI"), "locale") + compare(common.margin, 1.0, "margin") + } + + function test_3_change_invalid_common() { + common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice + common.theme.type = -2 + common.renderingMode = -1 + common.measureFps = false + common.orthoProjection = false + common.aspectRatio = -1.0 + common.polar = false + common.horizontalAspectRatio = -2 + common.reflection = false + common.reflectivity = -1.0 + compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode") + compare(common.theme.type, -2/*Theme3D.ThemeRetro*/, "theme") // TODO: Fix once QTRD-3367 is done + compare(common.renderingMode, -1/*AbstractGraph3D.RenderDirectToBackground_NoClear*/, "renderingMode") // TODO: Fix once QTRD-3367 is done + compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done + compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done + compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done + } + + function test_4_common_initialized() { + compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") + if (common_init.shadowsSupported === true) { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") + compare(common_init.msaaSamples, 2, "msaaSamples") + } else { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") + compare(common_init.msaaSamples, 0, "msaaSamples") + } + compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") + compare(common_init.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") + compare(common_init.measureFps, true, "measureFps") + compare(common_init.customItemList.length, 0, "customItemList") + compare(common_init.orthoProjection, false, "orthoProjection") + compare(common_init.aspectRatio, 3.0, "aspectRatio") + compare(common_init.optimizationHints, AbstractGraph3D.OptimizationStatic, "optimizationHints") + compare(common_init.polar, false, "polar") + compare(common_init.radialLabelOffset, 2, "radialLabelOffset") + compare(common_init.horizontalAspectRatio, 0.2, "horizontalAspectRatio") + compare(common_init.reflection, true, "reflection") + compare(common_init.reflectivity, 0.1, "reflectivity") + compare(common_init.locale, Qt.locale("UK"), "locale") + compare(common_init.margin, 0.2, "margin") + } + } +} diff --git a/tests/auto/qmltest/bars3d/tst_proxy.qml b/tests/auto/qmltest/bars3d/tst_proxy.qml new file mode 100644 index 00000000..8d91c055 --- /dev/null +++ b/tests/auto/qmltest/bars3d/tst_proxy.qml @@ -0,0 +1,253 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + ItemModelBarDataProxy { + id: initial + } + + ItemModelBarDataProxy { + id: initialized + + autoColumnCategories: false + autoRowCategories: false + columnCategories: ["colcat1", "colcat2"] + columnRole: "col" + columnRolePattern: /^.*-(\d\d)$/ + columnRoleReplace: "\\1" + itemModel: ListModel { objectName: "model1" } + multiMatchBehavior: ItemModelBarDataProxy.MMBAverage + rotationRole: "rot" + rotationRolePattern: /-/ + rotationRoleReplace: "\\1" + rowCategories: ["rowcat1", "rowcat2"] + rowRole: "row" + rowRolePattern: /^(\d\d\d\d).*$/ + rowRoleReplace: "\\1" + valueRole: "val" + valueRolePattern: /-/ + valueRoleReplace: "\\1" + + columnLabels: ["col1", "col2"] + rowLabels: ["row1", "row2"] + } + + ItemModelBarDataProxy { + id: change + } + + TestCase { + name: "ItemModelBarDataProxy Initial" + + function test_initial() { + compare(initial.autoColumnCategories, true) + compare(initial.autoRowCategories, true) + compare(initial.columnCategories, []) + compare(initial.columnRole, "") + verify(initial.columnRolePattern) + compare(initial.columnRoleReplace, "") + verify(!initial.itemModel) + compare(initial.multiMatchBehavior, ItemModelBarDataProxy.MMBLast) + compare(initial.rotationRole, "") + verify(initial.rotationRolePattern) + compare(initial.rotationRoleReplace, "") + compare(initial.rowCategories, []) + compare(initial.rowRole, "") + verify(initial.rowRolePattern) + compare(initial.rowRoleReplace, "") + compare(initial.useModelCategories, false) + compare(initial.valueRole, "") + verify(initial.valueRolePattern) + compare(initial.valueRoleReplace, "") + + compare(initial.columnLabels.length, 0) + compare(initial.rowCount, 0) + compare(initial.rowLabels.length, 0) + verify(!initial.series) + + compare(initial.type, AbstractDataProxy.DataTypeBar) + } + } + + TestCase { + name: "ItemModelBarDataProxy Initialized" + + function test_initialized() { + compare(initialized.autoColumnCategories, false) + compare(initialized.autoRowCategories, false) + compare(initialized.columnCategories.length, 2) + compare(initialized.columnCategories[0], "colcat1") + compare(initialized.columnCategories[1], "colcat2") + compare(initialized.columnRole, "col") + compare(initialized.columnRolePattern, /^.*-(\d\d)$/) + compare(initialized.columnRoleReplace, "\\1") + compare(initialized.itemModel.objectName, "model1") + compare(initialized.multiMatchBehavior, ItemModelBarDataProxy.MMBAverage) + compare(initialized.rotationRole, "rot") + compare(initialized.rotationRolePattern, /-/) + compare(initialized.rotationRoleReplace, "\\1") + compare(initialized.rowCategories.length, 2) + compare(initialized.rowCategories[0], "rowcat1") + compare(initialized.rowCategories[1], "rowcat2") + compare(initialized.rowRole, "row") + compare(initialized.rowRolePattern, /^(\d\d\d\d).*$/) + compare(initialized.rowRoleReplace, "\\1") + compare(initialized.valueRole, "val") + compare(initialized.valueRolePattern, /-/) + compare(initialized.valueRoleReplace, "\\1") + + compare(initialized.columnLabels.length, 2) + compare(initialized.rowCount, 2) + compare(initialized.rowLabels.length, 2) + } + } + + TestCase { + name: "ItemModelBarDataProxy Change" + + ListModel { id: model1; objectName: "model1" } + + function test_1_change() { + change.autoColumnCategories = false + change.autoRowCategories = false + change.columnCategories = ["colcat1", "colcat2"] + change.columnRole = "col" + change.columnRolePattern = /^.*-(\d\d)$/ + change.columnRoleReplace = "\\1" + change.itemModel = model1 + change.multiMatchBehavior = ItemModelBarDataProxy.MMBAverage + change.rotationRole = "rot" + change.rotationRolePattern = /-/ + change.rotationRoleReplace = "\\1" + change.rowCategories = ["rowcat1", "rowcat2"] + change.rowRole = "row" + change.rowRolePattern = /^(\d\d\d\d).*$/ + change.rowRoleReplace = "\\1" + change.useModelCategories = true // Overwrites columnLabels and rowLabels + change.valueRole = "val" + change.valueRolePattern = /-/ + change.valueRoleReplace = "\\1" + + change.columnLabels = ["col1", "col2"] + change.rowLabels = ["row1", "row2"] + } + + function test_2_test_change() { + // This test has a dependency to the previous one due to asynchronous item model resolving + compare(change.autoColumnCategories, false) + compare(change.autoRowCategories, false) + compare(change.columnCategories.length, 2) + compare(change.columnCategories[0], "colcat1") + compare(change.columnCategories[1], "colcat2") + compare(change.columnRole, "col") + compare(change.columnRolePattern, /^.*-(\d\d)$/) + compare(change.columnRoleReplace, "\\1") + compare(change.itemModel.objectName, "model1") + compare(change.multiMatchBehavior, ItemModelBarDataProxy.MMBAverage) + compare(change.rotationRole, "rot") + compare(change.rotationRolePattern, /-/) + compare(change.rotationRoleReplace, "\\1") + compare(change.rowCategories.length, 2) + compare(change.rowCategories[0], "rowcat1") + compare(change.rowCategories[1], "rowcat2") + compare(change.rowRole, "row") + compare(change.rowRolePattern, /^(\d\d\d\d).*$/) + compare(change.rowRoleReplace, "\\1") + compare(change.useModelCategories, true) + compare(change.valueRole, "val") + compare(change.valueRolePattern, /-/) + compare(change.valueRoleReplace, "\\1") + + compare(change.columnLabels.length, 1) + compare(change.rowCount, 0) + compare(change.rowLabels.length, 0) + } + } + + TestCase { + name: "ItemModelBarDataProxy MultiMatchBehaviour" + + Bars3D { + id: bars1 + + Bar3DSeries { + ItemModelBarDataProxy { + id: barProxy + itemModel: ListModel { + ListElement{ coords: "0,0"; data: "5"; } + ListElement{ coords: "0,0"; data: "15"; } + } + rowRole: "coords" + columnRole: "coords" + valueRole: "data" + rowRolePattern: /(\d),\d/ + columnRolePattern: /(\d),(\d)/ + rowRoleReplace: "\\1" + columnRoleReplace: "\\2" + } + } + } + + function test_0_async_dummy() { + } + + function test_1_test_multimatch() { + compare(bars1.valueAxis.max, 15) + } + + function test_2_multimatch() { + barProxy.multiMatchBehavior = ItemModelBarDataProxy.MMBFirst + } + + function test_3_test_multimatch() { + compare(bars1.valueAxis.max, 5) + } + + function test_4_multimatch() { + barProxy.multiMatchBehavior = ItemModelBarDataProxy.MMBLast + } + + function test_5_test_multimatch() { + compare(bars1.valueAxis.max, 15) + } + + function test_6_multimatch() { + barProxy.multiMatchBehavior = ItemModelBarDataProxy.MMBAverage + } + + function test_7_test_multimatch() { + compare(bars1.valueAxis.max, 10) + } + + function test_8_multimatch() { + barProxy.multiMatchBehavior = ItemModelBarDataProxy.MMBCumulative + } + + function test_9_test_multimatch() { + compare(bars1.valueAxis.max, 20) + } + } +} diff --git a/tests/auto/qmltest/custom3d/tst_customitem.qml b/tests/auto/qmltest/custom3d/tst_customitem.qml new file mode 100644 index 00000000..ee3d10fc --- /dev/null +++ b/tests/auto/qmltest/custom3d/tst_customitem.qml @@ -0,0 +1,106 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + width: 150 + height: 150 + + Custom3DItem { + id: initial + } + + Custom3DItem { + id: initialized + meshFile: ":\customitem.obj" + position: Qt.vector3d(1.0, 0.5, 1.0) + positionAbsolute: true + rotation: Qt.quaternion(1, 0.5, 0, 0) + scaling: Qt.vector3d(0.2, 0.2, 0.2) + scalingAbsolute: false + shadowCasting: false + textureFile: ":\customtexture.jpg" + visible: false + } + + Custom3DItem { + id: change + } + + TestCase { + name: "Custom3DItem Initial" + + function test_initial() { + compare(initial.meshFile, "") + compare(initial.position, Qt.vector3d(0.0, 0.0, 0.0)) + compare(initial.positionAbsolute, false) + compare(initial.rotation, Qt.quaternion(0, 0, 0, 0)) + compare(initial.scaling, Qt.vector3d(0.1, 0.1, 0.1)) + compare(initial.scalingAbsolute, true) + compare(initial.shadowCasting, true) + compare(initial.textureFile, "") + compare(initial.visible, true) + } + } + + TestCase { + name: "Custom3DItem Initialized" + + function test_initialized() { + compare(initialized.meshFile, ":\customitem.obj") + compare(initialized.position, Qt.vector3d(1.0, 0.5, 1.0)) + compare(initialized.positionAbsolute, true) + compare(initialized.rotation, Qt.quaternion(1, 0.5, 0, 0)) + compare(initialized.scaling, Qt.vector3d(0.2, 0.2, 0.2)) + compare(initialized.scalingAbsolute, false) + compare(initialized.shadowCasting, false) + compare(initialized.textureFile, ":\customtexture.jpg") + compare(initialized.visible, false) + } + } + + TestCase { + name: "Custom3DItem Change" + + function test_change() { + change.meshFile = ":\customitem.obj" + change.position = Qt.vector3d(1.0, 0.5, 1.0) + change.positionAbsolute = true + change.rotation = Qt.quaternion(1, 0.5, 0, 0) + change.scaling = Qt.vector3d(0.2, 0.2, 0.2) + change.scalingAbsolute = false + change.shadowCasting = false + change.textureFile = ":\customtexture.jpg" + change.visible = false + + compare(change.meshFile, ":\customitem.obj") + compare(change.position, Qt.vector3d(1.0, 0.5, 1.0)) + compare(change.positionAbsolute, true) + compare(change.rotation, Qt.quaternion(1, 0.5, 0, 0)) + compare(change.scaling, Qt.vector3d(0.2, 0.2, 0.2)) + compare(change.scalingAbsolute, false) + compare(change.shadowCasting, false) + compare(change.textureFile, ":\customtexture.jpg") + compare(change.visible, false) + } + } +} diff --git a/tests/auto/qmltest/custom3d/tst_customlabel.qml b/tests/auto/qmltest/custom3d/tst_customlabel.qml new file mode 100644 index 00000000..acac1b63 --- /dev/null +++ b/tests/auto/qmltest/custom3d/tst_customlabel.qml @@ -0,0 +1,134 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + width: 150 + height: 150 + + Custom3DLabel { + id: initial + } + + Custom3DLabel { + id: initialized + backgroundColor: "red" + backgroundEnabled: false + borderEnabled: false + facingCamera: true + font.family: "Times New Roman" + text: "test label" + textColor: "blue" + + position: Qt.vector3d(1.0, 0.5, 1.0) + positionAbsolute: true + rotation: Qt.quaternion(1, 0.5, 0, 0) + scaling: Qt.vector3d(0.2, 0.2, 0.2) + shadowCasting: true + visible: false + } + + Custom3DLabel { + id: change + } + + TestCase { + name: "Custom3DLabel Initial" + + function test_initial() { + compare(initial.backgroundColor, "#a0a0a4") + compare(initial.backgroundEnabled, true) + compare(initial.borderEnabled, true) + compare(initial.facingCamera, false) + compare(initial.font.family, "Arial") + compare(initial.text, "") + compare(initial.textColor, "#ffffff") + + compare(initial.meshFile, ":/defaultMeshes/plane") + compare(initial.position, Qt.vector3d(0.0, 0.0, 0.0)) + compare(initial.positionAbsolute, false) + compare(initial.rotation, Qt.quaternion(0, 0, 0, 0)) + compare(initial.scaling, Qt.vector3d(0.1, 0.1, 0.1)) + compare(initial.scalingAbsolute, true) + compare(initial.shadowCasting, false) + compare(initial.textureFile, "") + compare(initial.visible, true) + } + } + + TestCase { + name: "Custom3DLabel Initialized" + + function test_initialized() { + compare(initialized.backgroundColor, "#ff0000") + compare(initialized.backgroundEnabled, false) + compare(initialized.borderEnabled, false) + compare(initialized.facingCamera, true) + compare(initialized.font.family, "Times New Roman") + compare(initialized.text, "test label") + compare(initialized.textColor, "#0000ff") + + compare(initialized.position, Qt.vector3d(1.0, 0.5, 1.0)) + compare(initialized.positionAbsolute, true) + compare(initialized.rotation, Qt.quaternion(1, 0.5, 0, 0)) + compare(initialized.scaling, Qt.vector3d(0.2, 0.2, 0.2)) + compare(initialized.shadowCasting, true) + compare(initialized.visible, false) + } + } + + TestCase { + name: "Custom3DLabel Change" + + function test_change() { + change.backgroundColor = "red" + change.backgroundEnabled = false + change.borderEnabled = false + change.facingCamera = true + change.font.family = "Times New Roman" + change.text = "test label" + change.textColor = "blue" + + change.position = Qt.vector3d(1.0, 0.5, 1.0) + change.positionAbsolute = true + change.rotation = Qt.quaternion(1, 0.5, 0, 0) + change.scaling = Qt.vector3d(0.2, 0.2, 0.2) + change.shadowCasting = true + change.visible = false + + compare(change.backgroundColor, "#ff0000") + compare(change.backgroundEnabled, false) + compare(change.borderEnabled, false) + compare(change.facingCamera, true) + compare(change.font.family, "Times New Roman") + compare(change.text, "test label") + compare(change.textColor, "#0000ff") + + compare(change.position, Qt.vector3d(1.0, 0.5, 1.0)) + compare(change.positionAbsolute, true) + compare(change.rotation, Qt.quaternion(1, 0.5, 0, 0)) + compare(change.scaling, Qt.vector3d(0.2, 0.2, 0.2)) + compare(change.shadowCasting, true) + compare(change.visible, false) + } + } +} diff --git a/tests/auto/qmltest/custom3d/tst_customvolume.qml b/tests/auto/qmltest/custom3d/tst_customvolume.qml new file mode 100644 index 00000000..08c15013 --- /dev/null +++ b/tests/auto/qmltest/custom3d/tst_customvolume.qml @@ -0,0 +1,182 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + width: 150 + height: 150 + + Custom3DVolume { + id: initial + } + + Custom3DVolume { + id: initialized + alphaMultiplier: 0.1 + drawSliceFrames: true + drawSlices: true + preserveOpacity: false + sliceFrameColor: "red" + sliceFrameGaps: Qt.vector3d(2.0, 2.0, 2.0) + sliceFrameThicknesses: Qt.vector3d(2.0, 2.0, 2.0) + sliceFrameWidths: Qt.vector3d(2.0, 2.0, 2.0) + sliceIndexX: 0 + sliceIndexY: 0 + sliceIndexZ: 0 + useHighDefShader: false + + position: Qt.vector3d(1.0, 0.5, 1.0) + positionAbsolute: true + rotation: Qt.quaternion(1, 0.5, 0, 0) + scaling: Qt.vector3d(0.2, 0.2, 0.2) + scalingAbsolute: false + shadowCasting: false + visible: false + } + + Custom3DVolume { + id: change + } + + Custom3DVolume { + id: invalid + } + + TestCase { + name: "Custom3DVolume Initial" + + function test_initial() { + compare(initial.alphaMultiplier, 1.0) + compare(initial.drawSliceFrames, false) + compare(initial.drawSlices, false) + compare(initial.preserveOpacity, true) + compare(initial.sliceFrameColor, "#000000") + compare(initial.sliceFrameGaps, Qt.vector3d(0.01, 0.01, 0.01)) + compare(initial.sliceFrameThicknesses, Qt.vector3d(0.01, 0.01, 0.01)) + compare(initial.sliceFrameWidths, Qt.vector3d(0.01, 0.01, 0.01)) + compare(initial.sliceIndexX, -1) + compare(initial.sliceIndexY, -1) + compare(initial.sliceIndexZ, -1) + compare(initial.useHighDefShader, true) + + compare(initial.meshFile, ":/defaultMeshes/barFull") + compare(initial.position, Qt.vector3d(0.0, 0.0, 0.0)) + compare(initial.positionAbsolute, false) + compare(initial.rotation, Qt.quaternion(0, 0, 0, 0)) + compare(initial.scaling, Qt.vector3d(0.1, 0.1, 0.1)) + compare(initial.scalingAbsolute, true) + compare(initial.shadowCasting, true) + compare(initial.textureFile, "") + compare(initial.visible, true) + } + } + + TestCase { + name: "Custom3DVolume Initialized" + + function test_initialized() { + compare(initialized.alphaMultiplier, 0.1) + compare(initialized.drawSliceFrames, true) + compare(initialized.drawSlices, true) + compare(initialized.preserveOpacity, false) + compare(initialized.sliceFrameColor, "#ff0000") + compare(initialized.sliceFrameGaps, Qt.vector3d(2.0, 2.0, 2.0)) + compare(initialized.sliceFrameThicknesses, Qt.vector3d(2.0, 2.0, 2.0)) + compare(initialized.sliceFrameWidths, Qt.vector3d(2.0, 2.0, 2.0)) + compare(initialized.sliceIndexX, 0) + compare(initialized.sliceIndexY, 0) + compare(initialized.sliceIndexZ, 0) + compare(initialized.useHighDefShader, false) + + compare(initialized.position, Qt.vector3d(1.0, 0.5, 1.0)) + compare(initialized.positionAbsolute, true) + compare(initialized.rotation, Qt.quaternion(1, 0.5, 0, 0)) + compare(initialized.scaling, Qt.vector3d(0.2, 0.2, 0.2)) + compare(initialized.scalingAbsolute, false) + compare(initialized.shadowCasting, false) + compare(initialized.visible, false) + } + } + + TestCase { + name: "Custom3DVolume Change" + + function test_change() { + change.alphaMultiplier = 0.1 + change.drawSliceFrames = true + change.drawSlices = true + change.preserveOpacity = false + change.sliceFrameColor = "red" + change.sliceFrameGaps = Qt.vector3d(2.0, 2.0, 2.0) + change.sliceFrameThicknesses = Qt.vector3d(2.0, 2.0, 2.0) + change.sliceFrameWidths = Qt.vector3d(2.0, 2.0, 2.0) + change.sliceIndexX = 0 + change.sliceIndexY = 0 + change.sliceIndexZ = 0 + change.useHighDefShader = false + + change.position = Qt.vector3d(1.0, 0.5, 1.0) + change.positionAbsolute = true + change.rotation = Qt.quaternion(1, 0.5, 0, 0) + change.scaling = Qt.vector3d(0.2, 0.2, 0.2) + change.scalingAbsolute = false + change.shadowCasting = false + change.visible = false + + compare(change.alphaMultiplier, 0.1) + compare(change.drawSliceFrames, true) + compare(change.drawSlices, true) + compare(change.preserveOpacity, false) + compare(change.sliceFrameColor, "#ff0000") + compare(change.sliceFrameGaps, Qt.vector3d(2.0, 2.0, 2.0)) + compare(change.sliceFrameThicknesses, Qt.vector3d(2.0, 2.0, 2.0)) + compare(change.sliceFrameWidths, Qt.vector3d(2.0, 2.0, 2.0)) + compare(change.sliceIndexX, 0) + compare(change.sliceIndexY, 0) + compare(change.sliceIndexZ, 0) + compare(change.useHighDefShader, false) + + compare(change.position, Qt.vector3d(1.0, 0.5, 1.0)) + compare(change.positionAbsolute, true) + compare(change.rotation, Qt.quaternion(1, 0.5, 0, 0)) + compare(change.scaling, Qt.vector3d(0.2, 0.2, 0.2)) + compare(change.scalingAbsolute, false) + compare(change.shadowCasting, false) + compare(change.visible, false) + } + } + + TestCase { + name: "Custom3DVolume Invalid" + + function test_invalid() { + invalid.alphaMultiplier = -1.0 + compare(invalid.alphaMultiplier, 1.0) + invalid.sliceFrameGaps = Qt.vector3d(-0.1, -0.1, -0.1) + compare(invalid.sliceFrameGaps, Qt.vector3d(0.01, 0.01, 0.01)) + invalid.sliceFrameThicknesses = Qt.vector3d(-0.1, -0.1, -0.1) + compare(invalid.sliceFrameThicknesses, Qt.vector3d(0.01, 0.01, 0.01)) + invalid.sliceFrameWidths = Qt.vector3d(-0.1, -0.1, -0.1) + compare(invalid.sliceFrameWidths, Qt.vector3d(0.01, 0.01, 0.01)) + } + } +} diff --git a/tests/auto/qmltest/customitem.obj b/tests/auto/qmltest/customitem.obj new file mode 100644 index 00000000..108cf7ac --- /dev/null +++ b/tests/auto/qmltest/customitem.obj @@ -0,0 +1,54 @@ +# Blender v2.66 (sub 0) OBJ File: 'cube_filled.blend' +# www.blender.org +o Cube +v -1.000000 -1.000000 1.000000 +v -1.000000 -1.000000 -1.000000 +v 1.000000 -1.000000 -1.000000 +v 1.000000 -1.000000 1.000000 +v -1.000000 1.000000 1.000000 +v -1.000000 1.000000 -1.000000 +v 1.000000 1.000000 -1.000000 +v 1.000000 1.000000 1.000000 +vt 0.666667 0.332314 +vt 0.334353 0.333333 +vt 0.665647 0.000000 +vt 0.001020 0.333333 +vt 0.000000 0.001020 +vt 0.333333 0.332314 +vt 0.333333 0.665647 +vt 0.001019 0.666667 +vt 0.000000 0.334353 +vt 0.334353 0.666667 +vt 0.333333 0.334353 +vt 0.665647 0.333333 +vt 0.333333 0.667686 +vt 0.665647 0.666667 +vt 0.666667 0.998980 +vt 0.667686 0.333333 +vt 0.666667 0.001019 +vt 0.998980 0.000000 +vt 0.333333 0.001019 +vt 0.332314 0.000000 +vt 0.332314 0.333333 +vt 0.666667 0.665647 +vt 0.334353 1.000000 +vt 1.000000 0.332314 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 -0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000000 -1.000000 -0.000000 +s off +f 5/1/1 6/2/1 1/3/1 +f 6/4/2 7/5/2 2/6/2 +f 7/7/3 8/8/3 4/9/3 +f 8/10/4 5/11/4 1/12/4 +f 8/13/5 7/14/5 6/15/5 +f 2/16/6 3/17/6 4/18/6 +f 6/2/1 2/19/1 1/3/1 +f 7/5/2 3/20/2 2/6/2 +f 3/21/3 7/7/3 4/9/3 +f 4/22/4 8/10/4 1/12/4 +f 5/23/5 8/13/5 6/15/5 +f 1/24/6 2/16/6 4/18/6 diff --git a/tests/auto/qmltest/customtexture.jpg b/tests/auto/qmltest/customtexture.jpg Binary files differnew file mode 100644 index 00000000..2580f5bd --- /dev/null +++ b/tests/auto/qmltest/customtexture.jpg diff --git a/tests/auto/qmltest/input3d/tst_input.qml b/tests/auto/qmltest/input3d/tst_input.qml new file mode 100644 index 00000000..fefb585e --- /dev/null +++ b/tests/auto/qmltest/input3d/tst_input.qml @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + width: 150 + height: 150 + + InputHandler3D { + id: initial + } + + InputHandler3D { + id: initialized + rotationEnabled: false + selectionEnabled: false + zoomAtTargetEnabled: false + zoomEnabled: false + } + + InputHandler3D { + id: change + } + + TestCase { + name: "InputHandler3D Initial" + + function test_initial() { + compare(initial.rotationEnabled, true) + compare(initial.selectionEnabled, true) + compare(initial.zoomAtTargetEnabled, true) + compare(initial.zoomEnabled, true) + } + } + + TestCase { + name: "InputHandler3D Initialized" + + function test_initialized() { + compare(initialized.rotationEnabled, false) + compare(initialized.selectionEnabled, false) + compare(initialized.zoomAtTargetEnabled, false) + compare(initialized.zoomEnabled, false) + } + } + + TestCase { + name: "InputHandler3D Change" + + function test_change() { + change.rotationEnabled = false + change.selectionEnabled = false + change.zoomAtTargetEnabled = false + change.zoomEnabled = false + + compare(change.rotationEnabled, false) + compare(change.selectionEnabled, false) + compare(change.zoomAtTargetEnabled, false) + compare(change.zoomEnabled, false) + } + + // TODO: QTRD-3380 (mouse events) + } +} diff --git a/tests/auto/qmltest/input3d/tst_touch.qml b/tests/auto/qmltest/input3d/tst_touch.qml new file mode 100644 index 00000000..626da68f --- /dev/null +++ b/tests/auto/qmltest/input3d/tst_touch.qml @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + width: 150 + height: 150 + + TouchInputHandler3D { + id: initial + } + + TouchInputHandler3D { + id: initialized + rotationEnabled: false + selectionEnabled: false + zoomAtTargetEnabled: false + zoomEnabled: false + } + + TouchInputHandler3D { + id: change + } + + TestCase { + name: "TouchInputHandler3D Initial" + + function test_initial() { + compare(initial.rotationEnabled, true) + compare(initial.selectionEnabled, true) + compare(initial.zoomAtTargetEnabled, true) + compare(initial.zoomEnabled, true) + } + } + + TestCase { + name: "TouchInputHandler3D Initialized" + + function test_initialized() { + compare(initialized.rotationEnabled, false) + compare(initialized.selectionEnabled, false) + compare(initialized.zoomAtTargetEnabled, false) + compare(initialized.zoomEnabled, false) + } + } + + TestCase { + name: "TouchInputHandler3D Change" + + function test_change() { + change.rotationEnabled = false + change.selectionEnabled = false + change.zoomAtTargetEnabled = false + change.zoomEnabled = false + + compare(change.rotationEnabled, false) + compare(change.selectionEnabled, false) + compare(change.zoomAtTargetEnabled, false) + compare(change.zoomEnabled, false) + + // TODO: QTRD-3380 (mouse events) + } + } +} diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro new file mode 100644 index 00000000..cbb9b8b8 --- /dev/null +++ b/tests/auto/qmltest/qmltest.pro @@ -0,0 +1,35 @@ +TEMPLATE = app +TARGET = tst_qmltest +CONFIG += qmltestcase +CONFIG += console +SOURCES += tst_qmltest.cpp +OTHER_FILES += bars3d\tst_basic.qml \ + bars3d\tst_bars.qml \ + bars3d\tst_barseries.qml \ + bars3d\tst_proxy.qml \ + scatter3d\tst_basic.qml \ + scatter3d\tst_scatter.qml \ + scatter3d\tst_scatterseries.qml \ + scatter3d\tst_proxy.qml \ + surface3d\tst_basic.qml \ + surface3d\tst_surface.qml \ + surface3d\tst_surfaceseries.qml \ + surface3d\tst_proxy.qml \ + surface3d\tst_heightproxy.qml \ + theme3d\tst_theme.qml \ + theme3d\tst_colorgradient.qml \ + theme3d\tst_themecolor.qml \ + custom3d\tst_customitem.qml \ + custom3d\tst_customlabel.qml \ + custom3d\tst_customvolume.qml \ + scene3d\tst_scene.qml \ + scene3d\tst_camera.qml \ + scene3d\tst_light.qml \ + input3d\tst_input.qml \ + input3d\tst_touch.qml \ + axis3d\tst_category.qml \ + axis3d\tst_value.qml \ + axis3d\tst_logvalue.qml \ + +RESOURCES += \ + qmltest.qrc diff --git a/tests/auto/qmltest/qmltest.qrc b/tests/auto/qmltest/qmltest.qrc new file mode 100644 index 00000000..61f19086 --- /dev/null +++ b/tests/auto/qmltest/qmltest.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/"> + <file>customitem.obj</file> + <file>customtexture.jpg</file> + </qresource> +</RCC> diff --git a/tests/auto/qmltest/scatter3d/tst_basic.qml b/tests/auto/qmltest/scatter3d/tst_basic.qml new file mode 100644 index 00000000..b7221701 --- /dev/null +++ b/tests/auto/qmltest/scatter3d/tst_basic.qml @@ -0,0 +1,203 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + Scatter3D { + id: empty + } + + Scatter3D { + id: basic + anchors.fill: parent + } + + Scatter3D { + id: common + anchors.fill: parent + } + + Scatter3D { + id: common_init + anchors.fill: parent + selectionMode: AbstractGraph3D.SelectionNone + shadowQuality: AbstractGraph3D.ShadowQualityLow + msaaSamples: 2 + theme: Theme3D { } + renderingMode: AbstractGraph3D.RenderIndirect + measureFps: true + orthoProjection: false + aspectRatio: 3.0 + optimizationHints: AbstractGraph3D.OptimizationStatic + polar: false + radialLabelOffset: 2 + horizontalAspectRatio: 0.2 + reflection: true + reflectivity: 0.1 + locale: Qt.locale("UK") + margin: 0.2 + } + + TestCase { + name: "Scatter3D Empty" + + function test_empty() { + compare(empty.width, 0, "width") + compare(empty.height, 0, "height") + compare(empty.seriesList.length, 0, "seriesList") + compare(empty.selectedSeries, null, "selectedSeries") + compare(empty.axisX.orientation, AbstractAxis3D.AxisOrientationX) + compare(empty.axisZ.orientation, AbstractAxis3D.AxisOrientationZ) + compare(empty.axisY.orientation, AbstractAxis3D.AxisOrientationY) + compare(empty.axisX.type, AbstractAxis3D.AxisTypeValue) + compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue) + compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue) + } + } + + TestCase { + name: "Scatter3D Basic" + when: windowShown + + function test_basic() { + compare(basic.width, 150, "width") + compare(basic.height, 150, "height") + } + } + + TestCase { + name: "Scatter3D Common" + when: windowShown + + function test_1_common() { + compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") + compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") + if (common.shadowsSupported === true) + compare(common.msaaSamples, 4, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") + compare(common.theme.type, Theme3D.ThemeQt, "theme") + compare(common.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") + compare(common.measureFps, false, "measureFps") + compare(common.customItemList.length, 0, "customItemList") + compare(common.orthoProjection, false, "orthoProjection") + compare(common.selectedElement, AbstractGraph3D.ElementNone, "selectedElement") + compare(common.aspectRatio, 2.0, "aspectRatio") + compare(common.optimizationHints, AbstractGraph3D.OptimizationDefault, "optimizationHints") + compare(common.polar, false, "polar") + compare(common.radialLabelOffset, 1, "radialLabelOffset") + compare(common.horizontalAspectRatio, 0, "horizontalAspectRatio") + compare(common.reflection, false, "reflection") + compare(common.reflectivity, 0.5, "reflectivity") + compare(common.locale, Qt.locale("C"), "locale") + compare(common.queriedGraphPosition, Qt.vector3d(0, 0, 0), "queriedGraphPosition") + compare(common.margin, -1, "margin") + } + + function test_2_change_common() { + common.selectionMode = AbstractGraph3D.SelectionNone + common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh + compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") + common.msaaSamples = 8 + if (common.shadowsSupported === true) + compare(common.msaaSamples, 8, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") + common.theme.type = Theme3D.ThemeRetro + common.renderingMode = AbstractGraph3D.RenderDirectToBackground_NoClear + common.measureFps = true + common.orthoProjection = true + common.aspectRatio = 1.0 + common.optimizationHints = AbstractGraph3D.OptimizationStatic + common.polar = true + common.radialLabelOffset = 2 + common.horizontalAspectRatio = 1 + common.reflection = true + common.reflectivity = 1.0 + common.locale = Qt.locale("FI") + common.margin = 1.0 + compare(common.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") + compare(common.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") // Ortho disables shadows + compare(common.msaaSamples, 0, "msaaSamples") // Rendering mode changes this to zero + compare(common.theme.type, Theme3D.ThemeRetro, "theme") + compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode") + compare(common.measureFps, true, "measureFps") + compare(common.orthoProjection, true, "orthoProjection") + compare(common.aspectRatio, 1.0, "aspectRatio") + compare(common.optimizationHints, AbstractGraph3D.OptimizationStatic, "optimizationHints") + compare(common.polar, true, "polar") + compare(common.radialLabelOffset, 2, "radialLabelOffset") + compare(common.horizontalAspectRatio, 1, "horizontalAspectRatio") + compare(common.reflection, true, "reflection") + compare(common.reflectivity, 1.0, "reflectivity") + compare(common.locale, Qt.locale("FI"), "locale") + compare(common.margin, 1.0, "margin") + } + + function test_3_change_invalid_common() { + common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice + common.theme.type = -2 + common.renderingMode = -1 + common.measureFps = false + common.orthoProjection = false + common.aspectRatio = -1.0 + common.polar = false + common.horizontalAspectRatio = -2 + common.reflection = false + common.reflectivity = -1.0 + compare(common.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") + compare(common.theme.type, -2/*Theme3D.ThemeRetro*/, "theme") // TODO: Fix once QTRD-3367 is done + compare(common.renderingMode, -1/*AbstractGraph3D.RenderDirectToBackground_NoClear*/, "renderingMode") // TODO: Fix once QTRD-3367 is done + compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done + compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done + compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done + } + + function test_4_common_initialized() { + compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") + if (common_init.shadowsSupported === true) { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") + compare(common_init.msaaSamples, 2, "msaaSamples") + } else { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") + compare(common_init.msaaSamples, 0, "msaaSamples") + } + compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") + compare(common_init.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") + compare(common_init.measureFps, true, "measureFps") + compare(common_init.customItemList.length, 0, "customItemList") + compare(common_init.orthoProjection, false, "orthoProjection") + compare(common_init.aspectRatio, 3.0, "aspectRatio") + compare(common_init.optimizationHints, AbstractGraph3D.OptimizationStatic, "optimizationHints") + compare(common_init.polar, false, "polar") + compare(common_init.radialLabelOffset, 2, "radialLabelOffset") + compare(common_init.horizontalAspectRatio, 0.2, "horizontalAspectRatio") + compare(common_init.reflection, true, "reflection") + compare(common_init.reflectivity, 0.1, "reflectivity") + compare(common_init.locale, Qt.locale("UK"), "locale") + compare(common_init.margin, 0.2, "margin") + } + } +} diff --git a/tests/auto/qmltest/scatter3d/tst_proxy.qml b/tests/auto/qmltest/scatter3d/tst_proxy.qml new file mode 100644 index 00000000..e6478f15 --- /dev/null +++ b/tests/auto/qmltest/scatter3d/tst_proxy.qml @@ -0,0 +1,134 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + ItemModelScatterDataProxy { + id: initial + } + + ItemModelScatterDataProxy { + id: initialized + + itemModel: ListModel { objectName: "model1" } + rotationRole: "rot" + rotationRolePattern: /-/ + rotationRoleReplace: "\\1" + xPosRole: "x" + xPosRolePattern: /^.*-(\d\d)$/ + xPosRoleReplace: "\\1" + yPosRole: "y" + yPosRolePattern: /^(\d\d\d\d).*$/ + yPosRoleReplace: "\\1" + zPosRole: "z" + zPosRolePattern: /-/ + zPosRoleReplace: "\\1" + } + + ItemModelScatterDataProxy { + id: change + } + + TestCase { + name: "ItemModelScatterDataProxy Initial" + + function test_initial() { + verify(!initial.itemModel) + compare(initial.rotationRole, "") + verify(initial.rotationRolePattern) + compare(initial.rotationRoleReplace, "") + compare(initial.xPosRole, "") + verify(initial.xPosRolePattern) + compare(initial.xPosRoleReplace, "") + compare(initial.yPosRole, "") + verify(initial.yPosRolePattern) + compare(initial.yPosRoleReplace, "") + compare(initial.zPosRole, "") + verify(initial.zPosRolePattern) + compare(initial.zPosRoleReplace, "") + + compare(initial.itemCount, 0) + verify(!initial.series) + + compare(initial.type, AbstractDataProxy.DataTypeScatter) + } + } + + TestCase { + name: "ItemModelScatterDataProxy Initialized" + + function test_initialized() { + compare(initialized.itemModel.objectName, "model1") + compare(initialized.rotationRole, "rot") + compare(initialized.rotationRolePattern, /-/) + compare(initialized.rotationRoleReplace, "\\1") + compare(initialized.xPosRole, "x") + compare(initialized.xPosRolePattern, /^.*-(\d\d)$/) + compare(initialized.xPosRoleReplace, "\\1") + compare(initialized.yPosRole, "y") + compare(initialized.yPosRolePattern, /^(\d\d\d\d).*$/) + compare(initialized.yPosRoleReplace, "\\1") + compare(initialized.zPosRole, "z") + compare(initialized.zPosRolePattern, /-/) + compare(initialized.zPosRoleReplace, "\\1") + } + } + + TestCase { + name: "ItemModelScatterDataProxy Change" + + ListModel { id: model1; objectName: "model1" } + + function test_change() { + change.itemModel = model1 + change.rotationRole = "rot" + change.rotationRolePattern = /-/ + change.rotationRoleReplace = "\\1" + change.xPosRole = "x" + change.xPosRolePattern = /^.*-(\d\d)$/ + change.xPosRoleReplace = "\\1" + change.yPosRole = "y" + change.yPosRolePattern = /^(\d\d\d\d).*$/ + change.yPosRoleReplace = "\\1" + change.zPosRole = "z" + change.zPosRolePattern = /-/ + change.zPosRoleReplace = "\\1" + + compare(change.itemModel.objectName, "model1") + compare(change.rotationRole, "rot") + compare(change.rotationRolePattern, /-/) + compare(change.rotationRoleReplace, "\\1") + compare(change.xPosRole, "x") + compare(change.xPosRolePattern, /^.*-(\d\d)$/) + compare(change.xPosRoleReplace, "\\1") + compare(change.yPosRole, "y") + compare(change.yPosRolePattern, /^(\d\d\d\d).*$/) + compare(change.yPosRoleReplace, "\\1") + compare(change.zPosRole, "z") + compare(change.zPosRolePattern, /-/) + compare(change.zPosRoleReplace, "\\1") + } + } +} diff --git a/tests/auto/qmltest/scatter3d/tst_scatter.qml b/tests/auto/qmltest/scatter3d/tst_scatter.qml new file mode 100644 index 00000000..b070b5f0 --- /dev/null +++ b/tests/auto/qmltest/scatter3d/tst_scatter.qml @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + Scatter3D { + id: series + anchors.fill: parent + } + + TestCase { + name: "Scatter3D Series" + + Scatter3DSeries { id: series1 } + Scatter3DSeries { id: series2 } + + function test_1_add_series() { + series.seriesList = [series1, series2] + compare(series.seriesList.length, 2) + } + + function test_2_remove_series() { + series.seriesList = [series1] + compare(series.seriesList.length, 1) + } + + function test_3_remove_series() { + series.seriesList = [] + compare(series.seriesList.length, 0) + } + + function test_4_selected_series() { + series.seriesList = [series1, series2] + series.seriesList[0].selectedItem = 0 + compare(series.selectedSeries, series1) + } + } +} diff --git a/tests/auto/qmltest/scatter3d/tst_scatterseries.qml b/tests/auto/qmltest/scatter3d/tst_scatterseries.qml new file mode 100644 index 00000000..4df58303 --- /dev/null +++ b/tests/auto/qmltest/scatter3d/tst_scatterseries.qml @@ -0,0 +1,233 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + Scatter3DSeries { + id: initial + } + + ColorGradient { + id: gradient1; + stops: [ + ColorGradientStop { color: "red"; position: 0 }, + ColorGradientStop { color: "blue"; position: 1 } + ] + } + + ColorGradient { + id: gradient2; + stops: [ + ColorGradientStop { color: "green"; position: 0 }, + ColorGradientStop { color: "red"; position: 1 } + ] + } + + ColorGradient { + id: gradient3; + stops: [ + ColorGradientStop { color: "gray"; position: 0 }, + ColorGradientStop { color: "darkgray"; position: 1 } + ] + } + + Scatter3DSeries { + id: initialized + dataProxy: ItemModelScatterDataProxy { + itemModel: ListModel { + ListElement{ xPos: "2.754"; yPos: "1.455"; zPos: "3.362"; } + ListElement{ xPos: "3.164"; yPos: "2.022"; zPos: "4.348"; } + } + xPosRole: "xPos" + yPosRole: "yPos" + zPosRole: "zPos" + } + itemSize: 0.5 + selectedItem: 0 + + baseColor: "blue" + baseGradient: gradient1 + colorStyle: Theme3D.ColorStyleObjectGradient + itemLabelFormat: "%f" + itemLabelVisible: false + mesh: Abstract3DSeries.MeshMinimal + meshRotation: Qt.quaternion(1, 1, 1, 1) + meshSmooth: true + multiHighlightColor: "green" + multiHighlightGradient: gradient2 + name: "series1" + singleHighlightColor: "red" + singleHighlightGradient: gradient3 + userDefinedMesh: ":/customitem.obj" + visible: false + } + + ItemModelScatterDataProxy { + id: proxy1 + itemModel: ListModel { + ListElement{ xPos: "2.754"; yPos: "1.455"; zPos: "3.362"; } + ListElement{ xPos: "3.164"; yPos: "2.022"; zPos: "4.348"; } + ListElement{ xPos: "4.564"; yPos: "1.865"; zPos: "1.346"; } + } + xPosRole: "xPos" + yPosRole: "yPos" + zPosRole: "zPos" + } + + Scatter3DSeries { + id: change + } + + Scatter3DSeries { + id: invalid + } + + TestCase { + name: "Scatter3DSeries Initial" + + function test_1_initial() { + compare(initial.dataProxy.itemCount, 0) + compare(initial.invalidSelectionIndex, -1) + compare(initial.itemSize, 0.0) + compare(initial.selectedItem, -1) + } + + function test_2_initial_common() { + // Common properties + compare(initial.baseColor, "#000000") + compare(initial.baseGradient, null) + compare(initial.colorStyle, Theme3D.ColorStyleUniform) + compare(initial.itemLabel, "") + compare(initial.itemLabelFormat, "@xLabel, @yLabel, @zLabel") + compare(initial.itemLabelVisible, true) + compare(initial.mesh, Abstract3DSeries.MeshSphere) + compare(initial.meshRotation, Qt.quaternion(1, 0, 0, 0)) + compare(initial.meshSmooth, false) + compare(initial.multiHighlightColor, "#000000") + compare(initial.multiHighlightGradient, null) + compare(initial.name, "") + compare(initial.singleHighlightColor, "#000000") + compare(initial.singleHighlightGradient, null) + compare(initial.type, Abstract3DSeries.SeriesTypeScatter) + compare(initial.userDefinedMesh, "") + compare(initial.visible, true) + } + } + + TestCase { + name: "Scatter3DSeries Initialized" + + function test_1_initialized() { + compare(initialized.dataProxy.itemCount, 2) + compare(initialized.itemSize, 0.5) + compare(initialized.selectedItem, 0) + } + + function test_2_initialized_common() { + // Common properties + compare(initialized.baseColor, "#0000ff") + compare(initialized.baseGradient, gradient1) + compare(initialized.colorStyle, Theme3D.ColorStyleObjectGradient) + compare(initialized.itemLabelFormat, "%f") + compare(initialized.itemLabelVisible, false) + compare(initialized.mesh, Abstract3DSeries.MeshMinimal) + compare(initialized.meshRotation, Qt.quaternion(1, 1, 1, 1)) + compare(initialized.meshSmooth, true) + compare(initialized.multiHighlightColor, "#008000") + compare(initialized.multiHighlightGradient, gradient2) + compare(initialized.name, "series1") + compare(initialized.singleHighlightColor, "#ff0000") + compare(initialized.singleHighlightGradient, gradient3) + compare(initialized.userDefinedMesh, ":/customitem.obj") + compare(initialized.visible, false) + } + } + + TestCase { + name: "Scatter3DSeries Change" + + function test_1_change() { + change.dataProxy = proxy1 + change.itemSize = 0.5 + change.selectedItem = 0 + } + + function test_2_test_change() { + // This test has a dependency to the previous one due to asynchronous item model resolving + compare(change.dataProxy.itemCount, 3) + compare(change.itemSize, 0.5) + compare(change.selectedItem, 0) + } + + function test_3_change_common() { + change.baseColor = "blue" + change.baseGradient = gradient1 + change.colorStyle = Theme3D.ColorStyleObjectGradient + change.itemLabelFormat = "%f" + change.itemLabelVisible = false + change.mesh = Abstract3DSeries.MeshMinimal + change.meshRotation = Qt.quaternion(1, 1, 1, 1) + change.meshSmooth = true + change.multiHighlightColor = "green" + change.multiHighlightGradient = gradient2 + change.name = "series1" + change.singleHighlightColor = "red" + change.singleHighlightGradient = gradient3 + change.userDefinedMesh = ":/customitem.obj" + change.visible = false + + compare(change.baseColor, "#0000ff") + compare(change.baseGradient, gradient1) + compare(change.colorStyle, Theme3D.ColorStyleObjectGradient) + compare(change.itemLabelFormat, "%f") + compare(change.itemLabelVisible, false) + compare(change.mesh, Abstract3DSeries.MeshMinimal) + compare(change.meshRotation, Qt.quaternion(1, 1, 1, 1)) + compare(change.meshSmooth, true) + compare(change.multiHighlightColor, "#008000") + compare(change.multiHighlightGradient, gradient2) + compare(change.name, "series1") + compare(change.singleHighlightColor, "#ff0000") + compare(change.singleHighlightGradient, gradient3) + compare(change.userDefinedMesh, ":/customitem.obj") + compare(change.visible, false) + } + + function test_4_change_gradient_stop() { + gradient1.stops[0].color = "yellow" + compare(change.baseGradient.stops[0].color, "#ffff00") + } + } + TestCase { + name: "Scatter3DSeries Invalid" + + function test_invalid() { + invalid.itemSize = -1.0 + compare(invalid.itemSize, 0.0) + invalid.itemSize = 1.1 + compare(invalid.itemSize, 0.0) + } + } +} diff --git a/tests/auto/qmltest/scene3d/tst_camera.qml b/tests/auto/qmltest/scene3d/tst_camera.qml new file mode 100644 index 00000000..07adf633 --- /dev/null +++ b/tests/auto/qmltest/scene3d/tst_camera.qml @@ -0,0 +1,135 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + width: 150 + height: 150 + + Camera3D { + id: initial + } + + Camera3D { + id: initialized + maxZoomLevel: 1000.0 + minZoomLevel: 100.0 + target: Qt.vector3d(1.0, -1.0, 1.0) + wrapXRotation: false + wrapYRotation: true + xRotation: 30.0 + yRotation: 30.0 + zoomLevel: 500.0 + } + + Camera3D { + id: change + } + + Camera3D { + id: invalid + } + + TestCase { + name: "Camera3D Initial" + + function test_initial() { + compare(initial.cameraPreset, Camera3D.CameraPresetNone) + compare(initial.maxZoomLevel, 500.0) + compare(initial.minZoomLevel, 10.0) + compare(initial.target, Qt.vector3d(0.0, 0.0, 0.0)) + compare(initial.wrapXRotation, true) + compare(initial.wrapYRotation, false) + compare(initial.xRotation, 0.0) + compare(initial.yRotation, 0.0) + compare(initial.zoomLevel, 100.0) + } + } + + TestCase { + name: "Camera3D Initialized" + + function test_initialized() { + compare(initialized.maxZoomLevel, 1000.0) + compare(initialized.minZoomLevel, 100.0) + compare(initialized.target, Qt.vector3d(1.0, -1.0, 1.0)) + compare(initialized.wrapXRotation, false) + compare(initialized.wrapYRotation, true) + compare(initialized.xRotation, 30.0) + compare(initialized.yRotation, 30.0) + compare(initialized.zoomLevel, 500.0) + } + } + + TestCase { + name: "Camera3D Change" + + function test_1_change() { + change.cameraPreset = Camera3D.CameraPresetBehind // Will be overridden by the the following sets + change.maxZoomLevel = 1000.0 + change.minZoomLevel = 100.0 + change.target = Qt.vector3d(1.0, -1.0, 1.0) + change.wrapXRotation = false + change.wrapYRotation = true + change.xRotation = 30.0 + change.yRotation = 30.0 + change.zoomLevel = 500.0 + + compare(change.cameraPreset, Camera3D.CameraPresetNone) + compare(change.maxZoomLevel, 1000.0) + compare(change.minZoomLevel, 100.0) + compare(change.target, Qt.vector3d(1.0, -1.0, 1.0)) + compare(change.wrapXRotation, false) + compare(change.wrapYRotation, true) + compare(change.xRotation, 30.0) + compare(change.yRotation, 30.0) + compare(change.zoomLevel, 500.0) + } + + function test_2_change_preset() { + change.cameraPreset = Camera3D.CameraPresetBehind // Sets target and rotations + + compare(change.cameraPreset, Camera3D.CameraPresetBehind) + compare(change.maxZoomLevel, 1000.0) + compare(change.minZoomLevel, 100.0) + compare(change.target, Qt.vector3d(0.0, 0.0, 0.0)) + compare(change.wrapXRotation, false) + compare(change.wrapYRotation, true) + compare(change.xRotation, 180.0) + compare(change.yRotation, 22.5) + compare(change.zoomLevel, 500.0) + } + } + + TestCase { + name: "Camera3D Invalid" + + function test_invalid() { + invalid.target = Qt.vector3d(-1.5, -1.5, -1.5) + compare(invalid.target, Qt.vector3d(-1.0, -1.0, -1.0)) + invalid.target = Qt.vector3d(1.5, 1.5, 1.5) + compare(invalid.target, Qt.vector3d(1.0, 1.0, 1.0)) + invalid.minZoomLevel = 0.1 + compare(invalid.minZoomLevel, 1.0) + } + } +} diff --git a/tests/auto/qmltest/scene3d/tst_light.qml b/tests/auto/qmltest/scene3d/tst_light.qml new file mode 100644 index 00000000..d9fa282b --- /dev/null +++ b/tests/auto/qmltest/scene3d/tst_light.qml @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + // TODO: Has no adjustable properties yet. + // Keeping this as a placeholder for future implementations (QTRD-2406) + /* + Light3D { + id: initial + } + + Light3D { + id: initialized + } + + + Light3D { + id: change + } + + TestCase { + name: "Light3D Initial" + + function test_initial() { + } + } + + TestCase { + name: "Light3D Initialized" + + function test_initialized() { + } + } + + TestCase { + name: "Light3D Change" + + function test_change() { + } + } + */ +} diff --git a/tests/auto/qmltest/scene3d/tst_scene.qml b/tests/auto/qmltest/scene3d/tst_scene.qml new file mode 100644 index 00000000..d53042ca --- /dev/null +++ b/tests/auto/qmltest/scene3d/tst_scene.qml @@ -0,0 +1,125 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + // Scene3D is uncreatable, so it needs to be accessed via a graph + Bars3D { + id: initial + } + + Bars3D { + id: initialized + scene.activeCamera: Camera3D { zoomLevel: 200 } + scene.devicePixelRatio: 2.0 + //scene.graphPositionQuery: Qt.point(0, 0) // TODO: Unusable until QTBUG-40043 is fixed + scene.primarySubViewport: Qt.rect(0, 0, 50, 50) + scene.secondarySubViewport: Qt.rect(50, 50, 100, 100) + scene.secondarySubviewOnTop: false + scene.selectionQueryPosition: Qt.point(0, 0) + scene.slicingActive: true + } + + Bars3D { + id: change + } + + Bars3D { + id: invalid + } + + TestCase { + name: "Scene3D Initial" + + function test_initial() { + verify(initial.scene.activeCamera) + verify(initial.scene.activeLight) + compare(initial.scene.devicePixelRatio, 1.0) + compare(initial.scene.graphPositionQuery, Qt.point(-1, -1)) + compare(initial.scene.invalidSelectionPoint, Qt.point(-1, -1)) + compare(initial.scene.primarySubViewport, Qt.rect(0, 0, 0, 0)) + compare(initial.scene.secondarySubViewport, Qt.rect(0, 0, 0, 0)) + compare(initial.scene.secondarySubviewOnTop, true) + compare(initial.scene.selectionQueryPosition, Qt.point(-1, -1)) + compare(initial.scene.slicingActive, false) + compare(initial.scene.viewport, Qt.rect(0, 0, 0, 0)) + } + } + + TestCase { + name: "Scene3D Initialized" + + function test_initialized() { + compare(initialized.scene.activeCamera.zoomLevel, 200) + compare(initialized.scene.devicePixelRatio, 2.0) + //compare(initialized.scene.graphPositionQuery, Qt.point(0, 0)) // TODO: Unusable until QTBUG-40043 is fixed + compare(initialized.scene.primarySubViewport, Qt.rect(0, 0, 50, 50)) + compare(initialized.scene.secondarySubViewport, Qt.rect(50, 50, 100, 100)) + compare(initialized.scene.secondarySubviewOnTop, false) + compare(initialized.scene.selectionQueryPosition, Qt.point(0, 0)) + compare(initialized.scene.slicingActive, true) + compare(initialized.scene.viewport, Qt.rect(0, 0, 100, 100)) + } + } + + TestCase { + name: "Scene3D Change" + + Camera3D { + id: camera1 + zoomLevel: 200 + } + + function test_change() { + change.scene.activeCamera = camera1 + change.scene.devicePixelRatio = 2.0 + change.scene.graphPositionQuery = Qt.point(0, 0) + change.scene.primarySubViewport = Qt.rect(0, 0, 50, 50) + change.scene.secondarySubViewport = Qt.rect(50, 50, 100, 100) + change.scene.secondarySubviewOnTop = false + change.scene.selectionQueryPosition = Qt.point(0, 0) // TODO: When doing signal checks, add tests to check that queries return something (asynchronously) + change.scene.slicingActive = true + + compare(change.scene.activeCamera.zoomLevel, 200) + compare(change.scene.devicePixelRatio, 2.0) + compare(change.scene.graphPositionQuery, Qt.point(0, 0)) + compare(change.scene.primarySubViewport, Qt.rect(0, 0, 50, 50)) + compare(change.scene.secondarySubViewport, Qt.rect(50, 50, 100, 100)) + compare(change.scene.secondarySubviewOnTop, false) + compare(change.scene.selectionQueryPosition, Qt.point(0, 0)) + compare(change.scene.slicingActive, true) + compare(change.scene.viewport, Qt.rect(0, 0, 100, 100)) + } + } + + TestCase { + name: "Scene3D Invalid" + + function test_invalid() { + invalid.scene.primarySubViewport = Qt.rect(0, 0, -50, -50) + compare(invalid.scene.primarySubViewport, Qt.rect(0, 0, 0, 0)) + } + } +} diff --git a/tests/auto/qmltest/surface3d/tst_basic.qml b/tests/auto/qmltest/surface3d/tst_basic.qml new file mode 100644 index 00000000..dfcc4542 --- /dev/null +++ b/tests/auto/qmltest/surface3d/tst_basic.qml @@ -0,0 +1,211 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + Surface3D { + id: empty + } + + Surface3D { + id: basic + anchors.fill: parent + flipHorizontalGrid: true + } + + Surface3D { + id: common + anchors.fill: parent + } + + Surface3D { + id: common_init + anchors.fill: parent + selectionMode: AbstractGraph3D.SelectionNone + shadowQuality: AbstractGraph3D.ShadowQualityLow + msaaSamples: 2 + theme: Theme3D { } + renderingMode: AbstractGraph3D.RenderIndirect + measureFps: true + orthoProjection: false + aspectRatio: 3.0 + optimizationHints: AbstractGraph3D.OptimizationStatic + polar: false + radialLabelOffset: 2 + horizontalAspectRatio: 0.2 + reflection: true + reflectivity: 0.1 + locale: Qt.locale("UK") + margin: 0.2 + } + + TestCase { + name: "Surface3D Empty" + + function test_empty() { + compare(empty.width, 0, "width") + compare(empty.height, 0, "height") + compare(empty.seriesList.length, 0, "seriesList") + compare(empty.selectedSeries, null, "selectedSeries") + compare(empty.flipHorizontalGrid, false, "flipHorizontalGrid") + compare(empty.axisX.orientation, AbstractAxis3D.AxisOrientationX) + compare(empty.axisZ.orientation, AbstractAxis3D.AxisOrientationZ) + compare(empty.axisY.orientation, AbstractAxis3D.AxisOrientationY) + compare(empty.axisX.type, AbstractAxis3D.AxisTypeValue) + compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue) + compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue) + } + } + + TestCase { + name: "Surface3D Basic" + when: windowShown + + function test_basic() { + compare(basic.width, 150, "width") + compare(basic.height, 150, "height") + compare(basic.flipHorizontalGrid, true, "flipHorizontalGrid") + } + + function test_change_basic() { + basic.flipHorizontalGrid = false + compare(basic.flipHorizontalGrid, false, "flipHorizontalGrid") + } + } + + TestCase { + name: "Surface3D Common" + when: windowShown + + function test_1_common() { + compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") + compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") + if (common.shadowsSupported === true) + compare(common.msaaSamples, 4, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") + compare(common.theme.type, Theme3D.ThemeQt, "theme") + compare(common.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") + compare(common.measureFps, false, "measureFps") + compare(common.customItemList.length, 0, "customItemList") + compare(common.orthoProjection, false, "orthoProjection") + compare(common.selectedElement, AbstractGraph3D.ElementNone, "selectedElement") + compare(common.aspectRatio, 2.0, "aspectRatio") + compare(common.optimizationHints, AbstractGraph3D.OptimizationDefault, "optimizationHints") + compare(common.polar, false, "polar") + compare(common.radialLabelOffset, 1, "radialLabelOffset") + compare(common.horizontalAspectRatio, 0, "horizontalAspectRatio") + compare(common.reflection, false, "reflection") + compare(common.reflectivity, 0.5, "reflectivity") + compare(common.locale, Qt.locale("C"), "locale") + compare(common.queriedGraphPosition, Qt.vector3d(0, 0, 0), "queriedGraphPosition") + compare(common.margin, -1, "margin") + } + + function test_2_change_common() { + common.selectionMode = AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice + common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh + compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") + common.msaaSamples = 8 + if (common.shadowsSupported === true) + compare(common.msaaSamples, 8, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") + common.theme.type = Theme3D.ThemeRetro + common.renderingMode = AbstractGraph3D.RenderDirectToBackground_NoClear + common.measureFps = true + common.orthoProjection = true + common.aspectRatio = 1.0 + common.optimizationHints = AbstractGraph3D.OptimizationStatic + common.polar = true + common.radialLabelOffset = 2 + common.horizontalAspectRatio = 1 + common.reflection = true + common.reflectivity = 1.0 + common.locale = Qt.locale("FI") + common.margin = 1.0 + compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode") + compare(common.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") // Ortho disables shadows + compare(common.msaaSamples, 0, "msaaSamples") // Rendering mode changes this to zero + compare(common.theme.type, Theme3D.ThemeRetro, "theme") + compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode") + compare(common.measureFps, true, "measureFps") + compare(common.orthoProjection, true, "orthoProjection") + compare(common.aspectRatio, 1.0, "aspectRatio") + compare(common.optimizationHints, AbstractGraph3D.OptimizationStatic, "optimizationHints") + compare(common.polar, true, "polar") + compare(common.radialLabelOffset, 2, "radialLabelOffset") + compare(common.horizontalAspectRatio, 1, "horizontalAspectRatio") + compare(common.reflection, true, "reflection") + compare(common.reflectivity, 1.0, "reflectivity") + compare(common.locale, Qt.locale("FI"), "locale") + compare(common.margin, 1.0, "margin") + } + + function test_3_change_invalid_common() { + common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice + common.theme.type = -2 + common.renderingMode = -1 + common.measureFps = false + common.orthoProjection = false + common.aspectRatio = -1.0 + common.polar = false + common.horizontalAspectRatio = -2 + common.reflection = false + common.reflectivity = -1.0 + compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode") + compare(common.theme.type, -2/*Theme3D.ThemeRetro*/, "theme") // TODO: Fix once QTRD-3367 is done + compare(common.renderingMode, -1/*AbstractGraph3D.RenderDirectToBackground_NoClear*/, "renderingMode") // TODO: Fix once QTRD-3367 is done + compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done + compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done + compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done + } + + function test_4_common_initialized() { + compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") + if (common_init.shadowsSupported === true) { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") + compare(common_init.msaaSamples, 2, "msaaSamples") + } else { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") + compare(common_init.msaaSamples, 0, "msaaSamples") + } + compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") + compare(common_init.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") + compare(common_init.measureFps, true, "measureFps") + compare(common_init.customItemList.length, 0, "customItemList") + compare(common_init.orthoProjection, false, "orthoProjection") + compare(common_init.aspectRatio, 3.0, "aspectRatio") + compare(common_init.optimizationHints, AbstractGraph3D.OptimizationStatic, "optimizationHints") + compare(common_init.polar, false, "polar") + compare(common_init.radialLabelOffset, 2, "radialLabelOffset") + compare(common_init.horizontalAspectRatio, 0.2, "horizontalAspectRatio") + compare(common_init.reflection, true, "reflection") + compare(common_init.reflectivity, 0.1, "reflectivity") + compare(common_init.locale, Qt.locale("UK"), "locale") + compare(common_init.margin, 0.2, "margin") + } + } +} diff --git a/tests/auto/qmltest/surface3d/tst_heightproxy.qml b/tests/auto/qmltest/surface3d/tst_heightproxy.qml new file mode 100644 index 00000000..29772451 --- /dev/null +++ b/tests/auto/qmltest/surface3d/tst_heightproxy.qml @@ -0,0 +1,116 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + HeightMapSurfaceDataProxy { + id: initial + } + + HeightMapSurfaceDataProxy { + id: initialized + heightMapFile: ":/customtexture.jpg" + maxXValue: 10.0 + maxZValue: 10.0 + minXValue: -10.0 + minZValue: -10.0 + } + + HeightMapSurfaceDataProxy { + id: change + } + + HeightMapSurfaceDataProxy { + id: invalid + } + + TestCase { + name: "HeightMapSurfaceDataProxy Initial" + + function test_initial() { + compare(initial.heightMapFile, "") + compare(initial.maxXValue, 10.0) + compare(initial.maxZValue, 10.0) + compare(initial.minXValue, 0) + compare(initial.minZValue, 0) + + compare(initial.columnCount, 0) + compare(initial.rowCount, 0) + verify(!initial.series) + + compare(initial.type, AbstractDataProxy.DataTypeSurface) + } + } + + TestCase { + name: "HeightMapSurfaceDataProxy Initialized" + + function test_initialized() { + compare(initialized.heightMapFile, ":/customtexture.jpg") + compare(initialized.maxXValue, 10.0) + compare(initialized.maxZValue, 10.0) + compare(initialized.minXValue, -10.0) + compare(initialized.minZValue, -10.0) + + compare(initialized.columnCount, 24) + compare(initialized.rowCount, 24) + } + } + + TestCase { + name: "HeightMapSurfaceDataProxy Change" + + function test_1_change() { + change.heightMapFile = ":/customtexture.jpg" + change.maxXValue = 10.0 + change.maxZValue = 10.0 + change.minXValue = -10.0 + change.minZValue = -10.0 + } + + function test_2_test_change() { + // This test has a dependency to the previous one due to asynchronous item model resolving + compare(change.heightMapFile, ":/customtexture.jpg") + compare(change.maxXValue, 10.0) + compare(change.maxZValue, 10.0) + compare(change.minXValue, -10.0) + compare(change.minZValue, -10.0) + + compare(change.columnCount, 24) + compare(change.rowCount, 24) + } + } + + TestCase { + name: "HeightMapSurfaceDataProxy Invalid" + + function test_invalid() { + invalid.maxXValue = -10 + compare(invalid.minXValue, -11) + invalid.minZValue = 20 + compare(invalid.maxZValue, 21) + } + } +} diff --git a/tests/auto/qmltest/surface3d/tst_proxy.qml b/tests/auto/qmltest/surface3d/tst_proxy.qml new file mode 100644 index 00000000..8f353153 --- /dev/null +++ b/tests/auto/qmltest/surface3d/tst_proxy.qml @@ -0,0 +1,263 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + ItemModelSurfaceDataProxy { + id: initial + } + + ItemModelSurfaceDataProxy { + id: initialized + + autoColumnCategories: false + autoRowCategories: false + columnCategories: ["colcat1", "colcat2"] + columnRole: "col" + columnRolePattern: /^.*-(\d\d)$/ + columnRoleReplace: "\\1" + itemModel: ListModel { objectName: "model1" } + multiMatchBehavior: ItemModelSurfaceDataProxy.MMBAverage + rowCategories: ["rowcat1", "rowcat2"] + rowRole: "row" + rowRolePattern: /^(\d\d\d\d).*$/ + rowRoleReplace: "\\1" + xPosRole: "x" + xPosRolePattern: /^.*-(\d\d)$/ + xPosRoleReplace: "\\1" + yPosRole: "y" + yPosRolePattern: /^(\d\d\d\d).*$/ + yPosRoleReplace: "\\1" + zPosRole: "z" + zPosRolePattern: /-/ + zPosRoleReplace: "\\1" + } + + ItemModelSurfaceDataProxy { + id: change + } + + TestCase { + name: "ItemModelSurfaceDataProxy Initial" + + function test_initial() { + compare(initial.autoColumnCategories, true) + compare(initial.autoRowCategories, true) + compare(initial.columnCategories, []) + compare(initial.columnRole, "") + verify(initial.columnRolePattern) + compare(initial.columnRoleReplace, "") + verify(!initial.itemModel) + compare(initial.multiMatchBehavior, ItemModelSurfaceDataProxy.MMBLast) + compare(initial.rowCategories, []) + compare(initial.rowRole, "") + verify(initial.rowRolePattern) + compare(initial.rowRoleReplace, "") + compare(initial.useModelCategories, false) + compare(initial.xPosRole, "") + verify(initial.xPosRolePattern) + compare(initial.xPosRoleReplace, "") + compare(initial.yPosRole, "") + verify(initial.yPosRolePattern) + compare(initial.yPosRoleReplace, "") + compare(initial.zPosRole, "") + verify(initial.zPosRolePattern) + compare(initial.zPosRoleReplace, "") + + compare(initial.columnCount, 0) + compare(initial.rowCount, 0) + verify(!initial.series) + + compare(initial.type, AbstractDataProxy.DataTypeSurface) + } + } + + TestCase { + name: "ItemModelSurfaceDataProxy Initialized" + + function test_initialized() { + compare(initialized.autoColumnCategories, false) + compare(initialized.autoRowCategories, false) + compare(initialized.columnCategories.length, 2) + compare(initialized.columnCategories[0], "colcat1") + compare(initialized.columnCategories[1], "colcat2") + compare(initialized.columnRole, "col") + compare(initialized.columnRolePattern, /^.*-(\d\d)$/) + compare(initialized.columnRoleReplace, "\\1") + compare(initialized.itemModel.objectName, "model1") + compare(initialized.multiMatchBehavior, ItemModelSurfaceDataProxy.MMBAverage) + compare(initialized.rowCategories.length, 2) + compare(initialized.rowCategories[0], "rowcat1") + compare(initialized.rowCategories[1], "rowcat2") + compare(initialized.rowRole, "row") + compare(initialized.rowRolePattern, /^(\d\d\d\d).*$/) + compare(initialized.rowRoleReplace, "\\1") + compare(initialized.xPosRole, "x") + compare(initialized.xPosRolePattern, /^.*-(\d\d)$/) + compare(initialized.xPosRoleReplace, "\\1") + compare(initialized.yPosRole, "y") + compare(initialized.yPosRolePattern, /^(\d\d\d\d).*$/) + compare(initialized.yPosRoleReplace, "\\1") + compare(initialized.zPosRole, "z") + compare(initialized.zPosRolePattern, /-/) + compare(initialized.zPosRoleReplace, "\\1") + + compare(initialized.columnCount, 2) + compare(initialized.rowCount, 2) + } + } + + TestCase { + name: "ItemModelSurfaceDataProxy Change" + + ListModel { id: model1; objectName: "model1" } + + function test_1_change() { + change.autoColumnCategories = false + change.autoRowCategories = false + change.columnCategories = ["colcat1", "colcat2"] + change.columnRole = "col" + change.columnRolePattern = /^.*-(\d\d)$/ + change.columnRoleReplace = "\\1" + change.itemModel = model1 + change.multiMatchBehavior = ItemModelSurfaceDataProxy.MMBAverage + change.rowCategories = ["rowcat1", "rowcat2"] + change.rowRole = "row" + change.rowRolePattern = /^(\d\d\d\d).*$/ + change.rowRoleReplace = "\\1" + change.useModelCategories = true // Overwrites columnLabels and rowLabels + change.xPosRole = "x" + change.xPosRolePattern = /^.*-(\d\d)$/ + change.xPosRoleReplace = "\\1" + change.yPosRole = "y" + change.yPosRolePattern = /^(\d\d\d\d).*$/ + change.yPosRoleReplace = "\\1" + change.zPosRole = "z" + change.zPosRolePattern = /-/ + change.zPosRoleReplace = "\\1" + } + + function test_2_test_change() { + // This test has a dependency to the previous one due to asynchronous item model resolving + compare(change.autoColumnCategories, false) + compare(change.autoRowCategories, false) + compare(change.columnCategories.length, 2) + compare(change.columnCategories[0], "colcat1") + compare(change.columnCategories[1], "colcat2") + compare(change.columnRole, "col") + compare(change.columnRolePattern, /^.*-(\d\d)$/) + compare(change.columnRoleReplace, "\\1") + compare(change.itemModel.objectName, "model1") + compare(change.multiMatchBehavior, ItemModelSurfaceDataProxy.MMBAverage) + compare(change.rowCategories.length, 2) + compare(change.rowCategories[0], "rowcat1") + compare(change.rowCategories[1], "rowcat2") + compare(change.rowRole, "row") + compare(change.rowRolePattern, /^(\d\d\d\d).*$/) + compare(change.rowRoleReplace, "\\1") + compare(change.useModelCategories, true) + compare(change.xPosRole, "x") + compare(change.xPosRolePattern, /^.*-(\d\d)$/) + compare(change.xPosRoleReplace, "\\1") + compare(change.yPosRole, "y") + compare(change.yPosRolePattern, /^(\d\d\d\d).*$/) + compare(change.yPosRoleReplace, "\\1") + compare(change.zPosRole, "z") + compare(change.zPosRolePattern, /-/) + compare(change.zPosRoleReplace, "\\1") + + compare(change.columnCount, 0) + compare(change.rowCount, 0) + } + } + + TestCase { + name: "ItemModelSurfaceDataProxy MultiMatchBehaviour" + + Surface3D { + id: surface1 + Surface3DSeries { + ItemModelSurfaceDataProxy { + id: surfaceProxy + itemModel: ListModel { + ListElement{ coords: "0,0"; data: "5"; } + ListElement{ coords: "0,0"; data: "15"; } + ListElement{ coords: "0,1"; data: "5"; } + ListElement{ coords: "0,1"; data: "15"; } + ListElement{ coords: "1,0"; data: "5"; } + ListElement{ coords: "1,0"; data: "15"; } + ListElement{ coords: "1,1"; data: "0"; } + } + rowRole: "coords" + columnRole: "coords" + yPosRole: "data" + rowRolePattern: /(\d),\d/ + columnRolePattern: /(\d),(\d)/ + rowRoleReplace: "\\1" + columnRoleReplace: "\\2" + } + } + } + + function test_0_async_dummy() { + } + + function test_1_test_multimatch() { + compare(surface1.axisY.max, 15) + } + + function test_2_multimatch() { + surfaceProxy.multiMatchBehavior = ItemModelSurfaceDataProxy.MMBFirst + } + + function test_3_test_multimatch() { + compare(surface1.axisY.max, 5) + } + + function test_4_multimatch() { + surfaceProxy.multiMatchBehavior = ItemModelSurfaceDataProxy.MMBLast + } + + function test_5_test_multimatch() { + compare(surface1.axisY.max, 15) + } + + function test_6_multimatch() { + surfaceProxy.multiMatchBehavior = ItemModelSurfaceDataProxy.MMBAverage + } + + function test_7_test_multimatch() { + compare(surface1.axisY.max, 10) + } + + function test_8_multimatch() { + surfaceProxy.multiMatchBehavior = ItemModelSurfaceDataProxy.MMBCumulativeY + } + + function test_9_test_multimatch() { + compare(surface1.axisY.max, 20) + } + } +} diff --git a/tests/auto/qmltest/surface3d/tst_surface.qml b/tests/auto/qmltest/surface3d/tst_surface.qml new file mode 100644 index 00000000..31c86da2 --- /dev/null +++ b/tests/auto/qmltest/surface3d/tst_surface.qml @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + Surface3D { + id: series + anchors.fill: parent + } + + TestCase { + name: "Surface3D Series" + + Surface3DSeries { id: series1 } + Surface3DSeries { id: series2 } + + function test_1_add_series() { + series.seriesList = [series1, series2] + compare(series.seriesList.length, 2) + } + + function test_2_remove_series() { + series.seriesList = [series1] + compare(series.seriesList.length, 1) + } + + function test_3_remove_series() { + series.seriesList = [] + compare(series.seriesList.length, 0) + } + + function test_4_selected_series() { + series.seriesList = [series1, series2] + series.seriesList[0].selectedPoint = Qt.point(0, 0) + compare(series.selectedSeries, series1) + } + } +} diff --git a/tests/auto/qmltest/surface3d/tst_surfaceseries.qml b/tests/auto/qmltest/surface3d/tst_surfaceseries.qml new file mode 100644 index 00000000..dff2e4a8 --- /dev/null +++ b/tests/auto/qmltest/surface3d/tst_surfaceseries.qml @@ -0,0 +1,229 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + height: 150 + width: 150 + + Surface3DSeries { + id: initial + } + + ColorGradient { + id: gradient1; + stops: [ + ColorGradientStop { color: "red"; position: 0 }, + ColorGradientStop { color: "blue"; position: 1 } + ] + } + + ColorGradient { + id: gradient2; + stops: [ + ColorGradientStop { color: "green"; position: 0 }, + ColorGradientStop { color: "red"; position: 1 } + ] + } + + ColorGradient { + id: gradient3; + stops: [ + ColorGradientStop { color: "gray"; position: 0 }, + ColorGradientStop { color: "darkgray"; position: 1 } + ] + } + + Surface3DSeries { + id: initialized + dataProxy: ItemModelSurfaceDataProxy { + itemModel: ListModel { + ListElement{ longitude: "20"; latitude: "10"; pop_density: "4.75"; } + ListElement{ longitude: "21"; latitude: "10"; pop_density: "3.00"; } + } + rowRole: "longitude" + columnRole: "latitude" + yPosRole: "pop_density" + } + drawMode: Surface3DSeries.DrawSurface + flatShadingEnabled: false + selectedPoint: Qt.point(0, 0) + textureFile: ":\customtexture.jpg" + + baseColor: "blue" + baseGradient: gradient1 + colorStyle: Theme3D.ColorStyleObjectGradient + itemLabelFormat: "%f" + itemLabelVisible: false + mesh: Abstract3DSeries.MeshCube + meshRotation: Qt.quaternion(1, 1, 1, 1) + meshSmooth: true + multiHighlightColor: "green" + multiHighlightGradient: gradient2 + name: "series1" + singleHighlightColor: "red" + singleHighlightGradient: gradient3 + userDefinedMesh: ":/customitem.obj" + visible: false + } + + ItemModelSurfaceDataProxy { + id: proxy1 + itemModel: ListModel { + ListElement{ longitude: "20"; latitude: "10"; pop_density: "4.75"; } + ListElement{ longitude: "21"; latitude: "10"; pop_density: "3.00"; } + ListElement{ longitude: "22"; latitude: "10"; pop_density: "1.24"; } + } + rowRole: "longitude" + columnRole: "latitude" + yPosRole: "pop_density" + } + + Surface3DSeries { + id: change + } + + TestCase { + name: "Surface3DSeries Initial" + + function test_1_initial() { + compare(initial.dataProxy.rowCount, 0) + compare(initial.invalidSelectionPosition, Qt.point(-1, -1)) + compare(initial.drawMode, Surface3DSeries.DrawSurfaceAndWireframe) + compare(initial.flatShadingEnabled, true) + compare(initial.flatShadingSupported, true) + compare(initial.selectedPoint, Qt.point(-1, -1)) + } + + function test_2_initial_common() { + // Common properties + compare(initial.baseColor, "#000000") + compare(initial.baseGradient, null) + compare(initial.colorStyle, Theme3D.ColorStyleUniform) + compare(initial.itemLabel, "") + compare(initial.itemLabelFormat, "@xLabel, @yLabel, @zLabel") + compare(initial.itemLabelVisible, true) + compare(initial.mesh, Abstract3DSeries.MeshSphere) + compare(initial.meshRotation, Qt.quaternion(1, 0, 0, 0)) + compare(initial.meshSmooth, false) + compare(initial.multiHighlightColor, "#000000") + compare(initial.multiHighlightGradient, null) + compare(initial.name, "") + compare(initial.singleHighlightColor, "#000000") + compare(initial.singleHighlightGradient, null) + compare(initial.type, Abstract3DSeries.SeriesTypeSurface) + compare(initial.userDefinedMesh, "") + compare(initial.visible, true) + } + } + + TestCase { + name: "Surface3DSeries Initialized" + + function test_1_initialized() { + compare(initialized.dataProxy.rowCount, 2) + compare(initialized.drawMode, Surface3DSeries.DrawSurface) + compare(initialized.flatShadingEnabled, false) + compare(initialized.selectedPoint, Qt.point(0, 0)) + compare(initialized.textureFile, ":\customtexture.jpg") + } + + function test_2_initialized_common() { + // Common properties + compare(initialized.baseColor, "#0000ff") + compare(initialized.baseGradient, gradient1) + compare(initialized.colorStyle, Theme3D.ColorStyleObjectGradient) + compare(initialized.itemLabelFormat, "%f") + compare(initialized.itemLabelVisible, false) + compare(initialized.mesh, Abstract3DSeries.MeshCube) + compare(initialized.meshRotation, Qt.quaternion(1, 1, 1, 1)) + compare(initialized.meshSmooth, true) + compare(initialized.multiHighlightColor, "#008000") + compare(initialized.multiHighlightGradient, gradient2) + compare(initialized.name, "series1") + compare(initialized.singleHighlightColor, "#ff0000") + compare(initialized.singleHighlightGradient, gradient3) + compare(initialized.userDefinedMesh, ":/customitem.obj") + compare(initialized.visible, false) + } + } + + TestCase { + name: "Surface3DSeries Change" + + function test_1_change() { + change.dataProxy = proxy1 + change.drawMode = Surface3DSeries.DrawSurface + change.flatShadingEnabled = false + change.selectedPoint = Qt.point(0, 0) + change.textureFile = ":\customtexture.jpg" + } + + function test_2_test_change() { + // This test has a dependency to the previous one due to asynchronous item model resolving + compare(change.dataProxy.rowCount, 3) + compare(change.drawMode, Surface3DSeries.DrawSurface) + compare(change.flatShadingEnabled, false) + compare(change.selectedPoint, Qt.point(0, 0)) + compare(change.textureFile, ":\customtexture.jpg") + } + + function test_3_change_common() { + change.baseColor = "blue" + change.baseGradient = gradient1 + change.colorStyle = Theme3D.ColorStyleObjectGradient + change.itemLabelFormat = "%f" + change.itemLabelVisible = false + change.mesh = Abstract3DSeries.MeshCube + change.meshRotation = Qt.quaternion(1, 1, 1, 1) + change.meshSmooth = true + change.multiHighlightColor = "green" + change.multiHighlightGradient = gradient2 + change.name = "series1" + change.singleHighlightColor = "red" + change.singleHighlightGradient = gradient3 + change.userDefinedMesh = ":/customitem.obj" + change.visible = false + + compare(change.baseColor, "#0000ff") + compare(change.baseGradient, gradient1) + compare(change.colorStyle, Theme3D.ColorStyleObjectGradient) + compare(change.itemLabelFormat, "%f") + compare(change.itemLabelVisible, false) + compare(change.mesh, Abstract3DSeries.MeshCube) + compare(change.meshRotation, Qt.quaternion(1, 1, 1, 1)) + compare(change.meshSmooth, true) + compare(change.multiHighlightColor, "#008000") + compare(change.multiHighlightGradient, gradient2) + compare(change.name, "series1") + compare(change.singleHighlightColor, "#ff0000") + compare(change.singleHighlightGradient, gradient3) + compare(change.userDefinedMesh, ":/customitem.obj") + compare(change.visible, false) + } + + function test_4_change_gradient_stop() { + gradient1.stops[0].color = "yellow" + compare(change.baseGradient.stops[0].color, "#ffff00") + } + } +} diff --git a/tests/auto/qmltest/theme3d/tst_colorgradient.qml b/tests/auto/qmltest/theme3d/tst_colorgradient.qml new file mode 100644 index 00000000..395b6672 --- /dev/null +++ b/tests/auto/qmltest/theme3d/tst_colorgradient.qml @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + width: 150 + height: 150 + + ColorGradient { + id: initial + } + + ColorGradient { + id: initialized + stops: [ + ColorGradientStop { color: "blue"; position: 0 }, + ColorGradientStop { color: "white"; position: 0.5 }, + ColorGradientStop { color: "red"; position: 1 } + ] + } + + ColorGradient { + id: change + } + + TestCase { + name: "ColorGradient Initial" + + function test_initial() { + compare(initial.stops.length, 0) + } + } + + TestCase { + name: "ColorGradient Initialized" + + function test_initialized() { + compare(initialized.stops.length, 3) + compare(initialized.stops[0].color, "#0000ff") + compare(initialized.stops[1].color, "#ffffff") + compare(initialized.stops[2].color, "#ff0000") + } + } + + TestCase { + name: "ColorGradient Change" + + ColorGradientStop { id: stop1; color: "blue"; position: 0 } + ColorGradientStop { id: stop2; color: "red"; position: 1.0 } + ColorGradientStop { id: stop3; color: "white"; position: 0.5 } + + function test_change() { + change.stops = [stop1] + compare(change.stops.length, 1) + change.stops = [stop1, stop2] + compare(change.stops.length, 2) + compare(change.stops[0].color, "#0000ff") + change.stops[0].color = "red" + compare(change.stops[0].color, "#ff0000") + compare(change.stops[1].color, "#ff0000") + change.stops = [stop1, stop2, stop3] + compare(change.stops[2].color, "#ffffff") + compare(change.stops.length, 3) + stop2.position = 0.25 + stop3.position = 1.0 + compare(change.stops[1].position, 0.25) + compare(change.stops[2].position, 1.0) + } + } +} diff --git a/tests/auto/qmltest/theme3d/tst_theme.qml b/tests/auto/qmltest/theme3d/tst_theme.qml new file mode 100644 index 00000000..3e42b300 --- /dev/null +++ b/tests/auto/qmltest/theme3d/tst_theme.qml @@ -0,0 +1,266 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + width: 150 + height: 150 + + Theme3D { + id: initial + } + + ColorGradient { + id: gradient1 + stops: [ + ColorGradientStop { color: "red"; position: 0 }, + ColorGradientStop { color: "blue"; position: 1 } + ] + } + + ColorGradient { + id: gradient2 + stops: [ + ColorGradientStop { color: "green"; position: 0 }, + ColorGradientStop { color: "red"; position: 1 } + ] + } + + ColorGradient { + id: gradient3 + stops: [ + ColorGradientStop { color: "gray"; position: 0 }, + ColorGradientStop { color: "darkgray"; position: 1 } + ] + } + + ThemeColor { + id: color1 + color: "red" + } + + ThemeColor { + id: color2 + color: "blue" + } + + Theme3D { + id: initialized + ambientLightStrength: 0.3 + backgroundColor: "#ff0000" + backgroundEnabled: false + baseColors: [color1, color2] + baseGradients: [gradient1, gradient2] + colorStyle: Theme3D.ColorStyleRangeGradient + font.family: "Arial" + gridEnabled: false + gridLineColor: "#00ff00" + highlightLightStrength: 5.0 + labelBackgroundColor: "#ff00ff" + labelBackgroundEnabled: false + labelBorderEnabled: false + labelTextColor: "#00ffff" + lightColor: "#ffff00" + lightStrength: 2.5 + multiHighlightColor: "#ff00ff" + multiHighlightGradient: gradient3 + singleHighlightColor: "#ff0000" + singleHighlightGradient: gradient3 + type: Theme3D.ThemeQt // Default values will be overwritten by initialized values + windowColor: "#fff00f" + } + + Theme3D { + id: change + } + + Theme3D { + id: invalid + } + + TestCase { + name: "Theme3D Initial" + + Text { id: dummy } + + function test_initial() { + compare(initial.ambientLightStrength, 0.25) + compare(initial.backgroundColor, "#000000") + compare(initial.backgroundEnabled, true) + compare(initial.baseColors.length, 1) + compare(initial.baseColors[0].color, "#000000") + compare(initial.baseGradients.length, 1) + compare(initial.baseGradients[0].stops[0].color, "#000000") + compare(initial.baseGradients[0].stops[1].color, "#ffffff") + compare(initial.colorStyle, Theme3D.ColorStyleUniform) + // Initial font needs to be tested like this, as different platforms have different default font (QFont()) + compare(initial.font.family, dummy.font.family) + compare(initial.gridEnabled, true) + compare(initial.gridLineColor, "#ffffff") + compare(initial.highlightLightStrength, 7.5) + compare(initial.labelBackgroundColor, "#a0a0a4") + compare(initial.labelBackgroundEnabled, true) + compare(initial.labelBorderEnabled, true) + compare(initial.labelTextColor, "#ffffff") + compare(initial.lightColor, "#ffffff") + compare(initial.lightStrength, 5) + compare(initial.multiHighlightColor, "#0000ff") + compare(initial.multiHighlightGradient, null) + compare(initial.singleHighlightColor, "#ff0000") + compare(initial.singleHighlightGradient, null) + compare(initial.type, Theme3D.ThemeUserDefined) + compare(initial.windowColor, "#000000") + } + } + + TestCase { + name: "Theme3D Initialized" + + function test_initialized() { + compare(initialized.ambientLightStrength, 0.3) + compare(initialized.backgroundColor, "#ff0000") + compare(initialized.backgroundEnabled, false) + compare(initialized.baseColors.length, 2) + compare(initialized.baseColors[0].color, "#ff0000") + compare(initialized.baseColors[1].color, "#0000ff") + compare(initialized.baseGradients.length, 2) + compare(initialized.baseGradients[0], gradient1) + compare(initialized.baseGradients[1], gradient2) + compare(initialized.colorStyle, Theme3D.ColorStyleRangeGradient) + compare(initialized.font.family, "Arial") + compare(initialized.gridEnabled, false) + compare(initialized.gridLineColor, "#00ff00") + compare(initialized.highlightLightStrength, 5.0) + compare(initialized.labelBackgroundColor, "#ff00ff") + compare(initialized.labelBackgroundEnabled, false) + compare(initialized.labelBorderEnabled, false) + compare(initialized.labelTextColor, "#00ffff") + compare(initialized.lightColor, "#ffff00") + compare(initialized.lightStrength, 2.5) + compare(initialized.multiHighlightColor, "#ff00ff") + compare(initialized.multiHighlightGradient, gradient3) + compare(initialized.singleHighlightColor, "#ff0000") + compare(initialized.singleHighlightGradient, gradient3) + compare(initialized.type, Theme3D.ThemeQt) + compare(initialized.windowColor, "#fff00f") + } + } + + TestCase { + name: "Theme3D Change" + + ThemeColor { + id: color3 + color: "red" + } + + ColorGradient { + id: gradient4 + stops: [ + ColorGradientStop { color: "red"; position: 0 }, + ColorGradientStop { color: "blue"; position: 1 } + ] + } + + function test_1_change() { + change.type = Theme3D.ThemeStoneMoss // Default values will be overwritten by the following sets + change.ambientLightStrength = 0.3 + change.backgroundColor = "#ff0000" + change.backgroundEnabled = false + change.baseColors = [color3, color2] + change.baseGradients = [gradient4, gradient2] + change.colorStyle = Theme3D.ColorStyleObjectGradient + change.font.family = "Arial" + change.gridEnabled = false + change.gridLineColor = "#00ff00" + change.highlightLightStrength = 5.0 + change.labelBackgroundColor = "#ff00ff" + change.labelBackgroundEnabled = false + change.labelBorderEnabled = false + change.labelTextColor = "#00ffff" + change.lightColor = "#ffff00" + change.lightStrength = 2.5 + change.multiHighlightColor = "#ff00ff" + change.multiHighlightGradient = gradient3 + change.singleHighlightColor = "#ff0000" + change.singleHighlightGradient = gradient3 + change.windowColor = "#fff00f" + + compare(change.ambientLightStrength, 0.3) + compare(change.backgroundColor, "#ff0000") + compare(change.backgroundEnabled, false) + compare(change.baseColors.length, 2) + compare(change.baseColors[0].color, "#ff0000") + compare(change.baseColors[1].color, "#0000ff") + compare(change.baseGradients.length, 2) + compare(change.baseGradients[0], gradient4) + compare(change.baseGradients[1], gradient2) + compare(change.colorStyle, Theme3D.ColorStyleObjectGradient) + compare(change.font.family, "Arial") + compare(change.gridEnabled, false) + compare(change.gridLineColor, "#00ff00") + compare(change.highlightLightStrength, 5.0) + compare(change.labelBackgroundColor, "#ff00ff") + compare(change.labelBackgroundEnabled, false) + compare(change.labelBorderEnabled, false) + compare(change.labelTextColor, "#00ffff") + compare(change.lightColor, "#ffff00") + compare(change.lightStrength, 2.5) + compare(change.multiHighlightColor, "#ff00ff") + compare(change.multiHighlightGradient, gradient3) + compare(change.singleHighlightColor, "#ff0000") + compare(change.singleHighlightGradient, gradient3) + compare(change.type, Theme3D.ThemeStoneMoss) + compare(change.windowColor, "#fff00f") + } + + function test_2_change_color() { + color3.color = "white" + compare(change.baseColors[0].color, "#ffffff") + } + + function test_3_change_gradient() { + gradient4.stops[0].color = "black" + compare(change.baseGradients[0].stops[0].color, "#000000") + } + } + + + TestCase { + name: "Theme3D Invalid" + + function test_invalid() { + invalid.ambientLightStrength = -1.0 + compare(invalid.ambientLightStrength, 0.25) + invalid.ambientLightStrength = 1.1 + compare(invalid.ambientLightStrength, 0.25) + invalid.highlightLightStrength = -1.0 + compare(invalid.highlightLightStrength, 7.5) + invalid.highlightLightStrength = 10.1 + compare(invalid.highlightLightStrength, 7.5) + invalid.lightStrength = -1.0 + compare(invalid.lightStrength, 5.0) + invalid.lightStrength = 10.1 + compare(invalid.lightStrength, 5.0) + } + } +} diff --git a/tests/auto/qmltest/theme3d/tst_themecolor.qml b/tests/auto/qmltest/theme3d/tst_themecolor.qml new file mode 100644 index 00000000..421a5775 --- /dev/null +++ b/tests/auto/qmltest/theme3d/tst_themecolor.qml @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.0 +import QtDataVisualization 1.2 +import QtTest 1.0 + +Item { + id: top + width: 150 + height: 150 + + ThemeColor { + id: initial + } + + ThemeColor { + id: initialized + color: "red" + } + + ThemeColor { + id: change + } + + TestCase { + name: "ThemeColor Initial" + + function test_initial() { + compare(initial.color, "#000000") + } + } + + TestCase { + name: "ThemeColor Initialized" + + function test_initialized() { + compare(initialized.color, "#ff0000") + } + } + + TestCase { + name: "ThemeColor Change" + + function test_change() { + change.color = "blue" + + compare(change.color, "#0000ff") + } + } +} diff --git a/tests/auto/qmltest/tst_qmltest.cpp b/tests/auto/qmltest/tst_qmltest.cpp new file mode 100644 index 00000000..569d9150 --- /dev/null +++ b/tests/auto/qmltest/tst_qmltest.cpp @@ -0,0 +1,20 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtQuickTest/quicktest.h> +QUICK_TEST_MAIN(qmltest) diff --git a/tests/barstest/barstest.pro b/tests/barstest/barstest.pro index f213ea9e..56e24ef2 100644 --- a/tests/barstest/barstest.pro +++ b/tests/barstest/barstest.pro @@ -5,4 +5,6 @@ SOURCES += main.cpp chart.cpp custominputhandler.cpp HEADERS += chart.h custominputhandler.h +RESOURCES += barstest.qrc + QT += widgets diff --git a/tests/barstest/barstest.qrc b/tests/barstest/barstest.qrc new file mode 100644 index 00000000..f7237eb7 --- /dev/null +++ b/tests/barstest/barstest.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/"> + <file>shuttle.obj</file> + <file>shuttle.png</file> + </qresource> +</RCC> diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index d3c38d85..e468700e 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -26,6 +26,7 @@ #include <QtDataVisualization/q3dcamera.h> #include <QtDataVisualization/q3dtheme.h> #include <QtDataVisualization/q3dinputhandler.h> +#include <QtDataVisualization/qcustom3ditem.h> #include <QtCore/QTime> #include <QtCore/qmath.h> @@ -203,7 +204,7 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog) m_graph->activeTheme()->setFont(QFont("Times Roman", 20)); // Release and store the default input handler. - m_defaultInputHandler = m_graph->activeInputHandler(); + m_defaultInputHandler = static_cast<Q3DInputHandler *>(m_graph->activeInputHandler()); m_graph->releaseInputHandler(m_defaultInputHandler); m_graph->setActiveInputHandler(m_defaultInputHandler); @@ -241,7 +242,6 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog) QObject::connect(m_graph, &QAbstract3DGraph::currentFpsChanged, this, &GraphModifier::handleFpsChange); - resetTemperatureData(); } @@ -334,6 +334,9 @@ void GraphModifier::releaseSeries() void GraphModifier::flipViews() { m_graph->scene()->setSecondarySubviewOnTop(!m_graph->scene()->isSecondarySubviewOnTop()); + qDebug() << "secondary subview on top:" << m_graph->scene()->isSecondarySubviewOnTop(); + qDebug() << "point (50, 50) in primary subview:" << m_graph->scene()->isPointInPrimarySubView(QPoint(50, 50)); + qDebug() << "point (50, 50) in secondary subview:" << m_graph->scene()->isPointInSecondarySubView(QPoint(50, 50)); } void GraphModifier::createMassiveArray() @@ -626,33 +629,33 @@ void GraphModifier::changeTheme() m_graph->setActiveTheme(m_builtinTheme); switch (theme) { - case Q3DTheme::ThemeQt: - qDebug() << __FUNCTION__ << "ThemeQt"; - break; - case Q3DTheme::ThemePrimaryColors: - qDebug() << __FUNCTION__ << "ThemePrimaryColors"; - break; - case Q3DTheme::ThemeDigia: - qDebug() << __FUNCTION__ << "ThemeDigia"; - break; - case Q3DTheme::ThemeStoneMoss: - qDebug() << __FUNCTION__ << "ThemeStoneMoss"; - break; - case Q3DTheme::ThemeArmyBlue: - qDebug() << __FUNCTION__ << "ThemeArmyBlue"; - break; - case Q3DTheme::ThemeRetro: - qDebug() << __FUNCTION__ << "ThemeRetro"; - break; - case Q3DTheme::ThemeEbony: - qDebug() << __FUNCTION__ << "ThemeEbony"; - break; - case Q3DTheme::ThemeIsabelle: - qDebug() << __FUNCTION__ << "ThemeIsabelle"; - break; - default: - qDebug() << __FUNCTION__ << "Unknown theme"; - break; + case Q3DTheme::ThemeQt: + qDebug() << __FUNCTION__ << "ThemeQt"; + break; + case Q3DTheme::ThemePrimaryColors: + qDebug() << __FUNCTION__ << "ThemePrimaryColors"; + break; + case Q3DTheme::ThemeDigia: + qDebug() << __FUNCTION__ << "ThemeDigia"; + break; + case Q3DTheme::ThemeStoneMoss: + qDebug() << __FUNCTION__ << "ThemeStoneMoss"; + break; + case Q3DTheme::ThemeArmyBlue: + qDebug() << __FUNCTION__ << "ThemeArmyBlue"; + break; + case Q3DTheme::ThemeRetro: + qDebug() << __FUNCTION__ << "ThemeRetro"; + break; + case Q3DTheme::ThemeEbony: + qDebug() << __FUNCTION__ << "ThemeEbony"; + break; + case Q3DTheme::ThemeIsabelle: + qDebug() << __FUNCTION__ << "ThemeIsabelle"; + break; + default: + qDebug() << __FUNCTION__ << "Unknown theme"; + break; } if (++theme > Q3DTheme::ThemeIsabelle) @@ -1128,7 +1131,7 @@ void GraphModifier::changeValueAxisFormat(const QString & text) void GraphModifier::changeLogBase(const QString &text) { QLogValue3DAxisFormatter *formatter = - qobject_cast<QLogValue3DAxisFormatter *>(m_graph->valueAxis()->formatter()); + qobject_cast<QLogValue3DAxisFormatter *>(m_graph->valueAxis()->formatter()); if (formatter) formatter->setBase(qreal(text.toDouble())); } @@ -1406,6 +1409,26 @@ void GraphModifier::reverseValueAxis(int enabled) m_graph->valueAxis()->setReversed(enabled); } +void GraphModifier::setInputHandlerRotationEnabled(int enabled) +{ + m_defaultInputHandler->setRotationEnabled(enabled); +} + +void GraphModifier::setInputHandlerZoomEnabled(int enabled) +{ + m_defaultInputHandler->setZoomEnabled(enabled); +} + +void GraphModifier::setInputHandlerSelectionEnabled(int enabled) +{ + m_defaultInputHandler->setSelectionEnabled(enabled); +} + +void GraphModifier::setInputHandlerZoomAtTargetEnabled(int enabled) +{ + m_defaultInputHandler->setZoomAtTargetEnabled(enabled); +} + void GraphModifier::changeValueAxisSegments(int value) { qDebug() << __FUNCTION__ << value; @@ -1480,6 +1503,42 @@ void GraphModifier::handleFpsChange(qreal fps) m_fpsLabel->setText(fpsPrefix + QString::number(qRound(fps))); } +void GraphModifier::setCameraTargetX(int value) +{ + // Value is (-100, 100), normalize + m_cameraTarget.setX(float(value) / 100.0f); + m_graph->scene()->activeCamera()->setTarget(m_cameraTarget); + qDebug() << "m_cameraTarget:" << m_cameraTarget; +} + +void GraphModifier::setCameraTargetY(int value) +{ + // Value is (-100, 100), normalize + m_cameraTarget.setY(float(value) / 100.0f); + m_graph->scene()->activeCamera()->setTarget(m_cameraTarget); + qDebug() << "m_cameraTarget:" << m_cameraTarget; +} + +void GraphModifier::setCameraTargetZ(int value) +{ + // Value is (-100, 100), normalize + m_cameraTarget.setZ(float(value) / 100.0f); + m_graph->scene()->activeCamera()->setTarget(m_cameraTarget); + qDebug() << "m_cameraTarget:" << m_cameraTarget; +} + +void GraphModifier::setFloorLevel(int value) +{ + m_graph->setFloorLevel(float(value)); + qDebug() << "Floor level:" << value; +} + +void GraphModifier::setGraphMargin(int value) +{ + m_graph->setMargin(qreal(value) / 100.0); + qDebug() << "Setting margin:" << m_graph->margin() << value; +} + void GraphModifier::populateFlatSeries(QBar3DSeries *series, int rows, int columns, float value) { QBarDataArray *dataArray = new QBarDataArray; @@ -1673,3 +1732,44 @@ void GraphModifier::toggleMultiseriesScaling() { m_graph->setMultiSeriesUniform(!m_graph->isMultiSeriesUniform()); } + +void GraphModifier::setReflection(bool enabled) +{ + m_graph->setReflection(enabled); +} + +void GraphModifier::setReflectivity(int value) +{ + qreal reflectivity = (qreal)value / 100.0; + m_graph->setReflectivity(reflectivity); +} + +void GraphModifier::toggleCustomItem() +{ + static int counter = 0; + int state = ++counter % 3; + + QVector3D positionOne = QVector3D(6.0f, -15.0f, 3.0f); + QVector3D positionTwo = QVector3D(2.0f, 18.0f, 3.0f); + + if (state == 0) { + m_graph->removeCustomItemAt(positionTwo); + } else if (state == 1) { + QCustom3DItem *item = new QCustom3DItem(); + item->setMeshFile(":/shuttle.obj"); + item->setPosition(positionOne); + item->setScaling(QVector3D(0.1f, 0.1f, 0.1f)); + item->setRotation(QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, rand())); + item->setTextureImage(QImage(":/shuttle.png")); + m_graph->addCustomItem(item); + } else { + m_graph->removeCustomItemAt(positionOne); + QCustom3DItem *item = new QCustom3DItem(); + item->setMeshFile(":/shuttle.obj"); + item->setPosition(positionTwo); + item->setScaling(QVector3D(0.1f, 0.1f, 0.1f)); + item->setRotation(QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, rand())); + item->setTextureImage(QImage(":/shuttle.png")); + m_graph->addCustomItem(item); + } +} diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index 47d29c25..9713d06c 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -20,7 +20,7 @@ #define CHARTMODIFIER_H #include <QtDataVisualization/q3dbars.h> -#include <QtDataVisualization/qabstract3dinputhandler.h> +#include <QtDataVisualization/q3dinputhandler.h> #include <QtDataVisualization/qbar3dseries.h> #include <QtDataVisualization/q3dtheme.h> #include <QFont> @@ -94,6 +94,13 @@ public: void addRemoveSeries(); void testItemAndRowChanges(); void reverseValueAxis(int enabled); + void setInputHandlerRotationEnabled(int enabled); + void setInputHandlerZoomEnabled(int enabled); + void setInputHandlerSelectionEnabled(int enabled); + void setInputHandlerZoomAtTargetEnabled(int enabled); + void setReflection(bool enabled); + void setReflectivity(int value); + void toggleCustomItem(); public slots: void flipViews(); @@ -115,6 +122,11 @@ public slots: void triggerRotation(); void handleValueAxisLabelsChanged(); void handleFpsChange(qreal fps); + void setCameraTargetX(int value); + void setCameraTargetY(int value); + void setCameraTargetZ(int value); + void setFloorLevel(int value); + void setGraphMargin(int value); signals: void shadowQualityChanged(int quality); @@ -159,7 +171,7 @@ private: QValue3DAxis *m_currentAxis; bool m_negativeValuesOn; bool m_useNullInputHandler; - QAbstract3DInputHandler *m_defaultInputHandler; + Q3DInputHandler *m_defaultInputHandler; Q3DTheme *m_ownTheme; Q3DTheme *m_builtinTheme; QTimer m_insertRemoveTimer; @@ -169,6 +181,7 @@ private: QTimer m_rotationTimer; QLabel *m_fpsLabel; QBar3DSeries *m_extraSeries; + QVector3D m_cameraTarget; }; #endif diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index 5ecf63a4..af033990 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/main.cpp @@ -34,6 +34,18 @@ #include <QColorDialog> #include <QLineEdit> #include <QSpinBox> +#include <QtGui/QOpenGLContext> + +static bool isOpenGLES() +{ +#if defined(QT_OPENGL_ES_2) + return true; +#elif (QT_VERSION < QT_VERSION_CHECK(5, 3, 0)) + return false; +#else + return QOpenGLContext::currentContext()->isOpenGLES(); +#endif +} int main(int argc, char **argv) { @@ -43,13 +55,13 @@ int main(int argc, char **argv) QHBoxLayout *hLayout = new QHBoxLayout(widget); QVBoxLayout *vLayout = new QVBoxLayout(); QVBoxLayout *vLayout2 = new QVBoxLayout(); + QVBoxLayout *vLayout3 = new QVBoxLayout(); // For testing custom surface format QSurfaceFormat surfaceFormat; surfaceFormat.setDepthBufferSize(24); -#if !defined(QT_OPENGL_ES_2) - surfaceFormat.setSamples(8); -#endif + if (!isOpenGLES()) + surfaceFormat.setSamples(8); Q3DBars *widgetchart = new Q3DBars(&surfaceFormat); QSize screenSize = widgetchart->screen()->size(); @@ -65,6 +77,7 @@ int main(int argc, char **argv) hLayout->addWidget(container, 1); hLayout->addLayout(vLayout); hLayout->addLayout(vLayout2); + hLayout->addLayout(vLayout3); QPushButton *addSeriesButton = new QPushButton(widget); addSeriesButton->setText(QStringLiteral("Add / Remove a series")); @@ -220,6 +233,22 @@ int main(int argc, char **argv) staticCheckBox->setText("Use dynamic data"); staticCheckBox->setChecked(false); + QCheckBox *inputHandlerRotationCheckBox = new QCheckBox(widget); + inputHandlerRotationCheckBox->setText("IH: Allow rotation"); + inputHandlerRotationCheckBox->setChecked(true); + + QCheckBox *inputHandlerZoomCheckBox = new QCheckBox(widget); + inputHandlerZoomCheckBox->setText("IH: Allow zoom"); + inputHandlerZoomCheckBox->setChecked(true); + + QCheckBox *inputHandlerSelectionCheckBox = new QCheckBox(widget); + inputHandlerSelectionCheckBox->setText("IH: Allow selection"); + inputHandlerSelectionCheckBox->setChecked(true); + + QCheckBox *inputHandlerZoomAtTargetCheckBox = new QCheckBox(widget); + inputHandlerZoomAtTargetCheckBox->setText("IH: setZoomAtTarget"); + inputHandlerZoomAtTargetCheckBox->setChecked(true); + QSlider *rotationSliderX = new QSlider(Qt::Horizontal, widget); rotationSliderX->setTickInterval(1); rotationSliderX->setMinimum(-180); @@ -239,6 +268,23 @@ int main(int argc, char **argv) ratioSlider->setValue(30); ratioSlider->setMaximum(100); + QCheckBox *reflectionCheckBox = new QCheckBox(widget); + reflectionCheckBox->setText(QStringLiteral("Show reflections")); + reflectionCheckBox->setChecked(false); + + QSlider *reflectivitySlider = new QSlider(Qt::Horizontal, widget); + reflectivitySlider->setMinimum(0); + reflectivitySlider->setValue(50); + reflectivitySlider->setMaximum(100); + + QSlider *floorLevelSlider = new QSlider(Qt::Horizontal, widget); + floorLevelSlider->setMinimum(-50); + floorLevelSlider->setValue(0); + floorLevelSlider->setMaximum(50); + + QPushButton *toggleCustomItemButton = new QPushButton(widget); + toggleCustomItemButton->setText(QStringLiteral("Toggle Custom Item")); + QSlider *spacingSliderX = new QSlider(Qt::Horizontal, widget); spacingSliderX->setTickInterval(1); spacingSliderX->setMinimum(0); @@ -317,6 +363,27 @@ int main(int argc, char **argv) valueAxisSegmentsSpin->setMaximum(100); valueAxisSegmentsSpin->setValue(10); + QSlider *cameraTargetSliderX = new QSlider(Qt::Horizontal, widget); + cameraTargetSliderX->setTickInterval(1); + cameraTargetSliderX->setMinimum(-100); + cameraTargetSliderX->setValue(0); + cameraTargetSliderX->setMaximum(100); + QSlider *cameraTargetSliderY = new QSlider(Qt::Horizontal, widget); + cameraTargetSliderY->setTickInterval(1); + cameraTargetSliderY->setMinimum(-100); + cameraTargetSliderY->setValue(0); + cameraTargetSliderY->setMaximum(100); + QSlider *cameraTargetSliderZ = new QSlider(Qt::Horizontal, widget); + cameraTargetSliderZ->setTickInterval(1); + cameraTargetSliderZ->setMinimum(-100); + cameraTargetSliderZ->setValue(0); + cameraTargetSliderZ->setMaximum(100); + + QSlider *marginSlider = new QSlider(Qt::Horizontal, widget); + marginSlider->setMinimum(-1); + marginSlider->setValue(-1); + marginSlider->setMaximum(100); + vLayout->addWidget(addSeriesButton, 0, Qt::AlignTop); vLayout->addWidget(addDataButton, 0, Qt::AlignTop); vLayout->addWidget(addMultiDataButton, 0, Qt::AlignTop); @@ -340,15 +407,15 @@ int main(int argc, char **argv) vLayout->addWidget(insertRemoveTestButton, 0, Qt::AlignTop); vLayout->addWidget(releaseAxesButton, 0, Qt::AlignTop); vLayout->addWidget(releaseProxiesButton, 1, Qt::AlignTop); - vLayout->addWidget(flipViewsButton, 0, Qt::AlignTop); - vLayout->addWidget(changeColorStyleButton, 0, Qt::AlignTop); - vLayout->addWidget(ownThemeButton, 0, Qt::AlignTop); - vLayout->addWidget(primarySeriesTestsButton, 0, Qt::AlignTop); - vLayout->addWidget(toggleRotationButton, 0, Qt::AlignTop); - vLayout->addWidget(gradientBtoYPB, 0, Qt::AlignTop); - vLayout->addWidget(logAxisButton, 0, Qt::AlignTop); - vLayout->addWidget(testItemAndRowChangesButton, 1, Qt::AlignTop); + vLayout2->addWidget(flipViewsButton, 0, Qt::AlignTop); + vLayout2->addWidget(changeColorStyleButton, 0, Qt::AlignTop); + vLayout2->addWidget(ownThemeButton, 0, Qt::AlignTop); + vLayout2->addWidget(primarySeriesTestsButton, 0, Qt::AlignTop); + vLayout2->addWidget(toggleRotationButton, 0, Qt::AlignTop); + vLayout2->addWidget(gradientBtoYPB, 0, Qt::AlignTop); + vLayout2->addWidget(logAxisButton, 0, Qt::AlignTop); + vLayout2->addWidget(testItemAndRowChangesButton, 0, Qt::AlignTop); vLayout2->addWidget(staticCheckBox, 0, Qt::AlignTop); vLayout2->addWidget(rotationCheckBox, 0, Qt::AlignTop); vLayout2->addWidget(rotationSliderX, 0, Qt::AlignTop); @@ -365,25 +432,40 @@ int main(int argc, char **argv) vLayout2->addWidget(minSliderX, 0, Qt::AlignTop); vLayout2->addWidget(minSliderZ, 0, Qt::AlignTop); vLayout2->addWidget(minSliderY, 0, Qt::AlignTop); - vLayout2->addWidget(maxSliderY, 0, Qt::AlignTop); - vLayout2->addWidget(fpsLabel, 0, Qt::AlignTop); - vLayout2->addWidget(fpsCheckBox, 0, Qt::AlignTop); - vLayout2->addWidget(reverseValueAxisCheckBox, 0, Qt::AlignTop); - vLayout2->addWidget(backgroundCheckBox, 0, Qt::AlignTop); - vLayout2->addWidget(gridCheckBox, 0, Qt::AlignTop); - vLayout2->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")), 0, Qt::AlignTop); - vLayout2->addWidget(shadowQuality, 0, Qt::AlignTop); - vLayout2->addWidget(new QLabel(QStringLiteral("Change font")), 0, Qt::AlignTop); - vLayout2->addWidget(fontList, 0, Qt::AlignTop); - vLayout2->addWidget(new QLabel(QStringLiteral("Adjust font size")), 0, Qt::AlignTop); - vLayout2->addWidget(fontSizeSlider, 0, Qt::AlignTop); - vLayout2->addWidget(new QLabel(QStringLiteral("Value axis format")), 0, Qt::AlignTop); - vLayout2->addWidget(valueAxisFormatEdit, 0, Qt::AlignTop); - vLayout2->addWidget(new QLabel(QStringLiteral("Log axis base")), 0, Qt::AlignTop); - vLayout2->addWidget(logBaseEdit, 0, Qt::AlignTop); - vLayout2->addWidget(new QLabel(QStringLiteral("Value axis segments")), 0, Qt::AlignTop); - vLayout2->addWidget(valueAxisSegmentsSpin, 0, Qt::AlignTop); - // TODO: Add example for setMeshFileName + vLayout2->addWidget(maxSliderY, 1, Qt::AlignTop); + + vLayout3->addWidget(fpsLabel, 0, Qt::AlignTop); + vLayout3->addWidget(fpsCheckBox, 0, Qt::AlignTop); + vLayout3->addWidget(reverseValueAxisCheckBox, 0, Qt::AlignTop); + vLayout3->addWidget(backgroundCheckBox, 0, Qt::AlignTop); + vLayout3->addWidget(gridCheckBox, 0, Qt::AlignTop); + vLayout3->addWidget(inputHandlerRotationCheckBox, 0, Qt::AlignTop); + vLayout3->addWidget(inputHandlerZoomCheckBox, 0, Qt::AlignTop); + vLayout3->addWidget(inputHandlerSelectionCheckBox, 0, Qt::AlignTop); + vLayout3->addWidget(inputHandlerZoomAtTargetCheckBox, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")), 0, Qt::AlignTop); + vLayout3->addWidget(shadowQuality, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Change font")), 0, Qt::AlignTop); + vLayout3->addWidget(fontList, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Adjust font size")), 0, Qt::AlignTop); + vLayout3->addWidget(fontSizeSlider, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Value axis format")), 0, Qt::AlignTop); + vLayout3->addWidget(valueAxisFormatEdit, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Log axis base")), 0, Qt::AlignTop); + vLayout3->addWidget(logBaseEdit, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Value axis segments")), 0, Qt::AlignTop); + vLayout3->addWidget(valueAxisSegmentsSpin, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Camera target")), 0, Qt::AlignTop); + vLayout3->addWidget(cameraTargetSliderX, 0, Qt::AlignTop); + vLayout3->addWidget(cameraTargetSliderY, 0, Qt::AlignTop); + vLayout3->addWidget(cameraTargetSliderZ, 0, Qt::AlignTop); + vLayout3->addWidget(reflectionCheckBox, 0, Qt::AlignTop); + vLayout3->addWidget(reflectivitySlider, 0, Qt::AlignTop); + vLayout3->addWidget(toggleCustomItemButton, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Adjust floor level")), 0, Qt::AlignTop); + vLayout3->addWidget(floorLevelSlider, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Adjust margin")), 0, Qt::AlignTop); + vLayout3->addWidget(marginSlider, 1, Qt::AlignTop); widget->show(); @@ -411,6 +493,12 @@ int main(int argc, char **argv) &GraphModifier::setMinY); QObject::connect(maxSliderY, &QSlider::valueChanged, modifier, &GraphModifier::setMaxY); + QObject::connect(cameraTargetSliderX, &QSlider::valueChanged, modifier, + &GraphModifier::setCameraTargetX); + QObject::connect(cameraTargetSliderY, &QSlider::valueChanged, modifier, + &GraphModifier::setCameraTargetY); + QObject::connect(cameraTargetSliderZ, &QSlider::valueChanged, modifier, + &GraphModifier::setCameraTargetZ); QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier, SLOT(changeShadowQuality(int))); @@ -488,7 +576,14 @@ int main(int argc, char **argv) &GraphModifier::setBackgroundEnabled); QObject::connect(gridCheckBox, &QCheckBox::stateChanged, modifier, &GraphModifier::setGridEnabled); - + QObject::connect(inputHandlerRotationCheckBox, &QCheckBox::stateChanged, modifier, + &GraphModifier::setInputHandlerRotationEnabled); + QObject::connect(inputHandlerZoomCheckBox, &QCheckBox::stateChanged, modifier, + &GraphModifier::setInputHandlerZoomEnabled); + QObject::connect(inputHandlerSelectionCheckBox, &QCheckBox::stateChanged, modifier, + &GraphModifier::setInputHandlerSelectionEnabled); + QObject::connect(inputHandlerZoomAtTargetCheckBox, &QCheckBox::stateChanged, modifier, + &GraphModifier::setInputHandlerZoomAtTargetEnabled); QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, modifier, &GraphModifier::setUseNullInputHandler); @@ -501,6 +596,17 @@ int main(int argc, char **argv) QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderY, &QSlider::setValue); + QObject::connect(reflectionCheckBox, &QCheckBox::stateChanged, modifier, + &GraphModifier::setReflection); + QObject::connect(reflectivitySlider, &QSlider::valueChanged, modifier, + &GraphModifier::setReflectivity); + QObject::connect(floorLevelSlider, &QSlider::valueChanged, modifier, + &GraphModifier::setFloorLevel); + QObject::connect(marginSlider, &QSlider::valueChanged, modifier, + &GraphModifier::setGraphMargin); + QObject::connect(toggleCustomItemButton, &QPushButton::clicked, modifier, + &GraphModifier::toggleCustomItem); + QObject::connect(staticCheckBox, &QCheckBox::stateChanged, addDataButton, &QPushButton::setEnabled); QObject::connect(staticCheckBox, &QCheckBox::stateChanged, addMultiDataButton, diff --git a/tests/barstest/shuttle.obj b/tests/barstest/shuttle.obj new file mode 100644 index 00000000..e872228d --- /dev/null +++ b/tests/barstest/shuttle.obj @@ -0,0 +1,6349 @@ +# Blender v2.66 (sub 0) OBJ File: '' +# www.blender.org +v -0.290924 -0.416888 -3.733797 +v -0.033253 -0.399965 -3.916942 +v 0.098892 -0.335648 -4.014968 +v 0.110144 -0.419894 -4.016005 +v -0.014627 -0.351984 -3.919619 +v -0.003375 -0.436229 -3.920655 +v 0.077510 -0.338845 -3.987319 +v 0.088762 -0.423090 -3.988356 +v 0.268419 -0.311615 -4.127978 +v 0.279672 -0.395861 -4.129015 +v -0.216945 -0.357152 -3.636585 +v -0.442480 -0.421494 -3.440589 +v 0.040557 -0.350366 -3.819523 +v -0.366883 -0.356351 -3.352865 +v -0.059636 -0.414591 -3.440213 +v 0.195164 -0.388461 -3.624492 +v -0.508658 -0.419445 -3.066802 +v -0.205255 -0.426666 -3.173799 +v -0.446409 -0.327120 -2.985436 +v -0.301084 -0.444031 -2.817294 +v 0.151449 -0.262081 -3.165398 +v 0.405315 -0.264481 -3.348743 +v 0.818570 -0.244023 -3.649532 +v 0.829822 -0.328268 -3.650568 +v 0.438945 -0.298561 -3.337861 +v 0.450197 -0.382806 -3.338897 +v 0.010751 -0.257630 -2.926187 +v 0.476024 -0.294278 -3.283418 +v 0.487276 -0.378524 -3.284455 +v 0.893196 -0.234640 -3.602006 +v 0.904448 -0.318886 -3.603042 +v -0.575146 -0.405155 -2.358083 +v -0.526846 -0.291701 -2.296914 +v -0.123567 -0.205514 -2.586394 +v -0.401501 -0.443667 -2.166967 +v 0.438519 -0.375468 -2.805563 +v 0.688118 -0.342410 -2.991890 +v 0.304996 -0.393955 -2.597466 +v -0.651696 -0.393273 -1.762192 +v -0.615966 -0.265853 -1.716287 +v -0.263638 -0.153966 -1.992210 +v 0.143186 -0.430595 -2.279088 +v -0.512839 -0.438185 -1.613670 +v -0.710028 -0.388098 -1.448538 +v -0.679965 -0.261349 -1.410043 +v -0.813314 -0.388657 -1.206769 +v 0.751287 -0.156495 -2.401505 +v 0.998622 -0.165467 -2.585768 +v -0.031714 -0.447371 -1.755604 +v -0.583894 -0.434779 -1.325088 +v -0.408965 -0.117462 -1.482493 +v -0.790573 -0.268054 -1.169135 +v 0.625851 -0.150158 -2.234187 +v -1.051885 -0.397310 -0.885646 +v -1.031232 -0.284379 -0.851625 +v -0.707410 -0.437077 -1.088477 +v -1.334166 -0.408930 -0.570468 +v 0.404917 -0.087146 -1.938298 +v -0.498689 -0.116097 -1.212783 +v -1.314745 -0.307881 -0.538558 +v -0.959224 -0.446984 -0.774490 +v 1.798825 0.967755 -3.015114 +v 2.046406 0.986555 -3.209870 +v 1.795686 1.006585 -3.015357 +v 2.043267 1.025386 -3.210112 +v 1.806945 0.929656 -3.008470 +v 2.054526 0.948456 -3.203225 +v 1.797665 1.044451 -3.009186 +v 2.045245 1.063251 -3.203941 +v -0.218636 -0.452499 -1.294639 +v -0.644958 -0.132219 -0.977335 +v 1.804675 1.079696 -2.996872 +v 2.052256 1.098496 -3.191627 +v -1.248682 -0.457011 -0.466167 +v 1.840314 0.837931 -2.974904 +v 2.087895 0.856731 -3.169660 +v 1.646588 -0.144702 -2.733368 +v 1.657840 -0.228948 -2.734405 +v 1.737599 -0.131659 -2.805524 +v 1.748852 -0.215905 -2.806561 +v 1.819258 1.148577 -2.971684 +v 1.033279 0.836881 -2.319959 +v 1.031777 0.970096 -2.298396 +v 1.060381 0.758531 -2.296534 +v -0.899523 -0.158764 -0.676483 +v 0.945538 0.814187 -2.200939 +v 0.170080 -0.031614 -1.496071 +v 1.043881 1.032762 -2.270612 +v 0.966443 0.743790 -2.180778 +v 0.952423 0.936921 -2.181507 +v 1.858652 1.239977 -2.912781 +v -0.317238 -0.452926 -1.060344 +v -1.192492 -0.196285 -0.374663 +v 1.856681 0.583228 -2.822182 +v 2.018811 -0.094129 -2.886386 +v 0.967854 0.995533 -2.156932 +v 1.272977 -0.200327 -2.268122 +v 1.284228 -0.284573 -2.269158 +v 1.076506 1.117039 -2.211863 +v -0.484562 -0.458987 -0.834904 +v 1.848687 0.788896 -2.757349 +v 2.078178 -0.164712 -2.848704 +v 1.967059 0.229003 -2.794663 +v 1.967832 0.643840 -2.831535 +v 2.215413 0.662641 -3.026290 +v 0.936685 0.816251 -2.042840 +v 2.039912 0.250063 -2.839813 +v 1.003257 1.074974 -2.104949 +v 1.164321 0.598239 -2.181823 +v 0.950019 0.768391 -2.028775 +v 0.943810 0.900014 -2.031005 +v 2.521226 0.390336 -3.213021 +v 1.936351 1.129229 -2.824698 +v 2.183932 1.148030 -3.019454 +v 2.568967 0.404915 -3.250601 +v 1.055366 0.603082 -2.081103 +v 0.869869 0.465058 -1.923758 +v 0.936491 -0.173930 -1.917023 +v 2.705161 0.067033 -3.318110 +v 2.096944 0.264363 -2.850901 +v 1.957182 0.386704 -2.747152 +v 2.029313 0.077472 -2.774992 +v 0.955724 0.940103 -2.015164 +v 1.928438 1.372002 -2.811322 +v -0.765050 -0.471609 -0.536370 +v 2.030367 0.402476 -2.793896 +v 2.100080 0.103611 -2.820803 +v 2.514476 0.522913 -3.173254 +v 2.574949 0.263657 -3.196595 +v 2.562289 0.536088 -3.211256 +v 2.622122 0.279579 -3.234349 +v 2.598488 0.409527 -3.214962 +v -0.064938 0.006053 -1.100592 +v 2.088244 0.403277 -2.809050 +v 2.151782 0.130884 -2.833575 +v 2.199769 1.159790 -2.964559 +v 2.193588 1.233527 -2.965299 +v 2.221596 1.161935 -2.979915 +v 2.215481 1.234891 -2.980646 +v 2.136538 0.271664 -2.829406 +v 1.137830 1.220917 -2.137315 +v 0.872108 0.654248 -1.875077 +v 0.961190 -0.247342 -1.861737 +v 2.739614 0.051854 -3.275776 +v -2.850674 0.163164 1.082772 +v -2.774223 -0.444295 1.078949 +v -2.508742 -0.433973 0.871016 +v -2.566129 0.205717 0.857016 +v 0.982043 0.994775 -1.981001 +v -1.069794 -0.481435 -0.242789 +v 2.592936 0.518564 -3.182256 +v 2.642673 0.305340 -3.201453 +v -2.926099 0.145051 1.155134 +v -2.869277 -0.451273 1.165592 +v 1.009718 0.673075 -1.961110 +v 2.235091 1.170649 -2.961918 +v 1.045386 1.162465 -2.033586 +v 2.230007 1.231294 -2.962527 +v 2.325998 0.322675 -2.951759 +v 1.972627 1.185781 -2.753756 +v 2.129131 0.389939 -2.793774 +v 2.183229 0.158016 -2.814654 +v 2.227766 1.099078 -2.934829 +v 1.117407 -0.306283 -1.939579 +v 1.981589 1.144577 -2.746340 +v 1.973910 1.228192 -2.748031 +v 2.249297 1.101867 -2.950499 +v 2.210880 1.300532 -2.936848 +v 1.886303 0.951739 -2.651532 +v 2.165588 -0.207364 -2.762840 +v 1.360371 -0.269775 -2.128519 +v 2.232590 1.301186 -2.952497 +v 2.160973 0.274542 -2.798066 +v 0.937019 0.410104 -1.852872 +v 0.960798 0.265444 -1.858128 +v 2.041237 1.191461 -2.784518 +v 2.048705 1.157124 -2.778339 +v 2.042305 1.226803 -2.779748 +v 2.258118 1.120717 -2.937466 +v 2.320933 0.422137 -2.921925 +v 2.366302 0.227636 -2.939436 +v 1.976683 1.431691 -2.744228 +v 2.244230 1.286403 -2.939127 +v -3.086442 -0.474834 1.379359 +v 1.999431 1.110853 -2.726914 +v 1.985242 1.265353 -2.730038 +v -3.023720 -0.458462 1.334241 +v -3.024019 0.109883 1.282283 +v -2.844489 0.344693 1.122684 +v -2.737176 -0.511595 1.117650 +v -2.469550 -0.506414 0.908517 +v -2.551327 0.395732 0.889431 +v 1.000046 -0.329019 -1.811242 +v 2.154800 0.373104 -2.768372 +v 2.199881 0.179835 -2.785773 +v -2.914064 0.322285 1.189905 +v -2.834171 -0.518740 1.204847 +v 1.179604 1.267508 -2.087104 +v 2.051748 1.257770 -2.764754 +v 2.063573 1.129020 -2.762150 +v 2.080589 1.195258 -2.775463 +v -0.196284 0.002337 -0.889996 +v 1.013546 1.060481 -1.927888 +v -3.072142 -0.445996 1.396327 +v 2.603875 0.637948 -3.126857 +v 2.707508 0.193661 -3.166857 +v 2.085482 1.172761 -2.771414 +v 2.081289 1.218414 -2.772337 +v 1.075555 1.201415 -1.986324 +v 2.002330 0.508317 -2.645192 +v 2.127263 -0.027287 -2.693413 +v 2.556508 0.625865 -3.087951 +v 2.661251 0.176820 -3.128379 +v 2.074001 0.520013 -2.695353 +v 2.194747 0.002364 -2.741958 +v 1.000951 0.830916 -1.880131 +v 2.095224 1.154349 -2.760807 +v 2.087476 1.238703 -2.762513 +v 2.023438 1.089743 -2.698434 +v 2.004898 1.291606 -2.702516 +v -3.122983 -0.461461 1.459483 +v -3.158215 -0.041663 1.448402 +v -2.497997 0.004146 0.929450 +v -2.509563 0.149734 0.925099 +v 1.003036 0.858653 -1.877204 +v 2.270079 1.067661 -2.884072 +v 1.005703 0.814744 -1.874867 +v 2.291162 1.070783 -2.900280 +v 2.128013 0.510403 -2.719236 +v 2.238064 0.038604 -2.761713 +v 2.068128 1.279648 -2.741818 +v 2.083579 1.111428 -2.738417 +v 2.247011 1.342852 -2.886831 +v 2.268338 1.343057 -2.903010 +v -2.993610 -0.524459 1.373357 +v -2.994892 0.277606 1.300703 +v 2.627505 0.603237 -3.112099 +v 2.713651 0.233920 -3.145348 +v 2.292918 1.094878 -2.895721 +v 1.006938 0.871768 -1.872413 +v 2.105035 1.197866 -2.757530 +v 2.093582 1.187722 -2.747088 +v 2.092232 1.203828 -2.747250 +v 2.273946 1.321208 -2.897990 +v 0.912103 0.803812 -1.788658 +v 1.019079 -0.292614 -1.771378 +v 2.804159 0.046327 -3.194257 +v 2.107537 1.186366 -2.755460 +v 2.105394 1.209702 -2.755932 +v 2.245164 0.292374 -2.778011 +v 0.747334 -0.381459 -1.545246 +v 2.108331 1.142823 -2.745258 +v 2.098208 1.253036 -2.747486 +v 2.099697 1.174463 -2.740594 +v 2.096009 1.218463 -2.741035 +v 2.112516 1.176954 -2.750038 +v 2.108556 1.220074 -2.750911 +v 1.015678 0.889476 -1.861661 +v 2.162992 0.481149 -2.717304 +v 2.256692 0.079446 -2.753470 +v 1.035607 1.090416 -1.893256 +v 2.119216 1.171063 -2.742090 +v 2.114042 1.227400 -2.743229 +v -3.036469 -0.488219 1.432582 +v 1.026486 0.781917 -1.851175 +v 2.241119 0.356951 -2.758555 +v 2.270656 0.230325 -2.769956 +v -0.400720 -0.022989 -0.663568 +v 2.108939 1.167601 -2.729508 +v 2.352467 0.499374 -2.857929 +v 2.431048 0.162488 -2.888259 +v 2.103901 1.227706 -2.730110 +v 2.078094 0.869479 -2.669583 +v 2.325675 0.888279 -2.864338 +v 2.049954 1.084459 -2.665236 +v 2.029886 1.302955 -2.669655 +v 2.105674 1.107026 -2.710752 +v 2.088951 1.289105 -2.714434 +v 2.107442 1.198835 -2.720560 +v 2.122808 1.139938 -2.727132 +v 2.111851 1.259233 -2.729544 +v 2.126617 1.169588 -2.732825 +v 2.121016 1.230568 -2.734058 +v 2.126010 1.200245 -2.735167 +v 2.126854 1.200309 -2.735831 +v -3.255541 -0.463337 1.614298 +v -3.256979 -0.068785 1.579187 +v -3.090151 -0.525402 1.492390 +v -3.140838 0.071873 1.477060 +v 2.183017 0.449113 -2.704647 +v 2.261101 0.114361 -2.734786 +v 1.025626 0.910940 -1.843900 +v 2.118830 1.168976 -2.716800 +v 2.113792 1.229081 -2.717403 +v 2.133590 1.172756 -2.723654 +v 2.128416 1.229093 -2.724793 +v -2.405642 -0.551479 0.981773 +v -2.505313 0.545503 0.958747 +v 1.032741 0.920593 -1.832253 +v 2.139077 1.180082 -2.715972 +v 2.135116 1.223202 -2.716844 +v 2.126722 1.178219 -2.705876 +v 2.123034 1.222219 -2.706317 +v 2.136451 1.146135 -2.709190 +v 2.126328 1.256348 -2.711419 +v 2.142239 1.190453 -2.710951 +v 2.140096 1.213790 -2.711423 +v 2.330166 1.100055 -2.847870 +v 2.130499 1.192853 -2.699662 +v 2.129149 1.208959 -2.699824 +v 2.142597 1.202290 -2.709353 +v 2.311194 1.326385 -2.850139 +v -0.678415 -0.058034 -0.389918 +v 2.126498 1.116483 -2.683367 +v 2.111047 1.284703 -2.686769 +v 2.335972 1.077011 -2.842714 +v 2.315368 1.073955 -2.825890 +v 2.297923 0.301154 -2.738834 +v 2.313149 1.349285 -2.845444 +v -3.224716 -0.523658 1.644234 +v -3.228977 0.037748 1.596002 +v 2.259607 0.406750 -2.716804 +v 2.310765 0.187427 -2.736550 +v 2.292301 1.349146 -2.828649 +v 1.051190 0.836263 -1.810548 +v 2.074942 1.095809 -2.632374 +v 2.056402 1.297672 -2.636457 +v 1.051411 0.836718 -1.810222 +v 1.051764 0.833314 -1.810103 +v 2.147183 1.160469 -2.694164 +v 2.139435 1.244822 -2.695870 +v 1.051937 0.833724 -1.809843 +v 1.051832 0.835286 -1.809826 +v 1.052011 0.834070 -1.809716 +v 1.052027 0.833906 -1.809712 +v 1.051999 0.834825 -1.809658 +v 1.051961 0.835391 -1.809651 +v 1.052122 0.834297 -1.809553 +v 2.289008 0.296555 -2.724424 +v 1.946327 1.084103 -2.529010 +v 2.264997 -0.237532 -2.656099 +v -3.146048 -0.468059 1.586396 +v 2.295856 0.334163 -2.728890 +v 2.310954 0.269436 -2.734717 +v 2.287534 0.325511 -2.715739 +v 2.300741 0.268886 -2.720837 +v 2.153370 1.180757 -2.684340 +v 2.149177 1.226410 -2.685263 +v -2.995660 -0.411552 1.480706 +v 1.055648 0.923143 -1.800017 +v 2.154070 1.203913 -2.681214 +v -0.987628 -0.106173 -0.106669 +v -3.134648 -0.466717 1.601017 +v 2.142878 1.138361 -2.660432 +v 2.131053 1.267111 -2.663036 +v 2.305306 0.359619 -2.707547 +v 2.331457 0.247507 -2.717641 +v 2.296714 0.347997 -2.697108 +v 2.319591 0.249920 -2.705938 +v 2.094598 1.122062 -2.604852 +v 2.080408 1.276562 -2.607976 +v 0.470274 -0.415629 -1.195124 +v 2.682583 0.683203 -3.020018 +v 2.802250 0.170184 -3.066206 +v 2.692932 0.640855 -3.023288 +v 2.792405 0.214405 -3.061682 +v 2.636060 0.671604 -2.979968 +v 2.757006 0.153092 -3.026651 +v 2.359883 1.134861 -2.806733 +v 2.152321 1.169328 -2.645438 +v 2.145921 1.239007 -2.646847 +v 2.345995 1.300547 -2.808394 +v 2.153390 1.204670 -2.640668 +v 2.412149 0.533689 -2.776916 +v 2.502886 0.144687 -2.811939 +v 0.970224 0.925229 -1.686331 +v 1.091354 -0.325301 -1.665935 +v 2.881699 0.045075 -3.095805 +v 2.371721 1.118882 -2.793227 +v 2.351501 1.116275 -2.775872 +v -3.112347 -0.464090 1.629621 +v 2.105930 1.159222 -2.586859 +v 2.098250 1.242837 -2.588550 +v 2.355013 1.318201 -2.795225 +v 2.334614 1.317729 -2.777893 +v 2.314089 0.357987 -2.673523 +v 2.340505 0.244738 -2.683719 +v 1.104303 1.101391 -1.798523 +v 2.090404 0.561258 -2.516102 +v 2.159124 0.571179 -2.570591 +v 2.234664 -0.057203 -2.571783 +v 2.205596 0.557038 -2.605525 +v 2.229047 0.520855 -2.620486 +v 2.238063 0.482200 -2.623966 +v 2.298549 -0.026551 -2.624406 +v 2.332671 0.012252 -2.654572 +v 2.295672 0.428428 -2.663943 +v 2.328226 0.095662 -2.658767 +v 2.337243 0.057009 -2.662247 +v 2.319328 0.300003 -2.670594 +v 2.323741 0.370700 -2.680527 +v 2.354745 0.175176 -2.686744 +v 2.343450 0.307384 -2.690079 +v 2.353938 0.241245 -2.692182 +v 1.085896 0.905799 -1.761274 +v 2.107213 1.201633 -2.581135 +v 1.172914 1.208536 -1.853034 +v -3.524472 -0.463065 1.962955 +v -3.542270 -0.167984 1.949735 +v 2.374104 1.189970 -2.783334 +v 2.369021 1.250615 -2.783942 +v 1.303689 1.278820 -1.940955 +v -2.749923 0.604098 1.287890 +v -2.601352 -0.583194 1.281085 +v -2.331104 -0.584296 1.070484 +v -2.444929 0.666788 1.044342 +v 2.335002 0.352805 -2.651304 +v 2.357880 0.254727 -2.660134 +v -2.812832 0.575628 1.346300 +v -2.702155 -0.590712 1.367115 +v 2.388829 1.185178 -2.765078 +v 2.382714 1.258133 -2.765809 +v 2.346222 0.364438 -2.655067 +v 2.372374 0.252327 -2.665161 +v 2.368793 1.183281 -2.747422 +v 2.362612 1.257019 -2.748161 +v -3.502416 -0.514638 1.987533 +v -3.528153 -0.092777 1.968860 +v -2.930290 -0.491180 1.547024 +v 2.066685 0.851305 -2.470213 +v -3.080119 -0.460294 1.670958 +v 2.353852 0.333838 -2.636405 +v 2.367060 0.277213 -2.641503 +v 2.140192 0.869385 -2.515599 +v -2.873451 -0.595312 1.528083 +v -2.875654 0.517249 1.427634 +v 2.123721 1.449962 -2.555544 +v 2.366726 0.342510 -2.637991 +v 2.381824 0.277783 -2.643818 +v 2.365586 0.306170 -2.632818 +v 0.180044 -0.433739 -0.860263 +v 2.390810 0.196854 -2.633883 +v 2.339653 0.416178 -2.614137 +v 2.379757 0.310792 -2.633873 +v -2.972414 -0.594417 1.632153 +v -3.043199 0.236465 1.611041 +v 2.197619 0.881876 -2.526829 +v 1.155619 0.140929 -1.644002 +v 2.061041 1.010198 -2.426111 +v 2.124709 0.698580 -2.447134 +v 2.629037 1.066507 -2.869623 +v 2.771686 0.621339 -2.939622 +v 2.857832 0.252023 -2.972872 +v 2.676305 1.087418 -2.904726 +v 2.483987 0.515887 -2.700598 +v 2.562568 0.179001 -2.730927 +v 2.134736 1.022953 -2.472975 +v 2.196270 0.721780 -2.493294 +v -3.115630 -0.588979 1.772415 +v -3.122642 0.192029 1.706162 +v 2.305190 0.463503 -2.547947 +v 2.383274 0.128751 -2.578085 +v 2.026136 1.180204 -2.395136 +v 2.372061 -0.253901 -2.533144 +v 0.043832 -0.439397 -0.700086 +v -2.331525 -0.123197 1.132486 +v 2.610039 1.166097 -2.837585 +v 2.673477 0.969915 -2.869029 +v 2.777325 0.659725 -2.919367 +v 2.880958 0.215439 -2.959367 +v 2.657509 1.185952 -2.873027 +v 2.720273 0.991850 -2.904138 +v 2.379762 0.373280 -2.580731 +v 2.409298 0.246654 -2.592131 +v 2.731814 0.647876 -2.878239 +v 2.836558 0.198831 -2.918667 +v -3.039373 -0.455495 1.723220 +v 2.192646 1.021841 -2.487980 +v 2.248729 0.747345 -2.506499 +v 2.309599 0.498417 -2.529263 +v 2.403300 0.096714 -2.565429 +v 2.237351 0.888547 -2.505383 +v -0.183302 -0.450597 -0.489896 +v 2.405254 0.311230 -2.572676 +v 1.043932 1.013192 -1.572568 +v 1.174857 -0.343976 -1.550015 +v 2.968846 0.048153 -2.984724 +v 2.704206 1.090705 -2.868940 +v 1.193313 1.053879 -1.685613 +v 2.300203 0.530684 -2.498384 +v 2.410253 0.058885 -2.540860 +v -2.870028 -0.379944 1.617982 +v -0.502937 -0.466927 -0.212460 +v 2.262925 0.542265 -2.453038 +v 2.383671 0.024616 -2.499642 +v 2.688581 1.172611 -2.842590 +v 2.740755 1.011263 -2.868450 +v 2.233117 1.007717 -2.472307 +v 2.280868 0.774003 -2.488075 +v -2.681424 0.688036 1.389168 +v -2.372814 0.754289 1.142473 +v -2.249194 -0.603433 1.170773 +v 2.433319 0.963376 -2.621027 +v -2.742923 0.657642 1.444079 +v 2.197806 0.531341 -2.394472 +v 2.322739 -0.004263 -2.442693 +v -3.420844 -0.571247 2.087621 +v -3.456852 0.016609 2.061712 +v 2.261785 0.891425 -2.474043 +v -0.828435 -0.477984 0.061043 +v 2.548733 0.450740 -2.649420 +v 2.594102 0.256238 -2.666930 +v 2.619376 1.253520 -2.777794 +v 2.736592 0.891025 -2.835893 +v 2.666746 1.272449 -2.813868 +v 2.782720 0.913795 -2.871353 +v -2.802757 0.594778 1.513184 +v 2.842664 0.549920 -2.883518 +v 2.892401 0.336695 -2.902714 +v 2.419066 1.038090 -2.596991 +v 2.466659 0.890910 -2.620581 +v 2.366409 0.398028 -2.496960 +v 2.411491 0.204759 -2.514360 +v -3.768498 -0.285858 2.351028 +v -3.754395 -0.436849 2.353898 +v -2.979417 0.290761 1.695520 +v 2.258257 0.990733 -2.446479 +v 2.298049 0.795972 -2.459619 +v -3.744207 -0.468465 2.368351 +v -3.763825 -0.250991 2.363676 +v -2.991889 -0.449902 1.784124 +v 2.589037 0.355701 -2.637096 +v -3.058914 0.242857 1.779885 +v 2.405318 0.303321 -2.484666 +v 2.886850 0.445733 -2.870009 +v 2.109286 1.132686 -2.326646 +v 2.219562 0.592947 -2.363060 +v 2.696261 1.244513 -2.793414 +v 2.792664 0.946380 -2.841198 +v 1.301631 1.132067 -1.690738 +v 2.383062 0.419848 -2.468079 +v 2.437160 0.187925 -2.488959 +v 2.181364 1.141334 -2.376844 +v 2.287943 0.619687 -2.412037 +v 2.862712 0.573808 -2.851874 +v 2.922544 0.317299 -2.874968 +v 2.818116 0.561038 -2.810024 +v 2.878590 0.301782 -2.833364 +v 2.426071 1.103677 -2.552133 +v 2.514010 0.831724 -2.595722 +v 2.235144 1.129736 -2.400364 +v 2.332283 0.654296 -2.432440 +v 2.346390 0.907367 -2.454136 +v -3.411176 0.052851 2.120724 +v 2.429752 0.306199 -2.453326 +v 2.269301 1.099582 -2.397708 +v 2.352008 0.694778 -2.425019 +v 2.386485 0.438404 -2.426523 +v 2.450023 0.166012 -2.451047 +v 2.915866 0.448472 -2.835623 +v 2.344078 0.972432 -2.436077 +v 2.370150 0.844828 -2.444686 +v 2.871840 0.434359 -2.793598 +v -2.786263 -0.483209 1.702896 +v 1.459973 1.193063 -1.759240 +v -3.703011 -0.503725 2.422886 +v -3.730082 -0.199896 2.416091 +v 2.655625 1.315469 -2.699349 +v 2.808775 0.841848 -2.775261 +v 2.702611 1.333742 -2.736255 +v 2.854139 0.865139 -2.811362 +v 2.288410 1.067288 -2.384314 +v 2.357333 0.729951 -2.407073 +v 2.357592 0.441017 -2.374193 +v 2.427305 0.142152 -2.401100 +v 1.807099 1.188967 -2.008747 +v -3.783568 -0.334437 2.490638 +v -3.776477 -0.407414 2.491810 +v 2.122243 1.235844 -2.255761 +v 2.482100 -0.255753 -2.399353 +v 2.726073 1.295463 -2.728897 +v 2.852031 0.905933 -2.791331 +v 2.295756 0.426582 -2.312892 +v 2.367887 0.117350 -2.340733 +v -2.939741 -0.443760 1.851008 +v -3.781106 -0.318610 2.496646 +v -3.771103 -0.424172 2.498541 +v 2.441322 0.304925 -2.409196 +v 2.453266 1.150154 -2.493283 +v 2.568163 0.794829 -2.550234 +v 1.130007 1.063856 -1.452342 +v 1.265938 -0.347821 -1.428686 +v 3.061789 0.055427 -2.865868 +v -2.602579 0.736106 1.497157 +v -2.292120 0.804178 1.248855 +v -2.434953 -0.604050 1.489534 +v -2.163494 -0.608053 1.278256 +v -2.664054 0.704644 1.549387 +v -2.539160 -0.611934 1.572914 +v 2.399283 0.915534 -2.415008 +v -3.707198 -0.182800 2.448233 +v 2.363834 1.022590 -2.395347 +v 2.408991 0.801573 -2.410258 +v -2.722515 -0.616791 1.721958 +v -2.725142 0.639161 1.608672 +v -2.829179 -0.615824 1.810674 +v -2.909245 0.322942 1.786891 +v 2.392228 0.914706 -2.400276 +v 2.398101 0.948794 -2.405777 +v 2.411428 0.883567 -2.410178 +v -2.983486 -0.609514 1.936485 +v -2.991769 0.272910 1.861910 +v 2.388079 0.936458 -2.393279 +v 2.401934 0.893610 -2.400146 +v 1.266405 1.148829 -1.537915 +v 1.276485 1.330618 -1.562468 +v 1.301959 1.399716 -1.588675 +v 1.829089 1.191557 -1.980541 +v 2.385908 3.043540 -2.584738 +v 2.432531 3.084452 -2.624845 +v 2.484531 3.138930 -2.670390 +v 2.555058 3.180480 -2.729192 +v 2.587869 1.699016 -2.618729 +v 2.897153 3.208163 -2.998451 +v 2.950947 3.055532 -3.026375 +v 2.946595 3.189529 -3.035288 +v 2.959600 3.134547 -3.040378 +v 2.417759 0.294566 -2.355182 +v -3.764574 -0.295328 2.521762 +v -3.750702 -0.443027 2.524510 +v 2.358011 0.275051 -2.293223 +v -3.320640 -0.590025 2.214050 +v -3.361390 0.074490 2.184798 +v 2.390117 0.955552 -2.380219 +v 2.415719 0.876379 -2.392909 +v 2.408200 0.974432 -2.384957 +v 2.431282 0.861455 -2.392579 +v -3.753472 -0.287501 2.537197 +v 2.398036 0.969083 -2.363085 +v 2.431485 0.865638 -2.379665 +v -3.651074 -0.516133 2.490283 +v -3.681587 -0.172421 2.482510 +v 2.311849 1.347830 -2.326247 +v -3.741101 -0.282712 2.553676 +v -3.725441 -0.449869 2.556817 +v 2.175858 1.240742 -2.187508 +v 1.176857 1.068079 -1.392566 +v 1.312589 -0.342230 -1.368881 +v -2.560177 0.739860 1.551322 +v -2.121265 -0.602981 1.332435 +v -2.249778 0.807875 1.303072 +v -2.622366 0.708349 1.602724 +v -2.686267 0.642614 1.658664 +v -2.872984 0.326449 1.833357 +v -2.958486 0.276123 1.904730 +v -3.335886 0.076990 2.217503 +v -3.668144 -0.171074 2.499706 +v -3.734634 -0.282056 2.561952 +v -3.734566 -0.369723 2.570150 +v -2.150712 -0.249451 1.324240 +v 1.267079 0.010084 -1.364303 +v 1.704978 -0.191159 -1.687236 +v 2.198494 1.185947 -2.198470 +v 2.267581 1.192809 -2.252964 +v 2.325830 0.562710 -2.240516 +v 2.313725 1.176653 -2.287457 +v 2.336207 1.139528 -2.301576 +v 2.434129 0.098705 -2.282343 +v 2.390649 0.590464 -2.293602 +v 2.344165 1.100576 -2.304204 +v 2.425891 0.627661 -2.324495 +v 2.423750 0.711053 -2.330483 +v 2.431708 0.672101 -2.333111 +v 2.400364 1.044399 -2.342861 +v 2.410625 0.974989 -2.344487 +v 2.420496 0.915260 -2.346699 +v 2.426872 0.985581 -2.358127 +v 2.452506 0.789191 -2.360079 +v 2.446831 0.863022 -2.362433 +v 2.444856 0.921557 -2.366269 +v 2.453526 0.855127 -2.366929 +v 2.496511 1.170443 -2.429398 +v 2.620876 0.785842 -2.491042 +v 2.713268 1.342514 -2.614195 +v 2.759644 1.360499 -2.652004 +v 2.773482 1.317705 -2.658864 +v 2.879037 0.829869 -2.696361 +v 2.909818 0.896081 -2.726441 +v 2.923656 0.853286 -2.733300 +v 2.434469 0.098745 -2.281906 +v -2.120000 -0.602832 1.334057 +v 1.313986 -0.342065 -1.367090 +v 2.435135 0.098824 -2.281052 +v 2.435757 0.098897 -2.280254 +v 2.436307 0.098962 -2.279548 +v 2.436763 0.099016 -2.278964 +v 2.436999 0.099043 -2.278662 +v -2.885212 -0.437337 1.920949 +v -2.717870 -0.356682 1.785125 +v -3.728000 -0.281169 2.570479 +v -3.712341 -0.448326 2.573620 +v -0.735546 -0.053125 0.219066 +v -0.406216 0.000394 -0.041418 +v -0.100273 0.040739 -0.281944 +v 0.172417 0.073341 -0.495491 +v 2.335518 1.350617 -2.295889 +v 0.354290 0.083209 -0.634777 +v -3.623852 -0.512926 2.525198 +v -3.654365 -0.169215 2.517424 +v 2.425971 0.972373 -2.327255 +v 2.459421 0.868929 -2.343834 +v 0.696977 0.054076 -0.892441 +v 2.948120 3.214165 -2.933081 +v 2.606057 3.186486 -2.663780 +v 2.997989 3.195582 -2.969370 +v 2.536222 3.145018 -2.604090 +v 3.012064 3.140727 -2.973088 +v 2.485188 3.090654 -2.557307 +v 1.046458 0.007453 -1.152257 +v -3.714744 -0.282939 2.586870 +v 2.439279 3.049827 -2.516283 +v 3.004908 3.061887 -2.957164 +v 2.449116 0.979252 -2.332477 +v 2.472199 0.866275 -2.340099 +v 1.368491 -0.052711 -1.393705 +v 1.717894 -0.070445 -1.662515 +v 1.478573 -0.058668 -1.476762 +v 2.441737 0.961632 -2.314012 +v 2.467338 0.882459 -2.326701 +v -3.309670 0.080582 2.251135 +v -3.268919 -0.583933 2.280387 +v 2.410137 0.281190 -2.226363 +v -3.701911 -0.287948 2.602134 +v -3.688039 -0.435647 2.604882 +v 2.482991 0.302250 -2.271514 +v 2.455522 0.944402 -2.306774 +v 2.469378 0.901553 -2.313642 +v -2.915858 -0.601549 2.023225 +v -2.924141 0.280876 1.948650 +v 2.468971 0.957141 -2.314878 +v 2.482299 0.891914 -2.319279 +v 2.465229 0.923305 -2.306645 +v -2.755682 -0.607167 1.904943 +v -2.835748 0.331599 1.881160 +v -2.646201 0.648459 1.709923 +v -2.643573 -0.607493 1.823210 +v 2.443879 1.032018 -2.292681 +v 2.489036 0.811001 -2.307592 +v -3.626724 -0.173321 2.551450 +v 2.481117 0.925173 -2.310048 +v -2.579668 0.714584 1.657621 +v -2.454774 -0.601995 1.681149 +v -2.516832 0.746206 1.607137 +v -2.349206 -0.593950 1.599513 +v -2.206373 0.814278 1.358835 +v -2.077747 -0.597953 1.388236 +v 2.667233 1.708364 -2.516935 +v 1.224686 1.075007 -1.330905 +v 1.360617 -0.336670 -1.307250 +v 3.156468 0.066579 -2.744432 +v 2.549224 1.161456 -2.370206 +v 2.664121 0.806131 -2.427157 +v 2.540023 0.316550 -2.282602 +v 1.385180 1.409518 -1.481935 +v -3.679715 -0.306668 2.626691 +v -3.669712 -0.412230 2.628586 +v 1.360989 1.340571 -1.454082 +v 2.400261 0.438891 -2.178853 +v 2.472391 0.129659 -2.206693 +v 2.831269 1.307854 -2.593973 +v 2.957226 0.918323 -2.656406 +v 2.230447 1.248588 -2.116977 +v 2.590304 -0.243009 -2.260568 +v 1.354370 1.159190 -1.425091 +v 1.917054 1.201918 -1.867717 +v -3.673127 -0.321429 2.632291 +v -3.666035 -0.394406 2.633464 +v -2.830682 -0.430915 1.990889 +v 2.473447 0.454663 -2.225597 +v 2.543159 0.155798 -2.252504 +v 2.410583 1.081677 -2.227614 +v 2.479506 0.744341 -2.250373 +v 3.001074 0.449623 -2.628313 +v 2.829160 1.348647 -2.573941 +v 2.980689 0.880044 -2.649048 +v 2.783530 1.330534 -2.535297 +v 2.936681 0.856913 -2.611208 +v 3.051332 0.464469 -2.662340 +v -3.572802 -0.488389 2.589894 +v -3.599872 -0.184558 2.583099 +v 1.591093 1.208507 -1.591064 +v 2.482720 0.988763 -2.258252 +v 2.508792 0.861158 -2.266861 +v 2.531323 0.455464 -2.240752 +v 2.594861 0.183071 -2.265276 +v 2.415908 1.116850 -2.209669 +v 2.498616 0.712046 -2.236978 +v 2.579618 0.323851 -2.261107 +v -2.645182 -0.466535 1.885712 +v 1.939045 1.204508 -1.839511 +v -3.258276 0.070860 2.316835 +v 2.506480 0.926224 -2.248802 +v 2.992383 0.581606 -2.586979 +v 3.052857 0.322350 -2.610320 +v 2.407334 1.150018 -2.179512 +v 2.504473 0.674577 -2.211588 +v 3.042733 0.595054 -2.621444 +v 3.102565 0.338545 -2.644537 +v 2.603378 1.124561 -2.324717 +v 2.691316 0.852608 -2.368305 +v 3.078396 0.468329 -2.624718 +v 2.370287 1.163586 -2.134528 +v 2.476867 0.641940 -2.169721 +v 2.572210 0.442126 -2.225475 +v 2.626308 0.210203 -2.246356 +v 1.491168 1.154391 -1.447635 +v 2.890636 1.267406 -2.544106 +v 2.987040 0.969274 -2.591890 +v 2.788228 0.379194 -2.381967 +v 2.304762 1.155709 -2.075926 +v 2.415038 0.615971 -2.112340 +v 2.604052 0.326729 -2.229767 +v -2.858987 0.266405 2.036315 +v -3.533523 -0.443650 2.638577 +v -3.553141 -0.226176 2.633901 +v 2.469866 1.015657 -2.175067 +v 2.509659 0.820896 -2.188207 +v -2.762138 0.316353 1.974206 +v -2.778535 -0.424773 2.057773 +v 3.071249 0.576878 -2.590723 +v 3.120985 0.363654 -2.609920 +v 2.781708 0.478212 -2.350957 +v 2.827077 0.283710 -2.368468 +v -3.539008 -0.258828 2.645375 +v -3.524905 -0.409819 2.648245 +v 2.597879 0.425291 -2.200073 +v 2.642961 0.232022 -2.217474 +v 2.650729 1.065375 -2.299858 +v 2.698322 0.918196 -2.323448 +v -2.569382 0.622266 1.812512 +v 2.900579 1.299991 -2.513951 +v 3.016554 0.941337 -2.571435 +v 2.855713 1.281357 -2.474664 +v 2.972929 0.918862 -2.532765 +v 2.506130 0.920204 -2.160643 +v -3.173446 -0.542107 2.404937 +v -3.209453 0.045748 2.379028 +v 2.445409 0.560504 -2.076893 +v 2.570342 0.024900 -2.125114 +v -2.493455 0.687025 1.764050 +v 2.684069 0.992910 -2.299412 +v -2.427931 0.717893 1.714301 +v -2.119321 0.784146 1.467606 +v -1.995701 -0.573576 1.495906 +v 2.487048 1.037626 -2.146613 +v 2.534799 0.803912 -2.162379 +v 2.942544 1.202524 -2.516853 +v 2.994718 1.041175 -2.542714 +v 2.517081 0.572200 -2.127054 +v 2.637826 0.054551 -2.173658 +v 2.571093 0.562590 -2.150938 +v 2.681143 0.090791 -2.193414 +v 1.466306 1.086034 -1.335468 +v 2.979094 1.123082 -2.516365 +v -0.568604 -0.447372 0.394570 +v 1.323830 1.046159 -1.213567 +v 1.454755 -0.311009 -1.191014 +v 3.248744 0.081120 -2.625723 +v 2.688243 0.344561 -2.209711 +v -2.593169 -0.347277 1.974947 +v 3.029114 0.682935 -2.497393 +v 3.133857 0.233890 -2.537821 +v 2.530565 0.923082 -2.129303 +v -0.224107 -0.434065 0.145862 +v 3.079074 0.695309 -2.532807 +v 3.182707 0.251022 -2.572807 +v 2.606071 0.533336 -2.149005 +v 2.699770 0.131633 -2.185170 +v 2.490887 1.056969 -2.105453 +v 2.546971 0.782472 -2.123972 +v 2.684199 0.409138 -2.190257 +v 2.713735 0.282512 -2.201657 +v 2.963027 1.221936 -2.481166 +v 3.025790 1.027834 -2.512276 +v 2.918829 1.202466 -2.441528 +v 2.982266 1.006286 -2.472972 +v -2.731051 -0.419180 2.118678 +v 2.346020 1.217882 -1.984849 +v 2.691945 -0.216224 -2.122858 +v 2.626097 0.501300 -2.136348 +v 2.704180 0.166548 -2.166486 +v 2.809263 0.554231 -2.283747 +v 2.887846 0.217345 -2.314077 +v -2.799153 0.230131 2.121073 +v -2.792140 -0.550877 2.187326 +v 0.122037 -0.414552 -0.095656 +v 3.101457 0.660216 -2.517043 +v 3.187603 0.290900 -2.550293 +v 2.461960 1.061494 -2.053272 +v 2.523494 0.760321 -2.073591 +v 3.006995 1.126368 -2.480578 +v 2.963268 1.105875 -2.440934 +v 2.399616 1.050076 -1.991851 +v 2.463283 0.738458 -2.012874 +v 2.541997 0.922437 -2.085123 +v -2.620849 -0.553009 2.083075 +v -2.691633 0.277873 2.061963 +v 0.380138 -0.399580 -0.262083 +v 2.741003 0.353341 -2.170536 +v 2.702686 0.458937 -2.148505 +v 2.753845 0.239614 -2.168251 +v 2.735783 0.349782 -2.158101 +v 2.738935 0.386350 -2.160591 +v 2.754033 0.321623 -2.166418 +v 2.501059 1.494406 -2.071566 +v -2.498046 0.561724 1.911958 +v -2.495843 -0.550836 2.012409 +v 2.518039 0.913888 -2.030968 +v 2.733885 0.378609 -2.149074 +v 2.747093 0.321983 -2.154171 +v 2.457638 0.897352 -1.968773 +v -2.690304 -0.414381 2.170940 +v -3.127855 -0.045628 2.482288 +v -3.102117 -0.467490 2.500962 +v 2.770798 1.227046 -2.232150 +v 2.748385 0.411806 -2.139249 +v 2.774536 0.299695 -2.149342 +v 2.764617 1.300784 -2.232889 +v 2.792626 1.229192 -2.247504 +v -2.409183 0.623172 1.864025 +v -2.298506 -0.543169 1.884841 +v 2.786510 1.302148 -2.248235 +v 2.741907 0.400740 -2.129507 +v 2.764784 0.302663 -2.138337 +v -2.529794 -0.443952 2.062569 +v -2.339763 0.652407 1.813967 +v -2.191192 -0.534884 1.807161 +v -1.920944 -0.535987 1.596561 +v -2.034769 0.715099 1.570418 +v -1.970078 -0.080625 1.596081 +v 1.720073 1.327862 -1.406896 +v 0.572047 -0.387414 -0.352526 +v 2.806120 1.237906 -2.229508 +v 2.801037 1.298551 -2.230116 +v -3.088440 -0.411708 2.522214 +v -3.106239 -0.116627 2.508994 +v 1.609069 1.259907 -1.293617 +v 2.543657 1.253039 -2.021345 +v 1.525799 0.957611 -1.197050 +v 2.757700 0.410246 -2.104644 +v 2.784117 0.296996 -2.114841 +v 2.533483 0.613445 -1.947803 +v 2.602202 0.623366 -2.002292 +v 2.677744 -0.005017 -2.003484 +v 2.648675 0.609224 -2.037226 +v 2.672127 0.573042 -2.052187 +v 2.681143 0.534388 -2.055668 +v 2.741627 0.025636 -2.056106 +v 2.775750 0.064439 -2.086273 +v 2.738751 0.480616 -2.095645 +v 2.771306 0.147849 -2.090468 +v 2.780322 0.109196 -2.093948 +v 2.762407 0.352190 -2.102295 +v 2.766821 0.422887 -2.112228 +v 2.797824 0.227363 -2.118445 +v 2.786530 0.359571 -2.121780 +v 2.797017 0.293432 -2.123883 +v 1.548968 1.153765 -1.228190 +v 2.798795 1.166335 -2.202419 +v 2.552618 1.211834 -2.013930 +v 2.544939 1.295449 -2.015621 +v 2.863513 0.586883 -2.198347 +v 2.954250 0.197881 -2.233369 +v 2.820327 1.169125 -2.218088 +v 2.781909 1.367789 -2.204438 +v 2.803619 1.368443 -2.220086 +v 1.423109 0.978571 -1.105456 +v 1.544240 -0.271959 -1.085059 +v 3.334585 0.098417 -2.514929 +v 1.554716 0.187936 -1.132116 +v 2.612265 1.258718 -2.052108 +v 3.101424 0.726458 -2.383560 +v 3.222370 0.207946 -2.430242 +v -2.658075 -0.410585 2.212276 +v 3.150617 0.738370 -2.420182 +v 3.270283 0.225352 -2.466369 +v 3.160928 0.696012 -2.423422 +v 3.260400 0.269561 -2.461816 +v 2.619734 1.224381 -2.045928 +v 2.613334 1.294060 -2.047338 +v 2.829147 1.187974 -2.205056 +v 2.815259 1.353660 -2.206717 +v 2.570461 1.178110 -1.994503 +v 2.556271 1.332609 -1.997628 +v 2.777033 0.404579 -2.081148 +v 2.799910 0.306502 -2.089978 +v 2.789302 0.416625 -2.086768 +v 2.815452 0.304514 -2.096862 +v 2.634603 1.196277 -2.029740 +v 2.622778 1.325027 -2.032343 +v 2.651619 1.262515 -2.043053 +v 1.554142 0.981857 -1.160642 +v 2.656512 1.240018 -2.039004 +v 2.652319 1.285671 -2.039927 +v -2.635774 -0.407958 2.240880 +v 2.794724 0.385259 -2.065313 +v 2.807933 0.328634 -2.070411 +v 2.809805 0.394697 -2.069692 +v 2.824903 0.329970 -2.075520 +v 2.806035 0.357461 -2.061383 +v -2.489068 -0.351828 2.132329 +v 2.463909 1.145066 -1.865152 +v 2.782581 -0.176570 -1.992240 +v 1.570340 0.895334 -1.144881 +v 1.570297 0.896443 -1.144827 +v 1.570363 0.895879 -1.144798 +v 1.570504 0.894974 -1.144707 +v 1.570489 0.895138 -1.144709 +v 1.570444 0.896371 -1.144649 +v 1.570624 0.894816 -1.144569 +v 2.666254 1.221606 -2.028398 +v 2.658506 1.305960 -2.030103 +v 1.570869 0.894455 -1.144293 +v 1.570594 0.897869 -1.144312 +v 2.594467 1.157000 -1.966023 +v 2.575927 1.358863 -1.970106 +v 1.570894 0.897475 -1.143969 +v 2.833890 0.249041 -2.065584 +v 2.782731 0.468365 -2.045837 +v -2.701300 -0.462008 2.315575 +v -2.705561 0.099398 2.267342 +v 2.841108 1.134918 -2.151662 +v -0.479044 -0.046272 0.545593 +v 2.862191 1.138039 -2.167869 +v 2.822836 0.362979 -2.065575 +v 2.654608 1.178685 -2.006007 +v 2.639158 1.346905 -2.009409 +v -2.624374 -0.406615 2.255502 +v 2.818040 1.410109 -2.154421 +v 2.839368 1.410315 -2.170599 +v 2.863947 1.162135 -2.163311 +v 2.676065 1.265123 -2.025119 +v 2.664612 1.254980 -2.014677 +v 2.663261 1.271085 -2.014839 +v 0.971816 -0.356390 -0.546463 +v 2.844975 1.388465 -2.165580 +v 2.678566 1.253623 -2.023050 +v 2.676423 1.276959 -2.023522 +v 2.679361 1.210080 -2.012848 +v 2.669238 1.320294 -2.015076 +v 2.670727 1.241720 -2.008183 +v 2.667038 1.285720 -2.008625 +v 2.683546 1.244211 -2.017628 +v 2.679586 1.287331 -2.018500 +v 1.579791 0.985026 -1.130600 +v -1.956412 0.610154 1.662774 +v -1.856740 -0.486828 1.685802 +v 2.690246 1.238319 -2.009680 +v 2.685071 1.294657 -2.010819 +v 2.679968 1.234858 -1.997098 +v 2.674930 1.294963 -1.997700 +v -0.132362 0.006287 0.310615 +v 1.590120 0.977428 -1.119874 +v 2.748270 0.515690 -1.979648 +v 2.826352 0.180938 -2.009786 +v -2.571993 0.138873 2.206668 +v -2.521306 -0.458402 2.221998 +v -2.685403 -0.396185 2.345565 +v -2.686840 -0.001633 2.310453 +v 2.620983 1.151716 -1.932826 +v 2.600915 1.370211 -1.937245 +v 2.676704 1.174282 -1.978342 +v 2.659981 1.356362 -1.982024 +v 2.678470 1.266092 -1.988150 +v 2.693838 1.207195 -1.994723 +v 2.682881 1.326489 -1.997135 +v 2.697646 1.236845 -2.000415 +v 2.692045 1.297825 -2.001648 +v 2.697040 1.267502 -2.002758 +v 2.651196 0.936979 -1.934514 +v 2.898778 0.955779 -2.129270 +v 2.929918 0.567420 -2.117638 +v 3.008498 0.230534 -2.147968 +v 2.689859 1.236233 -1.984390 +v 2.684821 1.296338 -1.984993 +v 2.822841 0.425467 -2.012432 +v 2.852378 0.298841 -2.023833 +v 1.608781 0.850501 -1.104316 +v 2.704620 1.240012 -1.991243 +v 2.699446 1.296350 -1.992383 +v 1.624309 1.159754 -1.138181 +v 2.752678 0.550604 -1.960964 +v 2.846378 0.148901 -1.997130 +v 1.606690 0.959087 -1.103622 +v 2.710106 1.247339 -1.983562 +v 2.706145 1.290459 -1.984434 +v 2.697752 1.245476 -1.973465 +v 2.694063 1.289476 -1.973907 +v 2.707481 1.213392 -1.976781 +v 2.697358 1.323606 -1.979010 +v -2.445962 -0.418610 2.191836 +v 3.233725 0.674674 -2.334944 +v 3.319870 0.305357 -2.368193 +v 2.848333 0.363417 -2.004377 +v 2.713269 1.257710 -1.978540 +v 2.711125 1.281046 -1.979012 +v 1.518181 0.875199 -1.011295 +v 1.625158 -0.221229 -0.994015 +v 3.410238 0.117713 -2.416893 +v 2.901195 1.167312 -2.115460 +v 2.701529 1.260111 -1.967251 +v 2.700178 1.276216 -1.967413 +v 2.713626 1.269547 -1.976943 +v 1.616466 0.943560 -1.090626 +v 2.882224 1.393643 -2.117728 +v -2.383910 0.349570 2.084356 +v -2.382627 -0.452496 2.157011 +v 2.697528 1.183740 -1.950957 +v 2.682078 1.351960 -1.954359 +v 2.907001 1.144267 -2.110304 +v 2.886398 1.141212 -2.093480 +v 2.743282 0.582871 -1.930085 +v 2.853333 0.111072 -1.972562 +v 1.623579 0.887518 -1.082372 +v 0.198902 0.047648 0.105888 +v 1.621282 0.931471 -1.084234 +v 2.884178 1.416542 -2.113034 +v 2.863331 1.416404 -2.096239 +v -2.503361 -0.388481 2.254219 +v -2.538594 0.031317 2.243138 +v -1.878374 0.077127 1.724185 +v -1.889940 0.222714 1.719833 +v 2.645971 1.163066 -1.899965 +v 2.627431 1.364929 -1.904047 +v 2.718213 1.227726 -1.961754 +v 2.710466 1.312080 -1.963460 +v 1.626047 0.904541 -1.078374 +v 3.189935 0.700514 -2.275981 +v 3.294679 0.251469 -2.316409 +v 3.238191 0.712702 -2.313742 +v 3.341825 0.268415 -2.353742 +v 2.706004 0.594452 -1.884739 +v 2.826750 0.076803 -1.931343 +v 2.640884 0.583528 -1.826173 +v 2.765818 0.047924 -1.874394 +v 1.714162 1.276631 -1.167239 +v 2.724400 1.248014 -1.951930 +v 2.720207 1.293667 -1.952853 +v 1.654904 1.136021 -1.105274 +v 2.725100 1.271170 -1.948805 +v 2.713907 1.205618 -1.928023 +v 2.702083 1.334368 -1.930626 +v 1.831320 1.344269 -1.251206 +v -2.260945 0.399211 2.027604 +v -2.181051 -0.441814 2.042546 +v 2.809488 0.450216 -1.928661 +v 2.854570 0.256946 -1.946061 +v -2.423567 -0.369548 2.230060 +v -2.180836 0.422861 1.973894 +v -2.073524 -0.433428 1.968859 +v -1.805897 -0.428247 1.759726 +v -1.887675 0.473899 1.740641 +v -2.358199 -0.380076 2.187846 +v -2.358499 0.188271 2.135889 +v 2.990686 0.501054 -2.063247 +v 3.036054 0.306554 -2.080758 +v 2.665627 1.189319 -1.872442 +v 2.651437 1.343818 -1.875567 +v 2.648270 1.510792 -1.882843 +v 2.930912 1.202118 -2.074323 +v 2.723351 1.236585 -1.913028 +v 2.716951 1.306264 -1.914438 +v 2.917024 1.367804 -2.075984 +v 1.384653 -0.306314 -0.725204 +v 2.724420 1.271928 -1.908258 +v 1.621186 0.490687 -0.975352 +v 1.644965 0.346027 -0.980608 +v 0.465380 0.080433 -0.036070 +v 2.848397 0.355508 -1.916368 +v -2.408185 -0.394890 2.251162 +v 2.942750 1.186138 -2.060817 +v 2.578963 1.033323 -1.763117 +v 2.858250 -0.125781 -1.874424 +v 2.922529 1.183532 -2.043463 +v 2.676959 1.226479 -1.854450 +v 2.669279 1.310094 -1.856141 +v 2.926042 1.385458 -2.062815 +v 2.826142 0.472035 -1.899780 +v 2.880239 0.240111 -1.920660 +v 2.905643 1.384987 -2.045482 +v 3.029535 0.405571 -2.049749 +v 3.300344 0.601920 -2.275317 +v 3.350079 0.388695 -2.294513 +v 2.678242 1.268890 -1.848725 +v 2.945134 1.257227 -2.050923 +v 1.755731 1.246131 -1.122488 +v 1.720327 0.756772 -1.049674 +v 2.940050 1.317871 -2.051532 +v -2.214680 0.228844 2.067608 +v -2.157859 -0.367480 2.078067 +v 1.704158 1.079827 -1.054807 +v -2.127781 0.248308 2.009962 +v -2.051331 -0.359151 2.006140 +v -1.843236 0.290860 1.784206 +v -1.785848 -0.348829 1.798208 +v 1.604892 0.740558 -0.935201 +v 1.693974 -0.161033 -0.921860 +v 3.472397 0.138163 -2.335899 +v 1.873536 1.307570 -1.193691 +v 2.872832 0.358386 -1.885027 +v 2.959859 1.252435 -2.032667 +v 2.953743 1.325390 -2.033399 +v 3.342932 0.497244 -2.260519 +v 2.939822 1.250538 -2.015012 +v 2.829564 0.490591 -1.858224 +v 2.893102 0.218199 -1.882748 +v 2.933641 1.324275 -2.015751 +v 1.701154 -0.246228 -0.905127 +v -0.334995 -0.394882 0.699940 +v 3.318333 0.625178 -2.242012 +v 3.378166 0.368670 -2.265106 +v 3.270936 0.612055 -2.203483 +v 3.331410 0.352798 -2.226824 +v 2.870384 0.194339 -1.832802 +v 2.800672 0.493204 -1.805894 +v 2.706330 1.463624 -1.813588 +v 1.735438 1.031940 -1.015094 +v 2.096574 -0.183066 -1.184359 +v 2.738836 0.478769 -1.744593 +v 2.810966 0.169537 -1.772433 +v 1.857375 -0.219119 -0.990222 +v 2.884402 0.357112 -1.840897 +v 3.369567 0.499255 -2.224210 +v 0.704277 0.096803 -0.109143 +v 3.322719 0.484781 -2.185490 +v 1.668063 0.559071 -0.899985 +v 1.734685 -0.079917 -0.893249 +v 3.503355 0.161047 -2.294336 +v 1.853604 0.697100 -1.057274 +v 0.023839 -0.378671 0.476160 +v 2.742703 1.224204 -1.790460 +v 2.990285 1.243004 -1.985215 +v 1.751320 0.995124 -0.995284 +v 1.762367 0.864072 -0.986848 +v 1.978204 0.694100 -1.137927 +v 1.821889 1.171394 -1.054962 +v 2.860838 0.346753 -1.786883 +v 1.768391 0.914212 -0.976082 +v 2.800102 0.741867 -1.764054 +v 3.047683 0.760667 -1.958810 +v 2.801089 0.327237 -1.724923 +v 2.686153 0.887537 -1.683203 +v 2.915644 -0.066074 -1.774558 +v 1.939461 1.218681 -1.105028 +v 0.380965 -0.356962 0.277840 +v 2.157984 -0.096145 -1.130609 +v 2.171539 -0.180007 -1.133476 +v 1.870303 1.101825 -0.999439 +v 2.768902 0.690672 -1.652155 +v 2.931033 0.013315 -1.716360 +v 2.798614 1.350688 -1.707175 +v 1.895380 1.047986 -0.972059 +v -0.263286 -0.086843 0.817096 +v 1.915261 0.855545 -0.963812 +v 1.995518 1.144847 -1.050030 +v 1.923295 0.929349 -0.946858 +v 0.639411 -0.340042 0.173318 +v 2.048910 0.874962 -1.028633 +v 2.024876 1.087065 -1.024636 +v 0.098227 -0.041243 0.603403 +v 1.153992 0.084424 -0.229250 +v 2.057853 0.957558 -1.005829 +v 2.853774 1.270425 -1.644800 +v 2.691514 -0.001160 -1.386453 +v 2.705070 -0.085024 -1.389320 +v 2.781930 0.015918 -1.458515 +v 2.795485 -0.067945 -1.461382 +v 2.889620 0.961520 -1.629051 +v 3.137201 0.980321 -1.823807 +v 2.880562 1.206416 -1.616926 +v 3.128144 1.225217 -1.811681 +v 2.893827 1.173559 -1.603234 +v 3.141408 1.192360 -1.797990 +v -0.165990 -0.329480 0.922774 +v 2.905606 1.059058 -1.599313 +v 3.153188 1.077859 -1.794069 +v 2.902644 1.136966 -1.595558 +v 3.150226 1.155766 -1.790314 +v 2.906628 1.098234 -1.594232 +v 3.154210 1.117035 -1.788988 +v 0.450756 -0.003152 0.428413 +v 0.893967 -0.321301 0.137348 +v 0.203261 -0.310043 0.717218 +v -0.125580 -0.167821 0.986626 +v 0.712336 0.026704 0.345760 +v -0.090811 -0.262476 1.024542 +v 1.652963 0.059929 -0.335038 +v 0.245682 -0.133976 0.786321 +v 0.568430 -0.286725 0.550539 +v 0.283133 -0.240046 0.827356 +v 2.000346 0.011962 -0.463845 +v 0.611741 -0.102875 0.629863 +v 0.998399 0.048451 0.327453 +v 0.827128 -0.268380 0.491359 +v 1.390944 -0.279641 0.074489 +v 2.438757 0.004155 -0.738633 +v 0.652016 -0.215986 0.675288 +v 2.198852 0.014020 -0.544254 +v 0.870584 -0.078559 0.583979 +v 0.910831 -0.196982 0.637049 +v 1.127571 -0.244822 0.495289 +v 1.185795 -0.053488 0.599517 +v 1.535993 0.058149 0.320863 +v 1.947252 -0.218027 0.037437 +v 1.232465 -0.171199 0.659405 +v 2.293159 -0.159573 -0.040558 +v 2.769338 -0.097283 -0.322594 +v 1.695832 -0.196471 0.528473 +v 2.530709 -0.129037 -0.121828 +v 2.157723 0.063260 0.342121 +v 1.776927 -0.020207 0.662777 +v 1.833764 -0.121263 0.736990 +v 3.351091 0.073201 -0.443243 +v 3.364646 -0.010661 -0.446110 +v 2.948324 -0.003291 -0.110055 +v 2.961879 -0.087154 -0.112922 +v 2.992015 0.002089 -0.060870 +v 3.005570 -0.081773 -0.063737 +v 2.525032 0.038738 0.306061 +v 3.379430 0.074900 -0.358922 +v 3.392986 -0.008964 -0.361790 +v 3.036570 0.045434 0.026135 +v 2.796513 0.049478 0.227779 +v 2.357571 -0.130808 0.595337 +v 2.473462 0.016867 0.762129 +v 2.725617 -0.081249 0.592239 +v 2.544662 -0.059737 0.852031 +v 3.261550 -0.027300 0.308389 +v 3.022995 -0.051504 0.513873 +v 2.851826 0.022984 0.782891 +v 3.407963 0.046255 0.499554 +v 2.923753 -0.024800 0.883847 +v 3.168214 0.041578 0.705848 +v 3.711371 0.106264 0.292980 +v 3.724926 0.022401 0.290113 +v 3.531985 0.072015 0.446671 +v 3.545540 -0.011849 0.443804 +v 3.445588 0.055512 0.520889 +v 3.459143 -0.028351 0.518022 +v 3.563503 0.077601 0.432271 +v 3.577058 -0.006262 0.429404 +v 3.488101 0.014784 0.599486 +v 3.249111 0.000073 0.806963 +vt 0.592295 0.226200 +vt 0.597451 0.733993 +vt 0.582117 0.735152 +vt 0.578489 0.226600 +vt 0.583926 0.737917 +vt 0.580317 0.227579 +vt 0.553525 0.740642 +vt 0.440791 0.740508 +vt 0.450875 0.228401 +vt 0.552974 0.228523 +vt 0.390668 0.737686 +vt 0.405291 0.227370 +vt 0.388859 0.734922 +vt 0.403463 0.226391 +vt 0.371983 0.733724 +vt 0.388098 0.225956 +vt 0.619772 0.907170 +vt 0.592331 0.999817 +vt 0.601330 0.999666 +vt 0.610146 0.909999 +vt 0.574598 0.999907 +vt 0.590330 0.911915 +vt 0.553091 0.999969 +vt 0.566105 0.913419 +vt 0.528748 1.000000 +vt 0.538531 0.914447 +vt 0.502634 1.000000 +vt 0.478247 0.914918 +vt 0.475889 0.999968 +vt 0.508812 0.914955 +vt 0.449684 0.999906 +vt 0.448173 0.914340 +vt 0.425163 0.999816 +vt 0.419902 0.913245 +vt 0.403398 0.999703 +vt 0.394672 0.911681 +vt 0.385339 0.999570 +vt 0.373584 0.909717 +vt 0.375862 0.999397 +vt 0.362094 0.906863 +vt 0.605465 0.740602 +vt 0.597205 0.739049 +vt 0.491046 0.731144 +vt 0.490016 0.901745 +vt 0.489949 0.901745 +vt 0.579978 0.737974 +vt 0.489821 0.901745 +vt 0.558870 0.737116 +vt 0.489665 0.901745 +vt 0.534804 0.736510 +vt 0.489489 0.901745 +vt 0.508831 0.736184 +vt 0.489301 0.901744 +vt 0.482087 0.736152 +vt 0.489205 0.901744 +vt 0.455740 0.736416 +vt 0.430942 0.736963 +vt 0.408777 0.737770 +vt 0.390214 0.738801 +vt 0.379997 0.740333 +vt 0.353656 0.886514 +vt 0.378904 0.730193 +vt 0.361705 0.880889 +vt 0.395023 0.727499 +vt 0.380234 0.876591 +vt 0.415254 0.725377 +vt 0.403440 0.873201 +vt 0.438713 0.723920 +vt 0.430309 0.870869 +vt 0.464376 0.723192 +vt 0.459668 0.869695 +vt 0.477566 0.723232 +vt 0.474742 0.869751 +vt 0.491120 0.723224 +vt 0.490232 0.869731 +vt 0.517777 0.724015 +vt 0.520667 0.870977 +vt 0.543181 0.725530 +vt 0.549643 0.873375 +vt 0.566223 0.727704 +vt 0.575892 0.876824 +vt 0.585895 0.730440 +vt 0.598267 0.881171 +vt 0.611334 0.886821 +vt 0.514919 0.001808 +vt 0.498936 0.000000 +vt 0.513858 0.001846 +vt 0.529721 0.013570 +vt 0.531965 0.013618 +vt 0.556734 0.062512 +vt 0.561107 0.062168 +vt 0.573935 0.111992 +vt 0.579743 0.111218 +vt 0.580242 0.134938 +vt 0.586574 0.134186 +vt 0.586077 0.152110 +vt 0.592909 0.152041 +vt 0.591813 0.178477 +vt 0.599157 0.177963 +vt 0.593139 0.193428 +vt 0.600618 0.192699 +vt 0.592908 0.232476 +vt 0.600324 0.231459 +vt 0.496437 0.231529 +vt 0.508654 0.001888 +vt 0.518859 0.013502 +vt 0.535963 0.062914 +vt 0.546664 0.112914 +vt 0.550579 0.135830 +vt 0.554180 0.152166 +vt 0.557666 0.179076 +vt 0.558422 0.194288 +vt 0.558268 0.233688 +vt 0.501777 0.001902 +vt 0.504546 0.013460 +vt 0.508707 0.063079 +vt 0.510973 0.113312 +vt 0.511780 0.136212 +vt 0.512489 0.152160 +vt 0.513077 0.179318 +vt 0.513104 0.194651 +vt 0.512986 0.234213 +vt 0.498076 0.001898 +vt 0.496856 0.013450 +vt 0.494097 0.063062 +vt 0.491870 0.113289 +vt 0.491019 0.136187 +vt 0.490190 0.152133 +vt 0.489240 0.179289 +vt 0.488883 0.194622 +vt 0.488765 0.234184 +vt 0.490954 0.001867 +vt 0.482078 0.013458 +vt 0.466079 0.062831 +vt 0.455287 0.112805 +vt 0.451272 0.135711 +vt 0.447516 0.152039 +vt 0.443646 0.178940 +vt 0.442563 0.194150 +vt 0.442409 0.233550 +vt 0.485218 0.001812 +vt 0.470208 0.013499 +vt 0.443661 0.062377 +vt 0.426084 0.111816 +vt 0.419558 0.134746 +vt 0.413491 0.151904 +vt 0.407324 0.178257 +vt 0.405675 0.193204 +vt 0.405444 0.232252 +vt 0.483722 0.001771 +vt 0.467140 0.013541 +vt 0.437940 0.062021 +vt 0.418694 0.111026 +vt 0.411548 0.133977 +vt 0.404917 0.151817 +vt 0.398200 0.177723 +vt 0.396421 0.192455 +vt 0.396126 0.231215 +vt 0.482807 0.001091 +vt 0.465246 0.012218 +vt 0.434231 0.060860 +vt 0.413722 0.112734 +vt 0.406278 0.130880 +vt 0.397753 0.154535 +vt 0.390718 0.172336 +vt 0.388811 0.184259 +vt 0.483894 0.000866 +vt 0.467479 0.011696 +vt 0.438359 0.060674 +vt 0.419010 0.113922 +vt 0.412060 0.130257 +vt 0.403381 0.155615 +vt 0.396772 0.170695 +vt 0.394947 0.181718 +vt 0.394122 0.224712 +vt 0.489100 0.000562 +vt 0.478265 0.010987 +vt 0.458692 0.060437 +vt 0.445446 0.115578 +vt 0.440842 0.129428 +vt 0.433493 0.157124 +vt 0.429012 0.168469 +vt 0.427688 0.178256 +vt 0.426709 0.223032 +vt 0.492401 0.000471 +vt 0.485112 0.010775 +vt 0.471652 0.060373 +vt 0.462347 0.116094 +vt 0.459225 0.129185 +vt 0.452993 0.157597 +vt 0.449873 0.167802 +vt 0.448880 0.177211 +vt 0.447853 0.222532 +vt 0.495979 0.000427 +vt 0.492542 0.010672 +vt 0.485745 0.060349 +vt 0.480752 0.116370 +vt 0.479235 0.129074 +vt 0.474359 0.157853 +vt 0.472721 0.167476 +vt 0.472093 0.176692 +vt 0.471042 0.222291 +vt 0.497803 0.000430 +vt 0.496333 0.010680 +vt 0.492949 0.060359 +vt 0.490171 0.116373 +vt 0.489471 0.129091 +vt 0.485358 0.157859 +vt 0.484479 0.167501 +vt 0.484040 0.176724 +vt 0.482990 0.222314 +vt 0.499680 0.000431 +vt 0.500232 0.010681 +vt 0.500355 0.060366 +vt 0.499854 0.116392 +vt 0.499996 0.129099 +vt 0.496658 0.157879 +vt 0.496558 0.167505 +vt 0.496314 0.176721 +vt 0.495264 0.222320 +vt 0.503340 0.000484 +vt 0.507844 0.010802 +vt 0.514842 0.060424 +vt 0.518821 0.116161 +vt 0.520601 0.129259 +vt 0.518915 0.157676 +vt 0.520341 0.167887 +vt 0.520484 0.177297 +vt 0.519458 0.222618 +vt 0.506801 0.000583 +vt 0.515045 0.011031 +vt 0.528575 0.060520 +vt 0.536823 0.115687 +vt 0.540149 0.129546 +vt 0.540157 0.157251 +vt 0.543032 0.168605 +vt 0.543547 0.178394 +vt 0.542568 0.223170 +vt 0.512534 0.000900 +vt 0.526992 0.011767 +vt 0.551432 0.060809 +vt 0.566860 0.114099 +vt 0.572744 0.130449 +vt 0.575967 0.155821 +vt 0.581260 0.170915 +vt 0.582411 0.181941 +vt 0.581586 0.224936 +vt 0.514004 0.001128 +vt 0.530070 0.012295 +vt 0.557398 0.061007 +vt 0.574770 0.112926 +vt 0.581304 0.131089 +vt 0.585745 0.154759 +vt 0.591675 0.172575 +vt 0.593008 0.184503 +vt 0.500194 0.123038 +vt 0.538682 0.145632 +vt 0.499355 0.147686 +vt 0.567425 0.437987 +vt 0.495309 0.437689 +vt 0.572058 0.485965 +vt 0.494594 0.485885 +vt 0.579203 0.530428 +vt 0.494130 0.530571 +vt 0.588071 0.564595 +vt 0.493832 0.570346 +vt 0.603460 0.591429 +vt 0.494064 0.596672 +vt 0.634825 0.640783 +vt 0.495158 0.646017 +vt 0.673396 0.693624 +vt 0.496679 0.696159 +vt 0.692678 0.734348 +vt 0.497801 0.742533 +vt 0.702762 0.758051 +vt 0.498113 0.758399 +vt 0.701606 0.793564 +vt 0.498079 0.793255 +vt 0.493311 0.794017 +vt 0.530328 0.123074 +vt 0.571363 0.144013 +vt 0.627653 0.438535 +vt 0.636786 0.486372 +vt 0.650275 0.530678 +vt 0.666763 0.560227 +vt 0.694688 0.587480 +vt 0.750987 0.636789 +vt 0.820060 0.691789 +vt 0.854194 0.727752 +vt 0.872335 0.757923 +vt 0.870198 0.793953 +vt 0.555251 0.123104 +vt 0.591748 0.143109 +vt 0.665577 0.439237 +vt 0.677585 0.487036 +vt 0.695058 0.531278 +vt 0.716302 0.557996 +vt 0.751975 0.585509 +vt 0.823559 0.634725 +vt 0.911312 0.690971 +vt 0.954422 0.723886 +vt 0.977512 0.758039 +vt 0.974704 0.794354 +vt 0.570653 0.123123 +vt 0.596282 0.143062 +vt 0.674482 0.439878 +vt 0.687203 0.487720 +vt 0.705580 0.531920 +vt 0.727870 0.558106 +vt 0.765162 0.585722 +vt 0.839794 0.634825 +vt 0.931229 0.691232 +vt 0.975934 0.723388 +vt 1.000000 0.758335 +vt 0.996949 0.794648 +vt 0.404437 0.142964 +vt 0.426515 0.122951 +vt 0.573874 0.123126 +vt 0.323231 0.439478 +vt 0.310002 0.487319 +vt 0.291306 0.531610 +vt 0.269108 0.558029 +vt 0.232259 0.585436 +vt 0.158605 0.634392 +vt 0.068392 0.690386 +vt 0.024123 0.722737 +vt 0.000000 0.757160 +vt 0.002277 0.793454 +vt 0.408288 0.143022 +vt 0.329678 0.438833 +vt 0.316870 0.486617 +vt 0.298892 0.530832 +vt 0.277591 0.557845 +vt 0.242362 0.585244 +vt 0.172141 0.634290 +vt 0.086185 0.690163 +vt 0.044209 0.723323 +vt 0.021216 0.756939 +vt 0.023503 0.793219 +vt 0.429735 0.122954 +vt 0.428009 0.143973 +vt 0.365185 0.438218 +vt 0.354927 0.486047 +vt 0.340715 0.530335 +vt 0.323958 0.560190 +vt 0.296482 0.587348 +vt 0.241975 0.636524 +vt 0.175315 0.691197 +vt 0.142962 0.727426 +vt 0.125096 0.757073 +vt 0.126941 0.793066 +vt 0.445138 0.122973 +vt 0.460221 0.145670 +vt 0.423771 0.437812 +vt 0.417791 0.485792 +vt 0.409775 0.530252 +vt 0.400446 0.564744 +vt 0.385513 0.591511 +vt 0.356231 0.640793 +vt 0.320514 0.693380 +vt 0.303405 0.734406 +vt 0.293784 0.757604 +vt 0.294807 0.793079 +vt 0.470061 0.123002 +vt 0.584118 0.143846 +vt 0.652512 0.440323 +vt 0.663585 0.488333 +vt 0.679561 0.533226 +vt 0.698964 0.560878 +vt 0.731472 0.587869 +vt 0.796494 0.637100 +vt 0.876085 0.692426 +vt 0.914822 0.726015 +vt 0.935707 0.758515 +vt 0.932883 0.794633 +vt 0.564354 0.123115 +vt 0.557453 0.145374 +vt 0.603941 0.440767 +vt 0.611404 0.489119 +vt 0.622180 0.535513 +vt 0.635332 0.566338 +vt 0.657480 0.591977 +vt 0.701732 0.641506 +vt 0.755840 0.694578 +vt 0.781940 0.731416 +vt 0.796061 0.758682 +vt 0.793893 0.794463 +vt 0.543740 0.123090 +vt 0.520898 0.147383 +vt 0.537164 0.441133 +vt 0.539680 0.489942 +vt 0.543358 0.538385 +vt 0.547975 0.573543 +vt 0.555980 0.597337 +vt 0.571895 0.647283 +vt 0.591287 0.697315 +vt 0.600266 0.738659 +vt 0.605208 0.758809 +vt 0.604010 0.794167 +vt 0.515597 0.123057 +vt 0.480790 0.147467 +vt 0.463733 0.441064 +vt 0.460823 0.489897 +vt 0.456750 0.538466 +vt 0.452065 0.573899 +vt 0.444570 0.597554 +vt 0.429485 0.647493 +vt 0.410904 0.697284 +vt 0.401280 0.738907 +vt 0.396151 0.758578 +vt 0.396067 0.793912 +vt 0.484791 0.123020 +vt 0.444068 0.145371 +vt 0.396343 0.440538 +vt 0.388469 0.488901 +vt 0.377334 0.535405 +vt 0.364191 0.566484 +vt 0.342521 0.591951 +vt 0.299133 0.641406 +vt 0.245883 0.694154 +vt 0.219396 0.731230 +vt 0.205038 0.757996 +vt 0.206019 0.793754 +vt 0.456648 0.122986 +vt 0.417060 0.143778 +vt 0.346645 0.439977 +vt 0.335120 0.487990 +vt 0.318813 0.532980 +vt 0.299476 0.560871 +vt 0.267422 0.587665 +vt 0.203316 0.636772 +vt 0.124729 0.691714 +vt 0.085988 0.725511 +vt 0.064911 0.757495 +vt 0.066727 0.793592 +vt 0.436035 0.122962 +vt 0.495260 0.736170 +vt 0.500696 0.234197 +vt 0.536496 0.234045 +vt 0.577350 0.233157 +vt 0.495655 0.736171 +vt 0.501053 0.234197 +vt 0.464891 0.233960 +vt 0.422300 0.232972 +vt 0.408534 0.223769 +vt 0.563583 0.223955 +vt 0.367604 0.795692 +vt 0.344548 0.863566 +vt 0.343493 0.862334 +vt 0.368659 0.796923 +vt 0.344327 0.876900 +vt 0.343272 0.875668 +vt 0.145143 0.856433 +vt 0.144088 0.855201 +vt 0.144487 0.796170 +vt 0.143432 0.794939 +vt 0.132013 0.795411 +vt 0.130679 0.853014 +vt 0.129623 0.851782 +vt 0.133068 0.796642 +vt 0.006462 0.836828 +vt 0.005407 0.835597 +vt 0.003936 0.813497 +vt 0.002882 0.812266 +vt 0.005457 0.809612 +vt 0.004402 0.808380 +vt 0.004946 0.796489 +vt 0.003891 0.795258 +vt 0.854563 0.797672 +vt 0.853823 0.852194 +vt 0.854872 0.853763 +vt 0.853514 0.796103 +vt 0.978631 0.836386 +vt 0.979680 0.837955 +vt 0.982018 0.813180 +vt 0.983067 0.814749 +vt 0.980641 0.809310 +vt 0.981690 0.810879 +vt 0.981636 0.796256 +vt 0.982685 0.797825 +vt 0.618972 0.797391 +vt 0.639573 0.862183 +vt 0.640622 0.863752 +vt 0.617923 0.795822 +vt 0.639302 0.875450 +vt 0.640350 0.877019 +vt 0.839233 0.855561 +vt 0.840281 0.857130 +vt 0.842114 0.795606 +vt 0.843162 0.797175 +vt 0.341429 0.892018 +vt 0.354422 0.771751 +vt 0.371180 0.771906 +vt 0.361304 0.757630 +vt 0.375583 0.756290 +vt 0.376061 0.747099 +vt 0.386704 0.746114 +vt 0.396022 0.741918 +vt 0.399519 0.741536 +vt 0.406939 0.741656 +vt 0.407021 0.741651 +vt 0.362783 0.891001 +vt 0.382518 0.772090 +vt 0.385281 0.755640 +vt 0.393806 0.745632 +vt 0.401875 0.741347 +vt 0.407053 0.741648 +vt 0.377126 0.890562 +vt 0.415783 0.773053 +vt 0.413937 0.755087 +vt 0.414119 0.745184 +vt 0.408737 0.741153 +vt 0.407022 0.741639 +vt 0.418673 0.890604 +vt 0.457357 0.774594 +vt 0.449912 0.755475 +vt 0.439090 0.745395 +vt 0.417274 0.741201 +vt 0.406885 0.741627 +vt 0.367889 0.778452 +vt 0.364200 0.897177 +vt 0.470167 0.891713 +vt 0.370122 0.761446 +vt 0.381736 0.748731 +vt 0.398612 0.742335 +vt 0.406817 0.741630 +vt 0.341083 0.776828 +vt 0.346977 0.760159 +vt 0.366096 0.747919 +vt 0.393148 0.742062 +vt 0.406985 0.741639 +vt 0.330950 0.895375 +vt 0.334983 0.775889 +vt 0.341985 0.759566 +vt 0.362746 0.747620 +vt 0.391920 0.741975 +vt 0.407026 0.741643 +vt 0.322792 0.894560 +vt 0.337783 0.774019 +vt 0.345386 0.758625 +vt 0.365129 0.747299 +vt 0.392543 0.741914 +vt 0.407019 0.741650 +vt 0.324143 0.893295 +vt 0.342886 0.773061 +vt 0.350401 0.758202 +vt 0.368571 0.747202 +vt 0.393616 0.741910 +vt 0.406994 0.741653 +vt 0.329152 0.892735 +vt 0.606943 0.892335 +vt 0.578997 0.772154 +vt 0.598183 0.772042 +vt 0.576236 0.756530 +vt 0.592545 0.757906 +vt 0.567870 0.746331 +vt 0.580039 0.747342 +vt 0.558973 0.741727 +vt 0.562967 0.742117 +vt 0.553477 0.741826 +vt 0.553572 0.741831 +vt 0.582516 0.891263 +vt 0.566609 0.772310 +vt 0.565670 0.755855 +vt 0.560098 0.745830 +vt 0.556401 0.741531 +vt 0.553436 0.741823 +vt 0.566831 0.890789 +vt 0.533400 0.773194 +vt 0.537139 0.755234 +vt 0.539725 0.745333 +vt 0.549548 0.741322 +vt 0.553438 0.741813 +vt 0.525261 0.890731 +vt 0.494395 0.774638 +vt 0.503451 0.755539 +vt 0.516203 0.745487 +vt 0.541534 0.741350 +vt 0.553540 0.741802 +vt 0.599293 0.897457 +vt 0.597789 0.778726 +vt 0.476853 0.891721 +vt 0.595602 0.761715 +vt 0.582464 0.748970 +vt 0.563094 0.742531 +vt 0.553620 0.741805 +vt 0.620315 0.777161 +vt 0.614992 0.760479 +vt 0.595561 0.748192 +vt 0.567681 0.742270 +vt 0.553478 0.741814 +vt 0.627351 0.895729 +vt 0.624397 0.776234 +vt 0.618175 0.759896 +vt 0.597681 0.747900 +vt 0.568493 0.742185 +vt 0.553449 0.741818 +vt 0.633134 0.894930 +vt 0.618307 0.774354 +vt 0.611745 0.758943 +vt 0.593228 0.747572 +vt 0.567181 0.742122 +vt 0.553475 0.741825 +vt 0.628051 0.893657 +vt 0.611697 0.773381 +vt 0.605318 0.758506 +vt 0.588819 0.747464 +vt 0.565791 0.742115 +vt 0.553508 0.741827 +vt 0.621374 0.893083 +vt 0.467142 0.741480 +vt 0.460043 0.823727 +vt 0.466255 0.823734 +vt 0.491990 0.741510 +vt 0.491102 0.823764 +vt 0.497314 0.823771 +vt 0.459387 0.936839 +vt 0.481806 0.936865 +vt 0.442062 0.996371 +vt 0.457305 0.996390 +vt 0.441061 0.998017 +vt 0.455880 0.998035 +vt 0.440376 0.996388 +vt 0.454893 0.996405 +vt 0.440171 0.989270 +vt 0.454568 0.989287 +vt 0.440732 0.939254 +vt 0.455138 0.939271 +vt 0.441300 0.928768 +vt 0.455901 0.928785 +vt 0.442019 0.920921 +vt 0.456893 0.920939 +vt 0.442564 0.913924 +vt 0.457640 0.913942 +vt 0.463957 0.747884 +vt 0.487465 0.747912 +vt 0.464844 0.743833 +vt 0.488714 0.743862 +vt 0.549439 0.921434 +vt 0.548851 0.918488 +vt 0.544157 0.921323 +vt 0.551271 0.945406 +vt 0.533127 0.945025 +vt 0.552776 0.983628 +vt 0.528590 0.983120 +vt 0.552915 0.990499 +vt 0.528985 0.989997 +vt 0.552488 0.989209 +vt 0.532597 0.988792 +vt 0.540100 0.920799 +vt 0.519194 0.943227 +vt 0.510019 0.980723 +vt 0.510611 0.987626 +vt 0.517323 0.986820 +vt 0.538358 0.920003 +vt 0.513207 0.940494 +vt 0.502039 0.977080 +vt 0.502715 0.984021 +vt 0.510760 0.983824 +vt 0.539395 0.919149 +vt 0.516770 0.937557 +vt 0.506788 0.973165 +vt 0.507415 0.980148 +vt 0.514666 0.980605 +vt 0.542934 0.918463 +vt 0.528929 0.935204 +vt 0.522994 0.970029 +vt 0.523449 0.977045 +vt 0.527995 0.978025 +vt 0.548028 0.918132 +vt 0.546424 0.934066 +vt 0.546314 0.968512 +vt 0.546522 0.975543 +vt 0.547174 0.976777 +vt 0.553310 0.918243 +vt 0.564569 0.934446 +vt 0.570500 0.969019 +vt 0.570451 0.976045 +vt 0.567066 0.977194 +vt 0.557366 0.918766 +vt 0.578501 0.936245 +vt 0.589071 0.971416 +vt 0.588825 0.978417 +vt 0.582340 0.979166 +vt 0.559110 0.919562 +vt 0.584488 0.938978 +vt 0.597051 0.975059 +vt 0.596721 0.982022 +vt 0.588903 0.982162 +vt 0.558072 0.920417 +vt 0.580925 0.941915 +vt 0.592302 0.978974 +vt 0.592022 0.985895 +vt 0.584996 0.985382 +vt 0.554533 0.921102 +vt 0.568767 0.944267 +vt 0.576096 0.982110 +vt 0.575988 0.988998 +vt 0.571668 0.987961 +vt 0.424145 0.921277 +vt 0.423693 0.918338 +vt 0.418870 0.920933 +vt 0.423822 0.945229 +vt 0.405702 0.944048 +vt 0.421388 0.983437 +vt 0.397235 0.981863 +vt 0.420772 0.990308 +vt 0.396875 0.988751 +vt 0.420346 0.989024 +vt 0.400481 0.987729 +vt 0.414819 0.920239 +vt 0.391787 0.941664 +vt 0.378687 0.978685 +vt 0.378524 0.985607 +vt 0.385227 0.985116 +vt 0.413078 0.919381 +vt 0.385807 0.938716 +vt 0.370716 0.974756 +vt 0.370638 0.981719 +vt 0.378671 0.981884 +vt 0.414113 0.918588 +vt 0.389363 0.935994 +vt 0.375457 0.971128 +vt 0.375328 0.978129 +vt 0.382570 0.978900 +vt 0.417648 0.918074 +vt 0.401504 0.934227 +vt 0.391639 0.968773 +vt 0.391339 0.975799 +vt 0.395879 0.976963 +vt 0.422734 0.917975 +vt 0.418975 0.933889 +vt 0.414927 0.968321 +vt 0.414380 0.975353 +vt 0.415032 0.976592 +vt 0.428009 0.918319 +vt 0.437095 0.935070 +vt 0.439080 0.969896 +vt 0.438277 0.976910 +vt 0.434897 0.977887 +vt 0.432060 0.919013 +vt 0.451010 0.937454 +vt 0.457627 0.973073 +vt 0.456628 0.980054 +vt 0.450151 0.980500 +vt 0.433801 0.919872 +vt 0.456990 0.940402 +vt 0.465599 0.977003 +vt 0.464515 0.983942 +vt 0.456707 0.983732 +vt 0.432766 0.920664 +vt 0.453434 0.943124 +vt 0.460858 0.980631 +vt 0.459824 0.987532 +vt 0.452808 0.986716 +vt 0.429231 0.921178 +vt 0.441293 0.944891 +vt 0.444676 0.982987 +vt 0.443813 0.989862 +vt 0.439499 0.988653 +vt 0.489178 0.904955 +vt 0.478920 0.903724 +vt 0.488659 0.905860 +vt 0.513457 0.924223 +vt 0.511674 0.927332 +vt 0.523738 0.959386 +vt 0.521362 0.963531 +vt 0.522949 0.966121 +vt 0.520598 0.970220 +vt 0.515067 0.966111 +vt 0.513113 0.969519 +vt 0.486649 0.906626 +vt 0.504771 0.929961 +vt 0.512160 0.967035 +vt 0.511494 0.973688 +vt 0.505545 0.972402 +vt 0.483455 0.907135 +vt 0.493798 0.931710 +vt 0.497535 0.969367 +vt 0.497023 0.975995 +vt 0.493517 0.974319 +vt 0.479562 0.907310 +vt 0.480427 0.932313 +vt 0.479712 0.970170 +vt 0.479389 0.976790 +vt 0.478859 0.974980 +vt 0.475564 0.907126 +vt 0.466693 0.931678 +vt 0.461405 0.969323 +vt 0.461277 0.975952 +vt 0.463802 0.974284 +vt 0.472068 0.906608 +vt 0.454687 0.929901 +vt 0.445402 0.966955 +vt 0.445442 0.973609 +vt 0.450640 0.972336 +vt 0.469608 0.905838 +vt 0.446236 0.927254 +vt 0.434137 0.963426 +vt 0.434297 0.970118 +vt 0.441375 0.969434 +vt 0.468558 0.904931 +vt 0.442627 0.924138 +vt 0.429327 0.959274 +vt 0.429538 0.966009 +vt 0.437419 0.966018 +vt 0.469077 0.904026 +vt 0.444410 0.921030 +vt 0.431703 0.955130 +vt 0.431889 0.961909 +vt 0.439374 0.962610 +vt 0.471086 0.903260 +vt 0.451313 0.918400 +vt 0.440904 0.951625 +vt 0.440993 0.958442 +vt 0.446941 0.959728 +vt 0.474281 0.902751 +vt 0.462285 0.916651 +vt 0.455530 0.949294 +vt 0.455463 0.956135 +vt 0.458970 0.957810 +vt 0.478174 0.902575 +vt 0.475656 0.916048 +vt 0.473353 0.948490 +vt 0.473097 0.955340 +vt 0.473628 0.957150 +vt 0.482172 0.902760 +vt 0.489391 0.916684 +vt 0.491660 0.949337 +vt 0.491210 0.956177 +vt 0.488685 0.957846 +vt 0.485667 0.903278 +vt 0.501397 0.918460 +vt 0.507663 0.951705 +vt 0.507044 0.958521 +vt 0.501847 0.959794 +vt 0.488128 0.904048 +vt 0.509848 0.921108 +vt 0.518928 0.955234 +vt 0.518190 0.962012 +vt 0.511111 0.962696 +vt 0.490402 0.906636 +vt 0.478826 0.907307 +vt 0.488446 0.905821 +vt 0.501508 0.904625 +vt 0.497682 0.903031 +vt 0.513572 0.898392 +vt 0.507734 0.895959 +vt 0.520474 0.898400 +vt 0.513468 0.895480 +vt 0.527756 0.896328 +vt 0.519527 0.892898 +vt 0.532641 0.890349 +vt 0.523612 0.886586 +vt 0.534751 0.880504 +vt 0.525409 0.876611 +vt 0.483918 0.905221 +vt 0.488823 0.901856 +vt 0.494212 0.894166 +vt 0.497242 0.893329 +vt 0.500470 0.890372 +vt 0.502703 0.883814 +vt 0.503775 0.873743 +vt 0.478030 0.904996 +vt 0.477305 0.901416 +vt 0.476632 0.893495 +vt 0.476145 0.892524 +vt 0.475691 0.889426 +vt 0.475516 0.882776 +vt 0.475646 0.872669 +vt 0.472360 0.905207 +vt 0.466213 0.901829 +vt 0.459702 0.894125 +vt 0.455830 0.893280 +vt 0.451831 0.890314 +vt 0.449337 0.883750 +vt 0.448558 0.873677 +vt 0.468427 0.905797 +vt 0.458520 0.902984 +vt 0.447960 0.895887 +vt 0.441739 0.895394 +vt 0.435282 0.892798 +vt 0.431179 0.886476 +vt 0.429771 0.876497 +vt 0.467286 0.906609 +vt 0.456287 0.904571 +vt 0.444552 0.898310 +vt 0.437650 0.898301 +vt 0.430478 0.896212 +vt 0.425909 0.890222 +vt 0.424318 0.880373 +vt 0.469241 0.907423 +vt 0.460112 0.906165 +vt 0.450390 0.900743 +vt 0.444656 0.901221 +vt 0.438707 0.899641 +vt 0.434938 0.893984 +vt 0.433660 0.884266 +vt 0.473770 0.908024 +vt 0.468971 0.907340 +vt 0.463912 0.902535 +vt 0.460882 0.903372 +vt 0.457764 0.902168 +vt 0.455847 0.896756 +vt 0.455294 0.887134 +vt 0.479658 0.908248 +vt 0.480490 0.907779 +vt 0.481492 0.903207 +vt 0.481979 0.904178 +vt 0.482542 0.903114 +vt 0.483033 0.897794 +vt 0.483423 0.888208 +vt 0.485328 0.908037 +vt 0.491581 0.907367 +vt 0.498422 0.902577 +vt 0.502294 0.903422 +vt 0.506403 0.902226 +vt 0.509212 0.896820 +vt 0.510510 0.887200 +vt 0.489260 0.907447 +vt 0.499275 0.906212 +vt 0.510164 0.900814 +vt 0.516385 0.901307 +vt 0.522952 0.899742 +vt 0.527370 0.894095 +vt 0.529298 0.884380 +vt 0.435164 0.921226 +vt 0.423586 0.921892 +vt 0.433212 0.920281 +vt 0.446278 0.919232 +vt 0.442459 0.917382 +vt 0.458366 0.913050 +vt 0.452538 0.910227 +vt 0.465268 0.913058 +vt 0.458275 0.909671 +vt 0.472557 0.911003 +vt 0.464343 0.907025 +vt 0.477464 0.905073 +vt 0.468453 0.900708 +vt 0.479612 0.895309 +vt 0.470288 0.890792 +vt 0.428687 0.919585 +vt 0.433606 0.916021 +vt 0.439025 0.908150 +vt 0.442059 0.907178 +vt 0.445298 0.904097 +vt 0.447556 0.897496 +vt 0.448667 0.887469 +vt 0.422799 0.919325 +vt 0.422089 0.915513 +vt 0.421447 0.907374 +vt 0.420965 0.906248 +vt 0.420524 0.903004 +vt 0.420375 0.896296 +vt 0.420542 0.886228 +vt 0.417129 0.919572 +vt 0.410995 0.915994 +vt 0.404515 0.908109 +vt 0.400647 0.907129 +vt 0.396659 0.904039 +vt 0.394191 0.897432 +vt 0.393450 0.887403 +vt 0.413194 0.920257 +vt 0.403297 0.917335 +vt 0.392764 0.910156 +vt 0.386546 0.909585 +vt 0.380099 0.906924 +vt 0.376020 0.900598 +vt 0.374650 0.890678 +vt 0.412048 0.921199 +vt 0.401056 0.919178 +vt 0.389345 0.912967 +vt 0.382443 0.912959 +vt 0.375279 0.910887 +vt 0.370733 0.904945 +vt 0.369179 0.895177 +vt 0.414000 0.922144 +vt 0.404875 0.921027 +vt 0.395173 0.915790 +vt 0.389436 0.916346 +vt 0.383493 0.914865 +vt 0.379745 0.909310 +vt 0.378503 0.899693 +vt 0.418526 0.922840 +vt 0.413728 0.922388 +vt 0.408686 0.917867 +vt 0.405652 0.918839 +vt 0.402538 0.917793 +vt 0.400641 0.912523 +vt 0.400124 0.903017 +vt 0.424413 0.923099 +vt 0.425245 0.922896 +vt 0.426264 0.918643 +vt 0.426745 0.919770 +vt 0.427312 0.918886 +vt 0.427823 0.913722 +vt 0.428249 0.904258 +vt 0.430084 0.922854 +vt 0.436339 0.922415 +vt 0.443196 0.917909 +vt 0.447065 0.918889 +vt 0.451177 0.917851 +vt 0.454007 0.912586 +vt 0.455341 0.903083 +vt 0.434019 0.922168 +vt 0.444037 0.921074 +vt 0.454947 0.915862 +vt 0.461165 0.916432 +vt 0.467738 0.914966 +vt 0.472177 0.909421 +vt 0.474141 0.899807 +vt 0.560322 0.921376 +vt 0.548743 0.922041 +vt 0.558370 0.920430 +vt 0.571436 0.919381 +vt 0.567617 0.917532 +vt 0.583524 0.913199 +vt 0.577696 0.910376 +vt 0.590426 0.913208 +vt 0.583432 0.909820 +vt 0.597715 0.911152 +vt 0.589501 0.907174 +vt 0.602622 0.905222 +vt 0.593610 0.900857 +vt 0.604770 0.895458 +vt 0.595446 0.890942 +vt 0.553844 0.919735 +vt 0.558764 0.916170 +vt 0.564183 0.908299 +vt 0.567217 0.907327 +vt 0.570456 0.904246 +vt 0.572714 0.897645 +vt 0.573824 0.887618 +vt 0.547957 0.919475 +vt 0.547247 0.915662 +vt 0.546605 0.907524 +vt 0.546123 0.906397 +vt 0.545682 0.903153 +vt 0.545532 0.896446 +vt 0.545700 0.886378 +vt 0.542286 0.919721 +vt 0.536153 0.916144 +vt 0.529672 0.908258 +vt 0.525804 0.907278 +vt 0.521817 0.904188 +vt 0.519348 0.897581 +vt 0.518608 0.887552 +vt 0.538351 0.920406 +vt 0.528455 0.917485 +vt 0.517922 0.910305 +vt 0.511704 0.909735 +vt 0.505256 0.907073 +vt 0.501178 0.900747 +vt 0.499808 0.890828 +vt 0.537206 0.921348 +vt 0.526215 0.919327 +vt 0.514503 0.913117 +vt 0.507601 0.913109 +vt 0.500437 0.911036 +vt 0.495891 0.905095 +vt 0.494337 0.895326 +vt 0.539158 0.922293 +vt 0.530033 0.921176 +vt 0.520331 0.915940 +vt 0.514594 0.916496 +vt 0.508651 0.915014 +vt 0.504902 0.909460 +vt 0.503661 0.899843 +vt 0.543684 0.922989 +vt 0.538886 0.922537 +vt 0.533844 0.918017 +vt 0.530810 0.918989 +vt 0.527696 0.917942 +vt 0.525799 0.912672 +vt 0.525282 0.903166 +vt 0.549571 0.923249 +vt 0.550403 0.923045 +vt 0.551422 0.918792 +vt 0.551903 0.919919 +vt 0.552470 0.919035 +vt 0.552980 0.913871 +vt 0.553407 0.904407 +vt 0.555241 0.923003 +vt 0.561497 0.922564 +vt 0.568354 0.918058 +vt 0.572222 0.919038 +vt 0.576335 0.918000 +vt 0.579165 0.912735 +vt 0.580499 0.903232 +vt 0.559177 0.922317 +vt 0.569195 0.921223 +vt 0.580104 0.916011 +vt 0.586323 0.916581 +vt 0.592896 0.915115 +vt 0.597334 0.909570 +vt 0.599299 0.899957 +vt 0.559044 0.903560 +vt 0.555560 0.904061 +vt 0.557240 0.903502 +vt 0.562383 0.902441 +vt 0.558853 0.902327 +vt 0.565998 0.899330 +vt 0.560611 0.899155 +vt 0.568167 0.890833 +vt 0.561703 0.890623 +vt 0.555180 0.903480 +vt 0.554825 0.902283 +vt 0.554462 0.899089 +vt 0.554324 0.890544 +vt 0.553180 0.903497 +vt 0.550910 0.902317 +vt 0.548487 0.899141 +vt 0.547155 0.890606 +vt 0.551541 0.903552 +vt 0.547705 0.902423 +vt 0.543596 0.899303 +vt 0.541285 0.890801 +vt 0.550515 0.903635 +vt 0.545699 0.902586 +vt 0.540533 0.899551 +vt 0.537609 0.891098 +vt 0.550258 0.903734 +vt 0.545195 0.902780 +vt 0.539764 0.899847 +vt 0.536687 0.891453 +vt 0.550808 0.903834 +vt 0.546272 0.902975 +vt 0.541408 0.900146 +vt 0.538658 0.891812 +vt 0.552082 0.903920 +vt 0.548764 0.903143 +vt 0.545212 0.900402 +vt 0.543224 0.892119 +vt 0.553886 0.903978 +vt 0.552293 0.903257 +vt 0.550598 0.900576 +vt 0.549688 0.892329 +vt 0.555946 0.904000 +vt 0.556322 0.903301 +vt 0.556747 0.900643 +vt 0.557066 0.892408 +vt 0.557947 0.903983 +vt 0.560237 0.903267 +vt 0.562722 0.900591 +vt 0.564236 0.892346 +vt 0.559585 0.903929 +vt 0.563441 0.903161 +vt 0.567613 0.900428 +vt 0.570106 0.892151 +vt 0.560611 0.903845 +vt 0.565448 0.902998 +vt 0.570676 0.900181 +vt 0.573781 0.891854 +vt 0.560868 0.903746 +vt 0.565951 0.902804 +vt 0.571445 0.899885 +vt 0.574704 0.891499 +vt 0.560318 0.903646 +vt 0.564875 0.902609 +vt 0.569802 0.899586 +vt 0.572732 0.891140 +vt 0.397743 0.903368 +vt 0.394259 0.903868 +vt 0.395939 0.903310 +vt 0.401082 0.902248 +vt 0.397553 0.902134 +vt 0.404697 0.899137 +vt 0.399311 0.898963 +vt 0.406867 0.890641 +vt 0.400403 0.890431 +vt 0.393880 0.903288 +vt 0.393524 0.902090 +vt 0.393162 0.898897 +vt 0.393024 0.890351 +vt 0.391879 0.903305 +vt 0.389610 0.902124 +vt 0.387187 0.898948 +vt 0.385854 0.890414 +vt 0.390241 0.903359 +vt 0.386405 0.902231 +vt 0.382296 0.899111 +vt 0.379985 0.890608 +vt 0.389215 0.903442 +vt 0.384398 0.902393 +vt 0.379233 0.899359 +vt 0.376309 0.890906 +vt 0.388958 0.903541 +vt 0.383895 0.902587 +vt 0.378464 0.899655 +vt 0.375387 0.891261 +vt 0.389508 0.903641 +vt 0.384971 0.902783 +vt 0.380107 0.899953 +vt 0.377358 0.891619 +vt 0.390782 0.903727 +vt 0.387464 0.902951 +vt 0.383912 0.900209 +vt 0.381923 0.891927 +vt 0.392586 0.903786 +vt 0.390993 0.903065 +vt 0.389298 0.900384 +vt 0.388387 0.892136 +vt 0.394645 0.903808 +vt 0.395022 0.903108 +vt 0.395447 0.900450 +vt 0.395766 0.892216 +vt 0.396646 0.903790 +vt 0.398936 0.903074 +vt 0.401422 0.900398 +vt 0.402936 0.892153 +vt 0.398285 0.903736 +vt 0.402141 0.902968 +vt 0.406313 0.900236 +vt 0.408806 0.891959 +vt 0.399310 0.903653 +vt 0.404148 0.902806 +vt 0.409376 0.899988 +vt 0.412481 0.891661 +vt 0.399568 0.903554 +vt 0.404651 0.902612 +vt 0.410145 0.899692 +vt 0.413404 0.891306 +vt 0.399017 0.903454 +vt 0.403575 0.902416 +vt 0.408502 0.899393 +vt 0.411432 0.890948 +vt 0.560050 0.895619 +vt 0.598903 0.933649 +vt 0.559659 0.931810 +vt 0.626960 0.931921 +vt 0.632743 0.931121 +vt 0.633550 0.930793 +vt 0.633940 0.894602 +vt 0.632944 0.930462 +vt 0.633334 0.894271 +vt 0.630952 0.930143 +vt 0.631342 0.893951 +vt 0.627661 0.929849 +vt 0.589170 0.929516 +vt 0.589561 0.893325 +vt 0.398164 0.895426 +vt 0.363809 0.933369 +vt 0.397773 0.931617 +vt 0.330560 0.931567 +vt 0.322401 0.930751 +vt 0.321016 0.894228 +vt 0.320625 0.930420 +vt 0.320649 0.893898 +vt 0.320258 0.930089 +vt 0.321706 0.893582 +vt 0.321316 0.929773 +vt 0.323752 0.929486 +vt 0.361788 0.893053 +vt 0.361398 0.929244 +vt 0.559656 0.902097 +vt 0.555589 0.901346 +vt 0.557317 0.902165 +vt 0.573965 0.927557 +vt 0.563255 0.927865 +vt 0.573734 0.930613 +vt 0.563137 0.930918 +vt 0.570621 0.930463 +vt 0.561812 0.930717 +vt 0.554520 0.902163 +vt 0.550449 0.927858 +vt 0.550467 0.930911 +vt 0.551280 0.930711 +vt 0.552015 0.902093 +vt 0.538979 0.927538 +vt 0.539119 0.930594 +vt 0.541846 0.930447 +vt 0.550473 0.901973 +vt 0.531919 0.926990 +vt 0.532133 0.930052 +vt 0.536040 0.929997 +vt 0.550307 0.901836 +vt 0.531159 0.926362 +vt 0.531382 0.929430 +vt 0.535415 0.929480 +vt 0.551562 0.901718 +vt 0.536905 0.925821 +vt 0.537067 0.928895 +vt 0.540141 0.929035 +vt 0.553901 0.901651 +vt 0.547615 0.925513 +vt 0.547664 0.928591 +vt 0.548949 0.928782 +vt 0.556698 0.901652 +vt 0.560422 0.925520 +vt 0.560334 0.928598 +vt 0.559482 0.928788 +vt 0.559203 0.901723 +vt 0.571891 0.925841 +vt 0.571682 0.928915 +vt 0.568915 0.929052 +vt 0.560745 0.901842 +vt 0.578951 0.926388 +vt 0.578668 0.929457 +vt 0.574722 0.929502 +vt 0.560911 0.901979 +vt 0.579711 0.927017 +vt 0.579419 0.930079 +vt 0.575346 0.930019 +vt 0.398356 0.901905 +vt 0.394289 0.901154 +vt 0.396017 0.901972 +vt 0.412665 0.927365 +vt 0.401954 0.927673 +vt 0.412434 0.930421 +vt 0.401837 0.930726 +vt 0.409321 0.930271 +vt 0.400512 0.930524 +vt 0.394258 0.903992 +vt 0.393220 0.901971 +vt 0.389148 0.927666 +vt 0.389167 0.930719 +vt 0.389979 0.930518 +vt 0.390714 0.901901 +vt 0.377679 0.927345 +vt 0.377819 0.930402 +vt 0.380546 0.930255 +vt 0.389172 0.901781 +vt 0.370618 0.926798 +vt 0.370833 0.929860 +vt 0.374739 0.929804 +vt 0.389006 0.901644 +vt 0.369859 0.926169 +vt 0.370082 0.929238 +vt 0.374115 0.929287 +vt 0.390261 0.901526 +vt 0.375605 0.925629 +vt 0.375767 0.928703 +vt 0.378840 0.928843 +vt 0.392601 0.901458 +vt 0.386315 0.925321 +vt 0.386364 0.928398 +vt 0.387649 0.928590 +vt 0.395398 0.901460 +vt 0.399121 0.925328 +vt 0.399034 0.928406 +vt 0.398181 0.928596 +vt 0.397903 0.901530 +vt 0.410591 0.925648 +vt 0.410382 0.928723 +vt 0.407615 0.928859 +vt 0.399445 0.901650 +vt 0.417651 0.926196 +vt 0.417368 0.929265 +vt 0.413422 0.929310 +vt 0.399611 0.901787 +vt 0.418410 0.926824 +vt 0.418119 0.929886 +vt 0.414046 0.929826 +vn 0.011353 0.401349 0.915830 +vn 0.382275 0.411969 -0.827082 +vn -0.579608 0.385968 -0.717673 +vn -0.581500 0.379101 -0.719810 +vn -0.578936 0.391400 -0.715262 +vn -0.587512 0.353526 -0.727866 +vn -0.281625 0.919126 -0.275399 +vn 0.057253 0.984527 0.165563 +vn 0.071383 0.980926 0.180639 +vn -0.296457 0.908780 -0.293558 +vn 0.474380 0.596789 0.647114 +vn 0.491165 0.565630 0.662404 +vn 0.513932 0.515061 0.685965 +vn 0.517106 0.508774 0.688223 +vn 0.275857 0.401013 -0.873531 +vn -0.191260 0.288827 -0.938047 +vn -0.394971 -0.383221 0.834925 +vn 0.387310 -0.917112 0.094089 +vn 0.623280 0.340129 0.704123 +vn 0.167821 -0.764855 0.621906 +vn 0.346049 -0.937437 -0.037507 +vn 0.028108 -0.899045 0.436933 +vn 0.351848 -0.931425 -0.092898 +vn -0.021699 -0.935636 0.352214 +vn 0.354595 -0.925047 -0.135960 +vn -0.066134 -0.957091 0.282022 +vn 0.350780 -0.921049 -0.169012 +vn 0.518418 -0.764580 -0.382855 +vn 0.338420 -0.920835 -0.193701 +vn 0.202460 -0.979156 -0.015046 +vn 0.316080 -0.924802 -0.211646 +vn 0.010743 -0.996918 -0.077364 +vn 0.282449 -0.932432 -0.225257 +vn -0.263527 -0.963652 0.043672 +vn 0.235603 -0.942106 -0.238563 +vn -0.338664 -0.940489 -0.026948 +vn 0.130589 -0.939299 -0.317209 +vn -0.497787 -0.838588 -0.221198 +vn -0.419324 0.243233 -0.874599 +vn -0.876553 -0.425245 0.225349 +vn 0.628407 0.047426 -0.776421 +vn 0.780297 -0.115146 -0.614673 +vn 0.783563 0.069918 -0.617328 +vn -0.748405 -0.260353 0.609973 +vn -0.749504 -0.261116 0.608264 +vn 0.753014 -0.055422 -0.655629 +vn -0.749474 -0.261025 0.608386 +vn 0.758538 -0.024628 -0.651143 +vn -0.749535 -0.261055 0.608264 +vn 0.767571 -0.000092 -0.640919 +vn -0.749565 -0.261055 0.608234 +vn 0.611438 -0.665090 -0.428663 +vn -0.751213 -0.254250 0.609088 +vn 0.407697 -0.867550 -0.284768 +vn -0.752129 -0.255257 0.607532 +vn 0.356670 -0.868801 -0.343394 +vn 0.296243 -0.863887 -0.407300 +vn 0.220618 -0.847133 -0.483383 +vn 0.021393 -0.758263 -0.651570 +vn -0.141331 -0.391461 -0.909268 +vn -0.187475 -0.241737 0.952055 +vn 0.837397 0.084780 -0.539933 +vn -0.023103 -0.413434 0.910215 +vn 0.824702 0.075686 -0.560442 +vn -0.095370 -0.585253 0.805200 +vn 0.812677 0.068239 -0.578692 +vn -0.154118 -0.691580 0.705618 +vn 0.800623 0.065004 -0.595599 +vn -0.233772 -0.776574 0.584979 +vn 0.788965 0.064425 -0.611011 +vn -0.333689 -0.831782 0.443556 +vn 0.785150 0.052644 -0.617023 +vn -0.415937 -0.817103 0.399091 +vn 0.779382 0.063265 -0.623310 +vn -0.437086 -0.843745 0.311441 +vn 0.767327 0.061159 -0.638295 +vn -0.553789 -0.813898 0.175604 +vn 0.753685 0.061495 -0.654317 +vn -0.658071 -0.750481 0.060671 +vn 0.738456 0.065859 -0.671041 +vn -0.748985 -0.661794 -0.031587 +vn 0.720969 0.071505 -0.689230 +vn -0.847560 -0.510117 -0.146214 +vn -0.934355 -0.298257 -0.194861 +vn -0.388806 -0.092868 0.916593 +vn -0.783807 -0.067476 0.617298 +vn -0.417402 -0.324046 0.848964 +vn 0.045289 -0.536576 0.842616 +vn 0.101627 -0.139500 0.984985 +vn 0.268532 -0.648549 0.712180 +vn 0.342967 -0.179662 0.921964 +vn 0.327982 -0.690237 0.644917 +vn 0.425520 -0.197241 0.883145 +vn 0.333811 -0.702963 0.627979 +vn 0.428297 -0.209754 0.878933 +vn 0.353496 -0.704642 0.615192 +vn 0.454268 -0.208472 0.866115 +vn 0.400616 -0.719047 0.567858 +vn 0.518052 -0.221412 0.826167 +vn 0.455519 -0.674062 0.581439 +vn 0.540757 -0.377819 0.751518 +vn -0.056063 -0.389721 0.919187 +vn -0.071047 -0.408887 0.909787 +vn -0.799554 -0.060579 0.597491 +vn -0.499863 -0.502060 0.705710 +vn -0.068178 -0.820673 0.567278 +vn 0.131443 -0.908658 0.396252 +vn 0.175726 -0.927091 0.331004 +vn 0.185553 -0.931791 0.311930 +vn 0.202643 -0.933988 0.294198 +vn 0.229926 -0.937773 0.260079 +vn 0.249245 -0.927580 0.278268 +vn -0.605335 -0.408643 0.683035 +vn -0.580706 -0.562334 0.588610 +vn -0.185675 -0.914670 0.358959 +vn 0.015992 -0.980255 0.196997 +vn 0.065188 -0.986755 0.148350 +vn 0.079196 -0.987762 0.134129 +vn 0.098361 -0.988250 0.116916 +vn 0.122410 -0.988006 0.093783 +vn 0.182073 -0.973327 0.139500 +vn -0.653920 -0.466628 0.595477 +vn -0.661611 -0.570849 0.486160 +vn -0.310678 -0.929106 0.200537 +vn -0.097995 -0.993866 0.051149 +vn -0.037843 -0.999146 0.014679 +vn -0.021607 -0.999725 0.005341 +vn 0.000305 -0.999939 -0.008972 +vn 0.045381 -0.998901 0.010651 +vn 0.056917 0.996734 0.057009 +vn -0.761834 -0.063967 0.644581 +vn -0.760979 -0.529954 0.374187 +vn -0.492935 -0.869564 0.028474 +vn -0.268410 -0.956328 -0.115513 +vn -0.190405 -0.971160 -0.143376 +vn -0.172277 -0.974181 -0.145756 +vn -0.149602 -0.976074 -0.157720 +vn -0.080416 -0.988525 -0.127750 +vn 0.157567 0.963073 0.218177 +vn -0.774438 -0.080844 0.627430 +vn -0.895108 -0.376080 0.239387 +vn -0.758873 -0.626179 -0.178747 +vn -0.565905 -0.744591 -0.353954 +vn -0.478896 -0.784600 -0.393689 +vn -0.462539 -0.795160 -0.392071 +vn -0.446303 -0.797143 -0.406629 +vn -0.383801 -0.811182 -0.441176 +vn -0.569842 -0.402722 -0.716269 +vn -0.867214 -0.482040 -0.124546 +vn -0.972625 -0.160802 0.167699 +vn -0.913907 -0.254952 -0.315836 +vn -0.789666 -0.307993 -0.530595 +vn -0.731681 -0.333262 -0.594592 +vn -0.719108 -0.343425 -0.604053 +vn -0.711142 -0.341990 -0.614215 +vn -0.645924 -0.361064 -0.672597 +vn -0.589465 -0.359386 -0.723411 +vn -0.558916 -0.355724 -0.749016 +vn -0.984649 -0.017029 0.173559 +vn -0.950407 0.063387 -0.304422 +vn -0.841395 0.103824 -0.530290 +vn -0.806238 0.117710 -0.579699 +vn -0.796869 0.065188 -0.600574 +vn -0.815058 0.082797 -0.573412 +vn -0.747459 0.052217 -0.662221 +vn -0.662618 0.054933 -0.746910 +vn -0.946440 0.184942 0.264534 +vn -0.901151 0.405866 -0.152165 +vn -0.791284 0.484329 -0.373119 +vn -0.758507 0.497940 -0.420301 +vn -0.832942 0.412763 -0.368511 +vn -0.853053 0.386303 -0.350780 +vn -0.759667 0.372906 -0.532762 +vn -0.660024 0.386639 -0.644063 +vn -0.246498 0.354472 -0.901975 +vn -0.869778 0.307108 0.386151 +vn -0.768059 0.638356 0.050264 +vn -0.649892 0.745659 -0.146855 +vn -0.625477 0.757378 -0.187414 +vn -0.755150 0.653676 -0.049348 +vn -0.807489 0.588000 -0.046693 +vn -0.708548 0.652181 -0.269387 +vn -0.584002 0.694327 -0.420484 +vn -0.127415 0.687521 -0.714866 +vn -0.815638 0.347392 0.462600 +vn -0.668355 0.719535 0.188513 +vn -0.535874 0.844081 0.017426 +vn -0.510453 0.859676 -0.017945 +vn -0.661184 0.738060 0.134465 +vn -0.726676 0.668844 0.156682 +vn -0.613208 0.788659 -0.044343 +vn -0.469069 0.859127 -0.204505 +vn -0.005982 0.836024 -0.548601 +vn -0.769311 0.368267 0.521989 +vn -0.581652 0.755638 0.301035 +vn -0.433180 0.887845 0.155126 +vn -0.404614 0.905606 0.127018 +vn -0.570086 0.773553 0.276742 +vn -0.631184 0.706412 0.320200 +vn -0.491775 0.855464 0.162236 +vn -0.328074 0.944578 0.010163 +vn 0.136052 0.927732 -0.347453 +vn -0.751610 0.359294 0.553117 +vn -0.543962 0.760521 0.354472 +vn -0.385083 0.896725 0.218116 +vn -0.352306 0.916196 0.190802 +vn -0.517808 0.788629 0.331462 +vn -0.585437 0.710044 0.391247 +vn -0.428938 0.866573 0.255043 +vn -0.254402 0.960753 0.110477 +vn 0.239692 0.931913 -0.272164 +vn -0.726463 0.373699 0.576678 +vn -0.501083 0.765160 0.404187 +vn -0.335337 0.899319 0.280557 +vn -0.301431 0.917936 0.257851 +vn -0.474563 0.785058 0.398083 +vn -0.523942 0.719474 0.455824 +vn -0.352763 0.870785 0.342387 +vn -0.173925 0.962493 0.208197 +vn -0.035707 0.993988 0.103244 +vn -0.678487 0.364696 0.637684 +vn -0.410749 0.749992 0.518418 +vn -0.224158 0.880764 0.417066 +vn -0.182409 0.898740 0.398663 +vn -0.354961 0.774987 0.522843 +vn -0.385052 0.709708 0.589892 +vn -0.180914 0.837123 0.516190 +vn -0.016968 0.917447 0.397443 +vn -0.462996 0.684591 0.562975 +vn -0.612934 0.339244 0.713553 +vn -0.294046 0.693960 0.657216 +vn -0.084872 0.811884 0.577593 +vn -0.034639 0.826319 0.562120 +vn -0.180486 0.720573 0.669454 +vn -0.199011 0.655660 0.728324 +vn 0.022217 0.734397 0.678335 +vn 0.145665 0.812983 0.563738 +vn -0.714560 0.223823 0.662770 +vn -0.504288 0.240455 0.829341 +vn -0.113254 0.500290 0.858394 +vn 0.119724 0.592853 0.796319 +vn 0.180761 0.608966 0.772301 +vn 0.118778 0.528459 0.840571 +vn 0.082675 0.500137 0.861965 +vn 0.284463 0.498032 0.819147 +vn 0.422620 0.516312 0.744835 +vn 0.035096 0.318186 0.947356 +vn -0.410077 0.052370 0.910520 +vn 0.049562 0.183081 0.981842 +vn 0.291269 0.239875 0.926054 +vn 0.358043 0.252937 0.898770 +vn 0.362987 0.210150 0.907773 +vn 0.343822 0.221992 0.912381 +vn 0.442213 0.193243 0.875820 +vn 0.550554 0.199133 0.810663 +vn -0.318186 0.933988 0.162420 +vn -0.200354 0.971496 0.126591 +vn -0.223548 0.970855 0.086062 +vn -0.066347 0.990966 0.116398 +vn -0.139744 0.989990 0.019105 +vn -0.061495 0.991150 0.117496 +vn -0.134465 0.990814 0.013977 +vn -0.061037 0.991882 0.111362 +vn -0.123630 0.992309 0.003357 +vn -0.057009 0.994201 0.090915 +vn -0.100101 0.994812 -0.016938 +vn -0.012268 0.998962 0.043367 +vn -0.037477 0.996979 -0.067965 +vn 0.029817 0.999237 -0.024323 +vn 0.018677 0.993408 -0.112918 +vn 0.065371 0.994415 -0.082797 +vn 0.053926 0.989196 -0.136113 +vn 0.033235 0.996521 -0.076144 +vn 0.028626 0.992889 -0.115299 +vn -0.016511 0.998688 -0.048128 +vn -0.013733 0.996429 -0.083041 +vn 0.529496 0.712210 -0.460829 +vn 0.523026 0.708579 -0.473617 +vn 0.789056 -0.011536 -0.614185 +vn -0.302988 0.938353 0.166265 +vn -0.265389 0.938994 0.218726 +vn 0.008972 0.974334 0.224860 +vn 0.017914 0.971709 0.235389 +vn 0.009888 0.967406 0.252937 +vn -0.025452 0.968108 0.249153 +vn -0.026399 0.977172 0.210669 +vn -0.000336 0.993500 0.113742 +vn 0.030061 0.999298 0.021210 +vn 0.023957 0.999512 -0.018830 +vn -0.017853 0.999817 0.001221 +vn 0.536332 0.721305 -0.438215 +vn -0.298685 0.932981 0.200690 +vn -0.114658 -0.798791 -0.590564 +vn -0.370708 -0.526780 -0.764885 +vn -0.291025 -0.616688 -0.731407 +vn -0.143254 -0.625172 -0.767205 +vn 0.027223 -0.640553 -0.767418 +vn 0.111332 -0.662038 -0.741111 +vn 0.135563 -0.740410 -0.658315 +vn 0.095309 -0.862575 -0.496811 +vn 0.031892 -0.950316 -0.309610 +vn -0.117801 -0.895688 -0.428724 +vn 0.703726 0.085910 -0.705222 +vn 0.140812 -0.988342 -0.057833 +vn -0.176916 0.112217 -0.977783 +vn -0.463820 -0.000244 -0.885922 +vn -0.396466 0.495773 -0.772637 +vn -0.251259 0.629933 -0.734855 +vn -0.082247 0.613941 -0.785028 +vn 0.062685 0.432813 -0.899289 +vn 0.114200 0.360729 -0.925626 +vn 0.067263 0.509629 -0.857723 +vn -0.147404 0.666036 -0.731162 +vn -0.333659 0.761101 -0.556200 +vn -0.153478 0.913327 -0.377148 +vn -0.370403 -0.745903 -0.553514 +vn -0.117374 0.990661 0.069308 +vn -0.045228 -0.997101 0.061098 +vn -0.457808 -0.775109 -0.435408 +vn -0.716849 -0.364360 -0.594409 +vn -0.842647 0.257424 -0.472915 +vn -0.742363 -0.635609 -0.211829 +vn -0.978973 -0.126621 -0.159734 +vn -0.920560 0.370373 -0.124027 +vn -0.685263 -0.714591 -0.140477 +vn -0.822535 0.452986 -0.343791 +vn -0.424726 0.841395 -0.334086 +vn 0.104862 -0.938810 0.328043 +vn -0.146855 0.961974 -0.230232 +vn -0.592578 0.640126 -0.488907 +vn -0.615009 0.631336 -0.472365 +vn -0.672750 0.632954 -0.383038 +vn -0.732994 0.635304 -0.243019 +vn -0.733726 0.657796 -0.169988 +vn -0.650349 0.747856 -0.133000 +vn -0.509659 0.849849 -0.133976 +vn -0.374187 0.917051 -0.137638 +vn -0.261879 0.943449 -0.203101 +vn -0.750603 0.280526 0.598193 +vn -0.264351 0.961669 0.072787 +vn -0.292032 0.955870 -0.031159 +vn -0.329691 0.920103 -0.211402 +vn -0.339793 0.915555 -0.215125 +vn -0.354900 0.915159 -0.190985 +vn -0.364147 0.919675 -0.146916 +vn -0.327921 0.934049 -0.141392 +vn -0.236305 0.962859 -0.130497 +vn -0.132908 0.981079 -0.140751 +vn -0.095737 0.987732 -0.123142 +vn -0.095767 0.990448 -0.099002 +vn 0.488937 0.717917 -0.495499 +vn -0.306192 0.943205 0.128666 +vn -0.249184 0.966887 0.054659 +vn -0.214362 0.973754 -0.076144 +vn -0.213904 0.973327 -0.082614 +vn -0.208258 0.974456 -0.083956 +vn -0.190619 0.978057 -0.083712 +vn -0.134281 0.983673 -0.119694 +vn -0.065127 0.987915 -0.140446 +vn -0.005676 0.987548 -0.157170 +vn -0.010773 0.991577 -0.128971 +vn -0.047334 0.995025 -0.087466 +vn 0.511277 0.710990 -0.482742 +vn -0.317698 0.934355 0.161168 +vn 0.115726 -0.988556 0.096622 +vn 0.137333 -0.978088 0.156377 +vn 0.149754 -0.969787 0.192450 +vn 0.113804 -0.975402 0.188665 +vn 0.085177 -0.975860 0.201056 +vn 0.090030 -0.983673 0.155797 +vn 0.118778 -0.991150 0.058962 +vn 0.183233 -0.982940 -0.013886 +vn 0.138249 -0.988586 0.059420 +vn 0.134892 -0.989990 0.041383 +vn 0.729453 -0.456862 -0.509049 +vn -0.047090 -0.987243 0.151891 +vn 0.017121 -0.989441 0.143895 +vn 0.119480 -0.983428 0.136174 +vn 0.126865 -0.983886 0.125919 +vn 0.118809 -0.985748 0.119053 +vn 0.100009 -0.988037 0.117252 +vn 0.092471 -0.989349 0.112217 +vn 0.103183 -0.991180 0.082858 +vn 0.137211 -0.989776 0.038453 +vn 0.148564 -0.988800 0.012665 +vn 0.133518 -0.990966 0.011872 +vn 0.619343 -0.669668 -0.409772 +vn -0.082308 -0.983306 0.162206 +vn -0.013428 -0.993072 0.116581 +vn 0.076205 -0.994476 0.071780 +vn 0.089877 -0.994110 0.060427 +vn 0.092868 -0.994140 0.054903 +vn 0.089145 -0.994568 0.053194 +vn 0.092318 -0.994537 0.048616 +vn 0.110874 -0.993408 0.028413 +vn 0.147404 -0.989044 -0.005463 +vn 0.164617 -0.986053 -0.024293 +vn 0.148503 -0.988769 -0.015656 +vn 0.615223 -0.670400 -0.414716 +vn -0.095187 -0.981842 0.163976 +vn -0.030366 -0.994903 0.096072 +vn 0.037080 -0.999023 0.022736 +vn 0.052431 -0.998535 0.012757 +vn 0.059267 -0.998169 0.011414 +vn 0.060518 -0.998016 0.015534 +vn 0.066469 -0.997681 0.014222 +vn 0.091372 -0.995788 0.001312 +vn 0.133305 -0.990692 -0.027131 +vn 0.154118 -0.987274 -0.039003 +vn 0.143284 -0.989319 -0.026276 +vn 0.612751 -0.670492 -0.418226 +vn -0.094028 -0.983001 0.157659 +vn -0.057375 -0.996307 0.063570 +vn -0.016144 -0.999237 -0.034730 +vn -0.002991 -0.999207 -0.039277 +vn 0.003479 -0.999542 -0.030030 +vn 0.002014 -0.999908 -0.012177 +vn 0.004822 -0.999969 -0.002655 +vn 0.037202 -0.999268 -0.006897 +vn 0.092563 -0.995239 -0.029878 +vn 0.117161 -0.992523 -0.033509 +vn 0.112613 -0.993439 -0.018281 +vn 0.609699 -0.669759 -0.423841 +vn -0.078555 -0.987610 0.135685 +vn -0.137303 -0.990387 -0.015900 +vn -0.142460 -0.977447 -0.155675 +vn -0.135044 -0.979888 -0.146733 +vn -0.135533 -0.984924 -0.107364 +vn -0.147191 -0.987518 -0.055879 +vn -0.153020 -0.987945 -0.022248 +vn -0.097934 -0.995117 -0.011658 +vn -0.015992 -0.999634 -0.021455 +vn 0.047945 -0.998474 -0.026307 +vn 0.066897 -0.997559 -0.018983 +vn 0.600665 -0.671346 -0.434065 +vn -0.027772 -0.995697 0.088137 +vn 0.090670 -0.995666 0.019135 +vn 0.090579 -0.995697 0.019044 +vn 0.188879 -0.970733 0.148198 +vn 0.334513 -0.875454 0.348735 +vn 0.092196 -0.995514 0.021088 +vn 0.092257 -0.995483 0.021180 +vn -0.010163 -0.994171 -0.107089 +vn -0.175970 -0.935575 -0.306040 +vn -0.539750 0.570238 -0.619221 +vn 0.411664 0.682363 0.604022 +vn -0.004852 -0.012940 0.999878 +vn 0.696249 0.084201 0.712821 +vn -0.004883 -0.012940 0.999878 +vn 0.990326 0.131718 0.043519 +vn 0.050478 0.019013 -0.998535 +vn -0.983367 -0.129765 -0.126957 +vn -0.108615 -0.026734 0.993713 +vn 0.991089 0.132176 0.014832 +vn 0.062136 0.020569 -0.997833 +vn -0.673421 -0.080905 -0.734764 +vn -0.673421 -0.080905 -0.734794 +vn -0.689810 -0.083254 -0.719169 +vn -0.689810 -0.083285 -0.719169 +vn -0.981964 -0.129429 -0.137730 +vn -0.979644 -0.153935 -0.128636 +vn 0.215613 0.068148 -0.974090 +vn 0.972839 0.151250 0.175115 +vn 0.549547 0.060335 0.833247 +vn 0.530747 0.056856 0.845607 +vn -0.095462 -0.049409 0.994201 +vn -0.961516 -0.147496 -0.231666 +vn -0.523148 -0.055483 -0.850398 +vn 0.187872 0.063875 -0.980102 +vn 0.970794 0.150517 0.186682 +vn -0.106113 -0.051088 0.993011 +vn -0.567309 0.638081 -0.520554 +vn -0.672536 0.613269 -0.414167 +vn -0.600604 0.726829 -0.333079 +vn -0.865627 0.485733 -0.121220 +vn -0.821436 0.567125 -0.059572 +vn -0.932096 0.276009 0.234443 +vn -0.919126 0.294443 0.261635 +vn -0.874447 0.076205 0.479049 +vn -0.883908 0.053224 0.464583 +vn -0.603076 0.791742 0.096896 +vn -0.825739 -0.022523 0.563585 +vn -0.512680 0.740440 -0.434584 +vn -0.416974 0.906156 -0.070406 +vn -0.663503 0.732475 0.152409 +vn -0.827845 0.397473 0.395764 +vn -0.848079 0.094943 0.521256 +vn -0.826167 -0.037660 0.562120 +vn -0.333415 0.927396 -0.169500 +vn -0.134648 0.947172 0.290994 +vn -0.400525 0.795190 0.455214 +vn -0.672384 0.449507 0.588031 +vn -0.789911 0.101962 0.604633 +vn -0.920225 -0.098300 0.378765 +vn -0.052156 0.977294 0.205359 +vn 0.416059 0.251076 0.873959 +vn 0.175665 0.154698 0.972198 +vn -0.109897 -0.090121 0.989837 +vn -0.221870 -0.384716 0.895932 +vn 0.825556 -0.543962 0.150029 +vn 0.010590 -0.999908 0.005737 +vn 0.058046 -0.998260 -0.008972 +vn 0.495163 0.283273 0.821284 +vn -0.225318 -0.960570 0.162877 +vn -0.348491 -0.769860 0.534623 +vn -0.290658 -0.581988 0.759453 +vn 0.808496 -0.539659 0.234657 +vn -0.564837 -0.555742 -0.609973 +vn -0.793847 -0.511612 -0.328593 +vn -0.928495 -0.333506 0.163152 +vn -0.862911 -0.147649 0.483230 +vn 0.801141 0.079134 -0.593188 +vn -0.487472 -0.583026 -0.649922 +vn -0.719382 -0.151708 -0.677816 +vn -0.918424 -0.140019 -0.369945 +vn -0.987701 -0.086550 0.129978 +vn -0.884121 -0.044404 0.465102 +vn 0.804407 0.067415 -0.590197 +vn -0.601794 -0.283303 -0.746666 +vn -0.756035 0.248848 -0.605335 +vn -0.935301 0.212775 -0.282632 +vn -0.976867 0.133824 0.166753 +vn -0.877590 0.049898 0.476791 +vn 0.810999 0.054262 -0.582507 +vn -0.590533 0.500595 -0.632954 +vn -0.717277 0.486373 -0.498917 +vn -0.895657 0.404645 -0.184393 +vn -0.943510 0.251595 0.215583 +vn -0.863338 0.100070 0.494583 +vn 0.816828 0.033052 -0.575884 +vn -0.622181 0.495407 -0.606128 +vn 0.305063 0.740837 0.598376 +vn 0.108097 0.810297 0.575915 +vn 0.178533 0.713523 0.677450 +vn -0.196326 0.640767 0.742180 +vn -0.140599 0.571123 0.808710 +vn -0.506272 0.343059 0.791162 +vn -0.481643 0.329081 0.812220 +vn -0.671957 0.078188 0.736412 +vn -0.685629 0.098453 0.721244 +vn -0.746391 -0.013153 0.665365 +vn -0.312754 0.825800 0.469253 +vn 0.226600 0.827509 0.513627 +vn -0.115696 0.941649 0.316019 +vn -0.376385 0.766289 0.520676 +vn -0.622211 0.421674 0.659536 +vn -0.721458 0.109836 0.683645 +vn -0.743767 -0.027955 0.667837 +vn -0.001251 0.966521 0.256508 +vn -0.398022 0.916166 -0.046754 +vn -0.608875 0.770653 0.187964 +vn -0.773766 0.437574 0.458022 +vn -0.788141 0.102176 0.606922 +vn -0.584918 -0.058779 0.808954 +vn -0.297617 0.948363 -0.109470 +vn -0.762291 0.112308 -0.637410 +vn -0.908078 0.027039 -0.417859 +vn -0.974181 -0.191931 -0.118686 +vn -0.885250 -0.462874 0.045076 +vn 0.108097 -0.628437 -0.770287 +vn 0.111484 -0.991974 0.059542 +vn 0.085665 -0.991058 0.102023 +vn -0.694693 0.143132 -0.704886 +vn -0.127873 -0.949065 0.287851 +vn -0.533952 -0.791681 0.296762 +vn -0.753136 -0.636464 0.166173 +vn -0.002838 -0.644154 -0.764885 +vn 0.497726 -0.430586 0.752861 +vn 0.165593 -0.398602 0.902036 +vn -0.357982 -0.266305 0.894925 +vn -0.666982 -0.124607 0.734550 +vn 0.763817 0.074709 -0.641072 +vn 0.557848 -0.459914 0.690817 +vn 0.489090 -0.009369 0.872158 +vn 0.141697 -0.015137 0.989776 +vn -0.362529 -0.012940 0.931852 +vn -0.663869 -0.018494 0.747581 +vn 0.762780 0.062502 -0.643605 +vn 0.596301 -0.142186 0.790033 +vn 0.374584 0.382000 0.844813 +vn 0.022004 0.325541 0.945250 +vn -0.414838 0.200018 0.887631 +vn -0.681906 0.072970 0.727775 +vn 0.758141 0.048006 -0.650288 +vn 0.419935 0.619617 0.663076 +vn 0.260475 0.601550 0.755150 +vn -0.079928 0.500717 0.861873 +vn -0.464095 0.308054 0.830470 +vn -0.699973 0.119327 0.704093 +vn 0.755120 0.025727 -0.655049 +vn 0.386670 0.614246 0.687857 +vn -0.797174 -0.603107 -0.026521 +vn -0.244301 -0.755242 -0.608173 +vn 0.250954 -0.962004 -0.107303 +vn -0.112033 -0.515458 0.849513 +vn 0.600024 -0.644642 0.473647 +vn 0.108371 -0.565691 -0.817438 +vn 0.871578 -0.463698 0.159001 +vn 0.153172 -0.253609 -0.955077 +vn 0.984649 -0.136814 0.108341 +vn 0.192694 -0.028748 -0.980804 +vn 0.995270 0.083193 0.049776 +vn 0.059358 0.501267 -0.863247 +vn 0.796503 0.598743 0.084140 +vn -0.371776 0.692984 -0.617664 +vn 0.433210 0.798486 0.417951 +vn -0.580859 0.677633 -0.450972 +vn 0.224006 0.783013 0.580218 +vn -0.743370 0.583178 -0.327494 +vn 0.075320 0.691855 0.718070 +vn -0.787133 0.522355 -0.327952 +vn 0.071963 0.637623 0.766930 +vn -0.818659 0.513230 -0.257607 +vn -0.003662 0.622639 0.782464 +vn -0.911527 0.376415 -0.165441 +vn -0.102359 0.487228 0.867244 +vn -0.980560 0.178625 -0.081088 +vn -0.182897 0.289376 0.939573 +vn -0.523942 -0.729637 0.439375 +vn -0.776849 -0.229896 0.586200 +vn -0.699820 -0.676443 0.229469 +vn -0.117740 -0.979553 0.162999 +vn -0.408979 -0.893521 -0.185186 +vn 0.164525 -0.985473 -0.041627 +vn -0.152776 -0.891842 -0.425672 +vn 0.689962 -0.561754 -0.456435 +vn 0.454360 -0.492691 -0.742149 +vn 0.777703 0.233924 -0.583453 +vn -0.864254 -0.495743 0.085330 +vn -0.681845 -0.595752 -0.424390 +vn -0.450972 -0.565142 -0.690786 +vn 0.231727 -0.250313 -0.940001 +vn -0.972015 -0.229987 0.047243 +vn -0.859523 -0.156987 -0.486312 +vn -0.646535 -0.082919 -0.758324 +vn 0.085025 0.109104 -0.990356 +vn -0.990478 0.048311 0.128666 +vn -0.887539 0.300302 -0.349345 +vn -0.679220 0.417493 -0.603565 +vn 0.060488 0.482131 -0.873989 +vn -0.915403 0.260872 0.306497 +vn -0.761162 0.646199 -0.054811 +vn -0.543809 0.792535 -0.275918 +vn 0.161473 0.760338 -0.629109 +vn -0.769860 0.352367 0.532090 +vn -0.521287 0.792932 0.315378 +vn -0.284402 0.949736 0.130772 +vn 0.353923 0.876370 -0.326548 +vn -0.592029 0.299966 0.747978 +vn -0.230628 0.706900 0.668630 +vn 0.032563 0.856044 0.515854 +vn 0.588946 0.807154 -0.040101 +vn -0.427168 0.113987 0.896939 +vn 0.038881 0.404797 0.913541 +vn 0.329691 0.528428 0.782311 +vn 0.810205 0.564165 0.158971 +vn 0.777703 0.233955 -0.583422 +vn -0.320933 -0.157964 0.933805 +vn 0.213782 -0.038301 0.976104 +vn 0.524552 0.045381 0.850154 +vn 0.956145 0.204260 0.209815 +vn -0.304483 -0.437086 0.846278 +vn 0.242317 -0.495590 0.834040 +vn 0.557573 -0.454939 0.694327 +vn 0.981292 -0.168584 0.092654 +vn -0.379955 -0.644246 0.663717 +vn 0.119327 -0.837092 0.533830 +vn 0.423261 -0.829066 0.365337 +vn 0.881680 -0.446150 -0.153417 +vn -0.488205 -0.725425 0.485153 +vn -0.733879 -0.224799 0.640980 +vn -0.678182 -0.676565 0.286843 +vn -0.099948 -0.977447 0.185858 +vn -0.414655 -0.898648 -0.143132 +vn 0.167852 -0.985076 -0.037324 +vn -0.175298 -0.899380 -0.400403 +vn 0.661214 -0.565142 -0.493301 +vn 0.406384 -0.501968 -0.763451 +vn 0.734886 0.228889 -0.638356 +vn -0.853175 -0.499100 0.151402 +vn -0.705008 -0.606250 -0.367931 +vn -0.492904 -0.578600 -0.649770 +vn 0.169286 -0.264016 -0.949522 +vn -0.965056 -0.234626 0.116550 +vn -0.889401 -0.169530 -0.424482 +vn -0.695791 -0.098636 -0.711417 +vn 0.017121 0.093722 -0.995422 +vn -0.979827 0.044832 0.194708 +vn -0.911100 0.289743 -0.293100 +vn -0.721244 0.404004 -0.562609 +vn -0.001923 0.468429 -0.883480 +vn 0.734916 0.228889 -0.638356 +vn -0.894284 0.260659 0.363689 +vn -0.767388 0.641011 -0.013215 +vn -0.566454 0.784967 -0.250771 +vn 0.113529 0.751061 -0.650380 +vn -0.734428 0.356548 0.577441 +vn -0.504013 0.794977 0.337565 +vn -0.281198 0.950102 0.134922 +vn 0.325205 0.873012 -0.363384 +vn -0.542070 0.308603 0.781579 +vn -0.189550 0.716208 0.671590 +vn 0.061708 0.864345 0.499069 +vn 0.579547 0.809656 -0.092471 +vn 0.734886 0.228858 -0.638356 +vn -0.366283 0.125919 0.921934 +vn 0.097873 0.419568 0.902402 +vn 0.378338 0.542711 0.749840 +vn 0.815332 0.571123 0.094913 +vn -0.255989 -0.144780 0.955748 +vn 0.279550 -0.021516 0.959868 +vn 0.580523 0.061892 0.811853 +vn 0.966765 0.212897 0.141392 +vn -0.243629 -0.425153 0.871670 +vn 0.301462 -0.480850 0.823328 +vn 0.606250 -0.440687 0.661977 +vn 0.986419 -0.161626 0.028596 +vn -0.329936 -0.635670 0.697867 +vn 0.160710 -0.827784 0.537492 +vn 0.452467 -0.820734 0.348704 +vn 0.872219 -0.443617 -0.205817 +vn -0.279611 -0.239448 0.929746 +vn -0.728965 -0.331675 0.598804 +vn -0.241798 -0.437696 0.865963 +vn 0.251595 -0.073305 0.965026 +vn 0.314890 -0.405164 0.858272 +vn 0.554064 0.045930 0.831172 +vn 0.623554 -0.318369 0.713981 +vn 0.945769 0.279214 0.165960 +vn 0.996704 0.012146 0.080050 +vn 0.728965 0.331675 -0.598804 +vn 0.728965 0.331675 -0.598773 +vn -0.260384 -0.611774 0.746940 +vn 0.283761 -0.696493 0.659017 +vn 0.589404 -0.638203 0.495224 +vn 0.971679 -0.222236 -0.080233 +vn -0.332560 -0.735099 0.590747 +vn 0.162969 -0.902921 0.397626 +vn 0.456801 -0.864834 0.208258 +vn 0.874447 -0.388348 -0.290597 +vn -0.447310 -0.788965 0.421186 +vn -0.029084 -0.993042 0.113865 +vn 0.245918 -0.963744 -0.103214 +vn 0.719901 -0.460891 -0.518937 +vn -0.587207 -0.765099 0.264107 +vn -0.263222 -0.953124 -0.149022 +vn -0.011078 -0.919919 -0.391858 +vn 0.531480 -0.428755 -0.730522 +vn 0.728965 0.331706 -0.598804 +vn -0.730918 -0.667196 0.143406 +vn -0.503769 -0.789239 -0.351085 +vn -0.275155 -0.740013 -0.613666 +vn 0.337901 -0.296884 -0.893094 +vn -0.856594 -0.510117 0.077425 +vn -0.714072 -0.526353 -0.461501 +vn -0.506058 -0.451430 -0.734886 +vn 0.168676 -0.085330 -0.981964 +vn -0.945067 -0.317820 0.076235 +vn -0.862178 -0.204505 -0.463485 +vn -0.668630 -0.098056 -0.737083 +vn 0.049501 0.173650 -0.983551 +vn -0.982879 -0.119541 0.140019 +vn -0.925474 0.127354 -0.356700 +vn -0.738121 0.266243 -0.619861 +vn -0.001404 0.440687 -0.897641 +vn -0.964293 0.054506 0.259072 +vn -0.894345 0.418653 -0.157476 +vn -0.703970 0.586077 -0.401135 +vn 0.023591 0.675130 -0.737297 +vn 0.728935 0.331706 -0.598804 +vn -0.892117 0.177862 0.415265 +vn -0.773553 0.625111 0.103916 +vn -0.571368 0.812708 -0.114170 +vn 0.120792 0.841243 -0.526933 +vn -0.777367 0.231697 0.584796 +vn -0.581469 0.715232 0.387677 +vn -0.360485 0.911618 0.197333 +vn 0.275369 0.913755 -0.298593 +vn -0.637471 0.207831 0.741874 +vn -0.347331 0.675314 0.650594 +vn -0.103458 0.867794 0.485977 +vn 0.463790 0.881649 -0.087039 +vn -0.493759 0.109928 0.862606 +vn -0.106815 0.511429 0.852626 +vn 0.160588 0.687887 0.707785 +vn 0.657338 0.749779 0.075533 +vn -0.368084 -0.047121 0.928587 +vn 0.103488 0.248543 0.963042 +vn 0.391491 0.399304 0.829005 +vn 0.826594 0.538224 0.164373 +vn 0.869930 0.207892 -0.447157 +vn 0.764183 0.197546 -0.613941 +vn 0.834101 0.302194 -0.461409 +vn 0.965789 0.207770 -0.155034 +vn 0.877438 0.440321 -0.190191 +vn 0.906308 0.209906 -0.366710 +vn 0.854885 0.345256 -0.387158 +vn 0.889004 0.209113 -0.407300 +vn 0.845332 0.324046 -0.424696 +vn 0.972869 0.189856 0.131993 +vn 0.842891 0.532029 0.080264 +vn 0.805780 0.125584 0.578692 +vn 0.631306 0.584796 0.509323 +vn 0.701254 0.095614 0.706442 +vn 0.520554 0.571215 0.634571 +vn 0.775536 0.367412 -0.513291 +vn 0.733024 0.601154 -0.318217 +vn 0.770806 0.438887 -0.461684 +vn 0.773949 0.403546 -0.487960 +vn 0.630360 0.768731 -0.108066 +vn 0.346110 0.902432 0.256508 +vn 0.225166 0.900174 0.372753 +vn 0.709952 0.386090 -0.588977 +vn 0.571215 0.647175 -0.504776 +vn 0.676626 0.465712 -0.570299 +vn 0.693960 0.426313 -0.580187 +vn 0.392254 0.836482 -0.382641 +vn 0.026582 0.993347 -0.111942 +vn -0.105747 0.994324 -0.008850 +vn 0.654866 0.353191 -0.668111 +vn 0.435377 0.566088 -0.699942 +vn 0.597552 0.418500 -0.683920 +vn 0.626820 0.386212 -0.676656 +vn 0.192389 0.717124 -0.669820 +vn -0.241646 0.833186 -0.497330 +vn -0.383557 0.828486 -0.408002 +vn 0.625080 0.277566 -0.729514 +vn 0.361919 0.379589 -0.851405 +vn 0.554796 0.309915 -0.772057 +vn 0.590503 0.294046 -0.751518 +vn 0.084262 0.442701 -0.892666 +vn -0.386700 0.464888 -0.796411 +vn -0.533799 0.447035 -0.717765 +vn 0.628559 0.179479 -0.756737 +vn 0.370525 0.137669 -0.918546 +vn 0.559801 0.169073 -0.811151 +vn 0.594775 0.174444 -0.784722 +vn 0.096927 0.086673 -0.991485 +vn -0.369732 -0.012848 -0.929014 +vn -0.516221 -0.047761 -0.855098 +vn 0.664388 0.085177 -0.742485 +vn 0.458876 -0.094852 -0.883389 +vn 0.611225 0.033723 -0.790704 +vn 0.638417 0.059511 -0.767357 +vn 0.226936 -0.255470 -0.939787 +vn -0.195257 -0.472060 -0.859645 +vn -0.335521 -0.523392 -0.783227 +vn 0.722953 0.019959 -0.690573 +vn 0.603290 -0.255684 -0.755394 +vn 0.695303 -0.059877 -0.716178 +vn 0.709830 -0.019990 -0.704062 +vn 0.439467 -0.492141 -0.751396 +vn 0.089908 -0.789697 -0.606830 +vn -0.040132 -0.852351 -0.521409 +vn 0.788568 0.001282 -0.614917 +vn 0.765099 -0.301706 -0.568804 +vn 0.789483 -0.086673 -0.607562 +vn 0.789788 -0.042726 -0.611835 +vn 0.677572 -0.559893 -0.476852 +vn 0.409467 -0.880612 -0.238350 +vn 0.290780 -0.946501 -0.139775 +vn 0.843623 0.034150 -0.535783 +vn 0.900937 -0.220618 -0.373638 +vn 0.868557 -0.039460 -0.493973 +vn 0.856929 -0.002655 -0.515366 +vn 0.877438 -0.440565 -0.189642 +vn 0.677694 -0.720481 0.147008 +vn 0.568590 -0.780633 0.259346 +vn 0.873409 0.109806 -0.474380 +vn 0.974395 -0.034120 -0.222205 +vn 0.911313 0.069063 -0.405805 +vn 0.893246 0.089511 -0.440504 +vn 0.985534 -0.166112 0.033174 +vn 0.822748 -0.352153 0.446089 +vn 0.718833 -0.399182 0.569109 +vn 0.862636 0.241218 -0.444533 +vn 0.756767 0.231544 -0.611286 +vn 0.824213 0.334788 -0.456679 +vn 0.959288 0.237495 -0.152715 +vn 0.864498 0.468215 -0.182653 +vn 0.899197 0.242531 -0.364147 +vn 0.844020 0.376812 -0.381573 +vn 0.881771 0.242103 -0.404706 +vn 0.834925 0.356151 -0.419507 +vn 0.967681 0.213660 0.133854 +vn 0.828181 0.553178 0.089785 +vn 0.803674 0.135289 0.579455 +vn 0.616474 0.590899 0.520310 +vn 0.700339 0.099704 0.706778 +vn 0.506485 0.571612 0.645497 +vn 0.763726 0.399457 -0.507035 +vn 0.715354 0.627735 -0.306864 +vn 0.757195 0.469680 -0.453902 +vn 0.761193 0.435011 -0.480911 +vn 0.608722 0.787896 -0.092959 +vn 0.321940 0.905911 0.275033 +vn 0.201453 0.897855 0.391461 +vn 0.697409 0.417951 -0.582141 +vn 0.551836 0.673269 -0.492080 +vn 0.662008 0.496200 -0.561693 +vn 0.680380 0.457503 -0.572466 +vn 0.368084 0.854915 -0.365490 +vn -0.000977 0.995849 -0.090670 +vn -0.133000 0.991028 0.012665 +vn 0.643055 0.385266 -0.661824 +vn 0.417737 0.592669 -0.688620 +vn 0.583941 0.449263 -0.676107 +vn 0.614093 0.417676 -0.669637 +vn 0.170751 0.736290 -0.654714 +vn -0.265786 0.836665 -0.478835 +vn -0.407270 0.826136 -0.389294 +vn 0.615162 0.310160 -0.724784 +vn 0.348979 0.407514 -0.843867 +vn 0.543901 0.341472 -0.766472 +vn 0.580096 0.326151 -0.746361 +vn 0.069582 0.463820 -0.883175 +vn -0.401532 0.470992 -0.785394 +vn -0.547868 0.447432 -0.706809 +vn 0.621265 0.212806 -0.754112 +vn 0.364025 0.167394 -0.916196 +vn 0.552660 0.201697 -0.808588 +vn 0.587542 0.207465 -0.782128 +vn 0.091739 0.110477 -0.989624 +vn -0.371838 -0.003143 -0.928251 +vn -0.517106 -0.043641 -0.854762 +vn 0.659688 0.119236 -0.741966 +vn 0.458815 -0.063295 -0.886258 +vn 0.607837 0.067385 -0.791162 +vn 0.634388 0.093417 -0.767327 +vn 0.231208 -0.229011 -0.945555 +vn -0.184667 -0.458785 -0.869106 +vn -0.323252 -0.515549 -0.793512 +vn 0.720176 0.054567 -0.691610 +vn 0.607959 -0.222816 -0.762047 +vn 0.694662 -0.025422 -0.718863 +vn 0.708121 0.014557 -0.705924 +vn 0.450667 -0.463729 -0.762749 +vn 0.109836 -0.773766 -0.623829 +vn -0.018220 -0.841792 -0.539476 +vn 0.786493 0.036073 -0.616504 +vn 0.771477 -0.268349 -0.576830 +vn 0.789850 -0.051943 -0.611042 +vn 0.788934 -0.007935 -0.614368 +vn 0.691305 -0.530747 -0.490249 +vn 0.432783 -0.863735 -0.258095 +vn 0.316233 -0.934965 -0.160680 +vn 0.840877 0.068789 -0.536790 +vn 0.905576 -0.187750 -0.380291 +vn 0.867916 -0.005036 -0.496628 +vn 0.855251 0.031892 -0.517228 +vn 0.888638 -0.412152 -0.200995 +vn 0.697592 -0.704550 0.130039 +vn 0.590503 -0.770074 0.241279 +vn 0.868740 0.143864 -0.473861 +vn 0.974334 -0.002594 -0.225043 +vn 0.907956 0.102756 -0.406262 +vn 0.889218 0.123417 -0.440474 +vn 0.989807 -0.139653 0.027406 +vn 0.833369 -0.338878 0.436598 +vn 0.731101 -0.391369 0.558794 +vn 0.862636 0.241218 -0.444502 +vn 0.899197 0.242500 -0.364147 +vn 0.506485 0.571612 0.645527 +vn 0.763726 0.399487 -0.507035 +vn 0.757195 0.469680 -0.453871 +vn 0.697439 0.417951 -0.582141 +vn -0.133000 0.991028 0.012696 +vn 0.583911 0.449263 -0.676107 +vn 0.348979 0.407483 -0.843867 +vn 0.543931 0.341472 -0.766472 +vn -0.401532 0.470992 -0.785424 +vn 0.091708 0.110477 -0.989624 +vn 0.659719 0.119236 -0.741966 +vn 0.694662 -0.025452 -0.718863 +vn 0.109836 -0.773797 -0.623829 +vn 0.786493 0.036103 -0.616504 +vn 0.771477 -0.268349 -0.576861 +vn 0.840877 0.068789 -0.536821 +vn 0.855220 0.031892 -0.517228 +vn 0.907956 0.102725 -0.406262 +vn 0.731101 -0.391369 0.558824 +vn 0.841060 0.204260 -0.500870 +vn 0.784539 0.059572 -0.617145 +vn 0.798791 0.241432 -0.550981 +vn 0.865413 0.414045 -0.282052 +vn 0.760613 0.506211 -0.406415 +vn 0.723441 0.675710 0.141453 +vn 0.536637 0.839961 -0.080142 +vn 0.548235 0.746971 0.376080 +vn 0.335978 0.933622 0.124271 +vn 0.752129 0.250740 -0.609424 +vn 0.644826 0.529283 -0.551347 +vn 0.330332 0.881069 -0.338450 +vn 0.101566 0.980316 -0.169195 +vn 0.708152 0.230750 -0.667257 +vn 0.535752 0.479720 -0.694845 +vn 0.135899 0.792749 -0.594165 +vn -0.119327 0.879971 -0.459731 +vn 0.673544 0.184545 -0.715720 +vn 0.449904 0.365093 -0.814997 +vn -0.017029 0.588488 -0.808313 +vn -0.293130 0.647877 -0.703055 +vn 0.653584 0.119144 -0.747368 +vn 0.400433 0.202857 -0.893582 +vn -0.105197 0.299326 -0.948302 +vn -0.393292 0.319315 -0.862148 +vn 0.651326 0.044496 -0.757439 +vn 0.394848 0.017670 -0.918546 +vn -0.115177 -0.030641 -0.992859 +vn -0.404645 -0.055605 -0.912748 +vn 0.667104 -0.028016 -0.744407 +vn 0.433973 -0.162206 -0.886196 +vn -0.045442 -0.351268 -0.935148 +vn -0.325419 -0.419904 -0.847194 +vn 0.698508 -0.087374 -0.710196 +vn 0.511856 -0.309458 -0.801355 +vn 0.093356 -0.613666 -0.783990 +vn -0.167669 -0.718070 -0.675436 +vn 0.740776 -0.124516 -0.660085 +vn 0.616688 -0.401624 -0.677023 +vn 0.280160 -0.777917 -0.562395 +vn 0.044557 -0.904721 -0.423658 +vn 0.787439 -0.133824 -0.601642 +vn 0.732444 -0.424696 -0.532060 +vn 0.486465 -0.819056 -0.304086 +vn 0.278970 -0.951415 -0.130131 +vn 0.831416 -0.113834 -0.543809 +vn 0.841578 -0.375134 -0.388592 +vn 0.680929 -0.730735 -0.048372 +vn 0.499893 -0.851070 0.160375 +vn 0.866024 -0.067629 -0.495376 +vn 0.927396 -0.260506 -0.268410 +vn 0.833857 -0.526444 0.165746 +vn 0.673696 -0.618976 0.403699 +vn 0.885983 -0.002228 -0.463698 +vn 0.976867 -0.098239 -0.189856 +vn 0.922025 -0.237312 0.305765 +vn 0.773888 -0.290414 0.562761 +vn 0.888241 0.072390 -0.453627 +vn 0.982452 0.086886 -0.164861 +vn 0.932005 0.092654 0.350291 +vn 0.785211 0.084506 0.613392 +vn 0.872463 0.144902 -0.466659 +vn 0.943327 0.266793 -0.197241 +vn 0.862270 0.413282 0.292611 +vn 0.705985 0.448805 0.547838 +vn 0.841060 0.204291 -0.500870 +vn 0.784570 0.059572 -0.617145 +vn 0.760613 0.506211 -0.406384 +vn 0.723441 0.675680 0.141423 +vn 0.336009 0.933622 0.124271 +vn 0.535722 0.479720 -0.694845 +vn 0.135899 0.792749 -0.594134 +vn -0.016999 0.588488 -0.808313 +vn -0.293100 0.647877 -0.703055 +vn 0.400433 0.202857 -0.893551 +vn 0.651326 0.044496 -0.757469 +vn 0.394818 0.017670 -0.918577 +vn -0.045442 -0.351238 -0.935148 +vn 0.093387 -0.613666 -0.783990 +vn 0.280160 -0.777947 -0.562395 +vn 0.486496 -0.819056 -0.304056 +vn 0.279000 -0.951415 -0.130131 +vn 0.841578 -0.375134 -0.388562 +vn 0.499924 -0.851070 0.160375 +vn 0.866024 -0.067629 -0.495346 +vn 0.976867 -0.098270 -0.189856 +vn 0.922056 -0.237281 0.305765 +vn 0.982452 0.086886 -0.164830 +vn 0.932035 0.092685 0.350291 +vn 0.785241 0.084506 0.613392 +vn 0.872463 0.144932 -0.466659 +vn 0.943327 0.266793 -0.197211 +vn 0.862300 0.413282 0.292611 +vn 0.705985 0.448805 0.547807 +vn -0.602557 -0.161321 -0.781579 +vn 0.115879 -0.991913 0.051546 +vn 0.569872 -0.461409 0.679922 +vn 0.613330 -0.220466 0.758415 +vn 0.618824 -0.013581 0.785363 +vn 0.597156 0.195227 0.777978 +vn 0.547441 0.400739 0.734611 +vn 0.291025 0.843501 0.451399 +vn -0.326334 0.885983 -0.329356 +vn 0.618976 -0.017457 0.785180 +vn 0.066836 -0.997681 -0.011322 +vn -0.473830 -0.584338 -0.658773 +vn -0.560137 -0.358684 -0.746696 +vn -0.603107 -0.157506 -0.781915 +vn -0.619861 0.051881 -0.782983 +vn -0.608539 0.264595 -0.748070 +vn -0.438063 0.757622 -0.483779 +vn 0.158361 0.943083 0.292367 +vn -0.298898 -0.455184 0.838710 +vn -0.785272 -0.055574 0.616627 +vn -0.454390 -0.633290 0.626423 +vn 0.329417 -0.651906 0.682974 +vn 0.086978 -0.932493 0.350475 +vn 0.897397 -0.441145 0.003815 +vn 0.716025 -0.653005 -0.246620 +vn -0.653432 -0.658773 0.372845 +vn -0.224281 -0.973388 -0.046602 +vn 0.481399 -0.685232 -0.546495 +vn -0.843684 -0.517258 0.143559 +vn -0.521531 -0.751701 -0.403577 +vn 0.255623 -0.517869 -0.816340 +vn -0.969604 -0.244484 0.005127 +vn -0.717399 -0.325297 -0.616016 +vn 0.106540 -0.194739 -0.975036 +vn -0.996765 0.080172 -0.004120 +vn -0.758629 0.180090 -0.626087 +vn 0.074801 0.186163 -0.979644 +vn -0.922208 0.369335 0.114292 +vn -0.642232 0.628254 -0.439070 +vn 0.161504 0.522233 -0.837336 +vn -0.766472 0.551256 0.329508 +vn -0.400708 0.910184 -0.104678 +vn 0.342265 0.734306 -0.586200 +vn -0.566881 0.576373 0.588549 +vn -0.091281 0.950774 0.296030 +vn 0.575640 0.766411 -0.284951 +vn 0.784570 0.059542 -0.617145 +vn -0.376293 0.430647 0.820307 +vn 0.205054 0.727439 0.654775 +vn 0.800806 0.598712 -0.014435 +vn -0.250587 0.154088 0.955718 +vn 0.401807 0.299661 0.865291 +vn 0.950530 0.275399 0.143498 +vn -0.224036 -0.170202 0.959593 +vn 0.444899 -0.205390 0.871700 +vn 0.983520 -0.105411 0.146764 +vn -0.298898 -0.455153 0.838710 +vn -0.454360 -0.633290 0.626453 +vn 0.897427 -0.441115 0.003815 +vn 0.716056 -0.653005 -0.246651 +vn 0.478042 0.346324 -0.807154 +vn 0.590289 0.472304 -0.654561 +vn 0.786279 0.049104 -0.615894 +vn -0.653401 -0.658773 0.372845 +vn 0.732505 0.487350 -0.475265 +vn 0.866543 0.386975 -0.315104 +vn 0.106510 -0.194739 -0.975036 +vn 0.956420 0.196387 -0.216041 +vn -0.996765 0.080203 -0.004120 +vn -0.758660 0.180090 -0.626057 +vn 0.074770 0.186193 -0.979644 +vn 0.977935 -0.034547 -0.205969 +vn -0.922208 0.369366 0.114322 +vn 0.161473 0.522233 -0.837367 +vn 0.925565 -0.243690 -0.289712 +vn -0.766472 0.551256 0.329539 +vn 0.342235 0.734306 -0.586200 +vn 0.813379 -0.373730 -0.445723 +vn -0.566851 0.576373 0.588549 +vn 0.671163 -0.388348 -0.631397 +vn -0.376263 0.430647 0.820307 +vn 0.205023 0.727439 0.654775 +vn 0.800806 0.598743 -0.014435 +vn 0.537034 -0.283303 -0.794519 +vn 0.950530 0.275369 0.143498 +vn 0.447127 -0.088626 -0.890042 +vn 0.444899 -0.205390 0.871670 +vn 0.983520 -0.105411 0.146733 +vn 0.425611 0.141789 -0.893704 +s 1 +f 1204/1/1 1236/2/2 1176/3/3 +f 1132/4/4 1176/3/3 1177/5/5 +f 1131/6/6 1177/5/5 980/7/7 +f 980/7/7 448/8/8 466/9/9 +f 940/10/10 980/7/7 466/9/9 +f 466/9/9 448/8/8 175/11/11 +f 223/12/12 175/11/11 174/13/13 +f 224/14/14 174/13/13 117/15/15 +f 1204/1/1 1176/3/3 1132/4/4 +f 1132/4/4 1177/5/5 1131/6/6 +f 1131/6/6 980/7/7 940/10/10 +f 466/9/9 175/11/11 223/12/12 +f 223/12/12 174/13/13 224/14/14 +f 224/14/14 117/15/15 148/16/16 +f 1260/17/17 1208/18/18 1238/19/19 +f 1253/20/20 1109/21/21 1208/18/18 +f 1183/22/22 979/23/23 1109/21/21 +f 1013/24/24 868/25/25 979/23/23 +f 889/26/26 760/27/27 868/25/25 +f 760/27/27 580/28/28 593/29/29 +f 773/30/30 580/28/28 760/27/27 +f 580/28/28 487/31/31 593/29/29 +f 464/32/32 378/33/33 487/31/31 +f 341/34/34 247/35/35 378/33/33 +f 170/36/36 144/37/37 247/35/35 +f 102/38/38 119/39/39 144/37/37 +f 119/39/39 1260/17/17 1238/19/19 +f 95/40/40 1260/17/17 119/39/39 +f 1260/17/17 1253/20/20 1208/18/18 +f 1253/20/20 1183/22/22 1109/21/21 +f 1183/22/22 1013/24/24 979/23/23 +f 1013/24/24 889/26/26 868/25/25 +f 889/26/26 773/30/30 760/27/27 +f 580/28/28 464/32/32 487/31/31 +f 464/32/32 341/34/34 378/33/33 +f 341/34/34 170/36/36 247/35/35 +f 170/36/36 102/38/38 144/37/37 +f 102/38/38 95/40/40 119/39/39 +f 1237/41/41 1207/42/42 661/43/43 +f 1237/41/41 1253/20/20 1260/17/17 +f 697/44/44 696/45/45 1253/20/20 +f 1260/17/17 697/44/44 1253/20/20 +f 1207/42/42 1108/46/46 661/43/43 +f 1207/42/42 1183/22/22 1253/20/20 +f 696/45/45 695/47/47 1183/22/22 +f 1253/20/20 696/45/45 1183/22/22 +f 1108/46/46 978/48/48 661/43/43 +f 1108/46/46 1013/24/24 1183/22/22 +f 695/47/47 694/49/49 1013/24/24 +f 1183/22/22 695/47/47 1013/24/24 +f 978/48/48 867/50/50 661/43/43 +f 978/48/48 889/26/26 1013/24/24 +f 694/49/49 693/51/51 889/26/26 +f 1013/24/24 694/49/49 889/26/26 +f 867/50/50 759/52/52 661/43/43 +f 867/50/50 773/30/30 889/26/26 +f 693/51/51 690/53/53 773/30/30 +f 889/26/26 693/51/51 773/30/30 +f 759/52/52 592/54/54 661/43/43 +f 773/30/30 592/54/54 580/28/28 +f 759/52/52 592/54/54 773/30/30 +f 690/53/53 668/55/55 580/28/28 +f 773/30/30 580/28/28 690/53/53 +f 592/54/54 486/56/56 661/43/43 +f 592/54/54 464/32/32 580/28/28 +f 580/28/28 464/32/32 668/55/55 +f 486/56/56 377/57/57 661/43/43 +f 486/56/56 341/34/34 464/32/32 +f 464/32/32 668/55/55 341/34/34 +f 377/57/57 246/58/58 661/43/43 +f 377/57/57 170/36/36 341/34/34 +f 341/34/34 668/55/55 170/36/36 +f 246/58/58 143/59/59 661/43/43 +f 246/58/58 102/38/38 170/36/36 +f 170/36/36 668/55/55 102/38/38 +f 143/59/59 118/60/60 661/43/43 +f 143/59/59 95/40/40 102/38/38 +f 102/38/38 668/55/55 95/40/40 +f 118/60/60 117/15/15 661/43/43 +f 118/60/60 95/40/40 94/61/61 +f 95/40/40 668/55/55 94/61/61 +f 117/15/15 142/62/62 661/43/43 +f 117/15/15 94/61/61 101/63/63 +f 94/61/61 668/55/55 101/63/63 +f 142/62/62 245/64/64 661/43/43 +f 142/62/62 101/63/63 169/65/65 +f 101/63/63 668/55/55 169/65/65 +f 245/64/64 376/66/66 661/43/43 +f 245/64/64 169/65/65 340/67/67 +f 169/65/65 668/55/55 340/67/67 +f 376/66/66 485/68/68 661/43/43 +f 376/66/66 340/67/67 463/69/69 +f 340/67/67 668/55/55 463/69/69 +f 485/68/68 591/70/70 661/43/43 +f 485/68/68 463/69/69 579/71/71 +f 463/69/69 668/55/55 579/71/71 +f 591/70/70 647/72/72 661/43/43 +f 591/70/70 579/71/71 646/73/73 +f 579/71/71 668/55/55 646/73/73 +f 647/72/72 758/74/74 661/43/43 +f 647/72/72 646/73/73 772/75/75 +f 668/55/55 690/53/53 772/75/75 +f 646/73/73 668/55/55 772/75/75 +f 758/74/74 866/76/76 661/43/43 +f 758/74/74 772/75/75 888/77/77 +f 690/53/53 693/51/51 888/77/77 +f 772/75/75 690/53/53 888/77/77 +f 866/76/76 977/78/78 661/43/43 +f 866/76/76 888/77/77 1012/79/79 +f 693/51/51 694/49/49 1012/79/79 +f 888/77/77 693/51/51 1012/79/79 +f 977/78/78 1107/80/80 661/43/43 +f 977/78/78 1012/79/79 1182/81/81 +f 694/49/49 695/47/47 1182/81/81 +f 1012/79/79 694/49/49 1182/81/81 +f 1107/80/80 1206/82/82 661/43/43 +f 1107/80/80 1182/81/81 1252/83/83 +f 695/47/47 696/45/45 1252/83/83 +f 1182/81/81 695/47/47 1252/83/83 +f 1206/82/82 1236/2/2 661/43/43 +f 1206/82/82 1252/83/83 1259/84/84 +f 696/45/45 697/44/44 1259/84/84 +f 1252/83/83 696/45/45 1259/84/84 +f 1236/2/2 1237/41/41 661/43/43 +f 1236/2/2 1259/84/84 1260/17/17 +f 1259/84/84 697/44/44 1260/17/17 +f 1237/41/41 1253/20/20 1207/42/42 +f 1207/42/42 1183/22/22 1108/46/46 +f 1108/46/46 1013/24/24 978/48/48 +f 978/48/48 889/26/26 867/50/50 +f 867/50/50 773/30/30 759/52/52 +f 592/54/54 486/56/56 464/32/32 +f 486/56/56 377/57/57 341/34/34 +f 377/57/57 246/58/58 170/36/36 +f 246/58/58 143/59/59 102/38/38 +f 143/59/59 118/60/60 95/40/40 +f 118/60/60 117/15/15 94/61/61 +f 117/15/15 101/63/63 142/62/62 +f 142/62/62 169/65/65 245/64/64 +f 245/64/64 340/67/67 376/66/66 +f 376/66/66 463/69/69 485/68/68 +f 485/68/68 579/71/71 591/70/70 +f 591/70/70 646/73/73 647/72/72 +f 647/72/72 772/75/75 758/74/74 +f 758/74/74 888/77/77 866/76/76 +f 866/76/76 1012/79/79 977/78/78 +f 977/78/78 1182/81/81 1107/80/80 +f 1107/80/80 1252/83/83 1206/82/82 +f 1206/82/82 1259/84/84 1236/2/2 +f 1236/2/2 1260/17/17 1237/41/41 +f 777/85/85 659/86/86 766/87/87 +f 777/85/85 824/88/88 835/89/89 +f 835/89/89 924/90/90 945/91/91 +f 945/91/91 1030/92/92 1068/93/93 +f 1068/93/93 1067/94/94 1129/95/95 +f 1129/95/95 1117/96/96 1163/97/97 +f 1163/97/97 1155/98/98 1200/99/99 +f 1200/99/99 1160/100/100 1203/101/101 +f 1203/101/101 1161/102/102 1205/103/103 +f 1205/103/103 660/104/104 1161/102/102 +f 766/87/87 659/86/86 734/105/105 +f 766/87/87 789/106/106 824/88/88 +f 824/88/88 846/107/107 924/90/90 +f 924/90/90 895/108/108 1030/92/92 +f 1030/92/92 906/109/109 1067/94/94 +f 1067/94/94 917/110/110 1117/96/96 +f 1117/96/96 931/111/111 1155/98/98 +f 1155/98/98 937/112/112 1160/100/100 +f 1160/100/100 1161/102/102 938/113/113 +f 1161/102/102 660/104/104 938/113/113 +f 734/105/105 659/86/86 701/114/114 +f 734/105/105 708/115/115 789/106/106 +f 789/106/106 731/116/116 846/107/107 +f 846/107/107 738/117/117 895/108/108 +f 895/108/108 743/118/118 906/109/109 +f 906/109/109 746/119/119 917/110/110 +f 917/110/110 752/120/120 931/111/111 +f 931/111/111 754/121/121 937/112/112 +f 937/112/112 938/113/113 756/122/122 +f 938/113/113 660/104/104 756/122/122 +f 701/114/114 659/86/86 645/123/123 +f 708/115/115 645/123/123 641/124/124 +f 701/114/114 645/123/123 708/115/115 +f 731/116/116 641/124/124 632/125/125 +f 708/115/115 641/124/124 731/116/116 +f 738/117/117 632/125/125 611/126/126 +f 731/116/116 632/125/125 738/117/117 +f 743/118/118 611/126/126 606/127/127 +f 738/117/117 611/126/126 743/118/118 +f 746/119/119 606/127/127 604/128/128 +f 743/118/118 606/127/127 746/119/119 +f 752/120/120 604/128/128 599/129/129 +f 746/119/119 604/128/128 752/120/120 +f 754/121/121 599/129/129 596/130/130 +f 752/120/120 599/129/129 754/121/121 +f 756/122/122 597/131/131 596/130/130 +f 754/121/121 756/122/122 596/130/130 +f 756/122/122 660/104/104 597/131/131 +f 645/123/123 659/86/86 630/132/132 +f 645/123/123 566/133/133 641/124/124 +f 641/124/124 507/134/134 632/125/125 +f 632/125/125 459/135/135 611/126/126 +f 611/126/126 445/136/136 606/127/127 +f 606/127/127 435/137/137 604/128/128 +f 604/128/128 420/138/138 599/129/129 +f 599/129/129 596/130/130 414/139/139 +f 596/130/130 597/131/131 415/140/140 +f 597/131/131 660/104/104 415/140/140 +f 630/132/132 659/86/86 587/141/141 +f 630/132/132 529/142/142 566/133/133 +f 566/133/133 427/143/143 507/134/134 +f 507/134/134 320/144/144 459/135/135 +f 459/135/135 288/145/145 445/136/136 +f 445/136/136 235/146/146 435/137/137 +f 435/137/137 197/147/147 420/138/138 +f 420/138/138 414/139/139 190/148/148 +f 414/139/139 415/140/140 191/149/149 +f 415/140/140 660/104/104 191/149/149 +f 587/141/141 659/86/86 578/150/150 +f 587/141/141 525/151/151 529/142/142 +f 529/142/142 408/152/152 427/143/143 +f 427/143/143 286/153/153 320/144/144 +f 320/144/144 221/154/154 288/145/145 +f 288/145/145 187/155/155 235/146/146 +f 235/146/146 154/156/156 197/147/147 +f 197/147/147 146/157/157 190/148/148 +f 190/148/148 147/158/158 191/149/149 +f 191/149/149 660/104/104 147/158/158 +f 578/150/150 659/86/86 577/159/159 +f 578/150/150 524/160/160 525/151/151 +f 525/151/151 409/161/161 408/152/152 +f 408/152/152 287/162/162 286/153/153 +f 286/153/153 222/163/163 221/154/154 +f 221/154/154 188/164/164 187/155/155 +f 187/155/155 153/165/165 154/156/156 +f 154/156/156 145/166/166 146/157/157 +f 147/158/158 145/166/166 148/16/16 +f 146/157/157 145/166/166 147/158/158 +f 147/158/158 148/16/16 660/104/104 +f 577/159/159 659/86/86 586/167/167 +f 577/159/159 530/168/168 524/160/160 +f 524/160/160 428/169/169 409/161/161 +f 409/161/161 321/170/170 287/162/162 +f 287/162/162 289/171/171 222/163/163 +f 222/163/163 236/172/172 188/164/164 +f 188/164/164 196/173/173 153/165/165 +f 153/165/165 189/174/174 145/166/166 +f 145/166/166 192/175/175 148/16/16 +f 148/16/16 192/175/175 660/104/104 +f 586/167/167 659/86/86 629/176/176 +f 586/167/167 567/177/177 530/168/168 +f 530/168/168 508/178/178 428/169/169 +f 428/169/169 460/179/179 321/170/170 +f 321/170/170 446/180/180 289/171/171 +f 289/171/171 436/181/181 236/172/172 +f 236/172/172 419/182/182 196/173/173 +f 196/173/173 413/183/183 189/174/174 +f 189/174/174 416/184/184 192/175/175 +f 192/175/175 416/184/184 660/104/104 +f 629/176/176 659/86/86 638/185/185 +f 629/176/176 601/186/186 567/177/177 +f 567/177/177 554/187/187 508/178/178 +f 508/178/178 533/188/188 460/179/179 +f 460/179/179 526/189/189 446/180/180 +f 446/180/180 517/190/190 436/181/181 +f 436/181/181 504/191/191 419/182/182 +f 419/182/182 500/192/192 413/183/183 +f 413/183/183 501/193/193 416/184/184 +f 416/184/184 501/193/193 660/104/104 +f 638/185/185 659/86/86 644/194/194 +f 638/185/185 642/195/195 601/186/186 +f 601/186/186 633/196/196 554/187/187 +f 554/187/187 612/197/197 533/188/188 +f 533/188/188 607/198/198 526/189/189 +f 526/189/189 605/199/199 517/190/190 +f 517/190/190 598/200/200 504/191/191 +f 504/191/191 594/201/201 500/192/192 +f 500/192/192 595/202/202 501/193/193 +f 501/193/193 595/202/202 660/104/104 +f 644/194/194 659/86/86 658/203/203 +f 642/195/195 658/203/203 657/204/204 +f 644/194/194 658/203/203 642/195/195 +f 633/196/196 657/204/204 656/205/205 +f 642/195/195 657/204/204 633/196/196 +f 612/197/197 656/205/205 655/206/206 +f 633/196/196 656/205/205 612/197/197 +f 607/198/198 655/206/206 654/207/207 +f 612/197/197 655/206/206 607/198/198 +f 607/198/198 653/208/208 605/199/199 +f 605/199/199 652/209/209 598/200/200 +f 594/201/201 652/209/209 649/210/210 +f 598/200/200 652/209/209 594/201/201 +f 594/201/201 651/211/211 595/202/202 +f 595/202/202 651/211/211 660/104/104 +f 658/203/203 659/86/86 700/212/212 +f 657/204/204 700/212/212 709/213/213 +f 658/203/203 700/212/212 657/204/204 +f 656/205/205 709/213/213 730/214/214 +f 657/204/204 709/213/213 656/205/205 +f 655/206/206 730/214/214 739/215/215 +f 656/205/205 730/214/214 655/206/206 +f 654/207/207 739/215/215 744/216/216 +f 655/206/206 739/215/215 654/207/207 +f 654/207/207 745/217/217 653/208/208 +f 653/208/208 751/218/218 652/209/209 +f 649/210/210 751/218/218 753/219/219 +f 652/209/209 751/218/218 649/210/210 +f 649/210/210 755/220/220 651/211/211 +f 651/211/211 755/220/220 660/104/104 +f 700/212/212 659/86/86 720/221/221 +f 700/212/212 749/222/222 709/213/213 +f 709/213/213 801/223/223 730/214/214 +f 730/214/214 823/224/224 739/215/215 +f 739/215/215 828/225/225 744/216/216 +f 744/216/216 840/226/226 745/217/217 +f 745/217/217 850/227/227 751/218/218 +f 751/218/218 852/228/228 753/219/219 +f 753/219/219 853/229/229 755/220/220 +f 755/220/220 660/104/104 853/229/229 +f 720/221/221 659/86/86 733/230/230 +f 720/221/221 790/231/231 749/222/222 +f 749/222/222 847/232/232 801/223/223 +f 801/223/223 894/233/233 823/224/224 +f 823/224/224 907/234/234 828/225/225 +f 828/225/225 916/235/235 840/226/226 +f 840/226/226 930/236/236 850/227/227 +f 850/227/227 936/237/237 852/228/228 +f 852/228/228 853/229/229 939/238/238 +f 853/229/229 660/104/104 939/238/238 +f 733/230/230 659/86/86 765/239/239 +f 733/230/230 825/240/240 790/231/231 +f 790/231/231 923/241/241 847/232/232 +f 847/232/232 1031/242/242 894/233/233 +f 894/233/233 1066/243/243 907/234/234 +f 907/234/234 1116/244/244 916/235/235 +f 916/235/235 1154/245/245 930/236/236 +f 930/236/236 1159/246/246 936/237/237 +f 936/237/237 939/238/238 1162/247/247 +f 939/238/238 660/104/104 1162/247/247 +f 765/239/239 659/86/86 776/248/248 +f 765/239/239 834/249/249 825/240/240 +f 825/240/240 946/250/250 923/241/241 +f 923/241/241 1069/251/251 1031/242/242 +f 1031/242/242 1130/252/252 1066/243/243 +f 1066/243/243 1164/253/253 1116/244/244 +f 1116/244/244 1199/254/254 1154/245/245 +f 1154/245/245 1202/255/255 1159/246/246 +f 1159/246/246 1204/1/1 1162/247/247 +f 1162/247/247 660/104/104 1204/1/1 +f 776/248/248 659/86/86 777/85/85 +f 776/248/248 835/89/89 834/249/249 +f 834/249/249 945/91/91 946/250/250 +f 946/250/250 1068/93/93 1069/251/251 +f 1069/251/251 1129/95/95 1130/252/252 +f 1130/252/252 1163/97/97 1164/253/253 +f 1164/253/253 1200/99/99 1199/254/254 +f 1199/254/254 1203/101/101 1202/255/255 +f 1204/1/1 1205/103/103 1203/101/101 +f 1202/255/255 1203/101/101 1204/1/1 +f 1204/1/1 660/104/104 1205/103/103 +f 777/85/85 766/87/87 824/88/88 +f 835/89/89 824/88/88 924/90/90 +f 945/91/91 924/90/90 1030/92/92 +f 1068/93/93 1030/92/92 1067/94/94 +f 1129/95/95 1067/94/94 1117/96/96 +f 1163/97/97 1117/96/96 1155/98/98 +f 1200/99/99 1155/98/98 1160/100/100 +f 1203/101/101 1160/100/100 1161/102/102 +f 766/87/87 734/105/105 789/106/106 +f 824/88/88 789/106/106 846/107/107 +f 924/90/90 846/107/107 895/108/108 +f 1030/92/92 895/108/108 906/109/109 +f 1067/94/94 906/109/109 917/110/110 +f 1117/96/96 917/110/110 931/111/111 +f 1155/98/98 931/111/111 937/112/112 +f 1160/100/100 937/112/112 938/113/113 +f 734/105/105 701/114/114 708/115/115 +f 789/106/106 708/115/115 731/116/116 +f 846/107/107 731/116/116 738/117/117 +f 895/108/108 738/117/117 743/118/118 +f 906/109/109 743/118/118 746/119/119 +f 917/110/110 746/119/119 752/120/120 +f 931/111/111 752/120/120 754/121/121 +f 937/112/112 754/121/121 756/122/122 +f 645/123/123 630/132/132 566/133/133 +f 641/124/124 566/133/133 507/134/134 +f 632/125/125 507/134/134 459/135/135 +f 611/126/126 459/135/135 445/136/136 +f 606/127/127 445/136/136 435/137/137 +f 604/128/128 435/137/137 420/138/138 +f 599/129/129 420/138/138 414/139/139 +f 596/130/130 415/140/140 414/139/139 +f 630/132/132 587/141/141 529/142/142 +f 566/133/133 529/142/142 427/143/143 +f 507/134/134 427/143/143 320/144/144 +f 459/135/135 320/144/144 288/145/145 +f 445/136/136 288/145/145 235/146/146 +f 435/137/137 235/146/146 197/147/147 +f 420/138/138 197/147/147 190/148/148 +f 414/139/139 191/149/149 190/148/148 +f 587/141/141 578/150/150 525/151/151 +f 529/142/142 525/151/151 408/152/152 +f 427/143/143 408/152/152 286/153/153 +f 320/144/144 286/153/153 221/154/154 +f 288/145/145 221/154/154 187/155/155 +f 235/146/146 187/155/155 154/156/156 +f 197/147/147 154/156/156 146/157/157 +f 190/148/148 146/157/157 147/158/158 +f 578/150/150 577/159/159 524/160/160 +f 525/151/151 524/160/160 409/161/161 +f 408/152/152 409/161/161 287/162/162 +f 286/153/153 287/162/162 222/163/163 +f 221/154/154 222/163/163 188/164/164 +f 187/155/155 188/164/164 153/165/165 +f 154/156/156 153/165/165 145/166/166 +f 577/159/159 586/167/167 530/168/168 +f 524/160/160 530/168/168 428/169/169 +f 409/161/161 428/169/169 321/170/170 +f 287/162/162 321/170/170 289/171/171 +f 222/163/163 289/171/171 236/172/172 +f 188/164/164 236/172/172 196/173/173 +f 153/165/165 196/173/173 189/174/174 +f 145/166/166 189/174/174 192/175/175 +f 586/167/167 629/176/176 567/177/177 +f 530/168/168 567/177/177 508/178/178 +f 428/169/169 508/178/178 460/179/179 +f 321/170/170 460/179/179 446/180/180 +f 289/171/171 446/180/180 436/181/181 +f 236/172/172 436/181/181 419/182/182 +f 196/173/173 419/182/182 413/183/183 +f 189/174/174 413/183/183 416/184/184 +f 629/176/176 638/185/185 601/186/186 +f 567/177/177 601/186/186 554/187/187 +f 508/178/178 554/187/187 533/188/188 +f 460/179/179 533/188/188 526/189/189 +f 446/180/180 526/189/189 517/190/190 +f 436/181/181 517/190/190 504/191/191 +f 419/182/182 504/191/191 500/192/192 +f 413/183/183 500/192/192 501/193/193 +f 638/185/185 644/194/194 642/195/195 +f 601/186/186 642/195/195 633/196/196 +f 554/187/187 633/196/196 612/197/197 +f 533/188/188 612/197/197 607/198/198 +f 526/189/189 607/198/198 605/199/199 +f 517/190/190 605/199/199 598/200/200 +f 504/191/191 598/200/200 594/201/201 +f 500/192/192 594/201/201 595/202/202 +f 607/198/198 654/207/207 653/208/208 +f 605/199/199 653/208/208 652/209/209 +f 594/201/201 649/210/210 651/211/211 +f 654/207/207 744/216/216 745/217/217 +f 653/208/208 745/217/217 751/218/218 +f 649/210/210 753/219/219 755/220/220 +f 700/212/212 720/221/221 749/222/222 +f 709/213/213 749/222/222 801/223/223 +f 730/214/214 801/223/223 823/224/224 +f 739/215/215 823/224/224 828/225/225 +f 744/216/216 828/225/225 840/226/226 +f 745/217/217 840/226/226 850/227/227 +f 751/218/218 850/227/227 852/228/228 +f 753/219/219 852/228/228 853/229/229 +f 720/221/221 733/230/230 790/231/231 +f 749/222/222 790/231/231 847/232/232 +f 801/223/223 847/232/232 894/233/233 +f 823/224/224 894/233/233 907/234/234 +f 828/225/225 907/234/234 916/235/235 +f 840/226/226 916/235/235 930/236/236 +f 850/227/227 930/236/236 936/237/237 +f 852/228/228 936/237/237 939/238/238 +f 733/230/230 765/239/239 825/240/240 +f 790/231/231 825/240/240 923/241/241 +f 847/232/232 923/241/241 1031/242/242 +f 894/233/233 1031/242/242 1066/243/243 +f 907/234/234 1066/243/243 1116/244/244 +f 916/235/235 1116/244/244 1154/245/245 +f 930/236/236 1154/245/245 1159/246/246 +f 936/237/237 1159/246/246 1162/247/247 +f 765/239/239 776/248/248 834/249/249 +f 825/240/240 834/249/249 946/250/250 +f 923/241/241 946/250/250 1069/251/251 +f 1031/242/242 1069/251/251 1130/252/252 +f 1066/243/243 1130/252/252 1164/253/253 +f 1116/244/244 1164/253/253 1199/254/254 +f 1154/245/245 1199/254/254 1202/255/255 +f 1159/246/246 1202/255/255 1204/1/1 +f 776/248/248 777/85/85 835/89/89 +f 834/249/249 835/89/89 945/91/91 +f 946/250/250 945/91/91 1068/93/93 +f 1069/251/251 1068/93/93 1129/95/95 +f 1130/252/252 1129/95/95 1163/97/97 +f 1164/253/253 1163/97/97 1200/99/99 +f 1199/254/254 1200/99/99 1203/101/101 +f 698/256/256 870/257/257 699/258/258 +f 699/258/258 1033/259/259 702/260/260 +f 702/260/260 1062/261/261 703/262/262 +f 703/262/262 1125/263/263 704/264/264 +f 704/264/264 1178/265/265 705/266/266 +f 705/266/266 1234/267/267 707/268/268 +f 707/268/268 1271/269/269 712/270/270 +f 712/270/270 1297/271/271 719/272/272 +f 719/272/272 1301/273/273 725/274/274 +f 725/274/274 1308/275/275 727/276/276 +f 727/276/276 1306/277/277 726/278/278 +f 726/278/278 1306/277/277 662/279/279 +f 829/280/280 1011/281/281 870/257/257 +f 870/257/257 1263/282/282 1033/259/259 +f 1033/259/259 1270/283/283 1062/261/261 +f 1062/261/261 1291/284/284 1125/263/263 +f 1125/263/263 1295/285/285 1178/265/265 +f 1178/265/265 1303/286/286 1234/267/267 +f 1234/267/267 1313/287/287 1271/269/269 +f 1271/269/269 1320/288/288 1297/271/271 +f 1297/271/271 1329/289/289 1301/273/273 +f 1301/273/273 1333/290/290 1308/275/275 +f 1308/275/275 1332/291/291 1306/277/277 +f 1306/277/277 1332/291/291 662/279/279 +f 922/292/292 1158/293/293 1011/281/281 +f 1011/281/281 1294/294/294 1263/282/282 +f 1263/282/282 1298/295/295 1270/283/283 +f 1270/283/283 1302/296/296 1291/284/284 +f 1291/284/284 1309/297/297 1295/285/285 +f 1295/285/285 1312/298/298 1303/286/286 +f 1303/286/286 1321/299/299 1313/287/287 +f 1313/287/287 1335/300/300 1320/288/288 +f 1320/288/288 1340/301/301 1329/289/289 +f 1329/289/289 1343/302/302 1333/290/290 +f 1333/290/290 1341/303/303 1332/291/291 +f 1332/291/291 1341/303/303 662/279/279 +f 1005/304/304 1158/293/293 1180/305/305 +f 1158/293/293 1294/294/294 1296/306/306 +f 1294/294/294 1298/295/295 1300/307/307 +f 1298/295/295 1302/296/296 1307/308/308 +f 1302/296/296 1309/297/297 1310/309/309 +f 1309/297/297 1312/298/298 1315/310/310 +f 1312/298/298 1321/299/299 1322/311/311 +f 1321/299/299 1335/300/300 1337/312/312 +f 1335/300/300 1340/301/301 1342/313/313 +f 1340/301/301 1343/302/302 1353/314/314 +f 1343/302/302 1341/303/303 1352/315/315 +f 1341/303/303 1352/315/315 662/279/279 +f 1180/305/305 184/316/316 342/317/317 +f 1038/318/318 1180/305/305 342/317/317 +f 1296/306/306 184/316/316 57/319/319 +f 1180/305/305 1296/306/306 184/316/316 +f 1300/307/307 57/319/319 54/320/320 +f 1296/306/306 1300/307/307 57/319/319 +f 1307/308/308 46/321/321 54/320/320 +f 1300/307/307 1307/308/308 54/320/320 +f 1310/309/309 44/322/322 46/321/321 +f 1307/308/308 1310/309/309 46/321/321 +f 1315/310/310 44/322/322 39/323/323 +f 1310/309/309 1315/310/310 44/322/322 +f 1322/311/311 32/324/324 39/323/323 +f 1315/310/310 1322/311/311 39/323/323 +f 1337/312/312 17/325/325 32/324/324 +f 1322/311/311 1337/312/312 32/324/324 +f 1337/312/312 1342/313/313 12/326/326 +f 1353/314/314 1/327/327 12/326/326 +f 1342/313/313 1353/314/314 12/326/326 +f 1/327/327 1352/315/315 2/328/328 +f 1/327/327 1353/314/314 1352/315/315 +f 1352/315/315 662/279/279 2/328/328 +f 342/317/317 184/316/316 204/329/329 +f 184/316/316 60/330/330 57/319/319 +f 57/319/319 55/331/331 54/320/320 +f 54/320/320 52/332/332 46/321/321 +f 46/321/321 45/333/333 44/322/322 +f 44/322/322 40/334/334 39/323/323 +f 39/323/323 33/335/335 32/324/324 +f 32/324/324 19/336/336 17/325/325 +f 17/325/325 14/337/337 12/326/326 +f 12/326/326 11/338/338 1/327/327 +f 1/327/327 2/328/328 13/339/339 +f 2/328/328 662/279/279 13/339/339 +f 353/340/340 349/341/341 204/329/329 +f 204/329/329 93/342/342 60/330/330 +f 60/330/330 85/343/343 55/331/331 +f 55/331/331 71/344/344 52/332/332 +f 52/332/332 59/345/345 45/333/333 +f 45/333/333 51/346/346 40/334/334 +f 40/334/334 41/347/347 33/335/335 +f 33/335/335 34/348/348 19/336/336 +f 19/336/336 27/349/349 14/337/337 +f 14/337/337 21/350/350 11/338/338 +f 11/338/338 22/351/351 13/339/339 +f 13/339/339 22/351/351 662/279/279 +f 431/352/352 492/353/353 349/341/341 +f 349/341/341 352/354/354 93/342/342 +f 93/342/342 313/355/355 85/343/343 +f 85/343/343 268/356/356 71/344/344 +f 71/344/344 202/357/357 59/345/345 +f 59/345/345 133/358/358 51/346/346 +f 51/346/346 87/359/359 41/347/347 +f 41/347/347 58/360/360 34/348/348 +f 34/348/348 53/361/361 27/349/349 +f 27/349/349 47/362/362 21/350/350 +f 21/350/350 48/363/363 22/351/351 +f 22/351/351 48/363/363 662/279/279 +f 531/364/364 699/258/258 492/353/353 +f 492/353/353 702/260/260 352/354/354 +f 352/354/354 703/262/262 313/355/355 +f 313/355/355 704/264/264 268/356/356 +f 268/356/356 705/266/266 202/357/357 +f 202/357/357 707/268/268 133/358/358 +f 133/358/358 712/270/270 87/359/359 +f 87/359/359 719/272/272 58/360/360 +f 58/360/360 725/274/274 53/361/361 +f 53/361/361 727/276/276 47/362/362 +f 47/362/362 726/278/278 48/363/363 +f 48/363/363 726/278/278 662/279/279 +f 698/256/256 829/280/280 870/257/257 +f 699/258/258 870/257/257 1033/259/259 +f 702/260/260 1033/259/259 1062/261/261 +f 703/262/262 1062/261/261 1125/263/263 +f 704/264/264 1125/263/263 1178/265/265 +f 705/266/266 1178/265/265 1234/267/267 +f 707/268/268 1234/267/267 1271/269/269 +f 712/270/270 1271/269/269 1297/271/271 +f 719/272/272 1297/271/271 1301/273/273 +f 725/274/274 1301/273/273 1308/275/275 +f 727/276/276 1308/275/275 1306/277/277 +f 829/280/280 922/292/292 1011/281/281 +f 870/257/257 1011/281/281 1263/282/282 +f 1033/259/259 1263/282/282 1270/283/283 +f 1062/261/261 1270/283/283 1291/284/284 +f 1125/263/263 1291/284/284 1295/285/285 +f 1178/265/265 1295/285/285 1303/286/286 +f 1234/267/267 1303/286/286 1313/287/287 +f 1271/269/269 1313/287/287 1320/288/288 +f 1297/271/271 1320/288/288 1329/289/289 +f 1301/273/273 1329/289/289 1333/290/290 +f 1308/275/275 1333/290/290 1332/291/291 +f 922/292/292 1158/293/293 1005/304/304 +f 1011/281/281 1294/294/294 1158/293/293 +f 1263/282/282 1298/295/295 1294/294/294 +f 1270/283/283 1302/296/296 1298/295/295 +f 1291/284/284 1309/297/297 1302/296/296 +f 1295/285/285 1312/298/298 1309/297/297 +f 1303/286/286 1321/299/299 1312/298/298 +f 1313/287/287 1335/300/300 1321/299/299 +f 1320/288/288 1340/301/301 1335/300/300 +f 1329/289/289 1343/302/302 1340/301/301 +f 1333/290/290 1343/302/302 1341/303/303 +f 1005/304/304 1180/305/305 1038/318/318 +f 1158/293/293 1296/306/306 1180/305/305 +f 1294/294/294 1300/307/307 1296/306/306 +f 1298/295/295 1307/308/308 1300/307/307 +f 1302/296/296 1310/309/309 1307/308/308 +f 1309/297/297 1315/310/310 1310/309/309 +f 1312/298/298 1322/311/311 1315/310/310 +f 1321/299/299 1337/312/312 1322/311/311 +f 1335/300/300 1342/313/313 1337/312/312 +f 1340/301/301 1353/314/314 1342/313/313 +f 1343/302/302 1352/315/315 1353/314/314 +f 1337/312/312 17/325/325 12/326/326 +f 342/317/317 353/340/340 204/329/329 +f 184/316/316 204/329/329 60/330/330 +f 57/319/319 60/330/330 55/331/331 +f 54/320/320 55/331/331 52/332/332 +f 46/321/321 52/332/332 45/333/333 +f 44/322/322 45/333/333 40/334/334 +f 39/323/323 40/334/334 33/335/335 +f 32/324/324 33/335/335 19/336/336 +f 17/325/325 19/336/336 14/337/337 +f 12/326/326 14/337/337 11/338/338 +f 1/327/327 11/338/338 13/339/339 +f 353/340/340 431/352/352 349/341/341 +f 204/329/329 349/341/341 93/342/342 +f 60/330/330 93/342/342 85/343/343 +f 55/331/331 85/343/343 71/344/344 +f 52/332/332 71/344/344 59/345/345 +f 45/333/333 59/345/345 51/346/346 +f 40/334/334 51/346/346 41/347/347 +f 33/335/335 41/347/347 34/348/348 +f 19/336/336 34/348/348 27/349/349 +f 14/337/337 27/349/349 21/350/350 +f 11/338/338 21/350/350 22/351/351 +f 431/352/352 531/364/364 492/353/353 +f 349/341/341 492/353/353 352/354/354 +f 93/342/342 352/354/354 313/355/355 +f 85/343/343 313/355/355 268/356/356 +f 71/344/344 268/356/356 202/357/357 +f 59/345/345 202/357/357 133/358/358 +f 51/346/346 133/358/358 87/359/359 +f 41/347/347 87/359/359 58/360/360 +f 34/348/348 58/360/360 53/361/361 +f 27/349/349 53/361/361 47/362/362 +f 21/350/350 47/362/362 48/363/363 +f 531/364/364 698/256/256 699/258/258 +f 492/353/353 699/258/258 702/260/260 +f 352/354/354 702/260/260 703/262/262 +f 313/355/355 703/262/262 704/264/264 +f 268/356/356 704/264/264 705/266/266 +f 202/357/357 705/266/266 707/268/268 +f 133/358/358 707/268/268 712/270/270 +f 87/359/359 712/270/270 719/272/272 +f 58/360/360 719/272/272 725/274/274 +f 53/361/361 725/274/274 727/276/276 +f 47/362/362 727/276/276 726/278/278 +f 1038/318/318 1180/305/305 1101/365/365 +f 1180/305/305 1296/306/306 1284/366/366 +f 1296/306/306 1300/307/307 1293/367/367 +f 1300/307/307 1307/308/308 1299/368/368 +f 1307/308/308 1310/309/309 1304/369/369 +f 1310/309/309 1315/310/310 1311/370/370 +f 1315/310/310 1322/311/311 1318/371/371 +f 1322/311/311 1337/312/312 1334/372/372 +f 1337/312/312 1342/313/313 1336/373/373 +f 1342/313/313 1353/314/314 1339/374/374 +f 1353/314/314 1352/315/315 1338/375/375 +f 1352/315/315 1338/375/375 662/279/279 +f 984/376/376 935/377/377 1101/365/365 +f 1101/365/365 1219/378/378 1284/366/366 +f 1284/366/366 1240/379/379 1293/367/367 +f 1293/367/367 1255/380/380 1299/368/368 +f 1299/368/368 1267/381/381 1304/369/369 +f 1304/369/369 1292/382/382 1311/370/370 +f 1311/370/370 1305/383/383 1318/371/371 +f 1318/371/371 1314/384/384 1334/372/372 +f 1334/372/372 1316/385/385 1336/373/373 +f 1336/373/373 1319/386/386 1339/374/374 +f 1339/374/374 1317/387/387 1338/375/375 +f 1338/375/375 1317/387/387 662/279/279 +f 887/388/388 799/389/389 935/377/377 +f 935/377/377 865/390/390 1219/378/378 +f 1219/378/378 874/391/391 1240/379/379 +f 1240/379/379 896/392/392 1255/380/380 +f 1255/380/380 908/393/393 1267/381/381 +f 1267/381/381 942/394/394 1292/382/382 +f 1292/382/382 1045/395/395 1305/383/383 +f 1305/383/383 1174/396/396 1314/384/384 +f 1314/384/384 1218/397/397 1316/385/385 +f 1316/385/385 1231/398/398 1319/386/386 +f 1319/386/386 1228/399/399 1317/387/387 +f 1317/387/387 1228/399/399 662/279/279 +f 778/400/400 564/401/401 799/389/389 +f 799/389/389 510/402/402 865/390/390 +f 874/391/391 510/402/402 493/403/403 +f 865/390/390 510/402/402 874/391/391 +f 896/392/392 493/403/403 483/404/404 +f 874/391/391 493/403/403 896/392/392 +f 908/393/393 483/404/404 465/405/405 +f 896/392/392 483/404/404 908/393/393 +f 942/394/394 465/405/405 441/406/406 +f 908/393/393 465/405/405 942/394/394 +f 1045/395/395 441/406/406 362/407/407 +f 942/394/394 441/406/406 1045/395/395 +f 1045/395/395 251/408/408 1174/396/396 +f 1174/396/396 193/409/409 1218/397/397 +f 1218/397/397 164/410/410 1231/398/398 +f 1228/399/399 164/410/410 171/411/411 +f 1231/398/398 164/410/410 1228/399/399 +f 1228/399/399 171/411/411 662/279/279 +f 585/412/412 429/413/413 564/401/401 +f 564/401/401 150/414/414 510/402/402 +f 510/402/402 125/415/415 493/403/403 +f 493/403/403 100/416/416 483/404/404 +f 483/404/404 92/417/417 465/405/405 +f 465/405/405 70/418/418 441/406/406 +f 441/406/406 49/419/419 362/407/407 +f 362/407/407 42/420/420 251/408/408 +f 251/408/408 38/421/421 193/409/409 +f 193/409/409 36/422/422 164/410/410 +f 164/410/410 37/423/423 171/411/411 +f 171/411/411 37/423/423 662/279/279 +f 477/424/424 264/425/425 429/413/413 +f 429/413/413 74/426/426 150/414/414 +f 150/414/414 61/427/427 125/415/415 +f 125/415/415 56/428/428 100/416/416 +f 100/416/416 50/429/429 92/417/417 +f 92/417/417 43/430/430 70/418/418 +f 70/418/418 35/431/431 49/419/419 +f 49/419/419 20/432/432 42/420/420 +f 42/420/420 18/433/433 38/421/421 +f 38/421/421 15/434/434 36/422/422 +f 36/422/422 16/435/435 37/423/423 +f 37/423/423 16/435/435 662/279/279 +f 381/436/436 184/316/316 264/425/425 +f 264/425/425 57/319/319 74/426/426 +f 74/426/426 54/320/320 61/427/427 +f 61/427/427 46/321/321 56/428/428 +f 56/428/428 44/322/322 50/429/429 +f 50/429/429 39/323/323 43/430/430 +f 43/430/430 32/324/324 35/431/431 +f 35/431/431 17/325/325 20/432/432 +f 20/432/432 12/326/326 18/433/433 +f 1/327/327 15/434/434 18/433/433 +f 15/434/434 2/328/328 16/435/435 +f 16/435/435 2/328/328 662/279/279 +f 1038/318/318 984/376/376 1101/365/365 +f 1180/305/305 1101/365/365 1284/366/366 +f 1296/306/306 1284/366/366 1293/367/367 +f 1300/307/307 1293/367/367 1299/368/368 +f 1307/308/308 1299/368/368 1304/369/369 +f 1310/309/309 1304/369/369 1311/370/370 +f 1315/310/310 1311/370/370 1318/371/371 +f 1322/311/311 1318/371/371 1334/372/372 +f 1337/312/312 1334/372/372 1336/373/373 +f 1342/313/313 1336/373/373 1339/374/374 +f 1353/314/314 1339/374/374 1338/375/375 +f 984/376/376 887/388/388 935/377/377 +f 1101/365/365 935/377/377 1219/378/378 +f 1284/366/366 1219/378/378 1240/379/379 +f 1293/367/367 1240/379/379 1255/380/380 +f 1299/368/368 1255/380/380 1267/381/381 +f 1304/369/369 1267/381/381 1292/382/382 +f 1311/370/370 1292/382/382 1305/383/383 +f 1318/371/371 1305/383/383 1314/384/384 +f 1334/372/372 1314/384/384 1316/385/385 +f 1336/373/373 1316/385/385 1319/386/386 +f 1339/374/374 1319/386/386 1317/387/387 +f 887/388/388 778/400/400 799/389/389 +f 935/377/377 799/389/389 865/390/390 +f 1219/378/378 865/390/390 874/391/391 +f 1240/379/379 874/391/391 896/392/392 +f 1255/380/380 896/392/392 908/393/393 +f 1267/381/381 908/393/393 942/394/394 +f 1292/382/382 942/394/394 1045/395/395 +f 1305/383/383 1045/395/395 1174/396/396 +f 1314/384/384 1174/396/396 1218/397/397 +f 1316/385/385 1218/397/397 1231/398/398 +f 1319/386/386 1231/398/398 1228/399/399 +f 778/400/400 585/412/412 564/401/401 +f 799/389/389 564/401/401 510/402/402 +f 1045/395/395 362/407/407 251/408/408 +f 1174/396/396 251/408/408 193/409/409 +f 1218/397/397 193/409/409 164/410/410 +f 585/412/412 477/424/424 429/413/413 +f 564/401/401 429/413/413 150/414/414 +f 510/402/402 150/414/414 125/415/415 +f 493/403/403 125/415/415 100/416/416 +f 483/404/404 100/416/416 92/417/417 +f 465/405/405 92/417/417 70/418/418 +f 441/406/406 70/418/418 49/419/419 +f 362/407/407 49/419/419 42/420/420 +f 251/408/408 42/420/420 38/421/421 +f 193/409/409 38/421/421 36/422/422 +f 164/410/410 36/422/422 37/423/423 +f 477/424/424 381/436/436 264/425/425 +f 429/413/413 264/425/425 74/426/426 +f 150/414/414 74/426/426 61/427/427 +f 125/415/415 61/427/427 56/428/428 +f 100/416/416 56/428/428 50/429/429 +f 92/417/417 50/429/429 43/430/430 +f 70/418/418 43/430/430 35/431/431 +f 49/419/419 35/431/431 20/432/432 +f 42/420/420 20/432/432 18/433/433 +f 38/421/421 18/433/433 15/434/434 +f 36/422/422 15/434/434 16/435/435 +f 381/436/436 342/317/317 184/316/316 +f 264/425/425 184/316/316 57/319/319 +f 74/426/426 57/319/319 54/320/320 +f 61/427/427 54/320/320 46/321/321 +f 56/428/428 46/321/321 44/322/322 +f 50/429/429 44/322/322 39/323/323 +f 43/430/430 39/323/323 32/324/324 +f 35/431/431 32/324/324 17/325/325 +f 20/432/432 17/325/325 12/326/326 +f 18/433/433 12/326/326 1/327/327 +f 1/327/327 2/328/328 15/434/434 +f 648/437/437 759/52/52 756/122/122 +f 650/438/438 648/437/437 756/122/122 +f 756/122/122 759/52/52 867/50/50 +f 854/439/439 867/50/50 978/48/48 +f 938/113/113 978/48/48 1108/46/46 +f 1057/440/440 1108/46/46 1207/42/42 +f 1161/102/102 1207/42/42 1237/41/41 +f 1205/103/103 1237/41/41 1236/2/2 +f 756/122/122 867/50/50 854/439/439 +f 854/439/439 978/48/48 938/113/113 +f 938/113/113 1108/46/46 1057/440/440 +f 1057/440/440 1207/42/42 1161/102/102 +f 1161/102/102 1237/41/41 1205/103/103 +f 1205/103/103 1236/2/2 1204/1/1 +f 692/441/441 597/131/131 592/54/54 +f 691/442/442 597/131/131 692/441/441 +f 597/131/131 486/56/56 592/54/54 +f 502/443/443 377/57/57 486/56/56 +f 415/140/140 246/58/58 377/57/57 +f 297/444/444 143/59/59 246/58/58 +f 191/149/149 118/60/60 143/59/59 +f 147/158/158 117/15/15 118/60/60 +f 597/131/131 502/443/443 486/56/56 +f 502/443/443 415/140/140 377/57/57 +f 415/140/140 297/444/444 246/58/58 +f 297/444/444 191/149/149 143/59/59 +f 191/149/149 147/158/158 118/60/60 +f 147/158/158 148/16/16 117/15/15 +f 148/16/16 142/62/62 117/15/15 +f 192/175/175 245/64/64 142/62/62 +f 298/445/445 376/66/66 245/64/64 +f 416/184/184 485/68/68 376/66/66 +f 501/193/193 591/70/70 485/68/68 +f 595/202/202 647/72/72 591/70/70 +f 148/16/16 192/175/175 142/62/62 +f 192/175/175 298/445/445 245/64/64 +f 298/445/445 416/184/184 376/66/66 +f 416/184/184 501/193/193 485/68/68 +f 501/193/193 595/202/202 591/70/70 +f 595/202/202 651/211/211 647/72/72 +f 651/211/211 758/74/74 647/72/72 +f 755/220/220 866/76/76 758/74/74 +f 853/229/229 977/78/78 866/76/76 +f 939/238/238 1107/80/80 977/78/78 +f 1056/446/446 1206/82/82 1107/80/80 +f 1162/247/247 1236/2/2 1206/82/82 +f 651/211/211 755/220/220 758/74/74 +f 755/220/220 853/229/229 866/76/76 +f 853/229/229 939/238/238 977/78/78 +f 939/238/238 1056/446/446 1107/80/80 +f 1056/446/446 1162/247/247 1206/82/82 +f 1162/247/247 1204/1/1 1236/2/2 +f 97/447/447 78/448/448 77/449/448 +f 98/450/449 78/448/448 97/447/447 +f 77/449/448 80/451/450 79/452/450 +f 78/448/448 80/451/450 77/449/448 +f 79/452/450 31/453/451 30/454/451 +f 80/451/450 31/453/451 79/452/450 +f 30/454/451 29/455/452 28/456/452 +f 31/453/451 29/455/452 30/454/451 +f 28/456/452 98/450/449 97/447/447 +f 29/455/452 98/450/449 28/456/452 +f 25/457/453 24/458/454 23/459/454 +f 26/460/453 24/458/454 25/457/453 +f 23/459/454 10/461/455 9/462/455 +f 24/458/454 10/461/455 23/459/454 +f 9/462/455 4/463/456 3/464/457 +f 10/461/455 4/463/456 9/462/455 +f 3/464/457 8/465/458 7/466/459 +f 4/463/456 8/465/458 3/464/457 +f 7/466/459 6/467/460 5/468/460 +f 8/465/458 6/467/460 7/466/459 +f 5/468/460 26/460/453 25/457/453 +f 6/467/460 26/460/453 5/468/460 +f 1328/469/461 1330/470/462 1331/471/462 +f 1327/472/461 1330/470/462 1328/469/461 +f 1331/471/462 1344/473/463 1345/474/463 +f 1330/470/462 1344/473/463 1331/471/462 +f 1345/474/463 1350/475/464 1351/476/464 +f 1344/473/463 1350/475/464 1345/474/463 +f 1351/476/464 1346/477/465 1347/478/465 +f 1350/475/464 1346/477/465 1351/476/464 +f 1347/478/465 1348/479/466 1349/480/466 +f 1346/477/465 1348/479/466 1347/478/465 +f 1349/480/466 1327/472/461 1328/469/461 +f 1348/479/466 1327/472/461 1349/480/466 +f 1257/481/467 1274/482/468 1275/483/468 +f 1256/484/467 1274/482/468 1257/481/467 +f 1275/483/468 1276/485/469 1277/486/469 +f 1274/482/468 1276/485/469 1275/483/468 +f 1277/486/469 1323/487/470 1324/488/470 +f 1276/485/469 1323/487/470 1277/486/469 +f 1324/488/470 1325/489/471 1326/490/471 +f 1323/487/470 1325/489/471 1324/488/470 +f 1326/490/471 1256/484/467 1257/481/467 +f 1325/489/471 1256/484/467 1326/490/471 +f 91/491/472 99/492/473 141/493/474 +f 99/492/473 108/494/475 157/495/476 +f 108/494/475 149/496/477 203/497/478 +f 149/496/477 258/498/479 292/499/480 +f 258/498/479 329/500/481 335/501/482 +f 124/502/483 141/493/474 198/503/484 +f 141/493/474 157/495/476 209/504/485 +f 157/495/476 203/497/478 261/505/486 +f 203/497/478 292/499/480 299/506/487 +f 335/501/482 338/507/488 299/506/487 +f 292/499/480 335/501/482 299/506/487 +f 182/508/489 198/503/484 412/509/490 +f 198/503/484 209/504/485 407/510/491 +f 209/504/485 261/505/486 388/511/492 +f 261/505/486 299/506/487 350/512/493 +f 299/506/487 338/507/488 337/513/494 +f 437/514/495 412/509/490 565/515/496 +f 412/509/490 407/510/491 540/516/497 +f 407/510/491 388/511/492 489/517/498 +f 350/512/493 405/518/499 489/517/498 +f 388/511/492 350/512/493 489/517/498 +f 350/512/493 337/513/494 328/519/500 +f 565/515/496 109/520/501 104/521/502 +f 643/522/503 565/515/496 104/521/502 +f 540/516/497 116/523/504 109/520/501 +f 565/515/496 540/516/497 109/520/501 +f 489/517/498 155/524/505 116/523/504 +f 540/516/497 489/517/498 116/523/504 +f 405/518/499 265/525/506 155/524/505 +f 489/517/498 405/518/499 155/524/505 +f 328/519/500 325/526/507 265/525/506 +f 405/518/499 328/519/500 265/525/506 +f 104/521/502 109/520/501 84/527/508 +f 109/520/501 116/523/504 89/528/509 +f 116/523/504 155/524/505 110/529/510 +f 155/524/505 265/525/506 227/530/511 +f 325/526/507 333/531/512 227/530/511 +f 265/525/506 325/526/507 227/530/511 +f 75/532/513 84/527/508 82/533/514 +f 84/527/508 89/528/509 86/534/515 +f 89/528/509 110/529/510 106/535/516 +f 110/529/510 227/530/511 216/536/517 +f 227/530/511 333/531/512 336/537/518 +f 66/538/519 82/533/514 83/539/520 +f 82/533/514 86/534/515 90/540/521 +f 86/534/515 106/535/516 111/541/522 +f 106/535/516 216/536/517 225/542/523 +f 216/536/517 336/537/518 334/543/524 +f 72/544/525 83/539/520 88/545/526 +f 83/539/520 90/540/521 96/546/527 +f 90/540/521 111/541/522 123/547/528 +f 111/541/522 225/542/523 240/548/529 +f 225/542/523 334/543/524 332/549/530 +f 81/550/531 88/545/526 99/492/473 +f 88/545/526 96/546/527 108/494/475 +f 96/546/527 123/547/528 149/496/477 +f 123/547/528 240/548/529 258/498/479 +f 240/548/529 332/549/530 329/500/481 +f 91/491/472 141/493/474 124/502/483 +f 99/492/473 157/495/476 141/493/474 +f 108/494/475 203/497/478 157/495/476 +f 149/496/477 292/499/480 203/497/478 +f 258/498/479 335/501/482 292/499/480 +f 124/502/483 198/503/484 182/508/489 +f 141/493/474 209/504/485 198/503/484 +f 157/495/476 261/505/486 209/504/485 +f 203/497/478 299/506/487 261/505/486 +f 182/508/489 412/509/490 437/514/495 +f 198/503/484 407/510/491 412/509/490 +f 209/504/485 388/511/492 407/510/491 +f 261/505/486 350/512/493 388/511/492 +f 299/506/487 337/513/494 350/512/493 +f 437/514/495 565/515/496 643/522/503 +f 412/509/490 540/516/497 565/515/496 +f 407/510/491 489/517/498 540/516/497 +f 350/512/493 328/519/500 405/518/499 +f 104/521/502 84/527/508 75/532/513 +f 109/520/501 89/528/509 84/527/508 +f 116/523/504 110/529/510 89/528/509 +f 155/524/505 227/530/511 110/529/510 +f 75/532/513 82/533/514 66/538/519 +f 84/527/508 86/534/515 82/533/514 +f 89/528/509 106/535/516 86/534/515 +f 110/529/510 216/536/517 106/535/516 +f 227/530/511 336/537/518 216/536/517 +f 66/538/519 83/539/520 72/544/525 +f 82/533/514 90/540/521 83/539/520 +f 86/534/515 111/541/522 90/540/521 +f 106/535/516 225/542/523 111/541/522 +f 216/536/517 334/543/524 225/542/523 +f 72/544/525 88/545/526 81/550/531 +f 83/539/520 96/546/527 88/545/526 +f 90/540/521 123/547/528 96/546/527 +f 111/541/522 240/548/529 123/547/528 +f 225/542/523 332/549/530 240/548/529 +f 81/550/531 99/492/473 91/491/472 +f 88/545/526 108/494/475 99/492/473 +f 96/546/527 149/496/477 108/494/475 +f 123/547/528 258/498/479 149/496/477 +f 240/548/529 329/500/481 258/498/479 +f 1261/551/532 1209/552/533 1254/553/534 +f 1254/553/534 1196/554/535 1246/555/536 +f 1246/555/536 1149/556/537 1201/557/538 +f 1201/557/538 1063/558/539 1094/559/540 +f 1094/559/540 1017/560/541 1023/561/542 +f 1226/562/543 1153/563/544 1209/552/533 +f 1209/552/533 1146/564/545 1196/554/535 +f 1196/554/535 1091/565/546 1149/556/537 +f 1149/556/537 1055/566/547 1063/558/539 +f 1017/560/541 1055/566/547 1014/567/548 +f 1063/558/539 1055/566/547 1017/560/541 +f 1169/568/549 941/569/550 1153/563/544 +f 1153/563/544 947/570/551 1146/564/545 +f 1146/564/545 968/571/552 1091/565/546 +f 1091/565/546 1002/572/553 1055/566/547 +f 1055/566/547 1015/573/554 1014/567/548 +f 915/574/555 791/575/556 941/569/550 +f 941/569/550 816/576/557 947/570/551 +f 947/570/551 863/577/558 968/571/552 +f 1002/572/553 863/577/558 949/578/559 +f 968/571/552 863/577/558 1002/572/553 +f 1002/572/553 1024/579/560 1015/573/554 +f 791/575/556 1249/580/561 1245/581/562 +f 706/582/563 1249/580/561 791/575/556 +f 816/576/557 1245/581/562 1239/583/564 +f 791/575/556 1245/581/562 816/576/557 +f 863/577/558 1239/583/564 1197/584/565 +f 816/576/557 1239/583/564 863/577/558 +f 949/578/559 1197/584/565 1088/585/566 +f 863/577/558 1197/584/565 949/578/559 +f 1024/579/560 1088/585/566 1027/586/567 +f 949/578/559 1088/585/566 1024/579/560 +f 1249/580/561 1268/587/568 1245/581/562 +f 1245/581/562 1264/588/569 1239/583/564 +f 1239/583/564 1244/589/570 1197/584/565 +f 1197/584/565 1124/590/571 1088/585/566 +f 1027/586/567 1124/590/571 1019/591/572 +f 1088/585/566 1124/590/571 1027/586/567 +f 1278/592/573 1272/593/574 1268/587/568 +f 1268/587/568 1266/594/575 1264/588/569 +f 1264/588/569 1248/595/576 1244/589/570 +f 1244/589/570 1137/596/577 1124/590/571 +f 1124/590/571 1016/597/578 1019/591/572 +f 1285/598/579 1269/599/580 1272/593/574 +f 1272/593/574 1262/600/581 1266/594/575 +f 1266/594/575 1243/601/582 1248/595/576 +f 1248/595/576 1126/602/583 1137/596/577 +f 1137/596/577 1018/603/584 1016/597/578 +f 1280/604/585 1265/605/586 1269/599/580 +f 1269/599/580 1258/606/587 1262/600/581 +f 1262/600/581 1227/607/588 1243/601/582 +f 1243/601/582 1114/608/589 1126/602/583 +f 1126/602/583 1020/609/590 1018/603/584 +f 1273/610/591 1254/553/534 1265/605/586 +f 1265/605/586 1246/555/536 1258/606/587 +f 1258/606/587 1201/557/538 1227/607/588 +f 1227/607/588 1094/559/540 1114/608/589 +f 1114/608/589 1023/561/542 1020/609/590 +f 1261/551/532 1226/562/543 1209/552/533 +f 1254/553/534 1209/552/533 1196/554/535 +f 1246/555/536 1196/554/535 1149/556/537 +f 1201/557/538 1149/556/537 1063/558/539 +f 1094/559/540 1063/558/539 1017/560/541 +f 1226/562/543 1169/568/549 1153/563/544 +f 1209/552/533 1153/563/544 1146/564/545 +f 1196/554/535 1146/564/545 1091/565/546 +f 1149/556/537 1091/565/546 1055/566/547 +f 1169/568/549 915/574/555 941/569/550 +f 1153/563/544 941/569/550 947/570/551 +f 1146/564/545 947/570/551 968/571/552 +f 1091/565/546 968/571/552 1002/572/553 +f 1055/566/547 1002/572/553 1015/573/554 +f 915/574/555 706/582/563 791/575/556 +f 941/569/550 791/575/556 816/576/557 +f 947/570/551 816/576/557 863/577/558 +f 1002/572/553 949/578/559 1024/579/560 +f 1249/580/561 1278/592/573 1268/587/568 +f 1245/581/562 1268/587/568 1264/588/569 +f 1239/583/564 1264/588/569 1244/589/570 +f 1197/584/565 1244/589/570 1124/590/571 +f 1278/592/573 1285/598/579 1272/593/574 +f 1268/587/568 1272/593/574 1266/594/575 +f 1264/588/569 1266/594/575 1248/595/576 +f 1244/589/570 1248/595/576 1137/596/577 +f 1124/590/571 1137/596/577 1016/597/578 +f 1285/598/579 1280/604/585 1269/599/580 +f 1272/593/574 1269/599/580 1262/600/581 +f 1266/594/575 1262/600/581 1243/601/582 +f 1248/595/576 1243/601/582 1126/602/583 +f 1137/596/577 1126/602/583 1018/603/584 +f 1280/604/585 1273/610/591 1265/605/586 +f 1269/599/580 1265/605/586 1258/606/587 +f 1262/600/581 1258/606/587 1227/607/588 +f 1243/601/582 1227/607/588 1114/608/589 +f 1126/602/583 1114/608/589 1020/609/590 +f 1273/610/591 1261/551/532 1254/553/534 +f 1265/605/586 1254/553/534 1246/555/536 +f 1258/606/587 1246/555/536 1201/557/538 +f 1227/607/588 1201/557/538 1094/559/540 +f 1114/608/589 1094/559/540 1023/561/542 +f 615/611/592 576/612/593 618/613/594 +f 774/614/595 618/613/594 775/615/594 +f 615/611/592 618/613/594 774/614/595 +f 774/614/595 775/615/594 800/616/596 +f 618/613/594 576/612/593 623/617/597 +f 775/615/594 623/617/597 757/618/598 +f 618/613/594 623/617/597 775/615/594 +f 775/615/594 757/618/598 800/616/596 +f 623/617/597 576/612/593 625/619/599 +f 757/618/598 625/619/599 722/620/600 +f 623/617/597 625/619/599 757/618/598 +f 757/618/598 722/620/600 800/616/596 +f 625/619/599 576/612/593 627/621/601 +f 722/620/600 627/621/601 717/622/602 +f 625/619/599 627/621/601 722/620/600 +f 722/620/600 717/622/602 800/616/596 +f 627/621/601 576/612/593 626/623/603 +f 717/622/602 626/623/603 715/624/604 +f 627/621/601 626/623/603 717/622/602 +f 717/622/602 715/624/604 800/616/596 +f 626/623/603 576/612/593 624/625/605 +f 715/624/604 624/625/605 713/626/606 +f 626/623/603 624/625/605 715/624/604 +f 715/624/604 713/626/606 800/616/596 +f 624/625/605 576/612/593 622/627/607 +f 713/626/606 622/627/607 714/628/608 +f 624/625/605 622/627/607 713/626/606 +f 713/626/606 714/628/608 800/616/596 +f 622/627/607 576/612/593 621/629/609 +f 714/628/608 621/629/609 716/630/610 +f 622/627/607 621/629/609 714/628/608 +f 714/628/608 716/630/610 800/616/596 +f 621/629/609 576/612/593 620/631/611 +f 716/630/610 620/631/611 718/632/612 +f 621/629/609 620/631/611 716/630/610 +f 716/630/610 718/632/612 800/616/596 +f 620/631/611 576/612/593 619/633/613 +f 718/632/612 619/633/613 721/634/614 +f 620/631/611 619/633/613 718/632/612 +f 718/632/612 721/634/614 800/616/596 +f 619/633/613 576/612/593 617/635/615 +f 721/634/614 617/635/615 764/636/616 +f 619/633/613 617/635/615 721/634/614 +f 721/634/614 764/636/616 800/616/596 +f 617/635/615 576/612/593 616/637/617 +f 764/636/616 616/637/617 767/638/618 +f 617/635/615 616/637/617 764/636/616 +f 764/636/616 767/638/618 800/616/596 +f 616/637/617 576/612/593 615/611/592 +f 767/638/618 615/611/592 774/614/595 +f 616/637/617 615/611/592 767/638/618 +f 767/638/618 774/614/595 800/616/596 +f 951/639/619 963/640/620 934/641/621 +f 973/642/622 934/641/621 893/643/623 +f 951/639/619 934/641/621 973/642/622 +f 983/644/624 893/643/623 872/645/625 +f 973/642/622 893/643/623 983/644/624 +f 986/646/626 872/645/625 876/647/627 +f 983/644/624 872/645/625 986/646/626 +f 988/648/628 876/647/627 898/649/628 +f 986/646/626 876/647/627 988/648/628 +f 934/641/621 963/640/620 920/650/629 +f 893/643/623 920/650/629 833/651/630 +f 934/641/621 920/650/629 893/643/623 +f 872/645/625 833/651/630 804/652/631 +f 893/643/623 833/651/630 872/645/625 +f 876/647/627 804/652/631 808/653/632 +f 872/645/625 804/652/631 876/647/627 +f 898/649/628 808/653/632 831/654/628 +f 876/647/627 808/653/632 898/649/628 +f 920/650/629 963/640/620 912/655/633 +f 833/651/630 912/655/633 819/656/634 +f 920/650/629 912/655/633 833/651/630 +f 804/652/631 819/656/634 783/657/635 +f 833/651/630 819/656/634 804/652/631 +f 808/653/632 783/657/635 788/658/636 +f 804/652/631 783/657/635 808/653/632 +f 831/654/628 788/658/636 811/659/628 +f 808/653/632 788/658/636 831/654/628 +f 912/655/633 963/640/620 919/660/637 +f 819/656/634 919/660/637 832/661/638 +f 912/655/633 919/660/637 819/656/634 +f 783/657/635 832/661/638 803/662/639 +f 819/656/634 832/661/638 783/657/635 +f 788/658/636 803/662/639 807/663/640 +f 783/657/635 803/662/639 788/658/636 +f 811/659/628 807/663/640 830/664/628 +f 788/658/636 807/663/640 811/659/628 +f 919/660/637 963/640/620 933/665/641 +f 832/661/638 933/665/641 892/666/642 +f 919/660/637 933/665/641 832/661/638 +f 803/662/639 892/666/642 871/667/643 +f 832/661/638 892/666/642 803/662/639 +f 807/663/640 871/667/643 875/668/644 +f 803/662/639 871/667/643 807/663/640 +f 830/664/628 875/668/644 897/669/628 +f 807/663/640 875/668/644 830/664/628 +f 933/665/641 963/640/620 950/670/645 +f 892/666/642 950/670/645 972/671/646 +f 933/665/641 950/670/645 892/666/642 +f 871/667/643 972/671/646 982/672/647 +f 892/666/642 972/671/646 871/667/643 +f 875/668/644 982/672/647 985/673/648 +f 871/667/643 982/672/647 875/668/644 +f 897/669/628 985/673/648 987/674/628 +f 875/668/644 985/673/648 897/669/628 +f 950/670/645 963/640/620 995/675/649 +f 972/671/646 995/675/649 1082/676/650 +f 950/670/645 995/675/649 972/671/646 +f 982/672/647 1082/676/650 1138/677/651 +f 972/671/646 1082/676/650 982/672/647 +f 985/673/648 1138/677/651 1140/678/652 +f 982/672/647 1138/677/651 985/673/648 +f 987/674/628 1140/678/652 1102/679/628 +f 985/673/648 1140/678/652 987/674/628 +f 995/675/649 963/640/620 1006/680/653 +f 1082/676/650 1006/680/653 1165/681/654 +f 995/675/649 1006/680/653 1082/676/650 +f 1138/677/651 1165/681/654 1222/682/655 +f 1082/676/650 1165/681/654 1138/677/651 +f 1140/678/652 1222/682/655 1220/683/656 +f 1138/677/651 1222/682/655 1140/678/652 +f 1102/679/628 1220/683/656 1192/684/657 +f 1140/678/652 1220/683/656 1102/679/628 +f 1006/680/653 963/640/620 1010/685/658 +f 1165/681/654 1010/685/658 1191/686/659 +f 1006/680/653 1010/685/658 1165/681/654 +f 1222/682/655 1191/686/659 1235/687/660 +f 1165/681/654 1191/686/659 1222/682/655 +f 1220/683/656 1235/687/660 1233/688/661 +f 1222/682/655 1235/687/660 1220/683/656 +f 1192/684/657 1233/688/661 1213/689/628 +f 1220/683/656 1233/688/661 1192/684/657 +f 1010/685/658 963/640/620 1007/690/662 +f 1191/686/659 1007/690/662 1166/691/663 +f 1010/685/658 1007/690/662 1191/686/659 +f 1235/687/660 1166/691/663 1223/692/664 +f 1191/686/659 1166/691/663 1235/687/660 +f 1233/688/661 1223/692/664 1221/693/665 +f 1235/687/660 1223/692/664 1233/688/661 +f 1213/689/628 1221/693/665 1193/694/628 +f 1233/688/661 1221/693/665 1213/689/628 +f 1007/690/662 963/640/620 996/695/666 +f 1166/691/663 996/695/666 1083/696/667 +f 1007/690/662 996/695/666 1166/691/663 +f 1223/692/664 1083/696/667 1139/697/668 +f 1166/691/663 1083/696/667 1223/692/664 +f 1221/693/665 1139/697/668 1141/698/669 +f 1223/692/664 1139/697/668 1221/693/665 +f 1193/694/628 1141/698/669 1103/699/628 +f 1221/693/665 1141/698/669 1193/694/628 +f 996/695/666 963/640/620 951/639/619 +f 1083/696/667 951/639/619 973/642/622 +f 996/695/666 951/639/619 1083/696/667 +f 1139/697/668 973/642/622 983/644/624 +f 1083/696/667 973/642/622 1139/697/668 +f 1141/698/669 983/644/624 986/646/626 +f 1139/697/668 983/644/624 1141/698/669 +f 1103/699/628 986/646/626 988/648/628 +f 1141/698/669 986/646/626 1103/699/628 +f 387/700/670 400/701/671 359/702/672 +f 375/703/673 359/702/672 271/704/674 +f 387/700/670 359/702/672 375/703/673 +f 368/705/675 271/704/674 213/706/676 +f 375/703/673 271/704/674 368/705/675 +f 364/707/677 213/706/676 206/708/678 +f 368/705/675 213/706/676 364/707/677 +f 366/709/679 206/708/678 238/710/679 +f 364/707/677 206/708/678 366/709/679 +f 359/702/672 400/701/671 346/711/680 +f 271/704/674 346/711/680 181/712/681 +f 359/702/672 346/711/680 271/704/674 +f 213/706/676 181/712/681 129/713/682 +f 271/704/674 181/712/681 213/706/676 +f 206/708/678 129/713/682 131/714/683 +f 213/706/676 129/713/682 206/708/678 +f 238/710/679 131/714/683 152/715/679 +f 206/708/678 131/714/683 238/710/679 +f 346/711/680 400/701/671 339/716/684 +f 181/712/681 339/716/684 159/717/685 +f 346/711/680 339/716/684 181/712/681 +f 129/713/682 159/717/685 112/718/686 +f 181/712/681 159/717/685 129/713/682 +f 131/714/683 112/718/686 115/719/687 +f 129/713/682 112/718/686 131/714/683 +f 152/715/679 115/719/687 132/720/679 +f 131/714/683 115/719/687 152/715/679 +f 339/716/684 400/701/671 345/721/688 +f 159/717/685 345/721/688 180/722/689 +f 339/716/684 345/721/688 159/717/685 +f 112/718/686 180/722/689 128/723/690 +f 159/717/685 180/722/689 112/718/686 +f 115/719/687 128/723/690 130/724/691 +f 112/718/686 128/723/690 115/719/687 +f 132/720/679 130/724/691 151/725/692 +f 115/719/687 130/724/691 132/720/679 +f 345/721/688 400/701/671 358/726/693 +f 180/722/689 358/726/693 270/727/694 +f 345/721/688 358/726/693 180/722/689 +f 128/723/690 270/727/694 212/728/695 +f 180/722/689 270/727/694 128/723/690 +f 130/724/691 212/728/695 205/729/696 +f 128/723/690 212/728/695 130/724/691 +f 151/725/692 205/729/696 237/730/679 +f 130/724/691 205/729/696 151/725/692 +f 358/726/693 400/701/671 386/731/697 +f 270/727/694 386/731/697 374/732/698 +f 358/726/693 386/731/697 270/727/694 +f 212/728/695 374/732/698 367/733/699 +f 270/727/694 374/732/698 212/728/695 +f 205/729/696 367/733/699 363/734/700 +f 212/728/695 367/733/699 205/729/696 +f 237/730/679 363/734/700 365/735/679 +f 205/729/696 363/734/700 237/730/679 +f 386/731/697 400/701/671 417/736/701 +f 374/732/698 417/736/701 455/737/702 +f 386/731/697 417/736/701 374/732/698 +f 367/733/699 455/737/702 475/738/703 +f 374/732/698 455/737/702 367/733/699 +f 363/734/700 475/738/703 469/739/704 +f 367/733/699 475/738/703 363/734/700 +f 365/735/679 469/739/704 452/740/705 +f 363/734/700 469/739/704 365/735/679 +f 417/736/701 400/701/671 432/741/706 +f 455/737/702 432/741/706 511/742/707 +f 417/736/701 432/741/706 455/737/702 +f 475/738/703 511/742/707 547/743/708 +f 455/737/702 511/742/707 475/738/703 +f 469/739/704 547/743/708 545/744/709 +f 475/738/703 547/743/708 469/739/704 +f 452/740/705 545/744/709 518/745/679 +f 469/739/704 545/744/709 452/740/705 +f 432/741/706 400/701/671 440/746/710 +f 511/742/707 440/746/710 532/747/711 +f 432/741/706 440/746/710 511/742/707 +f 547/743/708 532/747/711 563/748/712 +f 511/742/707 532/747/711 547/743/708 +f 545/744/709 563/748/712 560/749/713 +f 547/743/708 563/748/712 545/744/709 +f 518/745/679 560/749/713 535/750/679 +f 545/744/709 560/749/713 518/745/679 +f 440/746/710 400/701/671 433/751/714 +f 532/747/711 433/751/714 512/752/715 +f 440/746/710 433/751/714 532/747/711 +f 563/748/712 512/752/715 548/753/716 +f 532/747/711 512/752/715 563/748/712 +f 560/749/713 548/753/716 546/754/717 +f 563/748/712 548/753/716 560/749/713 +f 535/750/679 546/754/717 519/755/679 +f 560/749/713 546/754/717 535/750/679 +f 433/751/714 400/701/671 418/756/718 +f 512/752/715 418/756/718 456/757/719 +f 433/751/714 418/756/718 512/752/715 +f 548/753/716 456/757/719 476/758/720 +f 512/752/715 456/757/719 548/753/716 +f 546/754/717 476/758/720 470/759/721 +f 548/753/716 476/758/720 546/754/717 +f 519/755/679 470/759/721 453/760/679 +f 546/754/717 470/759/721 519/755/679 +f 418/756/718 400/701/671 387/700/670 +f 456/757/719 387/700/670 375/703/673 +f 418/756/718 387/700/670 456/757/719 +f 476/758/720 375/703/673 368/705/675 +f 456/757/719 375/703/673 476/758/720 +f 470/759/721 368/705/675 364/707/677 +f 476/758/720 368/705/675 470/759/721 +f 453/760/679 364/707/677 366/709/679 +f 470/759/721 364/707/677 453/760/679 +f 742/761/722 676/762/723 737/763/724 +f 851/764/725 737/763/724 839/765/726 +f 742/761/722 737/763/724 851/764/725 +f 902/766/727 839/765/726 886/767/728 +f 851/764/725 839/765/726 902/766/727 +f 901/768/729 886/767/728 884/769/730 +f 902/766/727 886/767/728 901/768/729 +f 864/770/731 884/769/730 858/771/732 +f 901/768/729 884/769/730 864/770/731 +f 737/763/724 676/762/723 729/772/733 +f 839/765/726 729/772/733 810/773/734 +f 737/763/724 729/772/733 839/765/726 +f 886/767/728 810/773/734 844/774/735 +f 839/765/726 810/773/734 886/767/728 +f 884/769/730 844/774/735 842/775/736 +f 886/767/728 844/774/735 884/769/730 +f 858/771/732 842/775/736 818/776/731 +f 884/769/730 842/775/736 858/771/732 +f 729/772/733 676/762/723 711/777/737 +f 810/773/734 711/777/737 762/778/738 +f 729/772/733 711/777/737 810/773/734 +f 844/774/735 762/778/738 787/779/739 +f 810/773/734 762/778/738 844/774/735 +f 842/775/736 787/779/739 785/780/740 +f 844/774/735 787/779/739 842/775/736 +f 818/776/731 785/780/740 771/781/731 +f 842/775/736 785/780/740 818/776/731 +f 711/777/737 676/762/723 679/782/741 +f 762/778/738 679/782/741 683/783/742 +f 711/777/737 679/782/741 762/778/738 +f 787/779/739 683/783/742 687/784/743 +f 762/778/738 683/783/742 787/779/739 +f 785/780/740 687/784/743 689/785/744 +f 787/779/739 687/784/743 785/780/740 +f 771/781/731 689/785/744 688/786/731 +f 785/780/740 689/785/744 771/781/731 +f 679/782/741 676/762/723 640/787/745 +f 683/783/742 640/787/745 590/788/746 +f 679/782/741 640/787/745 683/783/742 +f 687/784/743 590/788/746 569/789/747 +f 683/783/742 590/788/746 687/784/743 +f 689/785/744 569/789/747 571/790/748 +f 687/784/743 569/789/747 689/785/744 +f 688/786/731 571/790/748 582/791/749 +f 689/785/744 571/790/748 688/786/731 +f 640/787/745 676/762/723 635/792/750 +f 590/788/746 635/792/750 550/793/751 +f 640/787/745 635/792/750 590/788/746 +f 569/789/747 550/793/751 514/794/752 +f 590/788/746 550/793/751 569/789/747 +f 571/790/748 514/794/752 516/795/753 +f 569/789/747 514/794/752 571/790/748 +f 582/791/749 516/795/753 539/796/731 +f 571/790/748 516/795/753 582/791/749 +f 635/792/750 676/762/723 614/797/754 +f 550/793/751 614/797/754 521/798/755 +f 635/792/750 614/797/754 550/793/751 +f 514/794/752 521/798/755 468/799/756 +f 550/793/751 521/798/755 514/794/752 +f 516/795/753 468/799/756 472/800/757 +f 514/794/752 468/799/756 516/795/753 +f 539/796/731 472/800/757 497/801/731 +f 516/795/753 472/800/757 539/796/731 +f 614/797/754 676/762/723 608/802/758 +f 521/798/755 608/802/758 503/803/759 +f 614/797/754 608/802/758 521/798/755 +f 468/799/756 503/803/759 451/804/760 +f 521/798/755 503/803/759 468/799/756 +f 472/800/757 451/804/760 454/805/761 +f 468/799/756 451/804/760 472/800/757 +f 497/801/731 454/805/761 488/806/731 +f 472/800/757 454/805/761 497/801/731 +f 608/802/758 676/762/723 613/807/762 +f 503/803/759 613/807/762 520/808/763 +f 608/802/758 613/807/762 503/803/759 +f 451/804/760 520/808/763 467/809/764 +f 503/803/759 520/808/763 451/804/760 +f 454/805/761 467/809/764 471/810/765 +f 451/804/760 467/809/764 454/805/761 +f 488/806/731 471/810/765 496/811/731 +f 454/805/761 471/810/765 488/806/731 +f 613/807/762 676/762/723 634/812/766 +f 520/808/763 634/812/766 549/813/767 +f 613/807/762 634/812/766 520/808/763 +f 467/809/764 549/813/767 513/814/768 +f 520/808/763 549/813/767 467/809/764 +f 471/810/765 513/814/768 515/815/769 +f 467/809/764 513/814/768 471/810/765 +f 496/811/731 515/815/769 538/816/770 +f 471/810/765 515/815/769 496/811/731 +f 634/812/766 676/762/723 639/817/771 +f 549/813/767 639/817/771 589/818/772 +f 634/812/766 639/817/771 549/813/767 +f 513/814/768 589/818/772 568/819/773 +f 549/813/767 589/818/772 513/814/768 +f 515/815/769 568/819/773 570/820/774 +f 513/814/768 568/819/773 515/815/769 +f 538/816/770 570/820/774 581/821/749 +f 515/815/769 570/820/774 538/816/770 +f 639/817/771 676/762/723 675/822/775 +f 589/818/772 675/822/775 682/823/776 +f 639/817/771 675/822/775 589/818/772 +f 568/819/773 682/823/776 684/824/777 +f 589/818/772 682/823/776 568/819/773 +f 570/820/774 684/824/777 685/825/778 +f 568/819/773 684/824/777 570/820/774 +f 581/821/749 685/825/778 686/826/749 +f 570/820/774 685/825/778 581/821/749 +f 675/822/775 676/762/723 710/827/779 +f 682/823/776 710/827/779 761/828/780 +f 675/822/775 710/827/779 682/823/776 +f 684/824/777 761/828/780 786/829/781 +f 682/823/776 761/828/780 684/824/777 +f 685/825/778 786/829/781 784/830/782 +f 684/824/777 786/829/781 685/825/778 +f 686/826/749 784/830/782 770/831/749 +f 685/825/778 784/830/782 686/826/749 +f 710/827/779 676/762/723 728/832/783 +f 761/828/780 728/832/783 809/833/784 +f 710/827/779 728/832/783 761/828/780 +f 786/829/781 809/833/784 843/834/785 +f 761/828/780 809/833/784 786/829/781 +f 784/830/782 843/834/785 841/835/786 +f 786/829/781 843/834/785 784/830/782 +f 770/831/749 841/835/786 817/836/749 +f 784/830/782 841/835/786 770/831/749 +f 728/832/783 676/762/723 736/837/787 +f 809/833/784 736/837/787 838/838/788 +f 728/832/783 736/837/787 809/833/784 +f 843/834/785 838/838/788 885/839/789 +f 809/833/784 838/838/788 843/834/785 +f 841/835/786 885/839/789 883/840/790 +f 843/834/785 885/839/789 841/835/786 +f 817/836/749 883/840/790 857/841/731 +f 841/835/786 883/840/790 817/836/749 +f 736/837/787 676/762/723 742/761/722 +f 838/838/788 742/761/722 851/764/725 +f 736/837/787 742/761/722 838/838/788 +f 885/839/789 851/764/725 902/766/727 +f 838/838/788 851/764/725 885/839/789 +f 883/840/790 902/766/727 901/768/729 +f 885/839/789 902/766/727 883/840/790 +f 857/841/731 901/768/729 864/770/731 +f 883/840/790 901/768/729 857/841/731 +f 750/842/791 680/843/792 740/844/793 +f 802/845/794 740/844/793 792/846/795 +f 750/842/791 740/844/793 802/845/794 +f 845/847/796 792/846/795 826/848/797 +f 802/845/794 792/846/795 845/847/796 +f 873/849/798 826/848/797 855/850/799 +f 845/847/796 826/848/797 873/849/798 +f 905/851/800 855/850/799 879/852/801 +f 873/849/798 855/850/799 905/851/800 +f 918/853/802 879/852/801 899/854/803 +f 905/851/800 879/852/801 918/853/802 +f 921/855/804 899/854/803 903/856/805 +f 918/853/802 899/854/803 921/855/804 +f 740/844/793 680/843/792 723/857/806 +f 792/846/795 723/857/806 747/858/807 +f 740/844/793 723/857/806 792/846/795 +f 826/848/797 747/858/807 781/859/808 +f 792/846/795 747/858/807 826/848/797 +f 855/850/799 781/859/808 796/860/809 +f 826/848/797 781/859/808 855/850/799 +f 879/852/801 796/860/809 805/861/810 +f 855/850/799 796/860/809 879/852/801 +f 899/854/803 805/861/810 812/862/811 +f 879/852/801 805/861/810 899/854/803 +f 903/856/805 812/862/811 820/863/812 +f 899/854/803 812/862/811 903/856/805 +f 723/857/806 680/843/792 677/864/813 +f 747/858/807 677/864/813 674/865/814 +f 723/857/806 677/864/813 747/858/807 +f 781/859/808 674/865/814 670/866/815 +f 747/858/807 674/865/814 781/859/808 +f 796/860/809 670/866/815 667/867/816 +f 781/859/808 670/866/815 796/860/809 +f 805/861/810 667/867/816 666/868/817 +f 796/860/809 667/867/816 805/861/810 +f 812/862/811 666/868/817 664/869/818 +f 805/861/810 666/868/817 812/862/811 +f 820/863/812 664/869/818 663/870/819 +f 812/862/811 664/869/818 820/863/812 +f 677/864/813 680/843/792 636/871/820 +f 674/865/814 636/871/820 602/872/821 +f 677/864/813 636/871/820 674/865/814 +f 670/866/815 602/872/821 572/873/822 +f 674/865/814 602/872/821 670/866/815 +f 667/867/816 572/873/822 556/874/823 +f 670/866/815 572/873/822 667/867/816 +f 666/868/817 556/874/823 551/875/824 +f 667/867/816 556/874/823 666/868/817 +f 664/869/818 551/875/824 543/876/825 +f 666/868/817 551/875/824 664/869/818 +f 663/870/819 543/876/825 536/877/826 +f 664/869/818 543/876/825 663/870/819 +f 636/871/820 680/843/792 609/878/827 +f 602/872/821 609/878/827 561/879/828 +f 636/871/820 609/878/827 602/872/821 +f 572/873/822 561/879/828 527/880/829 +f 602/872/821 561/879/828 572/873/822 +f 556/874/823 527/880/829 498/881/830 +f 572/873/822 527/880/829 556/874/823 +f 551/875/824 498/881/830 478/882/831 +f 556/874/823 498/881/830 551/875/824 +f 543/876/825 478/882/831 457/883/832 +f 551/875/824 478/882/831 543/876/825 +f 536/877/826 457/883/832 449/884/833 +f 543/876/825 457/883/832 536/877/826 +f 609/878/827 680/843/792 600/885/834 +f 561/879/828 600/885/834 553/886/835 +f 609/878/827 600/885/834 561/879/828 +f 527/880/829 553/886/835 509/887/836 +f 561/879/828 553/886/835 527/880/829 +f 498/881/830 509/887/836 482/888/837 +f 527/880/829 509/887/836 498/881/830 +f 478/882/831 482/888/837 447/889/838 +f 498/881/830 482/888/837 478/882/831 +f 457/883/832 447/889/838 434/890/839 +f 478/882/831 447/889/838 457/883/832 +f 449/884/833 434/890/839 430/891/840 +f 457/883/832 434/890/839 449/884/833 +f 600/885/834 680/843/792 610/892/841 +f 553/886/835 610/892/841 562/893/842 +f 600/885/834 610/892/841 553/886/835 +f 509/887/836 562/893/842 528/894/843 +f 553/886/835 562/893/842 509/887/836 +f 482/888/837 528/894/843 499/895/844 +f 509/887/836 528/894/843 482/888/837 +f 447/889/838 499/895/844 479/896/845 +f 482/888/837 499/895/844 447/889/838 +f 434/890/839 479/896/845 458/897/846 +f 447/889/838 479/896/845 434/890/839 +f 430/891/840 458/897/846 450/898/847 +f 434/890/839 458/897/846 430/891/840 +f 610/892/841 680/843/792 637/899/848 +f 562/893/842 637/899/848 603/900/849 +f 610/892/841 637/899/848 562/893/842 +f 528/894/843 603/900/849 573/901/850 +f 562/893/842 603/900/849 528/894/843 +f 499/895/844 573/901/850 557/902/851 +f 528/894/843 573/901/850 499/895/844 +f 479/896/845 557/902/851 552/903/852 +f 499/895/844 557/902/851 479/896/845 +f 458/897/846 552/903/852 544/904/853 +f 479/896/845 552/903/852 458/897/846 +f 450/898/847 544/904/853 537/905/854 +f 458/897/846 544/904/853 450/898/847 +f 637/899/848 680/843/792 681/906/855 +f 603/900/849 681/906/855 678/907/856 +f 637/899/848 681/906/855 603/900/849 +f 573/901/850 678/907/856 672/908/857 +f 603/900/849 678/907/856 573/901/850 +f 557/902/851 672/908/857 673/909/858 +f 573/901/850 672/908/857 557/902/851 +f 552/903/852 673/909/858 671/910/859 +f 557/902/851 673/909/858 552/903/852 +f 544/904/853 671/910/859 669/911/860 +f 552/903/852 671/910/859 544/904/853 +f 537/905/854 669/911/860 665/912/861 +f 544/904/853 669/911/860 537/905/854 +f 681/906/855 680/843/792 724/913/862 +f 678/907/856 724/913/862 748/914/863 +f 681/906/855 724/913/862 678/907/856 +f 672/908/857 748/914/863 782/915/864 +f 678/907/856 748/914/863 672/908/857 +f 673/909/858 782/915/864 797/916/865 +f 672/908/857 782/915/864 673/909/858 +f 671/910/859 797/916/865 806/917/866 +f 673/909/858 797/916/865 671/910/859 +f 669/911/860 806/917/866 813/918/867 +f 671/910/859 806/917/866 669/911/860 +f 665/912/861 813/918/867 821/919/868 +f 669/911/860 813/918/867 665/912/861 +f 724/913/862 680/843/792 741/920/869 +f 748/914/863 741/920/869 793/921/870 +f 724/913/862 741/920/869 748/914/863 +f 782/915/864 793/921/870 827/922/871 +f 748/914/863 793/921/870 782/915/864 +f 797/916/865 827/922/871 856/923/872 +f 782/915/864 827/922/871 797/916/865 +f 806/917/866 856/923/872 880/924/873 +f 797/916/865 856/923/872 806/917/866 +f 813/918/867 880/924/873 900/925/874 +f 806/917/866 880/924/873 813/918/867 +f 821/919/868 900/925/874 904/926/875 +f 813/918/867 900/925/874 821/919/868 +f 741/920/869 680/843/792 750/842/791 +f 793/921/870 750/842/791 802/845/794 +f 741/920/869 750/842/791 793/921/870 +f 827/922/871 802/845/794 845/847/796 +f 793/921/870 802/845/794 827/922/871 +f 856/923/872 845/847/796 873/849/798 +f 827/922/871 845/847/796 856/923/872 +f 880/924/873 873/849/798 905/851/800 +f 856/923/872 873/849/798 880/924/873 +f 900/925/874 905/851/800 918/853/802 +f 880/924/873 905/851/800 900/925/874 +f 904/926/875 918/853/802 921/855/804 +f 900/925/874 918/853/802 904/926/875 +f 444/927/876 403/928/877 438/929/878 +f 484/930/879 438/929/878 473/931/880 +f 444/927/876 438/929/878 484/930/879 +f 534/932/881 473/931/880 522/933/882 +f 484/930/879 473/931/880 534/932/881 +f 555/934/883 522/933/882 541/935/884 +f 534/932/881 522/933/882 555/934/883 +f 588/936/885 541/935/884 558/937/886 +f 555/934/883 541/935/884 588/936/885 +f 628/938/887 558/937/886 574/939/888 +f 588/936/885 558/937/886 628/938/887 +f 631/940/889 574/939/888 583/941/890 +f 628/938/887 574/939/888 631/940/889 +f 438/929/878 403/928/877 423/942/891 +f 473/931/880 423/942/891 443/943/892 +f 438/929/878 423/942/891 473/931/880 +f 522/933/882 443/943/892 461/944/893 +f 473/931/880 443/943/892 522/933/882 +f 541/935/884 461/944/893 480/945/894 +f 522/933/882 461/944/893 541/935/884 +f 558/937/886 480/945/894 490/946/895 +f 541/935/884 480/945/894 558/937/886 +f 574/939/888 490/946/895 494/947/896 +f 558/937/886 490/946/895 574/939/888 +f 583/941/890 494/947/896 505/948/897 +f 574/939/888 494/947/896 583/941/890 +f 423/942/891 403/928/877 401/949/898 +f 443/943/892 401/949/898 397/950/899 +f 423/942/891 401/949/898 443/943/892 +f 461/944/893 397/950/899 394/951/900 +f 443/943/892 397/950/899 461/944/893 +f 480/945/894 394/951/900 393/952/901 +f 461/944/893 394/951/900 480/945/894 +f 490/946/895 393/952/901 392/953/902 +f 480/945/894 393/952/901 490/946/895 +f 494/947/896 392/953/902 390/954/903 +f 490/946/895 392/953/902 494/947/896 +f 505/948/897 390/954/903 389/955/904 +f 494/947/896 390/954/903 505/948/897 +f 401/949/898 403/928/877 356/956/905 +f 397/950/899 356/956/905 322/957/906 +f 401/949/898 356/956/905 397/950/899 +f 394/951/900 322/957/906 290/958/907 +f 397/950/899 322/957/906 394/951/900 +f 393/952/901 290/958/907 259/959/908 +f 394/951/900 290/958/907 393/952/901 +f 392/953/902 259/959/908 229/960/909 +f 393/952/901 259/959/908 392/953/902 +f 390/954/903 229/960/909 214/961/910 +f 392/953/902 229/960/909 390/954/903 +f 389/955/904 214/961/910 210/962/911 +f 390/954/903 214/961/910 389/955/904 +f 356/956/905 403/928/877 343/963/912 +f 322/957/906 343/963/912 266/964/913 +f 356/956/905 343/963/912 322/957/906 +f 290/958/907 266/964/913 194/965/914 +f 322/957/906 266/964/913 290/958/907 +f 259/959/908 194/965/914 161/966/915 +f 290/958/907 194/965/914 259/959/908 +f 229/960/909 161/966/915 134/967/916 +f 259/959/908 161/966/915 229/960/909 +f 214/961/910 134/967/916 126/968/917 +f 229/960/909 134/967/916 214/961/910 +f 210/962/911 126/968/917 121/969/918 +f 214/961/910 126/968/917 210/962/911 +f 343/963/912 403/928/877 318/970/919 +f 266/964/913 318/970/919 250/971/920 +f 343/963/912 318/970/919 266/964/913 +f 194/965/914 250/971/920 173/972/921 +f 266/964/913 250/971/920 194/965/914 +f 161/966/915 173/972/921 140/973/922 +f 194/965/914 173/972/921 161/966/915 +f 134/967/916 140/973/922 120/974/923 +f 161/966/915 140/973/922 134/967/916 +f 126/968/917 120/974/923 107/975/924 +f 134/967/916 120/974/923 126/968/917 +f 121/969/918 107/975/924 103/976/925 +f 126/968/917 107/975/924 121/969/918 +f 318/970/919 403/928/877 344/977/926 +f 250/971/920 344/977/926 267/978/927 +f 318/970/919 344/977/926 250/971/920 +f 173/972/921 267/978/927 195/979/928 +f 250/971/920 267/978/927 173/972/921 +f 140/973/922 195/979/928 162/980/929 +f 173/972/921 195/979/928 140/973/922 +f 120/974/923 162/980/929 135/981/930 +f 140/973/922 162/980/929 120/974/923 +f 107/975/924 135/981/930 127/982/931 +f 120/974/923 135/981/930 107/975/924 +f 103/976/925 127/982/931 122/983/932 +f 107/975/924 127/982/931 103/976/925 +f 344/977/926 403/928/877 357/984/933 +f 267/978/927 357/984/933 323/985/934 +f 344/977/926 357/984/933 267/978/927 +f 195/979/928 323/985/934 291/986/935 +f 267/978/927 323/985/934 195/979/928 +f 162/980/929 291/986/935 260/987/936 +f 195/979/928 291/986/935 162/980/929 +f 135/981/930 260/987/936 230/988/937 +f 162/980/929 260/987/936 135/981/930 +f 127/982/931 230/988/937 215/989/938 +f 135/981/930 230/988/937 127/982/931 +f 122/983/932 215/989/938 211/990/939 +f 127/982/931 215/989/938 122/983/932 +f 357/984/933 403/928/877 404/991/940 +f 323/985/934 404/991/940 402/992/941 +f 357/984/933 404/991/940 323/985/934 +f 291/986/935 402/992/941 398/993/942 +f 323/985/934 402/992/941 291/986/935 +f 260/987/936 398/993/942 399/994/943 +f 291/986/935 398/993/942 260/987/936 +f 230/988/937 399/994/943 396/995/944 +f 260/987/936 399/994/943 230/988/937 +f 215/989/938 396/995/944 395/996/945 +f 230/988/937 396/995/944 215/989/938 +f 211/990/939 395/996/945 391/997/946 +f 215/989/938 395/996/945 211/990/939 +f 404/991/940 403/928/877 424/998/947 +f 402/992/941 424/998/947 442/999/948 +f 404/991/940 424/998/947 402/992/941 +f 398/993/942 442/999/948 462/1000/949 +f 402/992/941 442/999/948 398/993/942 +f 399/994/943 462/1000/949 481/1001/950 +f 398/993/942 462/1000/949 399/994/943 +f 396/995/944 481/1001/950 491/1002/951 +f 399/994/943 481/1001/950 396/995/944 +f 395/996/945 491/1002/951 495/1003/952 +f 396/995/944 491/1002/951 395/996/945 +f 391/997/946 495/1003/952 506/1004/953 +f 395/996/945 495/1003/952 391/997/946 +f 424/998/947 403/928/877 439/1005/954 +f 442/999/948 439/1005/954 474/1006/955 +f 424/998/947 439/1005/954 442/999/948 +f 462/1000/949 474/1006/955 523/1007/956 +f 442/999/948 474/1006/955 462/1000/949 +f 481/1001/950 523/1007/956 542/1008/957 +f 462/1000/949 523/1007/956 481/1001/950 +f 491/1002/951 542/1008/957 559/1009/958 +f 481/1001/950 542/1008/957 491/1002/951 +f 495/1003/952 559/1009/958 575/1010/959 +f 491/1002/951 559/1009/958 495/1003/952 +f 506/1004/953 575/1010/959 584/1011/960 +f 495/1003/952 575/1010/959 506/1004/953 +f 439/1005/954 403/928/877 444/927/876 +f 474/1006/955 444/927/876 484/930/879 +f 439/1005/954 444/927/876 474/1006/955 +f 523/1007/956 484/930/879 534/932/881 +f 474/1006/955 484/930/879 523/1007/956 +f 542/1008/957 534/932/881 555/934/883 +f 523/1007/956 534/932/881 542/1008/957 +f 559/1009/958 555/934/883 588/936/885 +f 542/1008/957 555/934/883 559/1009/958 +f 575/1010/959 588/936/885 628/938/887 +f 559/1009/958 588/936/885 575/1010/959 +f 584/1011/960 628/938/887 631/940/889 +f 575/1010/959 628/938/887 584/1011/960 +f 1035/1012/961 966/1013/877 1008/1014/878 +f 1104/1015/879 1008/1014/878 1086/1016/880 +f 1035/1012/961 1008/1014/878 1104/1015/879 +f 1179/1017/962 1086/1016/880 1156/1018/882 +f 1104/1015/879 1086/1016/880 1179/1017/962 +f 1210/1019/883 1156/1018/882 1188/1020/884 +f 1179/1017/962 1156/1018/882 1210/1019/883 +f 1232/1021/885 1188/1020/884 1215/1022/886 +f 1210/1019/883 1188/1020/884 1232/1021/885 +f 1247/1023/887 1215/1022/886 1225/1024/888 +f 1232/1021/885 1215/1022/886 1247/1023/887 +f 1251/1025/889 1225/1024/888 1229/1026/963 +f 1247/1023/887 1225/1024/888 1251/1025/889 +f 1008/1014/878 966/1013/877 997/1027/964 +f 1086/1016/880 997/1027/964 1029/1028/892 +f 1008/1014/878 997/1027/964 1086/1016/880 +f 1156/1018/882 1029/1028/892 1064/1029/965 +f 1086/1016/880 1029/1028/892 1156/1018/882 +f 1188/1020/884 1064/1029/965 1092/1030/894 +f 1156/1018/882 1064/1029/965 1188/1020/884 +f 1215/1022/886 1092/1030/894 1122/1031/895 +f 1188/1020/884 1092/1030/894 1215/1022/886 +f 1225/1024/888 1122/1031/895 1142/1032/896 +f 1215/1022/886 1122/1031/895 1225/1024/888 +f 1229/1026/963 1142/1032/896 1144/1033/897 +f 1225/1024/888 1142/1032/896 1229/1026/963 +f 997/1027/964 966/1013/877 964/1034/966 +f 1029/1028/892 964/1034/966 960/1035/899 +f 997/1027/964 964/1034/966 1029/1028/892 +f 1064/1029/965 960/1035/899 957/1036/900 +f 1029/1028/892 960/1035/899 1064/1029/965 +f 1092/1030/894 957/1036/900 956/1037/901 +f 1064/1029/965 957/1036/900 1092/1030/894 +f 1122/1031/895 956/1037/901 955/1038/902 +f 1092/1030/894 956/1037/901 1122/1031/895 +f 1142/1032/896 955/1038/902 953/1039/903 +f 1122/1031/895 955/1038/902 1142/1032/896 +f 1144/1033/897 953/1039/903 952/1040/967 +f 1142/1032/896 953/1039/903 1144/1033/897 +f 964/1034/966 966/1013/877 926/1041/905 +f 960/1035/899 926/1041/905 910/1042/906 +f 964/1034/966 926/1041/905 960/1035/899 +f 957/1036/900 910/1042/906 890/1043/968 +f 960/1035/899 910/1042/906 957/1036/900 +f 956/1037/901 890/1043/968 877/1044/908 +f 957/1036/900 890/1043/968 956/1037/901 +f 955/1038/902 877/1044/908 861/1045/909 +f 956/1037/901 877/1044/908 955/1038/902 +f 953/1039/903 861/1045/909 859/1046/910 +f 955/1038/902 861/1045/909 953/1039/903 +f 952/1040/967 859/1046/910 848/1047/911 +f 953/1039/903 859/1046/910 952/1040/967 +f 926/1041/905 966/1013/877 913/1048/912 +f 910/1042/906 913/1048/912 881/1049/969 +f 926/1041/905 913/1048/912 910/1042/906 +f 890/1043/968 881/1049/969 836/1050/970 +f 910/1042/906 881/1049/969 890/1043/968 +f 877/1044/908 836/1050/970 814/1051/915 +f 890/1043/968 836/1050/970 877/1044/908 +f 861/1045/909 814/1051/915 794/1052/916 +f 877/1044/908 814/1051/915 861/1045/909 +f 859/1046/910 794/1052/916 779/1053/971 +f 861/1045/909 794/1052/916 859/1046/910 +f 848/1047/911 779/1053/971 768/1054/918 +f 859/1046/910 779/1053/971 848/1047/911 +f 913/1048/912 966/1013/877 909/1055/919 +f 881/1049/969 909/1055/919 869/1056/920 +f 913/1048/912 909/1055/919 881/1049/969 +f 836/1050/970 869/1056/920 822/1057/921 +f 881/1049/969 869/1056/920 836/1050/970 +f 814/1051/915 822/1057/921 798/1058/922 +f 836/1050/970 822/1057/921 814/1051/915 +f 794/1052/916 798/1058/922 763/1059/972 +f 814/1051/915 798/1058/922 794/1052/916 +f 779/1053/971 763/1059/972 735/1060/924 +f 794/1052/916 763/1059/972 779/1053/971 +f 768/1054/918 735/1060/924 732/1061/925 +f 779/1053/971 735/1060/924 768/1054/918 +f 909/1055/919 966/1013/877 914/1062/973 +f 869/1056/920 914/1062/973 882/1063/927 +f 909/1055/919 914/1062/973 869/1056/920 +f 822/1057/921 882/1063/927 837/1064/928 +f 869/1056/920 882/1063/927 822/1057/921 +f 798/1058/922 837/1064/928 815/1065/929 +f 822/1057/921 837/1064/928 798/1058/922 +f 763/1059/972 815/1065/929 795/1066/930 +f 798/1058/922 815/1065/929 763/1059/972 +f 735/1060/924 795/1066/930 780/1067/931 +f 763/1059/972 795/1066/930 735/1060/924 +f 732/1061/925 780/1067/931 769/1068/932 +f 735/1060/924 780/1067/931 732/1061/925 +f 914/1062/973 966/1013/877 927/1069/933 +f 882/1063/927 927/1069/933 911/1070/934 +f 914/1062/973 927/1069/933 882/1063/927 +f 837/1064/928 911/1070/934 891/1071/974 +f 882/1063/927 911/1070/934 837/1064/928 +f 815/1065/929 891/1071/974 878/1072/936 +f 837/1064/928 891/1071/974 815/1065/929 +f 795/1066/930 878/1072/936 862/1073/937 +f 815/1065/929 878/1072/936 795/1066/930 +f 780/1067/931 862/1073/937 860/1074/975 +f 795/1066/930 862/1073/937 780/1067/931 +f 769/1068/932 860/1074/975 849/1075/939 +f 780/1067/931 860/1074/975 769/1068/932 +f 927/1069/933 966/1013/877 967/1076/976 +f 911/1070/934 967/1076/976 965/1077/977 +f 927/1069/933 967/1076/976 911/1070/934 +f 891/1071/974 965/1077/977 961/1078/942 +f 911/1070/934 965/1077/977 891/1071/974 +f 878/1072/936 961/1078/942 962/1079/943 +f 891/1071/974 961/1078/942 878/1072/936 +f 862/1073/937 962/1079/943 959/1080/944 +f 878/1072/936 962/1079/943 862/1073/937 +f 860/1074/975 959/1080/944 958/1081/945 +f 862/1073/937 959/1080/944 860/1074/975 +f 849/1075/939 958/1081/945 954/1082/946 +f 860/1074/975 958/1081/945 849/1075/939 +f 967/1076/976 966/1013/877 998/1083/978 +f 965/1077/977 998/1083/978 1028/1084/948 +f 967/1076/976 998/1083/978 965/1077/977 +f 961/1078/942 1028/1084/948 1065/1085/949 +f 965/1077/977 1028/1084/948 961/1078/942 +f 962/1079/943 1065/1085/949 1093/1086/979 +f 961/1078/942 1065/1085/949 962/1079/943 +f 959/1080/944 1093/1086/979 1123/1087/951 +f 962/1079/943 1093/1086/979 959/1080/944 +f 958/1081/945 1123/1087/951 1143/1088/952 +f 959/1080/944 1123/1087/951 958/1081/945 +f 954/1082/946 1143/1088/952 1145/1089/953 +f 958/1081/945 1143/1088/952 954/1082/946 +f 998/1083/978 966/1013/877 1009/1090/954 +f 1028/1084/948 1009/1090/954 1087/1091/955 +f 998/1083/978 1009/1090/954 1028/1084/948 +f 1065/1085/949 1087/1091/955 1157/1092/980 +f 1028/1084/948 1087/1091/955 1065/1085/949 +f 1093/1086/979 1157/1092/980 1189/1093/957 +f 1065/1085/949 1157/1092/980 1093/1086/979 +f 1123/1087/951 1189/1093/957 1216/1094/958 +f 1093/1086/979 1189/1093/957 1123/1087/951 +f 1143/1088/952 1216/1094/958 1224/1095/959 +f 1123/1087/951 1216/1094/958 1143/1088/952 +f 1145/1089/953 1224/1095/959 1230/1096/981 +f 1143/1088/952 1224/1095/959 1145/1089/953 +f 1009/1090/954 966/1013/877 1035/1012/961 +f 1087/1091/955 1035/1012/961 1104/1015/879 +f 1009/1090/954 1035/1012/961 1087/1091/955 +f 1157/1092/980 1104/1015/879 1179/1017/962 +f 1087/1091/955 1104/1015/879 1157/1092/980 +f 1189/1093/957 1179/1017/962 1210/1019/883 +f 1157/1092/980 1179/1017/962 1189/1093/957 +f 1216/1094/958 1210/1019/883 1232/1021/885 +f 1189/1093/957 1210/1019/883 1216/1094/958 +f 1224/1095/959 1232/1021/885 1247/1023/887 +f 1216/1094/958 1232/1021/885 1224/1095/959 +f 1230/1096/981 1247/1023/887 1251/1025/889 +f 1224/1095/959 1247/1023/887 1230/1096/981 +f 1096/1097/982 1079/1098/983 1090/1099/984 +f 1136/1100/985 1090/1099/984 1100/1101/986 +f 1096/1097/982 1090/1099/984 1136/1100/985 +f 1152/1102/987 1100/1101/986 1119/1103/988 +f 1136/1100/985 1100/1101/986 1152/1102/987 +f 1168/1104/989 1119/1103/988 1134/1105/990 +f 1152/1102/987 1119/1103/988 1168/1104/989 +f 1090/1099/984 1079/1098/983 1078/1106/991 +f 1100/1101/986 1078/1106/991 1076/1107/992 +f 1090/1099/984 1078/1106/991 1100/1101/986 +f 1119/1103/988 1076/1107/992 1073/1108/993 +f 1100/1101/986 1076/1107/992 1119/1103/988 +f 1134/1105/990 1073/1108/993 1071/1109/994 +f 1119/1103/988 1073/1108/993 1134/1105/990 +f 1078/1106/991 1079/1098/983 1059/1110/995 +f 1076/1107/992 1059/1110/995 1050/1111/996 +f 1078/1106/991 1059/1110/995 1076/1107/992 +f 1073/1108/993 1050/1111/996 1037/1112/997 +f 1076/1107/992 1050/1111/996 1073/1108/993 +f 1071/1109/994 1037/1112/997 1026/1113/998 +f 1073/1108/993 1037/1112/997 1071/1109/994 +f 1059/1110/995 1079/1098/983 1054/1114/999 +f 1050/1111/996 1054/1114/999 1022/1115/1000 +f 1059/1110/995 1054/1114/999 1050/1111/996 +f 1037/1112/997 1022/1115/1000 1000/1116/1001 +f 1050/1111/996 1022/1115/1000 1037/1112/997 +f 1026/1113/998 1000/1116/1001 994/1117/1002 +f 1037/1112/997 1000/1116/1001 1026/1113/998 +f 1054/1114/999 1079/1098/983 1048/1118/1003 +f 1022/1115/1000 1048/1118/1003 1004/1119/1004 +f 1054/1114/999 1048/1118/1003 1022/1115/1000 +f 1000/1116/1001 1004/1119/1004 990/1120/1005 +f 1022/1115/1000 1004/1119/1004 1000/1116/1001 +f 994/1117/1002 990/1120/1005 971/1121/1006 +f 1000/1116/1001 990/1120/1005 994/1117/1002 +f 1048/1118/1003 1079/1098/983 1042/1122/1007 +f 1004/1119/1004 1042/1122/1007 1001/1123/1008 +f 1048/1118/1003 1042/1122/1007 1004/1119/1004 +f 990/1120/1005 1001/1123/1008 981/1124/1009 +f 1004/1119/1004 1001/1123/1008 990/1120/1005 +f 971/1121/1006 981/1124/1009 948/1125/1010 +f 990/1120/1005 981/1124/1009 971/1121/1006 +f 1042/1122/1007 1079/1098/983 1047/1126/1011 +f 1001/1123/1008 1047/1126/1011 1003/1127/1012 +f 1042/1122/1007 1047/1126/1011 1001/1123/1008 +f 981/1124/1009 1003/1127/1012 989/1128/1013 +f 1001/1123/1008 1003/1127/1012 981/1124/1009 +f 948/1125/1010 989/1128/1013 970/1129/1014 +f 981/1124/1009 989/1128/1013 948/1125/1010 +f 1047/1126/1011 1079/1098/983 1053/1130/1015 +f 1003/1127/1012 1053/1130/1015 1021/1131/1016 +f 1047/1126/1011 1053/1130/1015 1003/1127/1012 +f 989/1128/1013 1021/1131/1016 999/1132/1017 +f 1003/1127/1012 1021/1131/1016 989/1128/1013 +f 970/1129/1014 999/1132/1017 993/1133/1018 +f 989/1128/1013 999/1132/1017 970/1129/1014 +f 1053/1130/1015 1079/1098/983 1058/1134/1019 +f 1021/1131/1016 1058/1134/1019 1049/1135/1020 +f 1053/1130/1015 1058/1134/1019 1021/1131/1016 +f 999/1132/1017 1049/1135/1020 1036/1136/1021 +f 1021/1131/1016 1049/1135/1020 999/1132/1017 +f 993/1133/1018 1036/1136/1021 1025/1137/1022 +f 999/1132/1017 1036/1136/1021 993/1133/1018 +f 1058/1134/1019 1079/1098/983 1077/1138/1023 +f 1049/1135/1020 1077/1138/1023 1075/1139/1024 +f 1058/1134/1019 1077/1138/1023 1049/1135/1020 +f 1036/1136/1021 1075/1139/1024 1072/1140/1025 +f 1049/1135/1020 1075/1139/1024 1036/1136/1021 +f 1025/1137/1022 1072/1140/1025 1070/1141/1026 +f 1036/1136/1021 1072/1140/1025 1025/1137/1022 +f 1077/1138/1023 1079/1098/983 1089/1142/1027 +f 1075/1139/1024 1089/1142/1027 1099/1143/1028 +f 1077/1138/1023 1089/1142/1027 1075/1139/1024 +f 1072/1140/1025 1099/1143/1028 1118/1144/1029 +f 1075/1139/1024 1099/1143/1028 1072/1140/1025 +f 1070/1141/1026 1118/1144/1029 1133/1145/1030 +f 1072/1140/1025 1118/1144/1029 1070/1141/1026 +f 1089/1142/1027 1079/1098/983 1095/1146/1031 +f 1099/1143/1028 1095/1146/1031 1135/1147/1032 +f 1089/1142/1027 1095/1146/1031 1099/1143/1028 +f 1118/1144/1029 1135/1147/1032 1151/1148/1033 +f 1099/1143/1028 1135/1147/1032 1118/1144/1029 +f 1133/1145/1030 1151/1148/1033 1167/1149/1034 +f 1118/1144/1029 1151/1148/1033 1133/1145/1030 +f 1095/1146/1031 1079/1098/983 1105/1150/1035 +f 1135/1147/1032 1105/1150/1035 1147/1151/1036 +f 1095/1146/1031 1105/1150/1035 1135/1147/1032 +f 1151/1148/1033 1147/1151/1036 1171/1152/1037 +f 1135/1147/1032 1147/1151/1036 1151/1148/1033 +f 1167/1149/1034 1171/1152/1037 1185/1153/1038 +f 1151/1148/1033 1171/1152/1037 1167/1149/1034 +f 1105/1150/1035 1079/1098/983 1113/1154/1039 +f 1147/1151/1036 1113/1154/1039 1150/1155/1040 +f 1105/1150/1035 1113/1154/1039 1147/1151/1036 +f 1171/1152/1037 1150/1155/1040 1175/1156/1041 +f 1147/1151/1036 1150/1155/1040 1171/1152/1037 +f 1185/1153/1038 1175/1156/1041 1194/1157/1042 +f 1171/1152/1037 1175/1156/1041 1185/1153/1038 +f 1113/1154/1039 1079/1098/983 1106/1158/1043 +f 1150/1155/1040 1106/1158/1043 1148/1159/1044 +f 1113/1154/1039 1106/1158/1043 1150/1155/1040 +f 1175/1156/1041 1148/1159/1044 1172/1160/1045 +f 1150/1155/1040 1148/1159/1044 1175/1156/1041 +f 1194/1157/1042 1172/1160/1045 1186/1161/1046 +f 1175/1156/1041 1172/1160/1045 1194/1157/1042 +f 1106/1158/1043 1079/1098/983 1096/1097/982 +f 1148/1159/1044 1096/1097/982 1136/1100/985 +f 1106/1158/1043 1096/1097/982 1148/1159/1044 +f 1172/1160/1045 1136/1100/985 1152/1102/987 +f 1148/1159/1044 1136/1100/985 1172/1160/1045 +f 1186/1161/1046 1152/1102/987 1168/1104/989 +f 1172/1160/1045 1152/1102/987 1186/1161/1046 +f 301/1162/1047 284/1163/1048 296/1164/984 +f 331/1165/985 296/1164/984 305/1166/1049 +f 301/1162/1047 296/1164/984 331/1165/985 +f 355/1167/1050 305/1166/1049 315/1168/988 +f 331/1165/985 305/1166/1049 355/1167/1050 +f 361/1169/989 315/1168/988 327/1170/1051 +f 355/1167/1050 315/1168/988 361/1169/989 +f 296/1164/984 284/1163/1048 283/1171/991 +f 305/1166/1049 283/1171/991 281/1172/992 +f 296/1164/984 283/1171/991 305/1166/1049 +f 315/1168/988 281/1172/992 278/1173/993 +f 305/1166/1049 281/1172/992 315/1168/988 +f 327/1170/1051 278/1173/993 276/1174/994 +f 315/1168/988 278/1173/993 327/1170/1051 +f 283/1171/991 284/1163/1048 263/1175/995 +f 281/1172/992 263/1175/995 253/1176/1052 +f 283/1171/991 263/1175/995 281/1172/992 +f 278/1173/993 253/1176/1052 231/1177/1053 +f 281/1172/992 253/1176/1052 278/1173/993 +f 276/1174/994 231/1177/1053 220/1178/998 +f 278/1173/993 231/1177/1053 276/1174/994 +f 263/1175/995 284/1163/1048 257/1179/999 +f 253/1176/1052 257/1179/999 218/1180/1000 +f 263/1175/995 257/1179/999 253/1176/1052 +f 231/1177/1053 218/1180/1000 199/1181/1054 +f 253/1176/1052 218/1180/1000 231/1177/1053 +f 220/1178/998 199/1181/1054 186/1182/1055 +f 231/1177/1053 199/1181/1054 220/1178/998 +f 257/1179/999 284/1163/1048 249/1183/1003 +f 218/1180/1000 249/1183/1003 208/1184/1056 +f 257/1179/999 249/1183/1003 218/1180/1000 +f 199/1181/1054 208/1184/1056 178/1185/1005 +f 218/1180/1000 208/1184/1056 199/1181/1054 +f 186/1182/1055 178/1185/1005 166/1186/1006 +f 199/1181/1054 178/1185/1005 186/1182/1055 +f 249/1183/1003 284/1163/1048 241/1187/1057 +f 208/1184/1056 241/1187/1057 201/1188/1058 +f 249/1183/1003 241/1187/1057 208/1184/1056 +f 178/1185/1005 201/1188/1058 176/1189/1009 +f 208/1184/1056 201/1188/1058 178/1185/1005 +f 166/1186/1006 176/1189/1009 160/1190/1010 +f 178/1185/1005 176/1189/1009 166/1186/1006 +f 241/1187/1057 284/1163/1048 248/1191/1011 +f 201/1188/1058 248/1191/1011 207/1192/1012 +f 241/1187/1057 248/1191/1011 201/1188/1058 +f 176/1189/1009 207/1192/1012 177/1193/1059 +f 201/1188/1058 207/1192/1012 176/1189/1009 +f 160/1190/1010 177/1193/1059 165/1194/1014 +f 176/1189/1009 177/1193/1059 160/1190/1010 +f 248/1191/1011 284/1163/1048 256/1195/1015 +f 207/1192/1012 256/1195/1015 217/1196/1016 +f 248/1191/1011 256/1195/1015 207/1192/1012 +f 177/1193/1059 217/1196/1016 200/1197/1060 +f 207/1192/1012 217/1196/1016 177/1193/1059 +f 165/1194/1014 200/1197/1060 185/1198/1018 +f 177/1193/1059 200/1197/1060 165/1194/1014 +f 256/1195/1015 284/1163/1048 262/1199/1019 +f 217/1196/1016 262/1199/1019 252/1200/1020 +f 256/1195/1015 262/1199/1019 217/1196/1016 +f 200/1197/1060 252/1200/1020 232/1201/1061 +f 217/1196/1016 252/1200/1020 200/1197/1060 +f 185/1198/1018 232/1201/1061 219/1202/1022 +f 200/1197/1060 232/1201/1061 185/1198/1018 +f 262/1199/1019 284/1163/1048 282/1203/1023 +f 252/1200/1020 282/1203/1023 280/1204/1024 +f 262/1199/1019 282/1203/1023 252/1200/1020 +f 232/1201/1061 280/1204/1024 277/1205/1062 +f 252/1200/1020 280/1204/1024 232/1201/1061 +f 219/1202/1022 277/1205/1062 275/1206/1063 +f 232/1201/1061 277/1205/1062 219/1202/1022 +f 282/1203/1023 284/1163/1048 295/1207/1027 +f 280/1204/1024 295/1207/1027 304/1208/1064 +f 282/1203/1023 295/1207/1027 280/1204/1024 +f 277/1205/1062 304/1208/1064 314/1209/1029 +f 280/1204/1024 304/1208/1064 277/1205/1062 +f 275/1206/1063 314/1209/1029 326/1210/1065 +f 277/1205/1062 314/1209/1029 275/1206/1063 +f 295/1207/1027 284/1163/1048 300/1211/1066 +f 304/1208/1064 300/1211/1066 330/1212/1032 +f 295/1207/1027 300/1211/1066 304/1208/1064 +f 314/1209/1029 330/1212/1032 354/1213/1033 +f 304/1208/1064 330/1212/1032 314/1209/1029 +f 326/1210/1065 354/1213/1033 360/1214/1034 +f 314/1209/1029 354/1213/1033 326/1210/1065 +f 300/1211/1066 284/1163/1048 306/1215/1035 +f 330/1212/1032 306/1215/1035 347/1216/1067 +f 300/1211/1066 306/1215/1035 330/1212/1032 +f 354/1213/1033 347/1216/1067 370/1217/1068 +f 330/1212/1032 347/1216/1067 354/1213/1033 +f 360/1214/1034 370/1217/1068 382/1218/1038 +f 354/1213/1033 370/1217/1068 360/1214/1034 +f 306/1215/1035 284/1163/1048 311/1219/1039 +f 347/1216/1067 311/1219/1039 351/1220/1069 +f 306/1215/1035 311/1219/1039 347/1216/1067 +f 370/1217/1068 351/1220/1069 373/1221/1070 +f 347/1216/1067 351/1220/1069 370/1217/1068 +f 382/1218/1038 373/1221/1070 406/1222/1071 +f 370/1217/1068 373/1221/1070 382/1218/1038 +f 311/1219/1039 284/1163/1048 307/1223/1072 +f 351/1220/1069 307/1223/1072 348/1224/1073 +f 311/1219/1039 307/1223/1072 351/1220/1069 +f 373/1221/1070 348/1224/1073 371/1225/1074 +f 351/1220/1069 348/1224/1073 373/1221/1070 +f 406/1222/1071 371/1225/1074 383/1226/1075 +f 373/1221/1070 371/1225/1074 406/1222/1071 +f 307/1223/1072 284/1163/1048 301/1162/1047 +f 348/1224/1073 301/1162/1047 331/1165/985 +f 307/1223/1072 301/1162/1047 348/1224/1073 +f 371/1225/1074 331/1165/985 355/1167/1050 +f 348/1224/1073 331/1165/985 371/1225/1074 +f 383/1226/1075 355/1167/1050 361/1169/989 +f 371/1225/1074 355/1167/1050 383/1226/1075 +f 1080/1227/1076 1250/1228/1077 1249/580/561 +f 1081/1229/1076 1250/1228/1077 1080/1227/1076 +f 1249/580/561 1279/1230/1078 1278/592/573 +f 1250/1228/1077 1279/1230/1078 1249/580/561 +f 1278/592/573 1286/1231/1079 1285/598/579 +f 1279/1230/1078 1286/1231/1079 1278/592/573 +f 1285/598/579 1290/1232/1080 1289/1233/1080 +f 1286/1231/1079 1290/1232/1080 1285/598/579 +f 1289/1233/1080 1288/1234/1081 1287/1235/1081 +f 1290/1232/1080 1288/1234/1081 1289/1233/1080 +f 1287/1235/1081 1283/1236/1082 1282/1237/1082 +f 1288/1234/1081 1283/1236/1082 1287/1235/1081 +f 1282/1237/1082 1281/1238/1083 1280/604/585 +f 1283/1236/1082 1281/1238/1083 1282/1237/1082 +f 1280/604/585 1242/1239/1084 1241/1240/1084 +f 1281/1238/1083 1242/1239/1084 1280/604/585 +f 1241/1240/1084 1081/1229/1076 1080/1227/1076 +f 1242/1239/1084 1081/1229/1076 1241/1240/1084 +f 273/1241/1085 104/521/502 105/1242/1086 +f 274/1243/1085 273/1241/1085 105/1242/1086 +f 104/521/502 75/532/513 76/1244/1087 +f 105/1242/1086 104/521/502 76/1244/1087 +f 75/532/513 66/538/519 67/1245/1088 +f 76/1244/1087 75/532/513 67/1245/1088 +f 66/538/519 62/1246/1089 63/1247/1089 +f 67/1245/1088 66/538/519 63/1247/1089 +f 62/1246/1089 64/1248/1090 65/1249/1090 +f 63/1247/1089 62/1246/1089 65/1249/1090 +f 64/1248/1090 68/1250/1091 69/1251/1091 +f 65/1249/1090 64/1248/1090 69/1251/1091 +f 68/1250/1091 72/544/525 73/1252/1092 +f 69/1251/1091 68/1250/1091 73/1252/1092 +f 72/544/525 113/1253/1093 114/1254/1093 +f 73/1252/1092 72/544/525 114/1254/1093 +f 113/1253/1093 273/1241/1085 274/1243/1085 +f 114/1254/1093 113/1253/1093 274/1243/1085 +f 1097/1255/1094 1074/1256/1095 1084/1257/1096 +f 1184/1258/1097 1084/1257/1096 1121/1259/1098 +f 1097/1255/1094 1084/1257/1096 1184/1258/1097 +f 1181/1260/1099 1121/1259/1098 1120/1261/1100 +f 1184/1258/1097 1121/1259/1098 1181/1260/1099 +f 1170/1262/1048 1120/1261/1100 1110/1263/1048 +f 1181/1260/1099 1120/1261/1100 1170/1262/1048 +f 1084/1257/1096 1074/1256/1095 1060/1264/1101 +f 1121/1259/1098 1060/1264/1101 1032/1265/1102 +f 1084/1257/1096 1060/1264/1101 1121/1259/1098 +f 1120/1261/1100 1032/1265/1102 1034/1266/1103 +f 1121/1259/1098 1032/1265/1102 1120/1261/1100 +f 1110/1263/1048 1034/1266/1103 1041/1267/1048 +f 1120/1261/1100 1034/1266/1103 1110/1263/1048 +f 1060/1264/1101 1074/1256/1095 1051/1268/1104 +f 1032/1265/1102 1051/1268/1104 969/1269/1105 +f 1060/1264/1101 1051/1268/1104 1032/1265/1102 +f 1034/1266/1103 969/1269/1105 974/1270/1106 +f 1032/1265/1102 969/1269/1105 1034/1266/1103 +f 1041/1267/1048 974/1270/1106 991/1271/1048 +f 1034/1266/1103 974/1270/1106 1041/1267/1048 +f 1051/1268/1104 1074/1256/1095 1043/1272/1107 +f 969/1269/1105 1043/1272/1107 925/1273/1108 +f 1051/1268/1104 1043/1272/1107 969/1269/1105 +f 974/1270/1106 925/1273/1108 929/1274/1109 +f 969/1269/1105 925/1273/1108 974/1270/1106 +f 991/1271/1048 929/1274/1109 943/1275/1048 +f 974/1270/1106 929/1274/1109 991/1271/1048 +f 1043/1272/1107 1074/1256/1095 1044/1276/1110 +f 925/1273/1108 1044/1276/1110 928/1277/1111 +f 1043/1272/1107 1044/1276/1110 925/1273/1108 +f 929/1274/1109 928/1277/1111 932/1278/1112 +f 925/1273/1108 928/1277/1111 929/1274/1109 +f 943/1275/1048 932/1278/1112 944/1279/983 +f 929/1274/1109 932/1278/1112 943/1275/1048 +f 1044/1276/1110 1074/1256/1095 1052/1280/1113 +f 928/1277/1111 1052/1280/1113 975/1281/1114 +f 1044/1276/1110 1052/1280/1113 928/1277/1111 +f 932/1278/1112 975/1281/1114 976/1282/1115 +f 928/1277/1111 975/1281/1114 932/1278/1112 +f 944/1279/983 976/1282/1115 992/1283/983 +f 932/1278/1112 976/1282/1115 944/1279/983 +f 1052/1280/1113 1074/1256/1095 1061/1284/1116 +f 975/1281/1114 1061/1284/1116 1039/1285/1117 +f 1052/1280/1113 1061/1284/1116 975/1281/1114 +f 976/1282/1115 1039/1285/1117 1040/1286/1118 +f 975/1281/1114 1039/1285/1117 976/1282/1115 +f 992/1283/983 1040/1286/1118 1046/1287/1048 +f 976/1282/1115 1040/1286/1118 992/1283/983 +f 1061/1284/1116 1074/1256/1095 1085/1288/1119 +f 1039/1285/1117 1085/1288/1119 1128/1289/1120 +f 1061/1284/1116 1085/1288/1119 1039/1285/1117 +f 1040/1286/1118 1128/1289/1120 1127/1290/1121 +f 1039/1285/1117 1128/1289/1120 1040/1286/1118 +f 1046/1287/1048 1127/1290/1121 1115/1291/1122 +f 1040/1286/1118 1127/1290/1121 1046/1287/1048 +f 1085/1288/1119 1074/1256/1095 1098/1292/1123 +f 1128/1289/1120 1098/1292/1123 1190/1293/1124 +f 1085/1288/1119 1098/1292/1123 1128/1289/1120 +f 1127/1290/1121 1190/1293/1124 1187/1294/1125 +f 1128/1289/1120 1190/1293/1124 1127/1290/1121 +f 1115/1291/1122 1187/1294/1125 1173/1295/1048 +f 1127/1290/1121 1187/1294/1125 1115/1291/1122 +f 1098/1292/1123 1074/1256/1095 1112/1296/1126 +f 1190/1293/1124 1112/1296/1126 1217/1297/1127 +f 1098/1292/1123 1112/1296/1126 1190/1293/1124 +f 1187/1294/1125 1217/1297/1127 1212/1298/1128 +f 1190/1293/1124 1217/1297/1127 1187/1294/1125 +f 1173/1295/1048 1212/1298/1128 1198/1299/1048 +f 1187/1294/1125 1212/1298/1128 1173/1295/1048 +f 1112/1296/1126 1074/1256/1095 1111/1300/1129 +f 1217/1297/1127 1111/1300/1129 1214/1301/1130 +f 1112/1296/1126 1111/1300/1129 1217/1297/1127 +f 1212/1298/1128 1214/1301/1130 1211/1302/1131 +f 1217/1297/1127 1214/1301/1130 1212/1298/1128 +f 1198/1299/1048 1211/1302/1131 1195/1303/1048 +f 1212/1298/1128 1211/1302/1131 1198/1299/1048 +f 1111/1300/1129 1074/1256/1095 1097/1255/1094 +f 1214/1301/1130 1097/1255/1094 1184/1258/1097 +f 1111/1300/1129 1097/1255/1094 1214/1301/1130 +f 1211/1302/1131 1184/1258/1097 1181/1260/1099 +f 1214/1301/1130 1184/1258/1097 1211/1302/1131 +f 1195/1303/1048 1181/1260/1099 1170/1262/1048 +f 1211/1302/1131 1181/1260/1099 1195/1303/1048 +f 302/1304/1132 279/1305/1095 293/1306/1133 +f 380/1307/1097 293/1306/1133 317/1308/1098 +f 302/1304/1132 293/1306/1133 380/1307/1097 +f 379/1309/1134 317/1308/1098 316/1310/1135 +f 380/1307/1097 317/1308/1098 379/1309/1134 +f 369/1311/1136 316/1310/1135 308/1312/1137 +f 379/1309/1134 316/1310/1135 369/1311/1136 +f 369/1311/1136 308/1312/1137 285/1313/1138 +f 293/1306/1133 279/1305/1095 269/1314/1139 +f 317/1308/1098 269/1314/1139 226/1315/1102 +f 293/1306/1133 269/1314/1139 317/1308/1098 +f 316/1310/1135 226/1315/1102 228/1316/1103 +f 317/1308/1098 226/1315/1102 316/1310/1135 +f 308/1312/1137 228/1316/1103 239/1317/1140 +f 316/1310/1135 228/1316/1103 308/1312/1137 +f 308/1312/1137 239/1317/1140 285/1313/1138 +f 269/1314/1139 279/1305/1095 254/1318/1104 +f 226/1315/1102 254/1318/1104 163/1319/1105 +f 269/1314/1139 254/1318/1104 226/1315/1102 +f 228/1316/1103 163/1319/1105 167/1320/1106 +f 226/1315/1102 163/1319/1105 228/1316/1103 +f 239/1317/1140 167/1320/1106 179/1321/1141 +f 228/1316/1103 167/1320/1106 239/1317/1140 +f 239/1317/1140 179/1321/1141 285/1313/1138 +f 254/1318/1104 279/1305/1095 242/1322/1107 +f 163/1319/1105 242/1322/1107 136/1323/1108 +f 254/1318/1104 242/1322/1107 163/1319/1105 +f 167/1320/1106 136/1323/1108 138/1324/1142 +f 163/1319/1105 136/1323/1108 167/1320/1106 +f 179/1321/1141 138/1324/1142 156/1325/1143 +f 167/1320/1106 138/1324/1142 179/1321/1141 +f 179/1321/1141 156/1325/1143 285/1313/1138 +f 242/1322/1107 279/1305/1095 243/1326/1144 +f 136/1323/1108 243/1326/1144 137/1327/1145 +f 242/1322/1107 243/1326/1144 136/1323/1108 +f 138/1324/1142 137/1327/1145 139/1328/1146 +f 136/1323/1108 137/1327/1145 138/1324/1142 +f 156/1325/1143 139/1328/1146 158/1329/1147 +f 138/1324/1142 139/1328/1146 156/1325/1143 +f 156/1325/1143 158/1329/1147 285/1313/1138 +f 243/1326/1144 279/1305/1095 255/1330/1148 +f 137/1327/1145 255/1330/1148 168/1331/1114 +f 243/1326/1144 255/1330/1148 137/1327/1145 +f 139/1328/1146 168/1331/1114 172/1332/1149 +f 137/1327/1145 168/1331/1114 139/1328/1146 +f 158/1329/1147 172/1332/1149 183/1333/1150 +f 139/1328/1146 172/1332/1149 158/1329/1147 +f 158/1329/1147 183/1333/1150 285/1313/1138 +f 255/1330/1148 279/1305/1095 272/1334/1151 +f 168/1331/1114 272/1334/1151 233/1335/1117 +f 255/1330/1148 272/1334/1151 168/1331/1114 +f 172/1332/1149 233/1335/1117 234/1336/1152 +f 168/1331/1114 233/1335/1117 172/1332/1149 +f 183/1333/1150 234/1336/1152 244/1337/1153 +f 172/1332/1149 234/1336/1152 183/1333/1150 +f 183/1333/1150 244/1337/1153 285/1313/1138 +f 272/1334/1151 279/1305/1095 294/1338/1154 +f 233/1335/1117 294/1338/1154 324/1339/1120 +f 272/1334/1151 294/1338/1154 233/1335/1117 +f 234/1336/1152 324/1339/1120 319/1340/1121 +f 233/1335/1117 324/1339/1120 234/1336/1152 +f 244/1337/1153 319/1340/1121 312/1341/1155 +f 234/1336/1152 319/1340/1121 244/1337/1153 +f 244/1337/1153 312/1341/1155 285/1313/1138 +f 294/1338/1154 279/1305/1095 303/1342/1156 +f 324/1339/1120 303/1342/1156 385/1343/1157 +f 294/1338/1154 303/1342/1156 324/1339/1120 +f 319/1340/1121 385/1343/1157 384/1344/1158 +f 324/1339/1120 385/1343/1157 319/1340/1121 +f 312/1341/1155 384/1344/1158 372/1345/1159 +f 319/1340/1121 384/1344/1158 312/1341/1155 +f 312/1341/1155 372/1345/1159 285/1313/1138 +f 303/1342/1156 279/1305/1095 310/1346/1126 +f 385/1343/1157 310/1346/1126 426/1347/1127 +f 303/1342/1156 310/1346/1126 385/1343/1157 +f 384/1344/1158 426/1347/1127 422/1348/1160 +f 385/1343/1157 426/1347/1127 384/1344/1158 +f 372/1345/1159 422/1348/1160 411/1349/1161 +f 384/1344/1158 422/1348/1160 372/1345/1159 +f 372/1345/1159 411/1349/1161 285/1313/1138 +f 310/1346/1126 279/1305/1095 309/1350/1129 +f 426/1347/1127 309/1350/1129 425/1351/1162 +f 310/1346/1126 309/1350/1129 426/1347/1127 +f 422/1348/1160 425/1351/1162 421/1352/1163 +f 426/1347/1127 425/1351/1162 422/1348/1160 +f 411/1349/1161 421/1352/1163 410/1353/1164 +f 422/1348/1160 421/1352/1163 411/1349/1161 +f 411/1349/1161 410/1353/1164 285/1313/1138 +f 309/1350/1129 279/1305/1095 302/1304/1132 +f 425/1351/1162 302/1304/1132 380/1307/1097 +f 309/1350/1129 302/1304/1132 425/1351/1162 +f 421/1352/1163 380/1307/1097 379/1309/1134 +f 425/1351/1162 380/1307/1097 421/1352/1163 +f 410/1353/1164 379/1309/1134 369/1311/1136 +f 421/1352/1163 379/1309/1134 410/1353/1164 +f 410/1353/1164 369/1311/1136 285/1313/1138 diff --git a/tests/barstest/shuttle.png b/tests/barstest/shuttle.png Binary files differnew file mode 100644 index 00000000..52d6244c --- /dev/null +++ b/tests/barstest/shuttle.png diff --git a/tests/directional/main.cpp b/tests/directional/main.cpp index 2b077b97..551ab141 100644 --- a/tests/directional/main.cpp +++ b/tests/directional/main.cpp @@ -80,6 +80,9 @@ int main(int argc, char **argv) backgroundCheckBox->setText(QStringLiteral("Show background")); backgroundCheckBox->setChecked(true); + QCheckBox *optimizationCheckBox = new QCheckBox(widget); + optimizationCheckBox->setText(QStringLiteral("Optimization static")); + QCheckBox *gridCheckBox = new QCheckBox(widget); gridCheckBox->setText(QStringLiteral("Show grid")); gridCheckBox->setChecked(true); @@ -100,6 +103,7 @@ int main(int argc, char **argv) vLayout->addWidget(labelButton, 0, Qt::AlignTop); vLayout->addWidget(cameraButton, 0, Qt::AlignTop); vLayout->addWidget(toggleRotationButton, 0, Qt::AlignTop); + vLayout->addWidget(optimizationCheckBox); vLayout->addWidget(backgroundCheckBox); vLayout->addWidget(gridCheckBox); vLayout->addWidget(new QLabel(QStringLiteral("Change dot style"))); @@ -127,6 +131,8 @@ int main(int argc, char **argv) QObject::connect(modifier, &ScatterDataModifier::backgroundEnabledChanged, backgroundCheckBox, &QCheckBox::setChecked); + QObject::connect(optimizationCheckBox, &QCheckBox::stateChanged, + modifier, &ScatterDataModifier::enableOptimization); QObject::connect(modifier, &ScatterDataModifier::gridEnabledChanged, gridCheckBox, &QCheckBox::setChecked); QObject::connect(itemStyleList, SIGNAL(currentIndexChanged(int)), modifier, @@ -150,6 +156,7 @@ int main(int argc, char **argv) &QFontComboBox::setCurrentFont); itemStyleList->setCurrentIndex(0); + optimizationCheckBox->setChecked(true); widget->show(); return app.exec(); diff --git a/tests/directional/scatterdatamodifier.cpp b/tests/directional/scatterdatamodifier.cpp index 1422cebb..2d6672b6 100644 --- a/tests/directional/scatterdatamodifier.cpp +++ b/tests/directional/scatterdatamodifier.cpp @@ -119,7 +119,14 @@ void ScatterDataModifier::addData() m_graph->seriesList().at(0)->dataProxy()->resetArray(dataArray); } -//! [8] +void ScatterDataModifier::enableOptimization(int enabled) +{ + if (enabled) + m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationStatic); + else + m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationDefault); +} + void ScatterDataModifier::changeStyle(int style) { QComboBox *comboBox = qobject_cast<QComboBox *>(sender()); diff --git a/tests/directional/scatterdatamodifier.h b/tests/directional/scatterdatamodifier.h index b87fa89f..20e59cdc 100644 --- a/tests/directional/scatterdatamodifier.h +++ b/tests/directional/scatterdatamodifier.h @@ -39,6 +39,7 @@ public: void changeLabelStyle(); void changeFont(const QFont &font); void changeFontSize(int fontsize); + void enableOptimization(int enabled); void setBackgroundEnabled(int enabled); void setGridEnabled(int enabled); void toggleRotation(); diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml index 444e175c..be4feca3 100644 --- a/tests/qmlcamera/qml/qmlcamera/main.qml +++ b/tests/qmlcamera/qml/qmlcamera/main.qml @@ -18,7 +18,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 -import QtDataVisualization 1.1 +import QtDataVisualization 1.2 import "." Rectangle { @@ -35,6 +35,15 @@ Rectangle { id: chartAxes } + Camera3D { + id: customCamera + wrapXRotation: false + xRotation: camControlArea.xValue + yRotation: camControlArea.yValue + zoomLevel: zoomSlider.value + target: Qt.vector3d(0.5, 0.5, 0.5) + } + Item { id: dataView width: parent.width - camControlArea.width @@ -60,21 +69,20 @@ Rectangle { columnAxis: chartAxes.column valueAxis: chartAxes.expenses - // Bind UI controls to the camera - scene.activeCamera.wrapXRotation: false - scene.activeCamera.xRotation: camControlArea.xValue - scene.activeCamera.yRotation: camControlArea.yValue - scene.activeCamera.zoomLevel: zoomSlider.value + scene.activeCamera: customCamera inputHandler: null customItemList: [shuttleItem, labelItem] + orthoProjection: true + + floorLevel: 10 } Custom3DItem { id: shuttleItem meshFile: ":/items/shuttle.obj" textureFile: ":/items/shuttle.png" - position: Qt.vector3d(5.0,29.0,3.0) + position: Qt.vector3d(2.0,29.0,2.0) scaling: Qt.vector3d(0.2,0.2,0.2) } @@ -82,7 +90,7 @@ Rectangle { id: labelItem facingCamera: true positionAbsolute: true - position: Qt.vector3d(0.0,1.5,0.0) + position: Qt.vector3d(-1.0,1.5,-1.0) scaling: Qt.vector3d(1.0,1.0,1.0) text: "Qt Shuttle" } @@ -162,6 +170,11 @@ Rectangle { currentAngle += 5 chartData.series.meshAngle = currentAngle shuttleItem.setRotationAxisAndAngle(Qt.vector3d(0.0, 1.0, 1.0), currentAngle) + console.log("label pos:", labelItem.position) + labelItem.position.x += 0.1 + labelItem.position.z += 0.1 + customCamera.target.x -= 0.1 + customCamera.target.z -= 0.1 } } @@ -203,4 +216,20 @@ Rectangle { } } } + + Button { + id: reflectionToggle + anchors.bottom: shuttleAdd.top + width: camControlArea.width + text: "Show reflections" + onClicked: { + if (testChart.reflection === true) { + text = "Show reflections" + testChart.reflection = false + } else { + text = "Hide reflections" + testChart.reflection = true + } + } + } } diff --git a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml index 0ec9d277..29c51fb3 100644 --- a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml +++ b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml @@ -71,18 +71,16 @@ Rectangle { isIncreasing = false; } } else { - // TODO: Once QTRD-2645 is fixed, change this to remove from - // random index to add coverage. - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); if (graphModel.count == 2) { scatterGraph.theme.type = Theme3D.ThemeDigia; isIncreasing = true; @@ -118,6 +116,12 @@ Rectangle { shadowQuality: AbstractGraph3D.ShadowQualitySoftMedium scene.activeCamera.yRotation: 30.0 inputHandler: null + axisX.min: 0 + axisY.min: 0 + axisZ.min: 0 + axisX.max: 1 + axisY.max: 1 + axisZ.max: 1 Scatter3DSeries { id: scatterSeries diff --git a/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml b/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml index 7dfe0bec..da382e3d 100644 --- a/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml +++ b/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml @@ -31,19 +31,51 @@ Rectangle { id: data } - Window { - id: firstWindow - x: 100 - y: 100 - width: 500 - height: 500 - visible: true - Rectangle { - id: firstRect - color: "red" - anchors.fill: parent - } - } + property QtObject surfaceWindowObject; + property string surfaceWindowStr: + "\n + import QtQuick 2.1\n + import QtQuick.Window 2.1\n + import QtQuick.Layouts 1.0\n + import QtDataVisualization 1.0\n + import \".\"\n + Window {\n + Data {\n + id: data\n + }\n + id: firstWindow\n + x: 100\n + y: 100\n + width: 500\n + height: 500\n + visible: true\n + Rectangle {\n + id: firstRect\n + color: \"red\"\n + anchors.fill: parent\n + Surface3D {\n + id: surfaceGraph\n + anchors.fill: parent\n + anchors.margins: parent.border.width\n + theme: Theme3D {\n + type: Theme3D.ThemePrimaryColors\n + font.pointSize: 60\n + }\n + scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeftHigh\n + Surface3DSeries {\n + itemLabelFormat: \"Pop density at (@xLabel N, @zLabel E): @yLabel\"\n + ItemModelSurfaceDataProxy {\n + itemModel: data.myData\n + rowRole: \"row\"\n + columnRole: \"col\"\n + xPosRole: \"latitude\"\n + zPosRole: \"longitude\"\n + yPosRole: \"pop_density\"\n + }\n + }\n + }\n + }\n + }" Window { id: secondWindow @@ -59,18 +91,12 @@ Rectangle { } } - states: [ - State { - name: "firstWindow" - ParentChange { target: surfaceGraph; parent: firstRect; x: 0; y: 0 } - }, - State { - name: "secondWindow" - ParentChange { target: surfaceGraph; parent: secondRect; x: 0; y: 0 } - } - ] + function destroyWindow() { + if (surfaceWindowObject != null) + surfaceWindowObject.destroy() + } - state: "firstWindow" + Component.onDestruction: destroyWindow() //! [0] GridLayout { @@ -86,32 +112,17 @@ Rectangle { Rectangle { Layout.fillHeight: true Layout.fillWidth: true - border.color: surfaceGraph.theme.gridLineColor border.width: 2 + } - Surface3D { - id: surfaceGraph - anchors.fill: parent - anchors.margins: parent.border.width - theme: Theme3D { - type: Theme3D.ThemePrimaryColors - font.pointSize: 60 - } - scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeftHigh - - Surface3DSeries { - itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" - ItemModelSurfaceDataProxy { - itemModel: data.myData - // The surface data points are not neatly lined up in rows and columns, - // so we define explicit row and column roles. - rowRole: "row" - columnRole: "col" - xPosRole: "latitude" - zPosRole: "longitude" - yPosRole: "pop_density" - } - } + Timer { + id: windowToggleTimer + interval: 1000 + running: false + repeat: false + onTriggered: { + destroyWindow() + surfaceWindowObject = Qt.createQmlObject(surfaceWindowStr, mainView) } } @@ -131,13 +142,10 @@ Rectangle { Layout.minimumWidth: parent.width / 2 Layout.fillHeight: true Layout.fillWidth: true - text: "Move graph between windows" + text: "(re)construct surface window in a loop" onClicked: { - if (mainView.state === "firstWindow") { - mainView.state = "secondWindow" - } else { - mainView.state = "firstWindow" - } + windowToggleTimer.running = true + windowToggleTimer.repeat = true } } @@ -231,14 +239,11 @@ Rectangle { function clearSelections() { barGraph.clearSelection() scatterGraph.clearSelection() - surfaceGraph.clearSelection() } function resetCameras() { - surfaceGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh scatterGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh barGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh - surfaceGraph.scene.activeCamera.zoomLevel = 100.0 scatterGraph.scene.activeCamera.zoomLevel = 100.0 barGraph.scene.activeCamera.zoomLevel = 100.0 } @@ -246,12 +251,9 @@ Rectangle { function toggleMeshStyle() { if (barGraph.seriesList[0].meshSmooth === true) { barGraph.seriesList[0].meshSmooth = false - if (surfaceGraph.seriesList[0].flatShadingSupported) - surfaceGraph.seriesList[0].flatShadingEnabled = true scatterGraph.seriesList[0].meshSmooth = false } else { barGraph.seriesList[0].meshSmooth = true - surfaceGraph.seriesList[0].flatShadingEnabled = false scatterGraph.seriesList[0].meshSmooth = true } } diff --git a/tests/qmlperf/main.cpp b/tests/qmlperf/main.cpp new file mode 100644 index 00000000..7d35b2ed --- /dev/null +++ b/tests/qmlperf/main.cpp @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include <QtGui/QGuiApplication> +#include <QtCore/QDir> +#include <QtQuick/QQuickView> +#include <QtQml/QQmlEngine> + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + + QQuickView viewer; + + // The following are needed to make examples run without having to install the module + // in desktop environments. +#ifdef Q_OS_WIN + QString extraImportPath(QStringLiteral("%1/../../../%2")); +#else + QString extraImportPath(QStringLiteral("%1/../../%2")); +#endif + viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); + QObject::connect(viewer.engine(), &QQmlEngine::quit, &viewer, &QWindow::close); + + viewer.setTitle(QStringLiteral("QML Performance")); + viewer.setSource(QUrl("qrc:/qml/qmlperf/main.qml")); + viewer.setResizeMode(QQuickView::SizeRootObjectToView); + viewer.show(); + + return app.exec(); +} diff --git a/tests/qmlperf/qml/qmlperf/main.qml b/tests/qmlperf/qml/qmlperf/main.qml new file mode 100644 index 00000000..35f8df5d --- /dev/null +++ b/tests/qmlperf/qml/qmlperf/main.qml @@ -0,0 +1,189 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.1 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 1.0 +import QtDataVisualization 1.1 +import "script.js" as Script +import "." + +Rectangle { + id: mainview + width: 1280 + height: 1024 + + property var itemCount: 1000.0 + property var addItems: 1000.0 + + Button { + id: changeButton + width: 350 + height: 50 + anchors.left: parent.left + enabled: true + text: "Change" + onClicked: { + console.log("changeButton clicked"); + if (graphView.state == "meshsphere") { + graphView.state = "meshcube" + } else if (graphView.state == "meshcube") { + graphView.state = "meshpyramid" + } else if (graphView.state == "meshpyramid") { + graphView.state = "meshpoint" + } else if (graphView.state == "meshpoint") { + graphView.state = "meshsphere" + } + } + } + + Text { + id: fpsText + text: "Reading" + width: 300 + height: 50 + anchors.left: changeButton.right + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + } + + Button { + id: optimization + width: 300 + height: 50 + anchors.left: fpsText.right + enabled: true + text: scatterPlot.optimizationHints === AbstractGraph3D.OptimizationDefault ? "To Static" : "To Default" + onClicked: { + console.log("Optimization"); + if (scatterPlot.optimizationHints === AbstractGraph3D.OptimizationDefault) { + scatterPlot.optimizationHints = AbstractGraph3D.OptimizationStatic; + optimization.text = "To Default"; + } else { + scatterPlot.optimizationHints = AbstractGraph3D.OptimizationDefault; + optimization.text = "To Static"; + } + } + } + + Button { + id: itemAdd + width: 300 + height: 50 + anchors.left: optimization.right + enabled: true + text: "Add" + onClicked: { + itemCount = itemCount + addItems; + Script.createData(addItems); + } + } + + Item { + id: graphView + width: mainview.width + height: mainview.height + anchors.top: changeButton.bottom + anchors.left: mainview.left + state: "meshsphere" + + ListModel { + id: dataModel + Component.onCompleted: Script.createData(itemCount) + } + + Scatter3D { + id: scatterPlot + width: graphView.width + height: graphView.height + shadowQuality: AbstractGraph3D.ShadowQualityNone + optimizationHints: AbstractGraph3D.OptimizationDefault + scene.activeCamera.yRotation: 45.0 + measureFps: true + onCurrentFpsChanged: { + fpsText.text = itemCount + " : " + scatterPlot.currentFps.toFixed(1); + } + +// theme: Theme3D { +// type: Theme3D.ThemeRetro +// colorStyle: Theme3D.ColorStyleRangeGradient +// baseGradients: customGradient + +// ColorGradient { +// id: customGradient +// ColorGradientStop { position: 1.0; color: "red" } +// ColorGradientStop { position: 0.0; color: "blue" } +// } +// } + + Scatter3DSeries { + id: scatterSeries + mesh: Abstract3DSeries.MeshSphere + ItemModelScatterDataProxy { + itemModel: dataModel + xPosRole: "x" + yPosRole: "y" + zPosRole: "z" + } + } + } + + states: [ + State { + name: "meshsphere" + StateChangeScript { + name: "doSphere" + script: { + console.log("Do the sphere"); + scatterSeries.mesh = Abstract3DSeries.MeshSphere; + } + } + }, + State { + name: "meshcube" + StateChangeScript { + name: "doCube" + script: { + console.log("Do the cube"); + scatterSeries.mesh = Abstract3DSeries.MeshCube; + } + } + }, + State { + name: "meshpyramid" + StateChangeScript { + name: "doPyramid" + script: { + console.log("Do the pyramid"); + scatterSeries.mesh = Abstract3DSeries.MeshPyramid; + } + } + }, + State { + name: "meshpoint" + StateChangeScript { + name: "doPoint" + script: { + console.log("Do the point"); + scatterSeries.mesh = Abstract3DSeries.MeshPoint; + } + } + } + ] + } +} diff --git a/tests/qmlperf/qml/qmlperf/script.js b/tests/qmlperf/qml/qmlperf/script.js new file mode 100644 index 00000000..dc271e8d --- /dev/null +++ b/tests/qmlperf/qml/qmlperf/script.js @@ -0,0 +1,33 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +//function createData(base) { +// for (var z = 0; z < 30; z++) { +// for (var x = 0; x < 30; x++) { +// var angle = (((z - 16) * (x - 16)) / 144.0) * 1.57; +// var y = Math.sin(angle + base); +// dataModel.append({"z": z, "x": x, "y": y}); +// } +// } +//} + +function createData(base) { + for (var i = 0; i < base; i++) { + dataModel.append({"z": Math.random(), "x": Math.random(), "y": Math.random()}); + } +} diff --git a/tests/qmlperf/qmlperf.pro b/tests/qmlperf/qmlperf.pro new file mode 100644 index 00000000..6560f55c --- /dev/null +++ b/tests/qmlperf/qmlperf.pro @@ -0,0 +1,12 @@ +!include( ../tests.pri ) { + error( "Couldn't find the tests.pri file!" ) +} + +# The .cpp file which was generated for your project. Feel free to hack it. +SOURCES += main.cpp + +RESOURCES += qmlperf.qrc + +OTHER_FILES += doc/src/* \ + doc/images/* \ + qml/qmlperf/* diff --git a/tests/qmlperf/qmlperf.qrc b/tests/qmlperf/qmlperf.qrc new file mode 100644 index 00000000..e50815c5 --- /dev/null +++ b/tests/qmlperf/qmlperf.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/"> + <file>qml/qmlperf/main.qml</file> + <file>qml/qmlperf/script.js</file> + </qresource> +</RCC> diff --git a/tests/qmlvolume/datasource.cpp b/tests/qmlvolume/datasource.cpp new file mode 100644 index 00000000..e1fe5385 --- /dev/null +++ b/tests/qmlvolume/datasource.cpp @@ -0,0 +1,90 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include "datasource.h" +#include <QtCore/qmath.h> +#include <QtGui/QRgb> +#include <QtGui/QVector3D> + +using namespace QtDataVisualization; + +Q_DECLARE_METATYPE(QCustom3DVolume *) + +DataSource::DataSource(QObject *parent) : + QObject(parent) +{ + qRegisterMetaType<QCustom3DVolume *>(); +} + +DataSource::~DataSource() +{ +} + +void DataSource::fillVolume(QCustom3DVolume *volumeItem) +{ + // Generate example texture data for an half-ellipsoid with a section missing. + // This can take a while if the dimensions are large, so we support incremental data generation. + + int index = 0; + int textureSize = 256; + QVector3D midPoint(float(textureSize) / 2.0f, + float(textureSize) / 2.0f, + float(textureSize) / 2.0f); + + QVector<uchar> *textureData = new QVector<uchar>(textureSize * textureSize * textureSize / 2); + for (int i = 0; i < textureSize; i++) { + for (int j = 0; j < textureSize / 2; j++) { + for (int k = 0; k < textureSize; k++) { + int colorIndex = 0; + // Take a section out of the ellipsoid + if (i >= textureSize / 2 || j >= textureSize / 4 || k >= textureSize / 2) { + QVector3D distVec = QVector3D(float(k), float(j * 2), float(i)) - midPoint; + float adjLen = qMin(255.0f, (distVec.length() * 512.0f / float(textureSize))); + colorIndex = 255 - int(adjLen); + } + + (*textureData)[index] = colorIndex; + index++; + } + } + } + + volumeItem->setScaling(QVector3D(2.0f, 1.0f, 2.0f)); + volumeItem->setTextureWidth(textureSize); + volumeItem->setTextureHeight(textureSize / 2); + volumeItem->setTextureDepth(textureSize); + volumeItem->setTextureFormat(QImage::Format_Indexed8); + volumeItem->setTextureData(textureData); + + QVector<QRgb> colorTable(256); + + for (int i = 1; i < 256; i++) { + if (i < 15) + colorTable[i] = qRgba(0, 0, 0, 0); + else if (i < 60) + colorTable[i] = qRgba((i * 2) + 120, 0, 0, 15); + else if (i < 120) + colorTable[i] = qRgba(0, ((i - 60) * 2) + 120, 0, 50); + else if (i < 180) + colorTable[i] = qRgba(0, 0, ((i - 120) * 2) + 120, 255); + else + colorTable[i] = qRgba(i, i, i, 255); + } + + volumeItem->setColorTable(colorTable); +} diff --git a/tests/qmlvolume/datasource.h b/tests/qmlvolume/datasource.h new file mode 100644 index 00000000..fc543792 --- /dev/null +++ b/tests/qmlvolume/datasource.h @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#ifndef DATASOURCE_H +#define DATASOURCE_H + +#include <QtDataVisualization/QCustom3DVolume> +#include <QtCore/QObject> + +using namespace QtDataVisualization; + +class DataSource : public QObject +{ + Q_OBJECT +public: + explicit DataSource(QObject *parent = 0); + virtual ~DataSource(); + +public: + Q_INVOKABLE void fillVolume(QCustom3DVolume *volumeItem); +}; + +#endif diff --git a/tests/qmlvolume/main.cpp b/tests/qmlvolume/main.cpp new file mode 100644 index 00000000..85de7eed --- /dev/null +++ b/tests/qmlvolume/main.cpp @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include "datasource.h" + +#include <QtDataVisualization/qutils.h> + +#include <QtGui/QGuiApplication> +#include <QtCore/QDir> +#include <QtQml/QQmlContext> +#include <QtQuick/QQuickView> +#include <QtQml/QQmlEngine> + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + + QQuickView viewer; + + // The following are needed to make examples run without having to install the module + // in desktop environments. +#ifdef Q_OS_WIN + QString extraImportPath(QStringLiteral("%1/../../../%2")); +#else + QString extraImportPath(QStringLiteral("%1/../../%2")); +#endif + viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); + QObject::connect(viewer.engine(), &QQmlEngine::quit, &viewer, &QWindow::close); + + viewer.setTitle(QStringLiteral("QML volume example")); + + DataSource dataSource; + viewer.rootContext()->setContextProperty("dataSource", &dataSource); + + viewer.setSource(QUrl("qrc:/qml/qmlvolume/main.qml")); + viewer.setResizeMode(QQuickView::SizeRootObjectToView); + viewer.show(); + + return app.exec(); +} diff --git a/tests/qmlvolume/qml/qmlvolume/NewButton.qml b/tests/qmlvolume/qml/qmlvolume/NewButton.qml new file mode 100644 index 00000000..e4fb99d2 --- /dev/null +++ b/tests/qmlvolume/qml/qmlvolume/NewButton.qml @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.1 +import QtQuick.Controls 1.0 +import QtQuick.Controls.Styles 1.0 + +Item { + id: newbutton + + property alias text: buttonText.text + + signal clicked + + implicitWidth: buttonText.implicitWidth + 5 + implicitHeight: buttonText.implicitHeight + 10 + + Button { + id: buttonText + width: parent.width + height: parent.height + + style: ButtonStyle { + label: Component { + Text { + text: buttonText.text + clip: true + wrapMode: Text.WordWrap + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + anchors.fill: parent + } + } + } + onClicked: newbutton.clicked() + } +} diff --git a/tests/qmlvolume/qml/qmlvolume/main.qml b/tests/qmlvolume/qml/qmlvolume/main.qml new file mode 100644 index 00000000..aec5f075 --- /dev/null +++ b/tests/qmlvolume/qml/qmlvolume/main.qml @@ -0,0 +1,164 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +import QtQuick 2.1 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 1.0 +import QtDataVisualization 1.2 +import "." + +Item { + id: mainView + width: 1280 + height: 1024 + + Item { + id: dataView + anchors.bottom: parent.bottom + width: parent.width + height: parent.height - buttonLayout.height + + Surface3D { + id: surfaceGraph + + width: dataView.width + height: dataView.height + orthoProjection: true + //measureFps: true + + onCurrentFpsChanged: { + if (fps > 10) + fpsText.text = "FPS: " + Math.round(surfaceGraph.currentFps) + else + fpsText.text = "FPS: " + Math.round(surfaceGraph.currentFps * 10.0) / 10.0 + } + + Surface3DSeries { + id: surfaceSeries + drawMode: Surface3DSeries.DrawSurface; + flatShadingEnabled: false; + meshSmooth: true + itemLabelFormat: "@xLabel, @zLabel: @yLabel" + itemLabelVisible: false + + onItemLabelChanged: { + if (surfaceSeries.selectedPoint === surfaceSeries.invalidSelectionPosition) + selectionText.text = "No selection" + else + selectionText.text = surfaceSeries.itemLabel + } + } + + Component.onCompleted: { + mainView.createVolume(); + } + } + } + + Rectangle { + width: parent.width + height: 50 + anchors.left: parent.left + anchors.top: parent.top + color: surfaceGraph.theme.backgroundColor + + ColumnLayout { + anchors.fill: parent + RowLayout { + id: sliderLayout + anchors.top: parent.top + Layout.fillHeight: true + Layout.fillWidth: true + Layout.minimumHeight: 150 + spacing: 0 + + Rectangle { + Layout.fillHeight: true + Layout.fillWidth: true + Layout.minimumWidth: fpsText.implicitWidth + 10 + Layout.maximumWidth: fpsText.implicitWidth + 10 + Layout.minimumHeight: 50 + Layout.maximumHeight: 50 + Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter + + border.color: "gray" + border.width: 1 + radius: 4 + + Text { + id: fpsText + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + } + } + } + + RowLayout { + id: buttonLayout + Layout.fillHeight: true + Layout.fillWidth: true + Layout.minimumHeight: 50 + anchors.bottom: parent.bottom + spacing: 0 + + NewButton { + id: sliceButton + Layout.fillHeight: true + Layout.fillWidth: true + + text: "Slice" + + onClicked: { + if (volumeItem.sliceIndexZ == -1) { + volumeItem.sliceIndexZ = 128 + volumeItem.drawSlices = true + volumeItem.drawSliceFrames = true + } else { + volumeItem.sliceIndexZ = -1 + volumeItem.drawSlices = false + volumeItem.drawSliceFrames = false + } + } + } + NewButton { + id: exitButton + Layout.fillHeight: true + Layout.fillWidth: true + + text: "Quit" + + onClicked: Qt.quit(0); + } + } + } + + } + + Custom3DVolume { + id: volumeItem + alphaMultiplier: 0.3 + preserveOpacity: true + useHighDefShader: false + } + + function createVolume() { + surfaceGraph.addCustomItem(volumeItem) + dataSource.fillVolume(volumeItem) + } +} diff --git a/tests/qmlvolume/qmlvolume.pro b/tests/qmlvolume/qmlvolume.pro new file mode 100644 index 00000000..1d58b668 --- /dev/null +++ b/tests/qmlvolume/qmlvolume.pro @@ -0,0 +1,16 @@ +!include( ../tests.pri ) { + error( "Couldn't find the tests.pri file!" ) +} + +QT += datavisualization + +# The .cpp file which was generated for your project. Feel free to hack it. +SOURCES += main.cpp \ + datasource.cpp +HEADERS += datasource.h + +RESOURCES += qmlvolume.qrc + +OTHER_FILES += doc/src/* \ + doc/images/* \ + qml/qmlvolume/* diff --git a/tests/qmlvolume/qmlvolume.qrc b/tests/qmlvolume/qmlvolume.qrc new file mode 100644 index 00000000..18fe57e1 --- /dev/null +++ b/tests/qmlvolume/qmlvolume.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/"> + <file>qml/qmlvolume/main.qml</file> + <file>qml/qmlvolume/NewButton.qml</file> + </qresource> +</RCC> diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp index 207da530..9b6f51ac 100644 --- a/tests/scattertest/main.cpp +++ b/tests/scattertest/main.cpp @@ -36,11 +36,13 @@ int main(int argc, char **argv) { QApplication app(argc, argv); + //QCoreApplication::setAttribute(Qt::AA_UseOpenGLES); QWidget *widget = new QWidget; QHBoxLayout *hLayout = new QHBoxLayout(widget); QVBoxLayout *vLayout = new QVBoxLayout(); QVBoxLayout *vLayout2 = new QVBoxLayout(); + QVBoxLayout *vLayout3 = new QVBoxLayout(); Q3DScatter *chart = new Q3DScatter(); QSize screenSize = chart->screen()->size(); @@ -56,6 +58,7 @@ int main(int argc, char **argv) hLayout->addWidget(container, 1); hLayout->addLayout(vLayout); hLayout->addLayout(vLayout2); + hLayout->addLayout(vLayout3); QPushButton *themeButton = new QPushButton(widget); themeButton->setText(QStringLiteral("Change theme")); @@ -235,6 +238,25 @@ int main(int argc, char **argv) aspectRatioSlider->setValue(20); aspectRatioSlider->setMaximum(100); + QSlider *horizontalAspectRatioSlider = new QSlider(Qt::Horizontal, widget); + horizontalAspectRatioSlider->setTickInterval(30); + horizontalAspectRatioSlider->setTickPosition(QSlider::TicksBelow); + horizontalAspectRatioSlider->setMinimum(0); + horizontalAspectRatioSlider->setValue(0); + horizontalAspectRatioSlider->setMaximum(300); + + QCheckBox *optimizationStaticCB = new QCheckBox(widget); + optimizationStaticCB->setText(QStringLiteral("Static optimization")); + optimizationStaticCB->setChecked(false); + + QCheckBox *orthoCB = new QCheckBox(widget); + orthoCB->setText(QStringLiteral("Orthographic projection")); + orthoCB->setChecked(false); + + QCheckBox *polarCB = new QCheckBox(widget); + polarCB->setText(QStringLiteral("Polar graph")); + polarCB->setChecked(false); + QCheckBox *axisTitlesVisibleCB = new QCheckBox(widget); axisTitlesVisibleCB->setText(QStringLiteral("Axis titles visible")); axisTitlesVisibleCB->setChecked(false); @@ -250,6 +272,34 @@ int main(int argc, char **argv) axisLabelRotationSlider->setValue(0); axisLabelRotationSlider->setMaximum(90); + QSlider *radialLabelSlider = new QSlider(Qt::Horizontal, widget); + radialLabelSlider->setTickInterval(10); + radialLabelSlider->setTickPosition(QSlider::TicksBelow); + radialLabelSlider->setMinimum(0); + radialLabelSlider->setValue(100); + radialLabelSlider->setMaximum(150); + + QSlider *cameraTargetSliderX = new QSlider(Qt::Horizontal, widget); + cameraTargetSliderX->setTickInterval(1); + cameraTargetSliderX->setMinimum(-100); + cameraTargetSliderX->setValue(0); + cameraTargetSliderX->setMaximum(100); + QSlider *cameraTargetSliderY = new QSlider(Qt::Horizontal, widget); + cameraTargetSliderY->setTickInterval(1); + cameraTargetSliderY->setMinimum(-100); + cameraTargetSliderY->setValue(0); + cameraTargetSliderY->setMaximum(100); + QSlider *cameraTargetSliderZ = new QSlider(Qt::Horizontal, widget); + cameraTargetSliderZ->setTickInterval(1); + cameraTargetSliderZ->setMinimum(-100); + cameraTargetSliderZ->setValue(0); + cameraTargetSliderZ->setMaximum(100); + + QSlider *marginSlider = new QSlider(Qt::Horizontal, widget); + marginSlider->setMinimum(-1); + marginSlider->setValue(-1); + marginSlider->setMaximum(100); + vLayout->addWidget(themeButton, 0, Qt::AlignTop); vLayout->addWidget(labelButton, 0, Qt::AlignTop); vLayout->addWidget(styleButton, 0, Qt::AlignTop); @@ -296,12 +346,26 @@ int main(int argc, char **argv) vLayout2->addWidget(fontList); vLayout2->addWidget(new QLabel(QStringLiteral("Adjust font size"))); vLayout2->addWidget(fontSizeSlider); - vLayout2->addWidget(new QLabel(QStringLiteral("Adjust aspect ratio"))); - vLayout2->addWidget(aspectRatioSlider, 1, Qt::AlignTop); - vLayout2->addWidget(axisTitlesVisibleCB); - vLayout2->addWidget(axisTitlesFixedCB); - vLayout2->addWidget(new QLabel(QStringLiteral("Axis label rotation"))); - vLayout2->addWidget(axisLabelRotationSlider, 1, Qt::AlignTop); + vLayout2->addWidget(new QLabel(QStringLiteral("Adjust vertical aspect ratio"))); + vLayout2->addWidget(aspectRatioSlider); + vLayout2->addWidget(new QLabel(QStringLiteral("Adjust horizontal aspect ratio"))); + vLayout2->addWidget(horizontalAspectRatioSlider, 1, Qt::AlignTop); + + vLayout3->addWidget(optimizationStaticCB); + vLayout3->addWidget(orthoCB); + vLayout3->addWidget(polarCB); + vLayout3->addWidget(axisTitlesVisibleCB); + vLayout3->addWidget(axisTitlesFixedCB); + vLayout3->addWidget(new QLabel(QStringLiteral("Axis label rotation"))); + vLayout3->addWidget(axisLabelRotationSlider); + vLayout3->addWidget(new QLabel(QStringLiteral("Radial label offset"))); + vLayout3->addWidget(radialLabelSlider, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Camera target")), 0, Qt::AlignTop); + vLayout3->addWidget(cameraTargetSliderX, 0, Qt::AlignTop); + vLayout3->addWidget(cameraTargetSliderY, 0, Qt::AlignTop); + vLayout3->addWidget(cameraTargetSliderZ, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Adjust margin")), 0, Qt::AlignTop); + vLayout3->addWidget(marginSlider, 1, Qt::AlignTop); ScatterDataModifier *modifier = new ScatterDataModifier(chart); @@ -389,6 +453,12 @@ int main(int argc, char **argv) &ScatterDataModifier::setMaxY); QObject::connect(maxSliderZ, &QSlider::valueChanged, modifier, &ScatterDataModifier::setMaxZ); + QObject::connect(optimizationStaticCB, &QCheckBox::stateChanged, modifier, + &ScatterDataModifier::toggleStatic); + QObject::connect(orthoCB, &QCheckBox::stateChanged, modifier, + &ScatterDataModifier::toggleOrtho); + QObject::connect(polarCB, &QCheckBox::stateChanged, modifier, + &ScatterDataModifier::togglePolar); QObject::connect(axisTitlesVisibleCB, &QCheckBox::stateChanged, modifier, &ScatterDataModifier::toggleAxisTitleVisibility); QObject::connect(axisTitlesFixedCB, &QCheckBox::stateChanged, modifier, @@ -397,13 +467,25 @@ int main(int argc, char **argv) &ScatterDataModifier::changeLabelRotation); QObject::connect(aspectRatioSlider, &QSlider::valueChanged, modifier, &ScatterDataModifier::setAspectRatio); + QObject::connect(horizontalAspectRatioSlider, &QSlider::valueChanged, modifier, + &ScatterDataModifier::setHorizontalAspectRatio); + QObject::connect(radialLabelSlider, &QSlider::valueChanged, modifier, + &ScatterDataModifier::changeRadialLabelOffset); + QObject::connect(cameraTargetSliderX, &QSlider::valueChanged, modifier, + &ScatterDataModifier::setCameraTargetX); + QObject::connect(cameraTargetSliderY, &QSlider::valueChanged, modifier, + &ScatterDataModifier::setCameraTargetY); + QObject::connect(cameraTargetSliderZ, &QSlider::valueChanged, modifier, + &ScatterDataModifier::setCameraTargetZ); + QObject::connect(marginSlider, &QSlider::valueChanged, modifier, + &ScatterDataModifier::setGraphMargin); modifier->setFpsLabel(fpsLabel); chart->setGeometry(QRect(0, 0, 800, 800)); modifier->start(); - modifier->renderToImage(); // Initial hidden render + //modifier->renderToImage(); // Initial hidden render widget->show(); diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index c00c526a..7d625d3f 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -23,6 +23,7 @@ #include <QtDataVisualization/q3dscene.h> #include <QtDataVisualization/q3dcamera.h> #include <QtDataVisualization/q3dtheme.h> +#include <QtDataVisualization/Q3DInputHandler> #include <qmath.h> using namespace QtDataVisualization; @@ -46,6 +47,8 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_chart->setAxisX(new QValue3DAxis); m_chart->setAxisY(new QValue3DAxis); m_chart->setAxisZ(new QValue3DAxis); + m_chart->axisY()->setLabelFormat(QStringLiteral("%.7f")); + static_cast<Q3DInputHandler *>(m_chart->activeInputHandler())->setZoomAtTargetEnabled(true); createAndAddSeries(); createAndAddSeries(); @@ -435,6 +438,10 @@ void ScatterDataModifier::testAxisReverse() m_chart->axisX()->setRange(0.0f, 10.0f); m_chart->axisY()->setRange(-20.0f, 50.0f); m_chart->axisZ()->setRange(5.0f, 15.0f); + m_chart->axisX()->setTitle("Axis X"); + m_chart->axisZ()->setTitle("Axis Z"); + m_chart->axisX()->setTitleVisible(true); + m_chart->axisZ()->setTitleVisible(true); m_chart->addSeries(series0); m_chart->addSeries(series1); } @@ -484,9 +491,9 @@ void ScatterDataModifier::addData() m_chart->axisX()->setRange(-50.0f, 50.0f); m_chart->axisY()->setRange(-1.0f, 1.2f); m_chart->axisZ()->setRange(-50.0f, 50.0f); - m_chart->axisX()->setSegmentCount(6); + m_chart->axisX()->setSegmentCount(5); m_chart->axisY()->setSegmentCount(4); - m_chart->axisZ()->setSegmentCount(9); + m_chart->axisZ()->setSegmentCount(10); m_chart->axisX()->setSubSegmentCount(2); m_chart->axisY()->setSubSegmentCount(3); m_chart->axisZ()->setSubSegmentCount(1); @@ -717,8 +724,24 @@ void ScatterDataModifier::changeBunch() if (m_targetSeries->dataProxy()->array()->size()) { int amount = qMin(m_targetSeries->dataProxy()->array()->size(), 100); QScatterDataArray items(amount); - for (int i = 0; i < items.size(); i++) + for (int i = 0; i < items.size(); i++) { items[i].setPosition(randVector()); + // Change the Y-values of first few items to exact gradient boundaries + if (i == 0) + items[i].setY(0.65f); + else if (i == 1) + items[i].setY(0.1f); + else if (i == 2) + items[i].setY(-0.45f); + else if (i == 3) + items[i].setY(-1.0f); + else if (i == 4) + items[i].setY(1.2f); +// else +// items[i].setY(0.1001f - (0.00001f * float(i))); + + } + m_targetSeries->dataProxy()->setItems(0, items); qDebug() << m_loopCounter << "Changed bunch, array size:" << m_targetSeries->dataProxy()->array()->size(); } @@ -934,6 +957,11 @@ void ScatterDataModifier::changeLabelRotation(int rotation) m_chart->axisZ()->setLabelAutoRotation(float(rotation)); } +void ScatterDataModifier::changeRadialLabelOffset(int offset) +{ + m_chart->setRadialLabelOffset(float(offset) / 100.0f); +} + void ScatterDataModifier::toggleAxisTitleVisibility(bool enabled) { m_chart->axisX()->setTitleVisible(enabled); @@ -970,6 +998,54 @@ void ScatterDataModifier::renderToImage() } } +void ScatterDataModifier::togglePolar(bool enable) +{ + m_chart->setPolar(enable); +} + +void ScatterDataModifier::toggleStatic(bool enable) +{ + if (enable) + m_chart->setOptimizationHints(QAbstract3DGraph::OptimizationStatic); + else + m_chart->setOptimizationHints(QAbstract3DGraph::OptimizationDefault); +} + +void ScatterDataModifier::toggleOrtho(bool enable) +{ + m_chart->setOrthoProjection(enable); +} + +void ScatterDataModifier::setCameraTargetX(int value) +{ + // Value is (-100, 100), normalize + m_cameraTarget.setX(float(value) / 100.0f); + m_chart->scene()->activeCamera()->setTarget(m_cameraTarget); + qDebug() << "m_cameraTarget:" << m_cameraTarget; +} + +void ScatterDataModifier::setCameraTargetY(int value) +{ + // Value is (-100, 100), normalize + m_cameraTarget.setY(float(value) / 100.0f); + m_chart->scene()->activeCamera()->setTarget(m_cameraTarget); + qDebug() << "m_cameraTarget:" << m_cameraTarget; +} + +void ScatterDataModifier::setCameraTargetZ(int value) +{ + // Value is (-100, 100), normalize + m_cameraTarget.setZ(float(value) / 100.0f); + m_chart->scene()->activeCamera()->setTarget(m_cameraTarget); + qDebug() << "m_cameraTarget:" << m_cameraTarget; +} + +void ScatterDataModifier::setGraphMargin(int value) +{ + m_chart->setMargin(qreal(value) / 100.0); + qDebug() << "Setting margin:" << m_chart->margin() << value; +} + void ScatterDataModifier::changeShadowQuality(int quality) { QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality); @@ -1019,10 +1095,16 @@ void ScatterDataModifier::setMaxZ(int max) void ScatterDataModifier::setAspectRatio(int ratio) { - float aspectRatio = float(ratio) / 10.0f; + qreal aspectRatio = qreal(ratio) / 10.0; m_chart->setAspectRatio(aspectRatio); } +void ScatterDataModifier::setHorizontalAspectRatio(int ratio) +{ + qreal aspectRatio = qreal(ratio) / 100.0; + m_chart->setHorizontalAspectRatio(aspectRatio); +} + QVector3D ScatterDataModifier::randVector() { QVector3D retvec = QVector3D( diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h index 97c3b1f9..a2b0f58e 100644 --- a/tests/scattertest/scatterchart.h +++ b/tests/scattertest/scatterchart.h @@ -53,6 +53,7 @@ public: void setMaxY(int max); void setMaxZ(int max); void setAspectRatio(int ratio); + void setHorizontalAspectRatio(int ratio); void start(); void massiveDataTest(); void massiveTestScroll(); @@ -90,9 +91,17 @@ public slots: void handleAxisZChanged(QValue3DAxis *axis); void handleFpsChange(qreal fps); void changeLabelRotation(int rotation); + void changeRadialLabelOffset(int offset); void toggleAxisTitleVisibility(bool enabled); void toggleAxisTitleFixed(bool enabled); void renderToImage(); + void togglePolar(bool enable); + void toggleStatic(bool enable); + void toggleOrtho(bool enable); + void setCameraTargetX(int value); + void setCameraTargetY(int value); + void setCameraTargetZ(int value); + void setGraphMargin(int value); signals: void shadowQualityChanged(int quality); @@ -113,6 +122,8 @@ private: QScatter3DSeries *m_targetSeries; QScatterDataArray m_massiveTestCacheArray; QLabel *m_fpsLabel; + QVector3D m_cameraTarget; + }; #endif diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp index ed86f03c..7192f0dc 100644 --- a/tests/surfacetest/graphmodifier.cpp +++ b/tests/surfacetest/graphmodifier.cpp @@ -21,18 +21,21 @@ #include <QtDataVisualization/QSurfaceDataProxy> #include <QtDataVisualization/QSurface3DSeries> #include <QtDataVisualization/Q3DTheme> +#include <QtDataVisualization/Q3DInputHandler> #include <qmath.h> #include <QLinearGradient> #include <QDebug> #include <QComboBox> - +#ifndef QT_NO_CURSOR +#include <QtGui/QCursor> +#endif using namespace QtDataVisualization; //#define JITTER_PLANE //#define WONKY_PLANE -GraphModifier::GraphModifier(Q3DSurface *graph) +GraphModifier::GraphModifier(Q3DSurface *graph, QWidget *parentWidget) : m_graph(graph), m_series1(new QSurface3DSeries), m_series2(new QSurface3DSeries), @@ -48,12 +51,12 @@ GraphModifier::GraphModifier(Q3DSurface *graph) m_zCount(24), m_activeSample(0), m_fontSize(40), - m_rangeX(16.0), + m_rangeX(34.0), m_rangeY(16.0), - m_rangeZ(16.0), - m_minX(-8.0), + m_rangeZ(34.0), + m_minX(-17.0), m_minY(-8.0), - m_minZ(-8.0), + m_minZ(-17.0), m_addRowCounter(m_zCount), m_insertTestZPos(0), m_insertTestIndexPos(1), @@ -63,7 +66,10 @@ GraphModifier::GraphModifier(Q3DSurface *graph) m_drawMode2(QSurface3DSeries::DrawSurfaceAndWireframe), m_drawMode3(QSurface3DSeries::DrawSurfaceAndWireframe), m_drawMode4(QSurface3DSeries::DrawSurfaceAndWireframe), - m_offset(4.0f) + m_offset(4.0f), + m_parentWidget(parentWidget), + m_ascendingX(true), + m_ascendingZ(true) { m_graph->setAxisX(new QValue3DAxis); m_graph->axisX()->setTitle("X-Axis"); @@ -97,6 +103,8 @@ GraphModifier::GraphModifier(Q3DSurface *graph) m_graph->axisY()->setRange(m_minY, m_minY + m_rangeY); m_graph->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ); + static_cast<Q3DInputHandler *>(m_graph->activeInputHandler())->setZoomAtTargetEnabled(true); + for (int i = 0; i < 4; i++) { m_multiseries[i] = new QSurface3DSeries; m_multiseries[i]->setName(QStringLiteral("Series %1").arg(i+1)); @@ -109,6 +117,7 @@ GraphModifier::GraphModifier(Q3DSurface *graph) m_theSeries->setItemLabelFormat(QStringLiteral("@seriesName: (@xLabel, @zLabel): @yLabel")); connect(&m_timer, &QTimer::timeout, this, &GraphModifier::timeout); + connect(&m_graphPositionQueryTimer, &QTimer::timeout, this, &GraphModifier::graphQueryTimeout); connect(m_theSeries, &QSurface3DSeries::selectedPointChanged, this, &GraphModifier::selectedPointChanged); QObject::connect(m_graph, &Q3DSurface::axisXChanged, this, @@ -119,6 +128,8 @@ GraphModifier::GraphModifier(Q3DSurface *graph) &GraphModifier::handleAxisZChanged); QObject::connect(m_graph, &QAbstract3DGraph::currentFpsChanged, this, &GraphModifier::handleFpsChange); + + //m_graphPositionQueryTimer.start(100); } GraphModifier::~GraphModifier() @@ -159,7 +170,6 @@ void GraphModifier::fillSeries() (*newRow[s])[j].setPosition(QVector3D(x, y, z)); } } - qDebug() << newRow[0]->at(0).z(); *dataArray1 << newRow[0]; *dataArray2 << newRow[1]; *dataArray3 << newRow[2]; @@ -606,19 +616,30 @@ void GraphModifier::adjustZMin(int min) void GraphModifier::gradientPressed() { + static Q3DTheme::ColorStyle colorStyle = Q3DTheme::ColorStyleUniform; + + if (colorStyle == Q3DTheme::ColorStyleRangeGradient) { + colorStyle = Q3DTheme::ColorStyleObjectGradient; + qDebug() << "Color style: ColorStyleObjectGradient"; + } else if (colorStyle == Q3DTheme::ColorStyleObjectGradient) { + colorStyle = Q3DTheme::ColorStyleUniform; + qDebug() << "Color style: ColorStyleUniform"; + } else { + colorStyle = Q3DTheme::ColorStyleRangeGradient; + qDebug() << "Color style: ColorStyleRangeGradient"; + } + 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_graph->seriesList().at(0)->setBaseGradient(gradient); -// m_graph->seriesList().at(0)->setSingleHighlightColor(Qt::red); -// m_graph->seriesList().at(0)->setColorStyle(Q3DTheme::ColorStyleRangeGradient); QList<QLinearGradient> gradients; gradients << gradient; m_graph->activeTheme()->setBaseGradients(gradients); - m_graph->activeTheme()->setColorStyle(Q3DTheme::ColorStyleRangeGradient); + m_graph->activeTheme()->setColorStyle(colorStyle); + } void GraphModifier::changeFont(const QFont &font) @@ -680,6 +701,16 @@ void GraphModifier::timeout() m_theSeries->dataProxy()->resetArray(m_planeArray); } +void GraphModifier::graphQueryTimeout() +{ +#ifndef QT_NO_CURSOR + m_graph->scene()->setGraphPositionQuery(m_parentWidget->mapFromGlobal(QCursor::pos())); + qDebug() << "pos: " << (m_parentWidget->mapFromGlobal(QCursor::pos())); +#else + m_graph->scene()->setGraphPositionQuery(QPoint(100, 100)); +#endif +} + void GraphModifier::handleAxisXChanged(QValue3DAxis *axis) { qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_graph->axisX()); @@ -723,6 +754,8 @@ void GraphModifier::toggleAxisTitleFixed(bool enabled) void GraphModifier::toggleXAscending(bool enabled) { + m_ascendingX = enabled; + // Flip data array contents if necessary foreach (QSurface3DSeries *series, m_graph->seriesList()) { QSurfaceDataArray *array = const_cast<QSurfaceDataArray *>(series->dataProxy()->array()); @@ -751,6 +784,8 @@ void GraphModifier::toggleXAscending(bool enabled) void GraphModifier::toggleZAscending(bool enabled) { + m_ascendingZ = enabled; + // Flip data array contents if necessary foreach (QSurface3DSeries *series, m_graph->seriesList()) { QSurfaceDataArray *array = const_cast<QSurfaceDataArray *>(series->dataProxy()->array()); @@ -777,6 +812,41 @@ void GraphModifier::toggleZAscending(bool enabled) } } +void GraphModifier::togglePolar(bool enabled) +{ + m_graph->setPolar(enabled); +} + +void GraphModifier::setCameraTargetX(int value) +{ + // Value is (-100, 100), normalize + m_cameraTarget.setX(float(value) / 100.0f); + m_graph->scene()->activeCamera()->setTarget(m_cameraTarget); + qDebug() << "m_cameraTarget:" << m_cameraTarget; +} + +void GraphModifier::setCameraTargetY(int value) +{ + // Value is (-100, 100), normalize + m_cameraTarget.setY(float(value) / 100.0f); + m_graph->scene()->activeCamera()->setTarget(m_cameraTarget); + qDebug() << "m_cameraTarget:" << m_cameraTarget; +} + +void GraphModifier::setCameraTargetZ(int value) +{ + // Value is (-100, 100), normalize + m_cameraTarget.setZ(float(value) / 100.0f); + m_graph->scene()->activeCamera()->setTarget(m_cameraTarget); + qDebug() << "m_cameraTarget:" << m_cameraTarget; +} + +void GraphModifier::setGraphMargin(int value) +{ + m_graph->setMargin(qreal(value) / 100.0); + qDebug() << "Setting margin:" << m_graph->margin() << value; +} + void GraphModifier::resetArrayAndSliders(QSurfaceDataArray *array, float minZ, float maxZ, float minX, float maxX) { m_axisMinSliderX->setValue(minX); @@ -831,7 +901,10 @@ void GraphModifier::changeRow() int row = rand() % m_zCount; QSurfaceDataRow *newRow = createMultiRow(row, changeRowSeries, true); - m_multiseries[changeRowSeries]->dataProxy()->setRow(row, newRow); + if (m_ascendingZ) + m_multiseries[changeRowSeries]->dataProxy()->setRow(row, newRow); + else + m_multiseries[changeRowSeries]->dataProxy()->setRow((m_zCount - 1) - row, newRow); changeRowSeries++; if (changeRowSeries > 3) @@ -848,11 +921,20 @@ QSurfaceDataRow *GraphModifier::createMultiRow(int row, int series, bool change) float i = float(row); QSurfaceDataRow *newRow = new QSurfaceDataRow(m_xCount); float z = float(i) - m_limitZ + 0.5f + m_multiSampleOffsetZ[series]; - for (int j = 0; j < m_xCount; j++) { - float x = float(j) - m_limitX + 0.5f + m_multiSampleOffsetX[series]; - float angle = (z * x) / float(full) * 1.57f; - float y = qSin(angle * float(qPow(1.3f, series))) + 0.2f * float(change) + 1.1f *series; - (*newRow)[j].setPosition(QVector3D(x, y, z)); + if (m_ascendingX) { + for (int j = 0; j < m_xCount; j++) { + float x = float(j) - m_limitX + 0.5f + m_multiSampleOffsetX[series]; + float angle = (z * x) / float(full) * 1.57f; + float y = qSin(angle * float(qPow(1.3f, series))) + 0.2f * float(change) + 1.1f *series; + (*newRow)[j].setPosition(QVector3D(x, y, z)); + } + } else { + for (int j = m_xCount - 1; j >= 0 ; j--) { + float x = float(j) - m_limitX + 0.5f + m_multiSampleOffsetX[series]; + float angle = (z * x) / float(full) * 1.57f; + float y = qSin(angle * float(qPow(1.3f, series))) + 0.2f * float(change) + 1.1f *series; + (*newRow)[(m_xCount - 1) - j].setPosition(QVector3D(x, y, z)); + } } return newRow; @@ -961,7 +1043,16 @@ void GraphModifier::changeItem() float angle = (z * x) / float(full) * 1.57f; float y = qSin(angle * float(qPow(1.3f, changeItemSeries))) + 0.2f + 1.1f *changeItemSeries; QSurfaceDataItem newItem(QVector3D(x, y, z)); - m_multiseries[changeItemSeries]->dataProxy()->setItem(int(i), int(j), newItem); + + if (m_ascendingZ && m_ascendingX) + m_multiseries[changeItemSeries]->dataProxy()->setItem(int(i), int(j), newItem); + else if (!m_ascendingZ && m_ascendingX) + m_multiseries[changeItemSeries]->dataProxy()->setItem(m_zCount - 1 - int(i), int(j), newItem); + else if (m_ascendingZ && !m_ascendingX) + m_multiseries[changeItemSeries]->dataProxy()->setItem(int(i), m_xCount - 1 - int(j), newItem); + else + m_multiseries[changeItemSeries]->dataProxy()->setItem(m_zCount - 1 - int(i), m_xCount - 1 - int(j), newItem); + //m_multiseries[changeItemSeries]->setSelectedPoint(QPoint(i, j)); changeItemSeries++; if (changeItemSeries > 3) changeItemSeries = 0; @@ -1228,12 +1319,12 @@ void GraphModifier::resetArray() void GraphModifier::resetArrayEmpty() { - QSurfaceDataArray *emptryArray = new QSurfaceDataArray; + QSurfaceDataArray *emptyArray = new QSurfaceDataArray; #ifdef MULTI_SERIES int series = rand() % 4; - m_multiseries[series]->dataProxy()->resetArray(emptryArray); + m_multiseries[series]->dataProxy()->resetArray(emptyArray); #else - m_theSeries->dataProxy()->resetArray(emptryArray); + m_theSeries->dataProxy()->resetArray(emptyArray); #endif } @@ -1569,6 +1660,20 @@ void GraphModifier::updateSamples() void GraphModifier::setAspectRatio(int ratio) { - float aspectRatio = float(ratio) / 10.0f; + qreal aspectRatio = qreal(ratio) / 10.0; m_graph->setAspectRatio(aspectRatio); } + +void GraphModifier::setHorizontalAspectRatio(int ratio) +{ + qreal aspectRatio = qreal(ratio) / 100.0; + m_graph->setHorizontalAspectRatio(aspectRatio); +} + +void GraphModifier::setSurfaceTexture(bool enabled) +{ + if (enabled) + m_multiseries[3]->setTexture(QImage(":/maps/mapimage")); + else + m_multiseries[3]->setTexture(QImage()); +} diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h index 5f1a252a..223a6854 100644 --- a/tests/surfacetest/graphmodifier.h +++ b/tests/surfacetest/graphmodifier.h @@ -41,7 +41,7 @@ public: Map }; - explicit GraphModifier(Q3DSurface *graph); + explicit GraphModifier(Q3DSurface *graph, QWidget *parentWidget); ~GraphModifier(); void toggleSeries1(bool enabled); @@ -112,8 +112,9 @@ public: void massiveTestAppendAndScroll(); void testAxisReverse(); void testDataOrdering(); - void setAspectRatio(int ratio); + void setHorizontalAspectRatio(int ratio); + void setSurfaceTexture(bool enabled); public slots: void changeShadowQuality(int quality); @@ -121,6 +122,7 @@ public slots: void flipViews(); void changeSelectionMode(int mode); void timeout(); + void graphQueryTimeout(); void handleAxisXChanged(QValue3DAxis *axis); void handleAxisYChanged(QValue3DAxis *axis); @@ -131,6 +133,11 @@ public slots: void toggleAxisTitleFixed(bool enabled); void toggleXAscending(bool enabled); void toggleZAscending(bool enabled); + void togglePolar(bool enabled); + void setCameraTargetX(int value); + void setCameraTargetY(int value); + void setCameraTargetZ(int value); + void setGraphMargin(int value); private: void fillSeries(); @@ -184,6 +191,11 @@ private: float m_multiSampleOffsetX[4]; float m_multiSampleOffsetZ[4]; QSurfaceDataArray m_massiveTestCacheArray; + QVector3D m_cameraTarget; + QWidget *m_parentWidget; + QTimer m_graphPositionQueryTimer; + bool m_ascendingX; + bool m_ascendingZ; }; #endif diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp index 5806d7b0..d1328e4e 100644 --- a/tests/surfacetest/main.cpp +++ b/tests/surfacetest/main.cpp @@ -46,8 +46,10 @@ int main(int argc, char *argv[]) QHBoxLayout *hLayout = new QHBoxLayout(widget); QVBoxLayout *vLayout = new QVBoxLayout(); QVBoxLayout *vLayout2 = new QVBoxLayout(); + QVBoxLayout *vLayout3 = new QVBoxLayout(); vLayout->setAlignment(Qt::AlignTop); vLayout2->setAlignment(Qt::AlignTop); + vLayout3->setAlignment(Qt::AlignTop); Q3DSurface *surfaceGraph = new Q3DSurface(); QSize screenSize = surfaceGraph->screen()->size(); @@ -56,7 +58,7 @@ int main(int argc, char *argv[]) surfaceGraph->activeTheme()->setType(Q3DTheme::Theme(initialTheme)); QWidget *container = QWidget::createWindowContainer(surfaceGraph); - container->setMinimumSize(QSize(screenSize.width() / 4, screenSize.height() / 4)); + container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 4)); container->setMaximumSize(screenSize); container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); container->setFocusPolicy(Qt::StrongFocus); @@ -66,6 +68,7 @@ int main(int argc, char *argv[]) hLayout->addWidget(container, 1); hLayout->addLayout(vLayout); hLayout->addLayout(vLayout2); + hLayout->addLayout(vLayout3); QCheckBox *smoothCB = new QCheckBox(widget); smoothCB->setText(QStringLiteral("Flat Surface")); @@ -183,7 +186,7 @@ int main(int argc, char *argv[]) QSlider *axisRangeSliderX = new QSlider(Qt::Horizontal, widget); axisRangeSliderX->setTickInterval(1); axisRangeSliderX->setMinimum(1); - axisRangeSliderX->setValue(16); + axisRangeSliderX->setValue(34); axisRangeSliderX->setMaximum(100); axisRangeSliderX->setEnabled(true); QSlider *axisRangeSliderY = new QSlider(Qt::Horizontal, widget); @@ -195,14 +198,14 @@ int main(int argc, char *argv[]) QSlider *axisRangeSliderZ = new QSlider(Qt::Horizontal, widget); axisRangeSliderZ->setTickInterval(1); axisRangeSliderZ->setMinimum(1); - axisRangeSliderZ->setValue(16); + axisRangeSliderZ->setValue(34); axisRangeSliderZ->setMaximum(100); axisRangeSliderZ->setEnabled(true); QSlider *axisMinSliderX = new QSlider(Qt::Horizontal, widget); axisMinSliderX->setTickInterval(1); axisMinSliderX->setMinimum(-100); - axisMinSliderX->setValue(-8); + axisMinSliderX->setValue(-17); axisMinSliderX->setMaximum(100); axisMinSliderX->setEnabled(true); QSlider *axisMinSliderY = new QSlider(Qt::Horizontal, widget); @@ -214,7 +217,7 @@ int main(int argc, char *argv[]) QSlider *axisMinSliderZ = new QSlider(Qt::Horizontal, widget); axisMinSliderZ->setTickInterval(1); axisMinSliderZ->setMinimum(-100); - axisMinSliderZ->setValue(-8); + axisMinSliderZ->setValue(-17); axisMinSliderZ->setMaximum(100); axisMinSliderZ->setEnabled(true); @@ -223,6 +226,11 @@ int main(int argc, char *argv[]) aspectRatioSlider->setValue(20); aspectRatioSlider->setMaximum(100); + QSlider *horizontalAspectRatioSlider = new QSlider(Qt::Horizontal, widget); + horizontalAspectRatioSlider->setMinimum(0); + horizontalAspectRatioSlider->setValue(0); + horizontalAspectRatioSlider->setMaximum(300); + QLinearGradient gr(0, 0, 100, 1); gr.setColorAt(0.0, Qt::black); gr.setColorAt(0.33, Qt::blue); @@ -393,6 +401,35 @@ int main(int argc, char *argv[]) zAscendingCB->setText(QStringLiteral("Z Ascending")); zAscendingCB->setChecked(true); + QCheckBox *polarCB = new QCheckBox(widget); + polarCB->setText(QStringLiteral("Polar")); + polarCB->setChecked(false); + + QCheckBox *surfaceTextureCB = new QCheckBox(widget); + surfaceTextureCB->setText(QStringLiteral("Map texture")); + surfaceTextureCB->setChecked(false); + + QSlider *cameraTargetSliderX = new QSlider(Qt::Horizontal, widget); + cameraTargetSliderX->setTickInterval(1); + cameraTargetSliderX->setMinimum(-100); + cameraTargetSliderX->setValue(0); + cameraTargetSliderX->setMaximum(100); + QSlider *cameraTargetSliderY = new QSlider(Qt::Horizontal, widget); + cameraTargetSliderY->setTickInterval(1); + cameraTargetSliderY->setMinimum(-100); + cameraTargetSliderY->setValue(0); + cameraTargetSliderY->setMaximum(100); + QSlider *cameraTargetSliderZ = new QSlider(Qt::Horizontal, widget); + cameraTargetSliderZ->setTickInterval(1); + cameraTargetSliderZ->setMinimum(-100); + cameraTargetSliderZ->setValue(0); + cameraTargetSliderZ->setMaximum(100); + + QSlider *marginSlider = new QSlider(Qt::Horizontal, widget); + marginSlider->setMinimum(-1); + marginSlider->setValue(-1); + marginSlider->setMaximum(100); + // Add controls to the layout #ifdef MULTI_SERIES vLayout->addWidget(series1CB); @@ -420,6 +457,7 @@ int main(int argc, char *argv[]) vLayout->addWidget(surfaceGridS4CB); vLayout->addWidget(surfaceS4CB); vLayout->addWidget(series4VisibleCB); + vLayout->addWidget(surfaceTextureCB, 1, Qt::AlignTop); #endif #ifndef MULTI_SERIES vLayout->addWidget(new QLabel(QStringLiteral("Select surface sample"))); @@ -429,60 +467,71 @@ int main(int argc, char *argv[]) vLayout->addWidget(new QLabel(QStringLiteral("Adjust sample count"))); vLayout->addWidget(gridSlidersLockCB); vLayout->addWidget(gridSliderX); - vLayout->addWidget(gridSliderZ); + vLayout->addWidget(gridSliderZ, 1, Qt::AlignTop); #endif - vLayout->addWidget(new QLabel(QStringLiteral("Adjust aspect ratio"))); - vLayout->addWidget(aspectRatioSlider); - vLayout->addWidget(new QLabel(QStringLiteral("Adjust axis range"))); - vLayout->addWidget(axisRangeSliderX); - vLayout->addWidget(axisRangeSliderY); - vLayout->addWidget(axisRangeSliderZ); - vLayout->addWidget(new QLabel(QStringLiteral("Adjust axis minimum"))); - vLayout->addWidget(axisMinSliderX); - vLayout->addWidget(axisMinSliderY); - vLayout->addWidget(axisMinSliderZ); - vLayout->addWidget(xAscendingCB); - vLayout->addWidget(zAscendingCB); + + vLayout2->addWidget(new QLabel(QStringLiteral("Adjust vertical aspect ratio"))); + vLayout2->addWidget(aspectRatioSlider); + vLayout2->addWidget(new QLabel(QStringLiteral("Adjust horizontal aspect ratio"))); + vLayout2->addWidget(horizontalAspectRatioSlider); + vLayout2->addWidget(new QLabel(QStringLiteral("Adjust axis range"))); + vLayout2->addWidget(axisRangeSliderX); + vLayout2->addWidget(axisRangeSliderY); + vLayout2->addWidget(axisRangeSliderZ); + vLayout2->addWidget(new QLabel(QStringLiteral("Adjust axis minimum"))); + vLayout2->addWidget(axisMinSliderX); + vLayout2->addWidget(axisMinSliderY); + vLayout2->addWidget(axisMinSliderZ); + vLayout2->addWidget(xAscendingCB); + vLayout2->addWidget(zAscendingCB); + vLayout2->addWidget(polarCB); vLayout2->addWidget(new QLabel(QStringLiteral("Change font"))); vLayout2->addWidget(fontList); - vLayout2->addWidget(labelButton); - vLayout2->addWidget(meshButton); vLayout2->addWidget(new QLabel(QStringLiteral("Change theme"))); vLayout2->addWidget(themeList); vLayout2->addWidget(new QLabel(QStringLiteral("Adjust shadow quality"))); vLayout2->addWidget(shadowQuality); vLayout2->addWidget(new QLabel(QStringLiteral("Selection Mode"))); vLayout2->addWidget(selectionMode); + vLayout2->addWidget(new QLabel(QStringLiteral("Camera target"))); + vLayout2->addWidget(cameraTargetSliderX); + vLayout2->addWidget(cameraTargetSliderY); + vLayout2->addWidget(cameraTargetSliderZ); + vLayout2->addWidget(new QLabel(QStringLiteral("Adjust margin")), 0, Qt::AlignTop); + vLayout2->addWidget(marginSlider, 1, Qt::AlignTop); + + vLayout3->addWidget(labelButton); + vLayout3->addWidget(meshButton); #ifndef MULTI_SERIES - vLayout2->addWidget(selectButton); - vLayout2->addWidget(selectionInfoLabel); - vLayout2->addWidget(flipViewsButton); + vLayout3->addWidget(selectButton); + vLayout3->addWidget(selectionInfoLabel); + vLayout3->addWidget(flipViewsButton); #endif - vLayout2->addWidget(colorPB); - vLayout2->addWidget(changeRowButton); - vLayout2->addWidget(changeRowsButton); - vLayout2->addWidget(changeMultipleRowsButton); - vLayout2->addWidget(changeItemButton); - vLayout2->addWidget(changeMultipleItemButton); - vLayout2->addWidget(addRowButton); - vLayout2->addWidget(addRowsButton); - vLayout2->addWidget(insertRowButton); - vLayout2->addWidget(insertRowsButton); - vLayout2->addWidget(removeRowButton); - vLayout2->addWidget(resetArrayButton); - vLayout2->addWidget(resetArrayEmptyButton); - vLayout2->addWidget(massiveDataTestButton); - vLayout2->addWidget(testReverseButton); - vLayout2->addWidget(testDataOrderingButton); - vLayout2->addWidget(axisTitlesVisibleCB); - vLayout2->addWidget(axisTitlesFixedCB); - vLayout2->addWidget(new QLabel(QStringLiteral("Axis label rotation"))); - vLayout2->addWidget(axisLabelRotationSlider, 1, Qt::AlignTop); + vLayout3->addWidget(colorPB); + vLayout3->addWidget(changeRowButton); + vLayout3->addWidget(changeRowsButton); + vLayout3->addWidget(changeMultipleRowsButton); + vLayout3->addWidget(changeItemButton); + vLayout3->addWidget(changeMultipleItemButton); + vLayout3->addWidget(addRowButton); + vLayout3->addWidget(addRowsButton); + vLayout3->addWidget(insertRowButton); + vLayout3->addWidget(insertRowsButton); + vLayout3->addWidget(removeRowButton); + vLayout3->addWidget(resetArrayButton); + vLayout3->addWidget(resetArrayEmptyButton); + vLayout3->addWidget(massiveDataTestButton); + vLayout3->addWidget(testReverseButton); + vLayout3->addWidget(testDataOrderingButton); + vLayout3->addWidget(axisTitlesVisibleCB); + vLayout3->addWidget(axisTitlesFixedCB); + vLayout3->addWidget(new QLabel(QStringLiteral("Axis label rotation"))); + vLayout3->addWidget(axisLabelRotationSlider, 1, Qt::AlignTop); widget->show(); - GraphModifier *modifier = new GraphModifier(surfaceGraph); + GraphModifier *modifier = new GraphModifier(surfaceGraph, container); // Connect controls to slots on modifier QObject::connect(smoothCB, &QCheckBox::stateChanged, @@ -650,9 +699,23 @@ int main(int argc, char *argv[]) modifier, &GraphModifier::toggleXAscending); QObject::connect(zAscendingCB, &QCheckBox::stateChanged, modifier, &GraphModifier::toggleZAscending); + QObject::connect(polarCB, &QCheckBox::stateChanged, + modifier, &GraphModifier::togglePolar); QObject::connect(aspectRatioSlider, &QSlider::valueChanged, modifier, &GraphModifier::setAspectRatio); + QObject::connect(horizontalAspectRatioSlider, &QSlider::valueChanged, + modifier, &GraphModifier::setHorizontalAspectRatio); + QObject::connect(surfaceTextureCB, &QCheckBox::stateChanged, + modifier, &GraphModifier::setSurfaceTexture); + QObject::connect(cameraTargetSliderX, &QSlider::valueChanged, modifier, + &GraphModifier::setCameraTargetX); + QObject::connect(cameraTargetSliderY, &QSlider::valueChanged, modifier, + &GraphModifier::setCameraTargetY); + QObject::connect(cameraTargetSliderZ, &QSlider::valueChanged, modifier, + &GraphModifier::setCameraTargetZ); + QObject::connect(marginSlider, &QSlider::valueChanged, modifier, + &GraphModifier::setGraphMargin); #ifdef MULTI_SERIES modifier->setSeries1CB(series1CB); diff --git a/tests/surfacetest/mapimage.png b/tests/surfacetest/mapimage.png Binary files differnew file mode 100644 index 00000000..079d0407 --- /dev/null +++ b/tests/surfacetest/mapimage.png diff --git a/tests/surfacetest/surfacetest.qrc b/tests/surfacetest/surfacetest.qrc index c18da2c4..266ed7e0 100644 --- a/tests/surfacetest/surfacetest.qrc +++ b/tests/surfacetest/surfacetest.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/maps"> <file alias="map">Heightmap.png</file> + <file alias="mapimage">mapimage.png</file> </qresource> </RCC> diff --git a/tests/tests.pro b/tests/tests.pro index 8bbdc3f2..ccecd486 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -7,22 +7,33 @@ contains(QT_CONFIG, opengles1) { TEMPLATE = subdirs -SUBDIRS += barstest \ - scattertest \ - surfacetest \ - qmlcamera \ - qmldynamicdata \ - multigraphs \ - directional \ - qmlmultiwindow \ - itemmodeltest \ - qmlmultitest +SUBDIRS += auto -#SUBDIRS += kinectsurface +qtHaveModule(quick) { + SUBDIRS += qmlcamera \ + qmldynamicdata \ + qmlmultiwindow \ + qmlmultitest \ + qmlvolume \ + qmlperf +} -qtHaveModule(multimedia):!android:!static: SUBDIRS += spectrum +!android:!ios { + SUBDIRS += barstest \ + scattertest \ + surfacetest \ + multigraphs \ + directional \ + itemmodeltest \ + volumetrictest + + # For testing code snippets of minimal applications + SUBDIRS += minimalbars \ + minimalscatter \ + minimalsurface -# For testing code snippets of minimal applications -SUBDIRS += minimalbars \ - minimalscatter \ - minimalsurface + # Requires Kinect drivers + #SUBDIRS += kinectsurface +} + +qtHaveModule(multimedia):!android:!static: SUBDIRS += spectrum diff --git a/tests/volumetrictest/cubeFilledFlat.obj b/tests/volumetrictest/cubeFilledFlat.obj new file mode 100644 index 00000000..108cf7ac --- /dev/null +++ b/tests/volumetrictest/cubeFilledFlat.obj @@ -0,0 +1,54 @@ +# Blender v2.66 (sub 0) OBJ File: 'cube_filled.blend' +# www.blender.org +o Cube +v -1.000000 -1.000000 1.000000 +v -1.000000 -1.000000 -1.000000 +v 1.000000 -1.000000 -1.000000 +v 1.000000 -1.000000 1.000000 +v -1.000000 1.000000 1.000000 +v -1.000000 1.000000 -1.000000 +v 1.000000 1.000000 -1.000000 +v 1.000000 1.000000 1.000000 +vt 0.666667 0.332314 +vt 0.334353 0.333333 +vt 0.665647 0.000000 +vt 0.001020 0.333333 +vt 0.000000 0.001020 +vt 0.333333 0.332314 +vt 0.333333 0.665647 +vt 0.001019 0.666667 +vt 0.000000 0.334353 +vt 0.334353 0.666667 +vt 0.333333 0.334353 +vt 0.665647 0.333333 +vt 0.333333 0.667686 +vt 0.665647 0.666667 +vt 0.666667 0.998980 +vt 0.667686 0.333333 +vt 0.666667 0.001019 +vt 0.998980 0.000000 +vt 0.333333 0.001019 +vt 0.332314 0.000000 +vt 0.332314 0.333333 +vt 0.666667 0.665647 +vt 0.334353 1.000000 +vt 1.000000 0.332314 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 -0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000000 -1.000000 -0.000000 +s off +f 5/1/1 6/2/1 1/3/1 +f 6/4/2 7/5/2 2/6/2 +f 7/7/3 8/8/3 4/9/3 +f 8/10/4 5/11/4 1/12/4 +f 8/13/5 7/14/5 6/15/5 +f 2/16/6 3/17/6 4/18/6 +f 6/2/1 2/19/1 1/3/1 +f 7/5/2 3/20/2 2/6/2 +f 3/21/3 7/7/3 4/9/3 +f 4/22/4 8/10/4 1/12/4 +f 5/23/5 8/13/5 6/15/5 +f 1/24/6 2/16/6 4/18/6 diff --git a/tests/volumetrictest/logo.png b/tests/volumetrictest/logo.png Binary files differnew file mode 100644 index 00000000..1e7ed4cf --- /dev/null +++ b/tests/volumetrictest/logo.png diff --git a/tests/volumetrictest/logo_no_padding.png b/tests/volumetrictest/logo_no_padding.png Binary files differnew file mode 100644 index 00000000..714234aa --- /dev/null +++ b/tests/volumetrictest/logo_no_padding.png diff --git a/tests/volumetrictest/main.cpp b/tests/volumetrictest/main.cpp new file mode 100644 index 00000000..7b18ceab --- /dev/null +++ b/tests/volumetrictest/main.cpp @@ -0,0 +1,168 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include "volumetrictest.h" +#include <QtWidgets/QApplication> +#include <QtWidgets/QWidget> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QRadioButton> +#include <QtWidgets/QSlider> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QLabel> +#include <QtWidgets/QPushButton> +#include <QtGui/QScreen> + +int main(int argc, char **argv) +{ + QApplication app(argc, argv); + //Q3DScatter *graph = new Q3DScatter(); + //Q3DSurface *graph = new Q3DSurface(); + Q3DBars *graph = new Q3DBars(); + QWidget *container = QWidget::createWindowContainer(graph); + + QSize screenSize = graph->screen()->size(); + container->setMinimumSize(QSize(screenSize.width() / 4, screenSize.height() / 4)); + container->setMaximumSize(screenSize); + container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + container->setFocusPolicy(Qt::StrongFocus); + + QWidget *widget = new QWidget; + QHBoxLayout *hLayout = new QHBoxLayout(widget); + QVBoxLayout *vLayout = new QVBoxLayout(); + hLayout->addWidget(container, 1); + hLayout->addLayout(vLayout); + + widget->setWindowTitle(QStringLiteral("Volumetric TEST")); + widget->resize(QSize(screenSize.width() / 1.5, screenSize.height() / 1.5)); + + QCheckBox *sliceXCheckBox = new QCheckBox(widget); + sliceXCheckBox->setText(QStringLiteral("Slice volume on X axis")); + sliceXCheckBox->setChecked(false); + QCheckBox *sliceYCheckBox = new QCheckBox(widget); + sliceYCheckBox->setText(QStringLiteral("Slice volume on Y axis")); + sliceYCheckBox->setChecked(false); + QCheckBox *sliceZCheckBox = new QCheckBox(widget); + sliceZCheckBox->setText(QStringLiteral("Slice volume on Z axis")); + sliceZCheckBox->setChecked(false); + + QSlider *sliceXSlider = new QSlider(Qt::Horizontal, widget); + sliceXSlider->setMinimum(0); + sliceXSlider->setMaximum(1024); + sliceXSlider->setValue(512); + sliceXSlider->setEnabled(true); + QSlider *sliceYSlider = new QSlider(Qt::Horizontal, widget); + sliceYSlider->setMinimum(0); + sliceYSlider->setMaximum(1024); + sliceYSlider->setValue(512); + sliceYSlider->setEnabled(true); + QSlider *sliceZSlider = new QSlider(Qt::Horizontal, widget); + sliceZSlider->setMinimum(0); + sliceZSlider->setMaximum(1024); + sliceZSlider->setValue(512); + sliceZSlider->setEnabled(true); + + QLabel *fpsLabel = new QLabel(QStringLiteral("Fps: "), widget); + + QLabel *sliceImageXLabel = new QLabel(widget); + QLabel *sliceImageYLabel = new QLabel(widget); + QLabel *sliceImageZLabel = new QLabel(widget); + sliceImageXLabel->setMinimumSize(QSize(200, 100)); + sliceImageYLabel->setMinimumSize(QSize(200, 200)); + sliceImageZLabel->setMinimumSize(QSize(200, 100)); + sliceImageXLabel->setMaximumSize(QSize(200, 100)); + sliceImageYLabel->setMaximumSize(QSize(200, 200)); + sliceImageZLabel->setMaximumSize(QSize(200, 100)); + sliceImageXLabel->setFrameShape(QFrame::Box); + sliceImageYLabel->setFrameShape(QFrame::Box); + sliceImageZLabel->setFrameShape(QFrame::Box); + sliceImageXLabel->setScaledContents(true); + sliceImageYLabel->setScaledContents(true); + sliceImageZLabel->setScaledContents(true); + + QPushButton *testSubTextureSetting = new QPushButton(widget); + testSubTextureSetting->setText(QStringLiteral("Test subtexture settings")); + + QLabel *rangeSliderLabel = new QLabel(QStringLiteral("Adjust ranges:"), widget); + + QSlider *rangeXSlider = new QSlider(Qt::Horizontal, widget); + rangeXSlider->setMinimum(0); + rangeXSlider->setMaximum(1024); + rangeXSlider->setValue(512); + rangeXSlider->setEnabled(true); + QSlider *rangeYSlider = new QSlider(Qt::Horizontal, widget); + rangeYSlider->setMinimum(0); + rangeYSlider->setMaximum(1024); + rangeYSlider->setValue(512); + rangeYSlider->setEnabled(true); + QSlider *rangeZSlider = new QSlider(Qt::Horizontal, widget); + rangeZSlider->setMinimum(0); + rangeZSlider->setMaximum(1024); + rangeZSlider->setValue(512); + rangeZSlider->setEnabled(true); + + QPushButton *testBoundsSetting = new QPushButton(widget); + testBoundsSetting->setText(QStringLiteral("Test data bounds")); + + vLayout->addWidget(fpsLabel); + vLayout->addWidget(sliceXCheckBox); + vLayout->addWidget(sliceXSlider); + vLayout->addWidget(sliceImageXLabel); + vLayout->addWidget(sliceYCheckBox); + vLayout->addWidget(sliceYSlider); + vLayout->addWidget(sliceImageYLabel); + vLayout->addWidget(sliceZCheckBox); + vLayout->addWidget(sliceZSlider); + vLayout->addWidget(sliceImageZLabel); + vLayout->addWidget(rangeSliderLabel); + vLayout->addWidget(rangeXSlider); + vLayout->addWidget(rangeYSlider); + vLayout->addWidget(rangeZSlider); + vLayout->addWidget(testBoundsSetting); + vLayout->addWidget(testSubTextureSetting, 1, Qt::AlignTop); + + VolumetricModifier *modifier = new VolumetricModifier(graph); + modifier->setFpsLabel(fpsLabel); + modifier->setSliceLabels(sliceImageXLabel, sliceImageYLabel, sliceImageZLabel); + + QObject::connect(sliceXCheckBox, &QCheckBox::stateChanged, modifier, + &VolumetricModifier::sliceX); + QObject::connect(sliceYCheckBox, &QCheckBox::stateChanged, modifier, + &VolumetricModifier::sliceY); + QObject::connect(sliceZCheckBox, &QCheckBox::stateChanged, modifier, + &VolumetricModifier::sliceZ); + QObject::connect(sliceXSlider, &QSlider::valueChanged, modifier, + &VolumetricModifier::adjustSliceX); + QObject::connect(sliceYSlider, &QSlider::valueChanged, modifier, + &VolumetricModifier::adjustSliceY); + QObject::connect(sliceZSlider, &QSlider::valueChanged, modifier, + &VolumetricModifier::adjustSliceZ); + QObject::connect(testSubTextureSetting, &QPushButton::clicked, modifier, + &VolumetricModifier::testSubtextureSetting); + QObject::connect(rangeXSlider, &QSlider::valueChanged, modifier, + &VolumetricModifier::adjustRangeX); + QObject::connect(rangeYSlider, &QSlider::valueChanged, modifier, + &VolumetricModifier::adjustRangeY); + QObject::connect(rangeZSlider, &QSlider::valueChanged, modifier, + &VolumetricModifier::adjustRangeZ); + QObject::connect(testBoundsSetting, &QPushButton::clicked, modifier, + &VolumetricModifier::testBoundsSetting); + + widget->show(); + return app.exec(); +} diff --git a/tests/volumetrictest/volumetrictest.cpp b/tests/volumetrictest/volumetrictest.cpp new file mode 100644 index 00000000..24ecac3d --- /dev/null +++ b/tests/volumetrictest/volumetrictest.cpp @@ -0,0 +1,716 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#include "volumetrictest.h" +#include <QtDataVisualization/qbar3dseries.h> +#include <QtDataVisualization/qvalue3daxis.h> +#include <QtDataVisualization/q3dscene.h> +#include <QtDataVisualization/q3dcamera.h> +#include <QtDataVisualization/q3dtheme.h> +#include <QtDataVisualization/qcustom3dlabel.h> +#include <QtCore/qmath.h> +#include <QtGui/QRgb> +#include <QtGui/QImage> +#include <QtWidgets/QLabel> +#include <QtCore/QDebug> + +using namespace QtDataVisualization; + +const int imageCount = 512; +const float xMiddle = 100.0f; +const float yMiddle = 2.5f; +const float zMiddle = 100.0f; +const float xRange = 40.0f; +const float yRange = 7.5f; +const float zRange = 20.0f; + +VolumetricModifier::VolumetricModifier(QAbstract3DGraph *scatter) + : m_graph(scatter), + m_volumeItem(0), + m_volumeItem2(0), + m_volumeItem3(0), + m_sliceIndexX(0), + m_sliceIndexY(0), + m_sliceIndexZ(0) +{ + m_graph->activeTheme()->setType(Q3DTheme::ThemeQt); + //m_graph->activeTheme()->setType(Q3DTheme::ThemeIsabelle); + m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualityNone); + m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront); + m_graph->setOrthoProjection(true); + //m_graph->scene()->activeCamera()->setTarget(QVector3D(-2.0f, 1.0f, 2.0f)); + m_scatterGraph = qobject_cast<Q3DScatter *>(m_graph); + m_surfaceGraph = qobject_cast<Q3DSurface *>(m_graph); + m_barGraph = qobject_cast<Q3DBars *>(m_graph); + if (m_scatterGraph) { + m_scatterGraph->axisX()->setRange(xMiddle - xRange, xMiddle + xRange); + m_scatterGraph->axisX()->setSegmentCount(8); + m_scatterGraph->axisY()->setRange(yMiddle - yRange, yMiddle + yRange); + m_scatterGraph->axisY()->setSegmentCount(3); + m_scatterGraph->axisZ()->setRange(zMiddle - zRange, zMiddle + zRange); + m_scatterGraph->axisZ()->setSegmentCount(8); + } else if (m_surfaceGraph) { + m_surfaceGraph->axisX()->setRange(xMiddle - xRange, xMiddle + xRange); + m_surfaceGraph->axisX()->setSegmentCount(8); + m_surfaceGraph->axisY()->setRange(yMiddle - yRange, yMiddle + yRange); + m_surfaceGraph->axisY()->setSegmentCount(3); + m_surfaceGraph->axisZ()->setRange(zMiddle - zRange, zMiddle + zRange); + m_surfaceGraph->axisZ()->setSegmentCount(8); + } else if (m_barGraph) { + QStringList rowLabels; + QStringList columnLabels; + for (int i = 0; i < xMiddle + xRange; i++) { + if (i % 5 == 0) + columnLabels << QString::number(i); + else + columnLabels << QString(); + } + for (int i = 0; i < zMiddle + zRange; i++) { + if (i % 5 == 0) + rowLabels << QString::number(i); + else + rowLabels << QString(); + } + + QBar3DSeries *series = new QBar3DSeries; + QBarDataArray *array = new QBarDataArray(); + array->reserve(zRange * 2 + 1); + for (int i = 0; i < zRange * 2 + 1; i++) + array->append(new QBarDataRow(xRange * 2 + 1)); + + series->dataProxy()->resetArray(array, rowLabels, columnLabels); + m_barGraph->addSeries(series); + + m_barGraph->columnAxis()->setRange(xMiddle - xRange, xMiddle + xRange); + m_barGraph->valueAxis()->setRange(yMiddle - yRange, yMiddle + yRange); + m_barGraph->rowAxis()->setRange(zMiddle - zRange, zMiddle + zRange); + //m_barGraph->setReflection(true); + } + m_graph->activeTheme()->setBackgroundEnabled(false); + + createVolume(); + createAnotherVolume(); + createYetAnotherVolume(); + +// m_volumeItem->setUseHighDefShader(false); +// m_volumeItem2->setUseHighDefShader(false); +// m_volumeItem3->setUseHighDefShader(false); + + m_volumeItem->setScalingAbsolute(false); + m_volumeItem2->setScalingAbsolute(false); + m_volumeItem3->setScalingAbsolute(false); + m_volumeItem->setPositionAbsolute(false); + m_volumeItem2->setPositionAbsolute(false); + m_volumeItem3->setPositionAbsolute(false); + + + m_plainItem = new QCustom3DItem; + QImage texture(2, 2, QImage::Format_ARGB32); + texture.fill(QColor(200, 200, 200, 130)); + m_plainItem->setMeshFile(QStringLiteral(":/mesh")); + m_plainItem->setTextureImage(texture); + m_plainItem->setRotation(m_volumeItem->rotation()); + m_plainItem->setPosition(QVector3D(xMiddle + xRange / 2.0f, yMiddle + yRange / 2.0f, zMiddle)); + m_plainItem->setScaling(QVector3D(20.0f, 5.0f, 10.0f)); + m_plainItem->setScalingAbsolute(false); + + m_graph->addCustomItem(m_volumeItem); + m_graph->addCustomItem(m_volumeItem2); + m_graph->addCustomItem(m_volumeItem3); + m_graph->addCustomItem(m_plainItem); + //m_graph->setMeasureFps(true); + + // Create label to cut through the volume 3 + QCustom3DLabel *label = new QCustom3DLabel; + label->setText(QStringLiteral("FOO BAR - FOO BAR - FOO BAR")); + QFont font; + font.setPixelSize(100); + label->setFont(font); + label->setScaling(QVector3D(2.0f, 2.0f, 0.0f)); + label->setRotationAxisAndAngle(QVector3D(0.0f, 1.0f, 0.0f), 45.0f); + label->setPosition(m_volumeItem3->position()); + label->setPositionAbsolute(false); + label->setScalingAbsolute(true); + + m_graph->addCustomItem(label); + + QObject::connect(m_graph, &QAbstract3DGraph::currentFpsChanged, this, + &VolumetricModifier::handleFpsChange); +// QObject::connect(m_graph->scene(), &Q3DScene::viewportChanged, this, +// &VolumetricModifier::handleFpsChange); +} + +VolumetricModifier::~VolumetricModifier() +{ + delete m_graph; +} + +void VolumetricModifier::setFpsLabel(QLabel *fpsLabel) +{ + m_fpsLabel = fpsLabel; +} + +void VolumetricModifier::sliceX(int enabled) +{ + m_volumeItem->setSliceIndexX(enabled ? m_sliceIndexX : -1); + m_volumeItem2->setSliceIndexX(enabled ? m_sliceIndexX : -1); +} + +void VolumetricModifier::sliceY(int enabled) +{ + m_volumeItem->setSliceIndexY(enabled ? m_sliceIndexY : -1); + m_volumeItem2->setSliceIndexY(enabled ? m_sliceIndexY : -1); +} + +void VolumetricModifier::sliceZ(int enabled) +{ + m_volumeItem->setSliceIndexZ(enabled ? m_sliceIndexZ : -1); + m_volumeItem2->setSliceIndexZ(enabled ? m_sliceIndexZ : -1); +} + +void VolumetricModifier::adjustSliceX(int value) +{ + m_sliceIndexX = int(float(value) / (1024.0f / m_volumeItem->textureWidth())); + if (m_sliceIndexX == m_volumeItem->textureWidth()) + m_sliceIndexX--; + qDebug() << "m_sliceIndexX:" << m_sliceIndexX; + if (m_volumeItem->sliceIndexX() != -1) { + m_volumeItem->setSliceIndexX(m_sliceIndexX); + m_volumeItem2->setSliceIndexX(m_sliceIndexX); + } + m_sliceLabelX->setPixmap(QPixmap::fromImage( + m_volumeItem->renderSlice(Qt::XAxis, m_sliceIndexX))); + +} + +void VolumetricModifier::adjustSliceY(int value) +{ + m_sliceIndexY = int(float(value) / (1024.0f / m_volumeItem->textureHeight())); + if (m_sliceIndexY == m_volumeItem->textureHeight()) + m_sliceIndexY--; + qDebug() << "m_sliceIndexY:" << m_sliceIndexY; + if (m_volumeItem->sliceIndexY() != -1) { + m_volumeItem->setSliceIndexY(m_sliceIndexY); + m_volumeItem2->setSliceIndexY(m_sliceIndexY); + } + m_sliceLabelY->setPixmap(QPixmap::fromImage( + m_volumeItem->renderSlice(Qt::YAxis, m_sliceIndexY))); +} + +void VolumetricModifier::adjustSliceZ(int value) +{ + m_sliceIndexZ = int(float(value) / (1024.0f / m_volumeItem->textureDepth())); + if (m_sliceIndexZ == m_volumeItem->textureDepth()) + m_sliceIndexZ--; + qDebug() << "m_sliceIndexZ:" << m_sliceIndexZ; + if (m_volumeItem->sliceIndexZ() != -1) { + m_volumeItem->setSliceIndexZ(m_sliceIndexZ); + m_volumeItem2->setSliceIndexZ(m_sliceIndexZ); + } + m_sliceLabelZ->setPixmap(QPixmap::fromImage( + m_volumeItem->renderSlice(Qt::ZAxis, m_sliceIndexZ))); +} + +void VolumetricModifier::handleFpsChange() +{ + const QString fpsFormat = QStringLiteral("Fps: %1"); + int fps10 = int(m_graph->currentFps() * 10.0); + m_fpsLabel->setText(fpsFormat.arg(QString::number(qreal(fps10) / 10.0))); +// const QString sceneDimensionsFormat = QStringLiteral("%1 x %2"); +// m_fpsLabel->setText(sceneDimensionsFormat +// .arg(m_graph->scene()->viewport().width()) + // .arg(m_graph->scene()->viewport().height())); +} + +void VolumetricModifier::testSubtextureSetting() +{ + // Setting the rendered Slice as subtexture should result in identical volume + QVector<uchar> dataBefore = *m_volumeItem->textureData(); + dataBefore[0] = dataBefore.at(0); // Make sure we are detached + + checkRenderCase(1, Qt::XAxis, 56, dataBefore, m_volumeItem); + checkRenderCase(2, Qt::YAxis, 64, dataBefore, m_volumeItem); + checkRenderCase(3, Qt::ZAxis, 87, dataBefore, m_volumeItem); + + checkRenderCase(4, Qt::XAxis, 0, dataBefore, m_volumeItem); + checkRenderCase(5, Qt::YAxis, 0, dataBefore, m_volumeItem); + checkRenderCase(6, Qt::ZAxis, 0, dataBefore, m_volumeItem); + + checkRenderCase(7, Qt::XAxis, m_volumeItem->textureWidth() - 1, dataBefore, m_volumeItem); + checkRenderCase(8, Qt::YAxis, m_volumeItem->textureHeight() - 1, dataBefore, m_volumeItem); + checkRenderCase(9, Qt::ZAxis, m_volumeItem->textureDepth() - 1, dataBefore, m_volumeItem); + + dataBefore = *m_volumeItem2->textureData(); + dataBefore[0] = dataBefore.at(0); // Make sure we are detached + + checkRenderCase(11, Qt::XAxis, 56, dataBefore, m_volumeItem2); + checkRenderCase(12, Qt::YAxis, 64, dataBefore, m_volumeItem2); + checkRenderCase(13, Qt::ZAxis, 87, dataBefore, m_volumeItem2); + + checkRenderCase(14, Qt::XAxis, 0, dataBefore, m_volumeItem2); + checkRenderCase(15, Qt::YAxis, 0, dataBefore, m_volumeItem2); + checkRenderCase(16, Qt::ZAxis, 0, dataBefore, m_volumeItem2); + + checkRenderCase(17, Qt::XAxis, m_volumeItem2->textureWidth() - 1, dataBefore, m_volumeItem2); + checkRenderCase(18, Qt::YAxis, m_volumeItem2->textureHeight() - 1, dataBefore, m_volumeItem2); + checkRenderCase(19, Qt::ZAxis, m_volumeItem2->textureDepth() - 1, dataBefore, m_volumeItem2); + + // Do some visible swaps on volume 3 + QImage slice = m_volumeItem3->renderSlice(Qt::XAxis, 144); + slice = slice.mirrored(); + m_volumeItem3->setSubTextureData(Qt::XAxis, 144, slice); + + slice = m_volumeItem3->renderSlice(Qt::YAxis, 80); + slice = slice.mirrored(); + m_volumeItem3->setSubTextureData(Qt::YAxis, 80, slice); + + slice = m_volumeItem3->renderSlice(Qt::ZAxis, 190); + slice = slice.mirrored(true, false); + m_volumeItem3->setSubTextureData(Qt::ZAxis, 190, slice); +} + +void VolumetricModifier::adjustRangeX(int value) +{ + float adjustment = float(value - 512) / 10.0f; + if (m_scatterGraph) + m_scatterGraph->axisX()->setRange(xMiddle + adjustment - xRange, xMiddle + adjustment + xRange); + if (m_surfaceGraph) + m_surfaceGraph->axisX()->setRange(xMiddle + adjustment - xRange, xMiddle + adjustment + xRange); + if (m_barGraph) + m_barGraph->columnAxis()->setRange(xMiddle + adjustment - xRange, xMiddle + adjustment + xRange); +} + +void VolumetricModifier::adjustRangeY(int value) +{ + float adjustment = float(value - 512) / 10.0f; + if (m_scatterGraph) + m_scatterGraph->axisY()->setRange(yMiddle + adjustment - yRange, yMiddle + adjustment + yRange); + if (m_surfaceGraph) + m_surfaceGraph->axisY()->setRange(yMiddle + adjustment - yRange, yMiddle + adjustment + yRange); + if (m_barGraph) + m_barGraph->valueAxis()->setRange(yMiddle + adjustment - yRange, yMiddle + adjustment + yRange); +} + +void VolumetricModifier::adjustRangeZ(int value) +{ + float adjustment = float(value - 512) / 10.0f; + if (m_scatterGraph) + m_scatterGraph->axisZ()->setRange(zMiddle + adjustment - zRange, zMiddle + adjustment + zRange); + if (m_surfaceGraph) + m_surfaceGraph->axisZ()->setRange(zMiddle + adjustment - zRange, zMiddle + adjustment + zRange); + if (m_barGraph) + m_barGraph->rowAxis()->setRange(zMiddle + adjustment - zRange, zMiddle + adjustment + zRange); +} + +void VolumetricModifier::testBoundsSetting() +{ + static QVector3D scaling1 = m_volumeItem->scaling(); + static QVector3D scaling2 = m_volumeItem2->scaling(); + static QVector3D scaling3 = m_volumeItem3->scaling(); + static QVector3D scaleVector = QVector3D(0.5f, 0.3f, 0.2f); + + if (m_volumeItem->isScalingAbsolute()) { + m_volumeItem->setScalingAbsolute(false); + m_volumeItem2->setScalingAbsolute(false); + m_volumeItem3->setScalingAbsolute(false); + + m_volumeItem->setScaling(scaling1); + m_volumeItem2->setScaling(scaling2); + m_volumeItem3->setScaling(scaling3); + } else { + m_volumeItem->setScalingAbsolute(true); + m_volumeItem2->setScalingAbsolute(true); + m_volumeItem3->setScalingAbsolute(true); + + m_volumeItem->setScaling(scaleVector); + m_volumeItem2->setScaling(scaleVector); + m_volumeItem3->setScaling(scaleVector); + } +} + +void VolumetricModifier::checkRenderCase(int id, Qt::Axis axis, int index, + const QVector<uchar> &dataBefore, + QCustom3DVolume *volumeItem) +{ + QImage slice = volumeItem->renderSlice(axis, index); + volumeItem->setSubTextureData(axis, index, slice); + + if (dataBefore == *volumeItem->textureData()) + qDebug() << __FUNCTION__ << "Case:" << id << "Vectors identical"; + else + qDebug() << __FUNCTION__ << "Case:" << id << "BUG: VECTORS DIFFER!"; +} + +void VolumetricModifier::createVolume() +{ + m_volumeItem = new QCustom3DVolume; + m_volumeItem->setTextureFormat(QImage::Format_ARGB32); + m_volumeItem->setRotation(QQuaternion::fromAxisAndAngle(1.0f, 1.0f, 0.0f, 20.0f)); + m_volumeItem->setPosition(QVector3D(xMiddle - (xRange / 2.0f), yMiddle + (yRange / 2.0f), zMiddle)); + //m_volumeItem->setPosition(QVector3D(xMiddle, yMiddle, zMiddle)); + m_volumeItem->setDrawSliceFrames(true); + m_volumeItem->setDrawSlices(true); + + QImage logo; + logo.load(QStringLiteral(":/logo_no_padding.png")); + //logo.load(QStringLiteral(":/logo.png")); + qDebug() << "image dimensions:" << logo.width() << logo.height() + << logo.byteCount() << (logo.width() * logo.height()) + << logo.bytesPerLine(); + + QVector<QImage *> imageArray(imageCount); + for (int i = 0; i < imageCount; i++) { + QImage *newImage = new QImage(logo); + imageArray[i] = newImage; + } + + m_volumeItem->createTextureData(imageArray); + + for (int i = 0; i < imageCount; i++) + delete imageArray[i]; + + m_sliceIndexX = m_volumeItem->textureWidth() / 2; + m_sliceIndexY = m_volumeItem->textureWidth() / 2; + m_sliceIndexZ = m_volumeItem->textureWidth() / 2; + + QVector<QRgb> colorTable = m_volumeItem->colorTable(); + + // Hack some alpha to the picture + for (int i = 0; i < colorTable.size(); i++) { + if (qAlpha(colorTable.at(i)) > 0) { + colorTable[i] = qRgba(qRed(colorTable.at(i)), + qGreen(colorTable.at(i)), + qBlue(colorTable.at(i)), + 50); + } + } + + colorTable.append(qRgba(0, 0, 0, 0)); + colorTable.append(qRgba(255, 0, 0, 255)); + colorTable.append(qRgba(0, 255, 0, 255)); + colorTable.append(qRgba(0, 0, 255, 255)); + + m_volumeItem->setColorTable(colorTable); + int alphaIndex = colorTable.size() - 4; + int redIndex = colorTable.size() - 3; + int greenIndex = colorTable.size() - 2; + int blueIndex = colorTable.size() - 1; + int width = m_volumeItem->textureDataWidth(); + int height = m_volumeItem->textureHeight(); + int depth = m_volumeItem->textureDepth(); + int frameSize = width * height; + qDebug() << width << height << depth << m_volumeItem->textureData()->size(); + m_volumeItem->setScaling(QVector3D(xRange, yRange, zRange) / 2.0f); + + uchar *data = m_volumeItem->textureData()->data(); + uchar *p = data; + + // Change one picture using subtexture replacement + QImage flipped = logo.mirrored(); + m_volumeItem->setSubTextureData(Qt::ZAxis, 100, flipped); + + // Clean up the two extra pixels + p = data + width - 1; + for (int k = 0; k < depth; k++) { + for (int j = 0; j < height; j++) { + *p = alphaIndex; + p += width; + } + } + p = data + width - 2; + for (int k = 0; k < depth; k++) { + for (int j = 0; j < height; j++) { + *p = alphaIndex; + p += width; + } + } + // Red first subtexture + p = data; + for (int j = 0; j < height; j++) { + for (int i = 0; i < width; i++) { + *p = redIndex; + p++; + } + } + + // Red last subtexture +// p = data + frameSize * (imageCount - 1); +// for (int j = 0; j < height; j++) { +// for (int i = 0; i < width; i++) { +// *p = redIndex; +// p++; +// } +// } + +// // Blue second to last subtexture +// p = data + frameSize * (imageCount - 2); +// for (int j = 0; j < height; j++) { +// for (int i = 0; i < width; i++) { +// *p = blueIndex; +// p++; +// } +// } + + // Blue x = 0 +// p = data; +// for (int k = 0; k < depth; k++) { +// for (int j = 0; j < height; j++) { +// *p = blueIndex; +// p += width; +// } +// } + + // Blue x = max + p = data + width - 1; + for (int k = 0; k < depth; k++) { + for (int j = 0; j < height; j++) { + *p = blueIndex; + p += width; + } + } + // green x = max - 1 + p = data + width - 2; + for (int k = 0; k < depth; k++) { + for (int j = 0; j < height; j++) { + *p = greenIndex; + p += width; + } + } + + // Green y = 0 + p = data; + for (int k = 0; k < depth; k++) { + for (int i = 0; i < width; i++) { + *p = greenIndex; + p++; + } + p += (frameSize - width); + } + + // Green y = max +// p = data + frameSize - width; +// for (int k = 0; k < depth; k++) { +// for (int i = 0; i < width; i++) { +// *p = greenIndex; +// p++; +// } +// p += (frameSize - width); +// } +} + +void VolumetricModifier::createAnotherVolume() +{ + m_volumeItem2 = new QCustom3DVolume; + m_volumeItem2->setTextureFormat(QImage::Format_ARGB32); + m_volumeItem2->setPosition(QVector3D(xMiddle + (xRange / 2.0f), yMiddle - (yRange / 2.0f), zMiddle)); + + QImage logo; + logo.load(QStringLiteral(":/logo_no_padding.png")); + //logo.load(QStringLiteral(":/logo.png")); + logo = logo.convertToFormat(QImage::Format_ARGB8555_Premultiplied); + qDebug() << "second image dimensions:" << logo.width() << logo.height() + << logo.byteCount() << (logo.width() * logo.height()) + << logo.bytesPerLine(); + + logo.save("d:/qt/goobar.png"); + + QVector<QImage *> imageArray(imageCount); + for (int i = 0; i < imageCount; i++) { + QImage *newImage = new QImage(logo); + imageArray[i] = newImage; + } + + m_volumeItem2->createTextureData(imageArray); + + for (int i = 0; i < imageCount; i++) + delete imageArray[i]; + + m_sliceIndexX = m_volumeItem2->textureWidth() / 2; + m_sliceIndexY = m_volumeItem2->textureWidth() / 2; + m_sliceIndexZ = m_volumeItem2->textureWidth() / 2; + + int width = m_volumeItem2->textureWidth(); + int height = m_volumeItem2->textureHeight(); + int depth = m_volumeItem2->textureDepth(); + qDebug() << width << height << depth << m_volumeItem2->textureData()->size(); + m_volumeItem2->setScaling(QVector3D(float(width) / float(depth) * xRange * 2.0f, + float(height) / float(depth) * yRange * 2.0f, + zRange * 2.0f)); + + // Change one picture using subtexture replacement + QImage flipped = logo.mirrored(); + m_volumeItem2->setSubTextureData(Qt::ZAxis, 100, flipped); + //m_volumeItem2->setAlphaMultiplier(0.2f); + m_volumeItem2->setPreserveOpacity(false); +} + +void VolumetricModifier::createYetAnotherVolume() +{ + m_volumeItem3 = new QCustom3DVolume; + m_volumeItem3->setTextureFormat(QImage::Format_Indexed8); +// m_volumeItem2->setRotation(QQuaternion::fromAxisAndAngle(1.0f, 1.0f, 0.0f, 10.0f)); + m_volumeItem3->setPosition(QVector3D(xMiddle - (xRange / 2.0f), yMiddle - (yRange / 2.0f), zMiddle)); + +// m_volumeItem3->setTextureDimensions(m_volumeItem->textureDataWidth(), +// m_volumeItem->textureHeight(), +// m_volumeItem->textureDepth()); + m_volumeItem3->setTextureDimensions(200, 200, 200); + + QVector<uchar> *tdata = new QVector<uchar>(m_volumeItem3->textureDataWidth() + * m_volumeItem3->textureHeight() + * m_volumeItem3->textureDepth()); + tdata->fill(0); + m_volumeItem3->setTextureData(tdata); + + m_sliceIndexX = m_volumeItem3->textureWidth() / 2; + m_sliceIndexY = m_volumeItem3->textureWidth() / 2; + m_sliceIndexZ = m_volumeItem3->textureWidth() / 2; + + QVector<QRgb> colorTable = m_volumeItem->colorTable(); + colorTable[0] = qRgba(0, 0, 0, 0); + m_volumeItem3->setColorTable(colorTable); + int redIndex = colorTable.size() - 3; + int greenIndex = colorTable.size() - 2; + int blueIndex = colorTable.size() - 1; + int width = m_volumeItem3->textureDataWidth(); + int height = m_volumeItem3->textureHeight(); + int depth = m_volumeItem3->textureDepth(); + int frameSize = width * height; + qDebug() << width << height << depth << m_volumeItem3->textureData()->size(); + m_volumeItem3->setScaling(m_volumeItem->scaling()); + + uchar *data = tdata->data(); + uchar *p = data; + + // Red first subtexture +// for (int j = 0; j < height; j++) { +// for (int i = 0; i < width; i++) { +// *p = redIndex; +// p++; +// } +// } + + // Red last subtexture + p = data + frameSize * (depth - 1); + for (int j = 0; j < height; j++) { + for (int i = 0; i < width; i++) { + *p = redIndex; + p++; + } + } + + // green edge + p = data + frameSize * (depth - 1); + for (int i = 0; i < width; i++) { + *p = greenIndex; + p++; + } + for (int j = 2; j < height; j++) { + *p = greenIndex; + p += width - 1; + *p = j % 7 ? greenIndex : blueIndex; + p++; + } + for (int i = 0; i < width; i++) { + *p = greenIndex; + p++; + } + +// // Blue second to last subtexture +// p = data + frameSize * (depth - 2); +// for (int j = 0; j < height; j++) { +// for (int i = 0; i < width; i++) { +// *p = blueIndex; +// p++; +// } +// } + +// // green third to last subtexture +// p = data + frameSize * (depth - 3); +// for (int j = 0; j < height; j++) { +// for (int i = 0; i < width; i++) { +// *p = greenIndex; +// p++; +// } +// } + + // Blue x = 0 + p = data; + for (int k = 0; k < depth; k++) { + for (int j = 0; j < height; j++) { + *p = blueIndex; + p += width; + } + } + +// // Blue x = max +// p = data + width - 1; +// for (int k = 0; k < depth; k++) { +// for (int j = 0; j < height; j++) { +// *p = blueIndex; +// p += width; +// } +// } + + // Green y = 0 +// p = data; +// for (int k = 0; k < depth; k++) { +// for (int i = 0; i < width; i++) { +// *p = greenIndex; +// p++; +// } +// p += (frameSize - width); +// } + +// // Green y = max + p = data + frameSize - width; + for (int k = 0; k < depth; k++) { + for (int i = 0; i < width; i++) { + *p = greenIndex; + p++; + } + p += (frameSize - width); + } + + +// // Fill with alternating pixels +// p = data; +// for (int k = 0; k < (depth * width * height / 4); k++) { +// *p = greenIndex; +// p++; +// *p = greenIndex; +// p++; +// *p = blueIndex; +// p++; +// *p = redIndex; +// p++; +// } + + +} + +void VolumetricModifier::setSliceLabels(QLabel *xLabel, QLabel *yLabel, QLabel *zLabel) +{ + m_sliceLabelX = xLabel; + m_sliceLabelY = yLabel; + m_sliceLabelZ = zLabel; + + adjustSliceX(512); + adjustSliceY(512); + adjustSliceZ(512); +} diff --git a/tests/volumetrictest/volumetrictest.h b/tests/volumetrictest/volumetrictest.h new file mode 100644 index 00000000..9029f7b9 --- /dev/null +++ b/tests/volumetrictest/volumetrictest.h @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtDataVisualization module. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** +****************************************************************************/ + +#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 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 diff --git a/tests/volumetrictest/volumetrictest.pro b/tests/volumetrictest/volumetrictest.pro new file mode 100644 index 00000000..df3ef0dd --- /dev/null +++ b/tests/volumetrictest/volumetrictest.pro @@ -0,0 +1,14 @@ +!include( ../tests.pri ) { + error( "Couldn't find the tests.pri file!" ) +} + +SOURCES += main.cpp volumetrictest.cpp +HEADERS += volumetrictest.h + +QT += widgets + +OTHER_FILES += doc/src/* \ + doc/images/* + +RESOURCES += \ + volumetrictest.qrc diff --git a/tests/volumetrictest/volumetrictest.qrc b/tests/volumetrictest/volumetrictest.qrc new file mode 100644 index 00000000..7cd8533b --- /dev/null +++ b/tests/volumetrictest/volumetrictest.qrc @@ -0,0 +1,7 @@ +<RCC> + <qresource prefix="/"> + <file>logo.png</file> + <file alias="mesh">cubeFilledFlat.obj</file> + <file>logo_no_padding.png</file> + </qresource> +</RCC> |
