HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r958:21d46a2d2e69

Removed key zoom/scroll from QChartView

Tero Ahola -

r958:21d46a2d2e69

parent child

Context file:

r958:21d46a2d2e69

Collapse all files

demos/chartthemes/themewidget.cpp +11 -11

             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++) {
                     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));
                     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) {
                     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);
                     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();
                     }
+                }
             }

src/qchartview.cpp 0 -31

@@ -187,37 +187,6 void QChartView::mouseReleaseEvent(QMouseEvent *event)
187	}	187	}
188		188
189	/*!	189	/*!
190	Pressing + and - keys performs zoomIn() and zoomOut() respectivly.
191	In other \a event is passed to the QGraphicsView::keyPressEvent() implementation
192	*/
193	void QChartView::keyPressEvent(QKeyEvent *event)
194	{
195	switch (event->key()) {
196	case Qt::Key_Plus:
197	d_ptr->m_chart->zoomIn();
198	break;
199	case Qt::Key_Minus:
200	d_ptr->m_chart->zoomOut();
201	break;
202	case Qt::Key_Left:
203	d_ptr->m_chart->scrollLeft();
204	break;
205	case Qt::Key_Right:
206	d_ptr->m_chart->scrollRight();
207	break;
208	case Qt::Key_Up:
209	d_ptr->m_chart->scrollUp();
210	break;
211	case Qt::Key_Down:
212	d_ptr->m_chart->scrollDown();
213	break;
214	default:
215	QGraphicsView::keyPressEvent(event);
216	break;
217	}
218	}
219
220	/*!
221	Resizes and updates the chart area using the \a event data	190	Resizes and updates the chart area using the \a event data
222	*/	191	*/
223	void QChartView::resizeEvent(QResizeEvent *event)	192	void QChartView::resizeEvent(QResizeEvent *event)

src/qchartview.h 0 -1

                 void mousePressEvent(QMouseEvent *event);
                 void mouseMoveEvent(QMouseEvent *event);
                 void mouseReleaseEvent(QMouseEvent *event);
-                void keyPressEvent(QKeyEvent *event);
             protected:
                 QScopedPointer<QChartViewPrivate> d_ptr;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages