HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1722:4a02b714acfa

Adds scrollchart, fixes chartdesigner

Michal Klocek -

r1722:4a02b714acfa

parent child

Context file:

r1722:4a02b714acfa

Collapse all files

examples/scrollchart/chart.cpp created 644 +63 0

@@ -0,0 +1,63
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "chart.h"
	22	#include <QGesture>
	23	#include <QGraphicsScene>
	24	#include <QGraphicsView>
	25
	26	Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags)
	27	:QChart(parent, wFlags)
	28	{
	29	// Seems that QGraphicsView (QChartView) does not grab gestures.
	30	// They can only be grabbed here in the QGraphicsWidget (QChart).
	31	grabGesture(Qt::PanGesture);
	32	grabGesture(Qt::PinchGesture);
	33	}
	34
	35	Chart::~Chart()
	36	{
	37
	38	}
	39
	40	//![1]
	41	bool Chart::sceneEvent(QEvent *event)
	42	{
	43	if (event->type() == QEvent::Gesture)
	44	return gestureEvent(static_cast<QGestureEvent*>(event));
	45	return QChart::event(event);
	46	}
	47
	48	bool Chart::gestureEvent(QGestureEvent* event)
	49	{
	50	if (QGesture *gesture = event->gesture(Qt::PanGesture)) {
	51	QPanGesture pan = static_cast<QPanGesture >(gesture);
	52	QChart::scroll(pan->delta().x(),pan->delta().y());
	53	}
	54
	55	if (QGesture *gesture = event->gesture(Qt::PinchGesture)) {
	56	QPinchGesture pinch = static_cast<QPinchGesture >(gesture);
	57	if (pinch->changeFlags() & QPinchGesture::ScaleFactorChanged)
	58	QChart::zoom(pinch->scaleFactor());
	59	}
	60
	61	return true;
	62	}
	63	//![1]

examples/scrollchart/chart.h created 644 +46 0

@@ -0,0 +1,46
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#ifndef CHART_H
	22	#define CHART_H
	23
	24	#include <QChart>
	25
	26	QTCOMMERCIALCHART_USE_NAMESPACE
	27
	28	//![1]
	29	class Chart : public QChart
	30	//![1]
	31	{
	32	public:
	33	explicit Chart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
	34	~Chart();
	35
	36	protected:
	37	bool sceneEvent(QEvent *event);
	38
	39	private:
	40	bool gestureEvent(QGestureEvent* event);
	41
	42	private:
	43
	44	};
	45
	46	#endif // CHART_H

examples/scrollchart/chartview.cpp created 644 +111 0

@@ -0,0 +1,111
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "chartview.h"
	22	#include <QMouseEvent>
	23	#include <QDebug>
	24
	25	ChartView::ChartView(QChart chart, QWidget parent) :
	26	QChartView(chart, parent), m_rubberBand(QRubberBand::Rectangle, this), m_isScrolling(
	27	false)
	28	{
	29	// setRubberBand(QChartView::RectangleRubberBand);
	30	this->chart()->setAnimationOptions(QChart::NoAnimation);
	31	}
	32
	33	void ChartView::mousePressEvent(QMouseEvent *event)
	34	{
	35	if (event->button() == Qt::RightButton) {
	36
	37	QRectF rect = chart()->plotArea();
	38
	39	m_origin = event->pos();
	40
	41	if (!rect.contains(m_origin))
	42	return;
	43
	44	m_rubberBand.setGeometry(QRect(m_origin, QSize()));
	45	m_rubberBand.show();
	46	}
	47
	48	if (event->button() == Qt::LeftButton) {
	49	m_origin = event->pos();
	50	m_isScrolling = true;
	51	}
	52
	53	event->accept();
	54	}
	55
	56	void ChartView::mouseMoveEvent(QMouseEvent *event)
	57	{
	58	if (m_rubberBand.isVisible())
	59	m_rubberBand.setGeometry(QRect(m_origin, event->pos()).normalized());
	60
	61	if (m_isScrolling) {
	62	QPointF delta = m_origin - event->pos();
	63	chart()->scroll(delta.x(),-delta.y());
	64	m_origin = event->pos();
	65	}
	66
	67	}
	68
	69	void ChartView::mouseReleaseEvent(QMouseEvent *event)
	70	{
	71	if (event->button() == Qt::RightButton && m_rubberBand.isVisible()) {
	72	m_rubberBand.hide();
	73
	74	QRect rect = m_rubberBand.geometry();
	75	chart()->zoomIn(rect);
	76	event->accept();
	77	}
	78
	79	if (event->button() == Qt::LeftButton) {
	80	m_isScrolling = false;
	81	}
	82	}
	83
	84	//![1]
	85	void ChartView::keyPressEvent(QKeyEvent *event)
	86	{
	87	switch (event->key()) {
	88	case Qt::Key_Plus:
	89	chart()->zoomIn();
	90	break;
	91	case Qt::Key_Minus:
	92	chart()->zoomOut();
	93	break;
	94	//![1]
	95	case Qt::Key_Left:
	96	chart()->scroll(-10, 0);
	97	break;
	98	case Qt::Key_Right:
	99	chart()->scroll(10, 0);
	100	break;
	101	case Qt::Key_Up:
	102	chart()->scroll(0, 10);
	103	break;
	104	case Qt::Key_Down:
	105	chart()->scroll(0, -10);
	106	break;
	107	default:
	108	QGraphicsView::keyPressEvent(event);
	109	break;
	110	}
	111	}

examples/scrollchart/chartview.h created 644 +46 0

@@ -0,0 +1,46
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#ifndef CHARTVIEW_H
	22	#define CHARTVIEW_H
	23
	24	#include <QChartView>
	25	#include <QRubberBand>
	26
	27	QTCOMMERCIALCHART_USE_NAMESPACE
	28
	29	class ChartView : public QChartView
	30	{
	31	public:
	32	ChartView(QChart chart, QWidget parent = 0);
	33	protected:
	34	void mousePressEvent(QMouseEvent *event);
	35	void mouseMoveEvent(QMouseEvent *event);
	36	void mouseReleaseEvent(QMouseEvent *event);
	37	void keyPressEvent(QKeyEvent *event);
	38
	39	private:
	40	bool m_isScrolling;
	41	bool m_isRubberBandShown;
	42	QRubberBand m_rubberBand;
	43	QPoint m_origin;
	44	};
	45
	46	#endif

examples/scrollchart/main.cpp created 644 +89 0

@@ -0,0 +1,89
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "chart.h"
	22	#include "chartview.h"
	23	#include <QApplication>
	24	#include <QMainWindow>
	25	#include <qmath.h>
	26	#include <QBarSeries>
	27	#include <QBarSet>
	28	#include <QBarCategoriesAxis>
	29	#include <QLineSeries>
	30	#include <QHorizontalBarSeries>
	31
	32	QTCOMMERCIALCHART_USE_NAMESPACE
	33
	34	int main(int argc, char *argv[])
	35	{
	36	QApplication a(argc, argv);
	37
	38	QLineSeries* series = new QLineSeries();
	39	for (int i = 0; i < 500; i++) {
	40	QPointF p((qreal) i, qSin(M_PI / 50 * i) * 100);
	41	p.ry() += qrand() % 20;
	42	*series << p;
	43	}
	44
	45	QBarSet *set0 = new QBarSet("Jane");
	46	QBarSet *set1 = new QBarSet("John");
	47	QBarSet *set2 = new QBarSet("Axel");
	48	QBarSet *set3 = new QBarSet("Mary");
	49	QBarSet *set4 = new QBarSet("Samantha");
	50
	51	*set0 << 1 << 2 << 3 << 4 << 5 << 6;
	52	*set1 << 5 << 0 << 0 << 4 << 0 << 7;
	53	*set2 << 3 << 5 << 8 << 13 << 8 << 5;
	54	*set3 << 5 << 6 << 7 << 3 << 4 << 5;
	55	*set4 << 9 << 7 << 5 << 3 << 1 << 2;
	56
	57	//QHorizontalBarSeries* series2 = new QHorizontalBarSeries();
	58	QBarSeries* series2 = new QBarSeries();
	59	series2->append(set0);
	60	series2->append(set1);
	61	series2->append(set2);
	62	series2->append(set3);
	63	series2->append(set4);
	64
	65	Chart* chart = new Chart();
	66	// chart->addSeries(series);
	67	chart->addSeries(series2);
	68	chart->setTitle("Scroll in/out example");
	69	chart->legend()->hide();
	70	chart->createDefaultAxes();
	71
	72	QStringList categories;
	73	categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
	74	QBarCategoriesAxis* axis = new QBarCategoriesAxis();
	75	axis->append(categories);
	76	chart->setAxisX(axis, series2);
	77
	78	ChartView* chartView = new ChartView(chart);
	79	chartView->setRenderHint(QPainter::Antialiasing);
	80
	81	QMainWindow window;
	82	window.setCentralWidget(chartView);
	83	window.resize(400, 300);
	84	window.grabGesture(Qt::PanGesture);
	85	window.grabGesture(Qt::PinchGesture);
	86	window.show();
	87
	88	return a.exec();
	89	}

examples/scrollchart/scrollchart.pro created 644 +7 0

@@ -0,0 +1,7
	1	!include( ../examples.pri ) {
	2	error( "Couldn't find the examples.pri file!" )
	3	}
	4	TARGET = scrollchart
	5	HEADERS += chart.h chartview.h
	6
	7	SOURCES += main.cpp chart.cpp chartview.cpp

examples/examples.pro +2 -1

             CURRENTLY_BUILDING_COMPONENTS = "examples"
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             SUBDIRS += \
                        areachart \
                        customchart \
                        linechart \
                        percentbarchart \
                        piechart \
                        piechartdrilldown \
                        presenterchart \
                        scatterchart \
                        scatterinteractions \
                        splinechart \
                        stackedbarchart \
                        stackedbarchartdrilldown \
                        zoomlinechart \
                        modeldata \
                        barchart \
                        legend \
                        barmodelmapper \
                        qmlpiechart \
                        lineandbar \
                        horizontalbarchart \
                        horizontalstackedbarchart \
                        horizontalpercentbarchart \
                        donut \
-                       donutdrilldown
+                       donutdrilldown \
+                       scrollchart

tests/chartdesigner/engine.cpp +43 -46

             /****************************************************************************
              **
              ** Copyright (C) 2012 Digia Plc
              ** All rights reserved.
              ** For any questions to Digia, please use contact form at http://qt.digia.com
              **
              ** This file is part of the Qt Commercial Charts Add-on.
              **
              ** $QT_BEGIN_LICENSE$
              ** Licensees holding valid Qt Commercial licenses may use this file in
              ** accordance with the Qt Commercial License Agreement provided with the
              ** Software or, alternatively, in accordance with the terms contained in
              ** a written agreement between you and Digia.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.digia.com
              ** $QT_END_LICENSE$
              **
              ****************************************************************************/
             #include "engine.h"
             #include <QItemSelectionModel>
             #include <QStandardItemModel>
-            #include <QXYModelMapper>
+            #include <QVXYModelMapper>
-            #include <QBarModelMapper>
+            #include <QHBarModelMapper>
-            #include <QPieModelMapper>
+            #include <QVPieModelMapper>
             #include <QLineSeries>
             #include <QSplineSeries>
             #include <QScatterSeries>
             #include <QBarSeries>
             #include <QPercentBarSeries>
             #include <QStackedBarSeries>
             #include <QAreaSeries>
             #include <QPieSeries>
             #include <QChart>
             #include <QBarSet>
             const qint32 MAGIC_NUMBER = 0x66666666;
             Engine::Engine(QObject* parent) :
                 QObject(parent), m_count(10), m_chart(new QChart()), m_model(0), m_selection(0)
             {
                 createModels();
             }
             Engine::~Engine()
             {
                 delete m_chart;
                 delete m_selection;
                 delete m_model;
             }
             void Engine::createModels()
             {
                 m_model = new QStandardItemModel(m_count, m_count);
                 m_model->setHorizontalHeaderLabels(
                     QStringList() << "A" << "B" << "C" << "D" << "E" << "F" << "G" << "H" << "I" << "J");
                 m_model->setVerticalHeaderLabels(
                     QStringList() << "1" << "2" << "3" << "4" << "5" << "6" << "7" << "8" << "9" << "10");
                 m_selection = new QItemSelectionModel(m_model);
             }
             QList<QAbstractSeries*> Engine::addSeries(QAbstractSeries::SeriesType type)
             {
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 QMap<int, QModelIndex> columns;
                 foreach(const QModelIndex& index, list) {
                     columns.insertMulti(index.column(), index);
                 }
                 QList<int> keys = columns.uniqueKeys();
                 QModelIndexList rows = columns.values(keys.first());
                 int minRow = m_count + 1;
                 int maxRow = -1;
                 foreach(const QModelIndex& index, rows) {
                     minRow = qMin(index.row(), minRow);
                     maxRow = qMax(index.row(), maxRow);
                 }
                 QList<QAbstractSeries*> result;
                 QColor color;
                 switch (type) {
                 case QAbstractSeries::SeriesTypeLine:
                 {
                     for (int i = 1; i < keys.count(); ++i) {
                         QLineSeries *line = new QLineSeries();
                         setupXYSeries(line, keys, i, minRow, maxRow);
                         result << line;
                     }
                     break;
                 }
                 case QAbstractSeries::SeriesTypeSpline:
                 {
                     for (int i = 1; i < keys.count(); ++i) {
                         QSplineSeries *line = new QSplineSeries();
                         setupXYSeries(line, keys, i, minRow, maxRow);
                         result << line;
                     }
                     break;
                 }
                 case QAbstractSeries::SeriesTypeScatter:
                 {
                     for (int i = 1; i < keys.count(); ++i) {
                         QScatterSeries *line = new QScatterSeries();
                         setupXYSeries(line, keys, i, minRow, maxRow);
                         result << line;
                     }
                     break;
                 }
                 case QAbstractSeries::SeriesTypeBar:
                 {
                     //TODO: fix me
                     QBarSeries *bar = new QBarSeries();
                     setupBarSeries(bar,keys,minRow,maxRow);
                     result << bar;
                     break;
                 }
                 case QAbstractSeries::SeriesTypePercentBar:
                 {
                     QPercentBarSeries *bar = new QPercentBarSeries();
                     setupBarSeries(bar,keys,minRow,maxRow);
                     result << bar;
                     break;
                 }
                 case QAbstractSeries::SeriesTypeStackedBar:
                 {
                     QStackedBarSeries *bar = new QStackedBarSeries();
                     setupBarSeries(bar,keys,minRow,maxRow);
                     result << bar;
                     break;
                 }
                 case QAbstractSeries::SeriesTypePie:
                 {
                     QPieSeries *pie = new QPieSeries();
                     setupPieSeries(pie,keys,minRow,maxRow);
                     result << pie;
                     break;
                 }
                 case QAbstractSeries::SeriesTypeArea:
                 {
                      QAreaSeries *area = new QAreaSeries( new QLineSeries(), new QLineSeries());
                      setupAreaSeries(area,keys,minRow,maxRow);
                      result << area;
                      break;
                 }
                 }
+                m_chart->createDefaultAxes();
                 return result;
             }
             void Engine::removeSeries(QAbstractSeries* series)
             {
                 m_chart->removeSeries(series);
                 foreach(const QModelIndex& index, m_seriesModelIndex.value(series)) {
                     m_model->setData(index, Qt::white, Qt::BackgroundRole);
                 }
             }
             void Engine::clearModels()
             {
                 delete m_selection;
                 m_selection = 0;
                 delete m_model;
                 m_model = 0;
                 createModels();
             }
             bool Engine::save(const QString &filename) const
             {
                 if (filename.isEmpty())
                     return false;
                 QFile file(filename);
                 if (!file.open(QIODevice::WriteOnly)) {
                     return false;
                 }
                 QDataStream out(&file);
                 out << MAGIC_NUMBER;
                 out.setVersion(QDataStream::Qt_4_8);
                 out << m_model->rowCount();
                 out << m_model->columnCount();
                 for (int row = 0; row < m_model->rowCount(); ++row) {
                     for (int column = 0; column < m_model->columnCount(); ++column) {
                         QStandardItem *item = m_model->item(row, column);
                         if (item) {
                                 out << row;
                                 out << column;
                                 out << item->data(Qt::EditRole).toString();
                         }
                     }
                 }
                 return true;
             }
             bool Engine::load(const QString &filename)
             {
                 clearModels();
                 if (filename.isEmpty())
                     return false;
                 QFile file(filename);
                 if (!file.open(QIODevice::ReadOnly)) {
                     return false;
                 }
                 QDataStream in(&file);
                 qint32 magicNumber;
                 in >> magicNumber;
                 if (magicNumber != MAGIC_NUMBER)
                     return false;
                 in.setVersion(QDataStream::Qt_4_8);
                 int rowCount;
                 in >> rowCount;
                 int columnCount;
                 in >> columnCount;
                 while (!in.atEnd()) {
                     int row;
                     int column;
                     QString value;
                     in >> row >> column >> value;
                     QStandardItem *item = new QStandardItem();
                     bool ok;
                     double result = value.toDouble(&ok);
                     if(ok)
                         item->setData(result, Qt::EditRole);
                     else
                         item->setData(value, Qt::EditRole);
                     m_model->setItem(row, column, item);
                 }
                 return true;
             }
             void Engine::setupXYSeries(QXYSeries *xyseries, const QList<int>& columns, int column, int minRow, int maxRow)
             {
-                xyseries->setModel(m_model);
+                QVXYModelMapper* mapper = new QVXYModelMapper(xyseries);
-                QXYModelMapper* mapper = new QXYModelMapper(xyseries);
+                mapper->setSeries(xyseries);
-                xyseries->setModelMapper(mapper);
+                mapper->setModel(m_model);
-                mapper->setMapX(columns.first());
+                mapper->setXColumn(columns.first());
-                mapper->setMapY(columns.at(column));
+                mapper->setYColumn(columns.at(column));
-                mapper->setOrientation(Qt::Vertical);
+                mapper->setFirstRow(minRow);
-                mapper->setFirst(minRow);
+                mapper->setRowCount(maxRow - minRow + 1);
-                mapper->setCount(maxRow - minRow + 1);
                 m_chart->addSeries(xyseries);
                 xyseries->setName(QString("Series %1").arg(m_chart->series().count()));
                 QObject::connect(xyseries,SIGNAL(clicked(const QPointF&)),this,SIGNAL(selected()));
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 QModelIndexList result;
                 foreach(const QModelIndex& index, list) {
                     if (index.column() ==columns.at(column)){
                         m_model->setData(index, xyseries->pen().color(), Qt::BackgroundRole);
                         result << index;
                     }
                 }
                 m_seriesModelIndex.insert(xyseries,result);
             }
-            void Engine::setupBarSeries(QBarSeries *bar, const QList<int>& columns, int minRow, int maxRow)
+            void Engine::setupBarSeries(QAbstractBarSeries *bar, const QList<int>& columns, int minRow, int maxRow)
             {
-                bar->setModel(m_model);
+                QHBarModelMapper* mapper = new QHBarModelMapper(bar);
-                QBarModelMapper* mapper = new QBarModelMapper(bar);
+                mapper->setSeries(bar);
-                bar->setModelMapper(mapper);
+                mapper->setModel(m_model);
-                mapper->setMapCategories(columns.first());
+                mapper->setFirstColumn(minRow);
-                mapper->setMapBarTop(columns.last());
+                mapper->setColumnCount(maxRow - minRow + 1);
-                mapper->setMapBarBottom(columns.at(1));
+                mapper->setFirstBarSetRow(columns.at(1));
-                mapper->setOrientation(Qt::Vertical);
+                mapper->setLastBarSetRow(columns.last());
-                mapper->setFirst(minRow);
-                mapper->setCount(maxRow - minRow + 1);
                 m_chart->addSeries(bar);
                 bar->setName(QString("Series %1").arg(m_chart->series().count()));
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 foreach(const QModelIndex& index, list) {
                     if (index.column() >= columns.at(1) && index.column()<= columns.last()) {
                         //m_model->setData(index, bar->barSets().at(index.column())->brush().color(), Qt::BackgroundRole);
                     }
                 }
             }
             void Engine::setupPieSeries(QPieSeries *pie, const QList<int>& columns, int minRow, int maxRow)
             {
-                pie->setModel(m_model);
+                QVPieModelMapper* mapper = new QVPieModelMapper(pie);
-                QPieModelMapper* mapper = new QPieModelMapper(pie);
+                mapper->setSeries(pie);
-                pie->setModelMapper(mapper);
+                mapper->setModel(m_model);
-                mapper->setMapValues(columns.at(1));
+                mapper->setValuesColumn(columns.at(1));
-                mapper->setMapLabels(columns.first());
+                mapper->setLabelsColumn(columns.first());
-                mapper->setOrientation(Qt::Vertical);
+                mapper->setFirstRow(minRow);
-                mapper->setFirst(minRow);
+                mapper->setRowCount(maxRow - minRow + 1);
-                mapper->setCount(maxRow - minRow + 1);
                 m_chart->addSeries(pie);
                 pie->setName(QString("Series %1").arg(m_chart->series().count()));
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 foreach(const QModelIndex& index, list) {
                    // m_model->setData(index, bar->barSets()pen().color(), Qt::BackgroundRole);
                 }
             }
             void Engine::setupAreaSeries(QAreaSeries *series, const QList<int>& columns, int minRow, int maxRow)
             {
-                series->lowerSeries()->setModel(m_model);
+                QVXYModelMapper* umapper = new QVXYModelMapper(series);
-                series->upperSeries()->setModel(m_model);
+                umapper->setSeries(series->upperSeries());
-                QXYModelMapper* umapper = new QXYModelMapper(series);
+                umapper->setModel(m_model);
-                umapper->setMapX(columns.first());
+                umapper->setXColumn(columns.first());
-                umapper->setMapY(columns.at(1));
+                umapper->setYColumn(columns.at(1));
-                umapper->setOrientation(Qt::Vertical);
+                umapper->setFirstRow(minRow);
-                umapper->setFirst(minRow);
+                umapper->setRowCount(maxRow - minRow + 1);
-                umapper->setCount(maxRow - minRow + 1);
-                QXYModelMapper* lmapper = new QXYModelMapper(series);
+                QVXYModelMapper* lmapper = new QVXYModelMapper(series);
-                lmapper->setMapX(columns.first());
+                lmapper->setSeries(series->lowerSeries());
-                lmapper->setMapY(columns.at(2));
+                lmapper->setModel(m_model);
-                lmapper->setOrientation(Qt::Vertical);
+                lmapper->setXColumn(columns.first());
-                lmapper->setFirst(minRow);
+                lmapper->setYColumn(columns.at(2));
-                lmapper->setCount(maxRow - minRow + 1);
+                lmapper->setFirstRow(minRow);
-                series->upperSeries()->setModelMapper(umapper);
+                lmapper->setRowCount(maxRow - minRow + 1);
-                series->lowerSeries()->setModelMapper(lmapper);
                 m_chart->addSeries(series);
                 series->setName(QString("Series %1").arg(m_chart->series().count()));
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 foreach(const QModelIndex& index, list) {
                     //if (index.column() ==columns.at(column))
                       //  m_model->setData(index, xyseries->pen().color(), Qt::BackgroundRole);
                 }
             }

tests/chartdesigner/engine.h +2 -2

             /****************************************************************************
              **
              ** Copyright (C) 2012 Digia Plc
              ** All rights reserved.
              ** For any questions to Digia, please use contact form at http://qt.digia.com
              **
              ** This file is part of the Qt Commercial Charts Add-on.
              **
              ** $QT_BEGIN_LICENSE$
              ** Licensees holding valid Qt Commercial licenses may use this file in
              ** accordance with the Qt Commercial License Agreement provided with the
              ** Software or, alternatively, in accordance with the terms contained in
              ** a written agreement between you and Digia.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.digia.com
              ** $QT_END_LICENSE$
              **
              ****************************************************************************/
             #ifndef ENGINE_H_
             #define ENGINE_H_
             #include <QObject>
             #include <QAbstractSeries>
             #include <QModelIndex>
             class QStandardItemModel;
             class QItemSelectionModel;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class QXYSeries;
-            class QBarSeries;
+            class QAbstractBarSeries;
             class QPieSeries;
             class QAreaSeries;
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Engine : public QObject
             {
                 Q_OBJECT
             public:
                 explicit Engine(QObject *parent = 0);
                ~Engine();
                 int modelCount() { return m_count; }
                 QStandardItemModel *model() const { return m_model; }
                 QItemSelectionModel *selectionModel() const { return m_selection; }
                 QChart* chart() const { return m_chart; }
                 void clearModels();
                 QList<QAbstractSeries*> addSeries(QAbstractSeries::SeriesType type);
                 void removeSeries(QAbstractSeries* series);
                 bool save(const QString &filename) const;
                 bool load(const QString &filename);
             signals:
                 void selected();
             private:
                 void createModels();
                 void setupXYSeries(QXYSeries *xyseries, const QList<int>& columns, int column, int minRow, int maxRow);
-                void setupBarSeries(QBarSeries *series, const QList<int>& columns, int minRow, int maxRow);
+                void setupBarSeries(QAbstractBarSeries *series, const QList<int>& columns, int minRow, int maxRow);
                 void setupPieSeries(QPieSeries *pie, const QList<int>& columns, int minRow, int maxRow);
                 void setupAreaSeries(QAreaSeries *series, const QList<int>& columns, int minRow, int maxRow);
             private:
                 int m_count;
                 QChart *m_chart;
                 QStandardItemModel *m_model;
                 QItemSelectionModel *m_selection;
                 QMap<QAbstractSeries*, QList<QModelIndex> > m_seriesModelIndex;
             };
             #endif /* ENGINE_H_ */

tests/tests.pro +2 -1

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             SUBDIRS += \
                 auto \
                 chartwidgettest \
-                qmlchartproperties
+                qmlchartproperties \
+                chartdesigner
             !linux-arm*: {
                 SUBDIRS += \
                         wavechart
             }

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