Theme color update

+ mingw warning fix

Change-Id: I1dd89d27fccbdcde2b209a4e8f947f775066b531
Change-Id: I1dd89d27fccbdcde2b209a4e8f947f775066b531
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

3 files changed, 68 insertions, 1 deletions

diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index f4ccf83e..00a64773 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -55,6 +55,11 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog)
       m_temperatureData(new QBar3DSeries),
       m_temperatureData2(new QBar3DSeries),
       m_genericData(new QBar3DSeries),
+      m_dummyData(new QBar3DSeries),
+      m_dummyData2(new QBar3DSeries),
+      m_dummyData3(new QBar3DSeries),
+      m_dummyData4(new QBar3DSeries),
+      m_dummyData5(new QBar3DSeries),
       m_currentAxis(m_fixedRangeAxis),
       m_negativeValuesOn(false),
       m_useNullInputHandler(false),
@@ -270,6 +275,11 @@ void GraphModifier::releaseProxies()
         m_graph->removeSeries(m_temperatureData);
         m_graph->removeSeries(m_temperatureData2);
         m_graph->removeSeries(m_genericData);
+        m_graph->removeSeries(m_dummyData);
+        m_graph->removeSeries(m_dummyData2);
+        m_graph->removeSeries(m_dummyData3);
+        m_graph->removeSeries(m_dummyData4);
+        m_graph->removeSeries(m_dummyData5);
     } else {
         m_graph->addSeries(m_temperatureData);
         m_graph->addSeries(m_temperatureData2);
@@ -325,7 +335,6 @@ void GraphModifier::createMassiveArray()
 
 void GraphModifier::resetTemperatureData()
 {
-
     // Set up data
     static const float temp[7][12] = {
         {-6.7f, -11.7f, -9.7f, 3.3f, 9.2f, 14.0f, 16.3f, 17.8f, 10.2f, 2.1f, -2.6f, -0.3f},    // 2006
@@ -645,6 +654,52 @@ void GraphModifier::changeShadowQuality(int quality)
     emit shadowQualityChanged(quality);
 }
 
+void GraphModifier::showFiveSeries()
+{
+    releaseProxies();
+    releaseAxes();
+
+    m_dummyData->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList());
+    m_dummyData2->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList());
+    m_dummyData3->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList());
+    m_dummyData4->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList());
+    m_dummyData5->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList());
+
+    m_graph->addSeries(m_dummyData);
+    m_graph->addSeries(m_dummyData2);
+    m_graph->addSeries(m_dummyData3);
+    m_graph->addSeries(m_dummyData4);
+    m_graph->addSeries(m_dummyData5);
+}
+
+QBarDataArray *GraphModifier::makeDummyData()
+{
+    // Set up data
+    static const float temp[4][4] = {
+        {10.0f, 5.0f, 10.0f, 5.0f},
+        {5.0f, 10.0f, 5.0f, 10.0f},
+        {10.0f, 5.0f, 10.0f, 5.0f},
+        {5.0f, 10.0f, 5.0f, 10.0f}
+    };
+
+    // Create data rows
+    QBarDataArray *dataSet = new QBarDataArray;
+    QBarDataRow *dataRow;
+
+    dataSet->reserve(4);
+    for (int i = 0; i < 4; i++) {
+        dataRow = new QBarDataRow(4);
+        // Create data items
+        for (int j = 0; j < 4; j++) {
+            // Add data to rows
+            (*dataRow)[j].setValue(temp[i][j]);
+        }
+        // Add row to set
+        dataSet->append(dataRow);
+    }
+    return dataSet;
+}
+
 void GraphModifier::setBackgroundEnabled(int enabled)
 {
     m_graph->theme()->setBackgroundEnabled(bool(enabled));
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index 5d29cc86..96038b9f 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -78,6 +78,8 @@ public:
     void useOwnTheme();
     void changeBaseColor(const QColor &color);
     void changeColorStyle();
+    void showFiveSeries();
+    QBarDataArray *makeDummyData();
 
 public slots:
     void flipViews();
@@ -118,6 +120,11 @@ private:
     QBar3DSeries *m_temperatureData;
     QBar3DSeries *m_temperatureData2;
     QBar3DSeries *m_genericData;
+    QBar3DSeries *m_dummyData;
+    QBar3DSeries *m_dummyData2;
+    QBar3DSeries *m_dummyData3;
+    QBar3DSeries *m_dummyData4;
+    QBar3DSeries *m_dummyData5;
     Q3DValueAxis *m_currentAxis;
     bool m_negativeValuesOn;
     bool m_useNullInputHandler;
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp
index d5e62b86..e18aaed1 100644
--- a/tests/barstest/main.cpp
+++ b/tests/barstest/main.cpp
@@ -131,6 +131,9 @@ int main(int argc, char **argv)
     flipViewsButton->setText(QStringLiteral("Flip views"));
     flipViewsButton->setEnabled(true);
 
+    QPushButton *showFiveSeriesButton = new QPushButton(widget);
+    showFiveSeriesButton->setText(QStringLiteral("Try 5 series"));
+    showFiveSeriesButton->setEnabled(true);
 
     QPushButton *changeColorStyleButton = new QPushButton(widget);
     changeColorStyleButton->setText(QStringLiteral("Change color style"));
@@ -271,6 +274,7 @@ int main(int argc, char **argv)
     vLayout->addWidget(removeRowButton, 0, Qt::AlignTop);
     vLayout->addWidget(removeRowsButton, 0, Qt::AlignTop);
     vLayout->addWidget(massiveArrayButton, 0, Qt::AlignTop);
+    vLayout->addWidget(showFiveSeriesButton, 0, Qt::AlignTop);
     vLayout->addWidget(themeButton, 0, Qt::AlignTop);
     vLayout->addWidget(labelButton, 0, Qt::AlignTop);
     vLayout->addWidget(styleButton, 0, Qt::AlignTop);
@@ -362,6 +366,7 @@ int main(int argc, char **argv)
     QObject::connect(removeRowButton, &QPushButton::clicked, modifier, &GraphModifier::removeRow);
     QObject::connect(removeRowsButton, &QPushButton::clicked, modifier, &GraphModifier::removeRows);
     QObject::connect(massiveArrayButton, &QPushButton::clicked, modifier, &GraphModifier::createMassiveArray);
+    QObject::connect(showFiveSeriesButton, &QPushButton::clicked, modifier, &GraphModifier::showFiveSeries);
     QObject::connect(selectionButton, &QPushButton::clicked, modifier,
                      &GraphModifier::changeSelectionMode);
     QObject::connect(setSelectedBarButton, &QPushButton::clicked, modifier,