From 21d46a2d2e69ed6c4ce563e4d20bef49df3140fb 2012-04-10 11:30:58
From: Tero Ahola <tero.ahola@digia.com>
Date: 2012-04-10 11:30:58
Subject: [PATCH] Removed key zoom/scroll from QChartView

---

diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp
index b393db6..4fcbcff 100644
--- a/demos/chartthemes/themewidget.cpp
+++ b/demos/chartthemes/themewidget.cpp
@@ -176,16 +176,15 @@ QComboBox* ThemeWidget::createLegendBox() const
 
 QChart* ThemeWidget::createAreaChart() const
 {
-    // area chart
     QChart *chart = new QChart();
     chart->axisX()->setNiceNumbers(true);
     chart->axisY()->setNiceNumbers(true);
     chart->setTitle("Area chart");
-    QString name("Series ");
-    int nameIndex = 0;
 
     // The lower series initialized to zero values
     QLineSeries *lowerSeries = 0;
+    QString name("Series ");
+    int nameIndex = 0;
     for (int i(0); i < m_dataTable.count(); i++) {
         QLineSeries *upperSeries = new QLineSeries(chart);
         for (int j(0); j < m_dataTable[i].count(); j++) {
@@ -201,22 +200,21 @@ QChart* ThemeWidget::createAreaChart() const
         chart->addSeries(area);
         lowerSeries = upperSeries;
     }
+
     return chart;
 }
 
 QChart* ThemeWidget::createBarChart(int valueCount) const
 {
-    // bar chart
     QChart* chart = new QChart();
     chart->axisX()->setNiceNumbers(true);
     chart->axisY()->setNiceNumbers(true);
     chart->setTitle("Bar chart");
+
     QBarCategories categories;
-    // TODO: categories
     for (int i(0); i < valueCount; i++)
         categories << QString::number(i);
-//            QBarSeries* series = new QBarSeries(categories, chart);
-//            QPercentBarSeries* series = new QPercentBarSeries(categories, chart);
+
     QStackedBarSeries* series = new QStackedBarSeries(categories, chart);
     for (int i(0); i < m_dataTable.count(); i++) {
         QBarSet *set = new QBarSet("Bar set " + QString::number(i));
@@ -225,16 +223,17 @@ QChart* ThemeWidget::createBarChart(int valueCount) const
         series->appendBarSet(set);
     }
     chart->addSeries(series);
+
     return chart;
 }
 
 QChart* ThemeWidget::createLineChart() const
 {
-    // line chart
     QChart* chart = new QChart();
     chart->axisX()->setNiceNumbers(true);
     chart->axisY()->setNiceNumbers(true);
     chart->setTitle("Line chart");
+
     QString name("Series ");
     int nameIndex = 0;
     foreach (DataList list, m_dataTable) {
@@ -245,14 +244,15 @@ QChart* ThemeWidget::createLineChart() const
         nameIndex++;
         chart->addSeries(series);
     }
+
     return chart;
 }
 
 QChart* ThemeWidget::createPieChart() const
 {
-    // pie chart
     QChart* chart = new QChart();
     chart->setTitle("Pie chart");
+
     qreal pieSize = 1.0 / m_dataTable.count();
     for (int i = 0; i < m_dataTable.count(); i++) {
         QPieSeries *series = new QPieSeries(chart);
@@ -364,11 +364,11 @@ void ThemeWidget::updateUI()
         foreach (QChartView *chartView, m_charts) {
             chartView->chart()->legend()->hide();
         }
-    }
-    else
+    } else {
         foreach (QChartView *chartView, m_charts) {
             chartView->chart()->legend()->setAlignment(alignment);
             chartView->chart()->legend()->show();
         }
+    }
 }
 
diff --git a/src/qchartview.cpp b/src/qchartview.cpp
index 139d8c8..51aa066 100644
--- a/src/qchartview.cpp
+++ b/src/qchartview.cpp
@@ -187,37 +187,6 @@ void QChartView::mouseReleaseEvent(QMouseEvent *event)
 }
 
 /*!
-    Pressing + and - keys performs zoomIn() and zoomOut() respectivly.
-    In other \a event is passed to the QGraphicsView::keyPressEvent() implementation
-*/
-void QChartView::keyPressEvent(QKeyEvent *event)
-{
-    switch (event->key()) {
-        case Qt::Key_Plus:
-            d_ptr->m_chart->zoomIn();
-            break;
-        case Qt::Key_Minus:
-            d_ptr->m_chart->zoomOut();
-            break;
-        case Qt::Key_Left:
-            d_ptr->m_chart->scrollLeft();
-            break;
-        case Qt::Key_Right:
-            d_ptr->m_chart->scrollRight();
-            break;
-        case Qt::Key_Up:
-            d_ptr->m_chart->scrollUp();
-            break;
-        case Qt::Key_Down:
-            d_ptr->m_chart->scrollDown();
-            break;
-        default:
-            QGraphicsView::keyPressEvent(event);
-            break;
-    }
-}
-
-/*!
     Resizes and updates the chart area using the \a event data
 */
 void QChartView::resizeEvent(QResizeEvent *event)
diff --git a/src/qchartview.h b/src/qchartview.h
index bd0078e..d0e4b66 100644
--- a/src/qchartview.h
+++ b/src/qchartview.h
@@ -60,7 +60,6 @@ protected:
     void mousePressEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
-    void keyPressEvent(QKeyEvent *event);
 
 protected:
     QScopedPointer<QChartViewPrivate> d_ptr;