Add configurable main and slice view ordering.

Change-Id: I9f5d7399d60971c782fa8ac6fc39a05fa3bbcaa8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

6 files changed, 27 insertions, 0 deletions

diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index c8cd3657..f150345e 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -211,6 +211,11 @@ void GraphModifier::releaseProxies()
     m_chart->releaseDataProxy(m_genericData);
 }
 
+void GraphModifier::flipViews()
+{
+    m_chart->scene()->setSecondarySubviewOnTop(!m_chart->scene()->isSecondarySubviewOnTop());
+}
+
 void GraphModifier::createMassiveArray()
 {
     const int arrayDimension = 1000;
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index 79cb3cb3..221ccff8 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -75,6 +75,7 @@ public:
     void createMassiveArray();
 
 public slots:
+    void flipViews();
     void changeShadowQuality(int quality);
     void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
     void handleSelectionChange(const QPoint &position);
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp
index a36ebc7a..7d6d1380 100644
--- a/tests/barstest/main.cpp
+++ b/tests/barstest/main.cpp
@@ -124,6 +124,10 @@ int main(int argc, char **argv)
     releaseProxiesButton->setText(QStringLiteral("Release all proxies"));
     releaseProxiesButton->setEnabled(true);
 
+    QPushButton *flipViewsButton = new QPushButton(widget);
+    flipViewsButton->setText(QStringLiteral("Flip views"));
+    flipViewsButton->setEnabled(true);
+
     QCheckBox *backgroundCheckBox = new QCheckBox(widget);
     backgroundCheckBox->setText(QStringLiteral("Show background"));
     backgroundCheckBox->setChecked(true);
@@ -248,6 +252,7 @@ int main(int argc, char **argv)
     vLayout->addWidget(swapAxisButton, 0, Qt::AlignTop);
     vLayout->addWidget(releaseAxesButton, 0, Qt::AlignTop);
     vLayout->addWidget(releaseProxiesButton, 1, Qt::AlignTop);
+    vLayout->addWidget(flipViewsButton, 1, Qt::AlignTop);
 
     vLayout2->addWidget(staticCheckBox, 0, Qt::AlignTop);
     vLayout2->addWidget(rotationCheckBox, 0, Qt::AlignTop);
@@ -342,6 +347,9 @@ int main(int argc, char **argv)
     QObject::connect(releaseProxiesButton, &QPushButton::clicked, modifier,
                      &GraphModifier::releaseProxies);
 
+    QObject::connect(flipViewsButton, &QPushButton::clicked, modifier,
+                     &GraphModifier::flipViews);
+
     QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier,
                      &GraphModifier::changeFont);
 
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index ebc712a8..f5c39f98 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -333,6 +333,12 @@ void GraphModifier::changeTheme(int theme)
     m_graph->setTheme((QDataVis::Theme)theme);
 }
 
+
+void GraphModifier::flipViews()
+{
+    m_graph->scene()->setSecondarySubviewOnTop(!m_graph->scene()->isSecondarySubviewOnTop());
+}
+
 void GraphModifier::timeout()
 {
     int rows = m_planeArray->size();
diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h
index 48b3e8ec..853c698a 100644
--- a/tests/surfacetest/graphmodifier.h
+++ b/tests/surfacetest/graphmodifier.h
@@ -70,6 +70,7 @@ public:
 public slots:
     void changeShadowQuality(int quality);
     void changeTheme(int theme);
+    void flipViews();
     void changeSelectionMode(int mode);
     void timeout();
 
diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp
index 78e7badb..8ed84a4f 100644
--- a/tests/surfacetest/main.cpp
+++ b/tests/surfacetest/main.cpp
@@ -200,6 +200,9 @@ int main(int argc, char *argv[])
     QPushButton *selectButton = new QPushButton(widget);
     selectButton->setText(QStringLiteral("Select random point"));
 
+    QPushButton *flipViewsButton = new QPushButton(widget);
+    flipViewsButton->setText(QStringLiteral("Flip Views"));
+
     QLabel *selectionInfoLabel = new QLabel(widget);
 
     // Add controls to the layout
@@ -232,6 +235,7 @@ int main(int argc, char *argv[])
     vLayout->addWidget(selectionMode);
     vLayout->addWidget(selectButton);
     vLayout->addWidget(selectionInfoLabel);
+    vLayout->addWidget(flipViewsButton);
 
     widget->show();
 
@@ -278,6 +282,8 @@ int main(int argc, char *argv[])
                      modifier, SLOT(changeSelectionMode(int)));
     QObject::connect(selectButton, &QPushButton::clicked,
                      modifier, &GraphModifier::selectButtonClicked);
+    QObject::connect(flipViewsButton, &QPushButton::clicked,
+                     modifier, &GraphModifier::flipViews);
 
     modifier->setGridSliderZ(gridSliderZ);
     modifier->setGridSliderX(gridSliderX);