Range changing added to bars example

Task-number: QTRD-2804

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

4 files changed, 36 insertions, 7 deletions

diff --git a/examples/bars/doc/src/bars.qdoc b/examples/bars/doc/src/bars.qdoc
index 9c80b804..3cfc72b1 100644
--- a/examples/bars/doc/src/bars.qdoc
+++ b/examples/bars/doc/src/bars.qdoc
@@ -158,6 +158,7 @@
         \li Grid visibility
         \li Bar shading smoothness
         \li Visibility of the second bar series
+        \li Data range to be shown
         \li Bar style
         \li Selection mode
         \li Theme
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp
index 06b36b7f..55f52580 100644
--- a/examples/bars/graphmodifier.cpp
+++ b/examples/bars/graphmodifier.cpp
@@ -60,14 +60,14 @@ GraphModifier::GraphModifier(Q3DBars *bargraph)
     //! [2]
 
     m_months << "January" << "February" << "March" << "April" << "May" << "June" << "July" << "August" << "September" << "October" << "November" << "December";
-    m_years << "2006" << "2007" << "2008" << "2009" << "2010" << "2011" << "2012";
+    m_years << "2006" << "2007" << "2008" << "2009" << "2010" << "2011" << "2012" << "2013";
 
     //! [3]
     m_temperatureAxis->setTitle("Average temperature");
     m_temperatureAxis->setSegmentCount(m_segments);
     m_temperatureAxis->setSubSegmentCount(m_subSegments);
     m_temperatureAxis->setRange(m_minval, m_maxval);
-    m_temperatureAxis->setLabelFormat(QString(QStringLiteral("%d ") + celsiusString));
+    m_temperatureAxis->setLabelFormat(QString(QStringLiteral("%.1f ") + celsiusString));
 
     m_yearAxis->setTitle("Year");
     m_monthAxis->setTitle("Month");
@@ -112,24 +112,26 @@ void GraphModifier::resetTemperatureData()
 {
     //! [5]
     // Set up data
-    static const float tempOulu[7][12] = {
+    static const float tempOulu[8][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
         {-6.8f, -13.3f, 0.2f, 1.5f, 7.9f, 13.4f, 16.1f, 15.5f, 8.2f, 5.4f, -2.6f, -0.8f},      // 2007
         {-4.2f, -4.0f, -4.6f, 1.9f, 7.3f, 12.5f, 15.0f, 12.8f, 7.6f, 5.1f, -0.9f, -1.3f},      // 2008
         {-7.8f, -8.8f, -4.2f, 0.7f, 9.3f, 13.2f, 15.8f, 15.5f, 11.2f, 0.6f, 0.7f, -8.4f},      // 2009
         {-14.4f, -12.1f, -7.0f, 2.3f, 11.0f, 12.6f, 18.8f, 13.8f, 9.4f, 3.9f, -5.6f, -13.0f},  // 2010
         {-9.0f, -15.2f, -3.8f, 2.6f, 8.3f, 15.9f, 18.6f, 14.9f, 11.1f, 5.3f, 1.8f, -0.2f},     // 2011
-        {-8.7f, -11.3f, -2.3f, 0.4f, 7.5f, 12.2f, 16.4f, 14.1f, 9.2f, 3.1f, 0.3f, -12.1f}      // 2012
+        {-8.7f, -11.3f, -2.3f, 0.4f, 7.5f, 12.2f, 16.4f, 14.1f, 9.2f, 3.1f, 0.3f, -12.1f},     // 2012
+        {-7.9f, -5.3f, -9.1f, 0.8f, 11.6f, 16.6f, 15.9f, 15.5f, 11.2f, 4.0f, 0.1f, -1.9f}      // 2013
     };
 
-    static const float tempHelsinki[7][12] = {
+    static const float tempHelsinki[8][12] = {
         {-3.7f, -7.8f, -5.4f, 3.4f, 10.7f, 15.4f, 18.6f, 18.7f, 14.3f, 8.5f, 2.9f, 4.1f},      // 2006
         {-1.2f, -7.5f, 3.1f, 5.5f, 10.3f, 15.9f, 17.4f, 17.9f, 11.2f, 7.3f, 1.1f, 0.5f},       // 2007
         {-0.6f, 1.2f, 0.2f, 6.3f, 10.2f, 13.8f, 18.1f, 15.1f, 10.1f, 9.4f, 2.5f, 0.4f},        // 2008
         {-2.9f, -3.5f, -0.9f, 4.7f, 10.9f, 14.0f, 17.4f, 16.8f, 13.2f, 4.1f, 2.6f, -2.3f},     // 2009
         {-10.2f, -8.0f, -1.9f, 6.6f, 11.3f, 14.5f, 21.0f, 18.8f, 12.6f, 6.1f, -0.5f, -7.3f},   // 2010
         {-4.4f, -9.1f, -2.0f, 5.5f, 9.9f, 15.6f, 20.8f, 17.8f, 13.4f, 8.9f, 3.6f, 1.5f},       // 2011
-        {-3.5f, -3.2f, -0.7f, 4.0f, 11.1f, 13.4f, 17.3f, 15.8f, 13.1f, 6.4f, 4.1f, -5.1f}      // 2012
+        {-3.5f, -3.2f, -0.7f, 4.0f, 11.1f, 13.4f, 17.3f, 15.8f, 13.1f, 6.4f, 4.1f, -5.1f},     // 2012
+        {-4.8f, -1.8f, -5.0f, 2.9f, 12.8f, 17.2f, 18.0f, 17.1f, 12.5f, 7.5f, 4.5f, 2.3f}       // 2013
     };
 
     // Create data arrays
@@ -159,6 +161,14 @@ void GraphModifier::resetTemperatureData()
     //! [5]
 }
 
+void GraphModifier::changeRange(int range)
+{
+    if (range >= m_years.count())
+        m_yearAxis->setRange(0, m_years.count() - 1);
+    else
+        m_yearAxis->setRange(range, range);
+}
+
 void GraphModifier::changeStyle(int style)
 {
     QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
diff --git a/examples/bars/graphmodifier.h b/examples/bars/graphmodifier.h
index cfb1ceec..674c3262 100644
--- a/examples/bars/graphmodifier.h
+++ b/examples/bars/graphmodifier.h
@@ -50,6 +50,7 @@ public:
     void setSeriesVisibility(int enabled);
 
 public slots:
+    void changeRange(int range);
     void changeStyle(int style);
     void changeSelectionMode(int selectionMode);
     void changeTheme(int theme);
diff --git a/examples/bars/main.cpp b/examples/bars/main.cpp
index 0b934aac..f04e501d 100644
--- a/examples/bars/main.cpp
+++ b/examples/bars/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
     hLayout->addLayout(vLayout);
     //! [1]
 
-    widget->setWindowTitle(QStringLiteral("Average temperatures in Oulu and Helsinki, Finland (2006-2012)"));
+    widget->setWindowTitle(QStringLiteral("Average temperatures in Oulu and Helsinki, Finland (2006-2013)"));
 
     QComboBox *themeList = new QComboBox(widget);
     themeList->addItem(QStringLiteral("Qt"));
@@ -167,6 +167,18 @@ int main(int argc, char **argv)
     shadowQuality->addItem(QStringLiteral("High Soft"));
     shadowQuality->setCurrentIndex(5);
 
+    QComboBox *rangeList = new QComboBox(widget);
+    rangeList->addItem(QStringLiteral("2006"));
+    rangeList->addItem(QStringLiteral("2007"));
+    rangeList->addItem(QStringLiteral("2008"));
+    rangeList->addItem(QStringLiteral("2009"));
+    rangeList->addItem(QStringLiteral("2010"));
+    rangeList->addItem(QStringLiteral("2011"));
+    rangeList->addItem(QStringLiteral("2012"));
+    rangeList->addItem(QStringLiteral("2013"));
+    rangeList->addItem(QStringLiteral("All"));
+    rangeList->setCurrentIndex(8);
+
     //! [5]
     vLayout->addWidget(new QLabel(QStringLiteral("Rotate horizontally")));
     vLayout->addWidget(rotationSliderX, 0, Qt::AlignTop);
@@ -179,6 +191,8 @@ int main(int argc, char **argv)
     vLayout->addWidget(gridCheckBox);
     vLayout->addWidget(smoothCheckBox);
     vLayout->addWidget(seriesCheckBox);
+    vLayout->addWidget(new QLabel(QStringLiteral("Show year")));
+    vLayout->addWidget(rangeList);
     vLayout->addWidget(new QLabel(QStringLiteral("Change bar style")));
     vLayout->addWidget(barStyleList);
     vLayout->addWidget(new QLabel(QStringLiteral("Change selection mode")));
@@ -220,6 +234,9 @@ int main(int argc, char **argv)
     QObject::connect(modifier, &GraphModifier::gridEnabledChanged,
                      gridCheckBox, &QCheckBox::setChecked);
 
+    QObject::connect(rangeList, SIGNAL(currentIndexChanged(int)), modifier,
+                     SLOT(changeRange(int)));
+
     QObject::connect(barStyleList, SIGNAL(currentIndexChanged(int)), modifier,
                      SLOT(changeStyle(int)));