From aa0e09b6abc052d8515b3fe3cf6d4b601917b8dd 2012-01-19 08:09:07
From: Tero Ahola <tero.ahola@digia.com>
Date: 2012-01-19 08:09:07
Subject: [PATCH] The test app now preserves series type selection

---

diff --git a/test/chartwidgettest/dataseriedialog.cpp b/test/chartwidgettest/dataseriedialog.cpp
index 9f3d2b6..b0a0047 100644
--- a/test/chartwidgettest/dataseriedialog.cpp
+++ b/test/chartwidgettest/dataseriedialog.cpp
@@ -6,7 +6,7 @@
 #include <QLabel>
 #include <QDebug>
 
-DataSerieDialog::DataSerieDialog(QWidget *parent) :
+DataSerieDialog::DataSerieDialog(QString defaultType, QWidget *parent) :
     QDialog(parent)
 {
     // Combo box for selecting the series type
@@ -18,6 +18,13 @@ DataSerieDialog::DataSerieDialog(QWidget *parent) :
     m_seriesTypeCombo->addItem("Scatter");
     m_seriesTypeCombo->addItem("Spline");
 
+    // Allow pre-selection of a series type
+    if (defaultType != "") {
+        int index = m_seriesTypeCombo->findText(defaultType);
+        if (index > 0)
+            m_seriesTypeCombo->setCurrentIndex(index);
+    }
+
     // Combo box for selecting data for the new series
     m_testDataCombo = new QComboBox(this);
     m_testDataCombo->addItem("linear");
diff --git a/test/chartwidgettest/dataseriedialog.h b/test/chartwidgettest/dataseriedialog.h
index fb13d03..37ec17b 100644
--- a/test/chartwidgettest/dataseriedialog.h
+++ b/test/chartwidgettest/dataseriedialog.h
@@ -9,7 +9,7 @@ class DataSerieDialog : public QDialog
 {
     Q_OBJECT
 public:
-    explicit DataSerieDialog(QWidget *parent = 0);
+    explicit DataSerieDialog(QString defaultType, QWidget *parent = 0);
 
 signals:
     void accepted(QString series, QString data);
diff --git a/test/chartwidgettest/mainwidget.cpp b/test/chartwidgettest/mainwidget.cpp
index b01be9c..7dfcac8 100644
--- a/test/chartwidgettest/mainwidget.cpp
+++ b/test/chartwidgettest/mainwidget.cpp
@@ -91,7 +91,7 @@ MainWidget::MainWidget(QWidget *parent) :
 
 void MainWidget::addSeries()
 {
-    DataSerieDialog dialog(this);
+    DataSerieDialog dialog(m_defaultSeries, this);
     connect(&dialog, SIGNAL(accepted(QString, QString)), this, SLOT(addSeries(QString, QString)));
     dialog.exec();
 }
@@ -99,6 +99,7 @@ void MainWidget::addSeries()
 void MainWidget::addSeries(QString series, QString data)
 {
     qDebug() << "addSeries: " << series << " data: " << data;
+    m_defaultSeries = series;
 
     QXYChartSeries* series0 = new QXYChartSeries();
 
diff --git a/test/chartwidgettest/mainwidget.h b/test/chartwidgettest/mainwidget.h
index 55ec46e..e8bf4f7 100644
--- a/test/chartwidgettest/mainwidget.h
+++ b/test/chartwidgettest/mainwidget.h
@@ -37,6 +37,7 @@ private:
     QSpinBox *m_xMaxSpin;
     QSpinBox *m_yMinSpin;
     QSpinBox *m_yMaxSpin;
+    QString m_defaultSeries;
 };
 
 #endif // MAINWIDGET_H