summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-08-26 11:26:06 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-08-26 11:57:58 +0300
commitfcac33d0ee25115808ca43810cf6a3438e2da227 (patch)
tree476ccc9bef5aa83204144a43f86c13cadb81b62d /tests
parent5a51d06ec8f0210f51e65abfde9f868ab7bfa8ef (diff)
Reflection API added
Task-number: QTRD-3287 Change-Id: I6c06b8fe025e0f1f87be00be906cab0e1f18a19f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/barstest/chart.cpp11
-rw-r--r--tests/barstest/chart.h2
-rw-r--r--tests/barstest/main.cpp19
-rw-r--r--tests/qmlcamera/qml/qmlcamera/main.qml18
4 files changed, 47 insertions, 3 deletions
diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index 445c235e..f451e480 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -1712,3 +1712,14 @@ 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);
+}
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index 6740df73..91be6e04 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -97,6 +97,8 @@ public:
void setInputHandlerRotationEnabled(int enabled);
void setInputHandlerZoomEnabled(int enabled);
void setInputHandlerSelectionEnabled(int enabled);
+ void setReflection(bool enabled);
+ void setReflectivity(int value);
public slots:
void flipViews();
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp
index bd891cd3..0dc29eb1 100644
--- a/tests/barstest/main.cpp
+++ b/tests/barstest/main.cpp
@@ -253,6 +253,15 @@ 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 *spacingSliderX = new QSlider(Qt::Horizontal, widget);
spacingSliderX->setTickInterval(1);
spacingSliderX->setMinimum(0);
@@ -420,8 +429,9 @@ int main(int argc, char **argv)
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, 1, Qt::AlignTop);
- // TODO: Add example for setMeshFileName
+ vLayout3->addWidget(cameraTargetSliderZ, 0, Qt::AlignTop);
+ vLayout3->addWidget(reflectionCheckBox, 0, Qt::AlignTop);
+ vLayout3->addWidget(reflectivitySlider, 1, Qt::AlignTop);
widget->show();
@@ -550,6 +560,11 @@ 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(staticCheckBox, &QCheckBox::stateChanged, addDataButton,
&QPushButton::setEnabled);
QObject::connect(staticCheckBox, &QCheckBox::stateChanged, addMultiDataButton,
diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml
index cb1737f6..cb22af59 100644
--- a/tests/qmlcamera/qml/qmlcamera/main.qml
+++ b/tests/qmlcamera/qml/qmlcamera/main.qml
@@ -41,7 +41,7 @@ Rectangle {
xRotation: camControlArea.xValue
yRotation: camControlArea.yValue
zoomLevel: zoomSlider.value
- target: Qt.vector3d(1.0, 1.0, 1.0)
+ target: Qt.vector3d(0.5, 0.5, 0.5)
}
Item {
@@ -214,4 +214,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
+ }
+ }
+ }
}