HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1507:4d1b1b063da8

QXYModelMapper removed from the docs

Marek Rosa -

r1507:4d1b1b063da8

parent child

Context file:

r1507:4d1b1b063da8

Collapse all files

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +5 -5

                             model: customModel
                             xRow: 0
                             yRow: 1
-                            first: 2
+                            firstColumn: 2
                         }
                     }
                     //![4]
                             model: customModel
                             xRow: 0
                             yRow: 2
-                            first: 2
+                            firstColumn: 2
                         }
                     }
                             model: customModel
                             xRow: 0
                             yRow: 3
-                            first: 2
+                            firstColumn: 2
                         }
                     }
                             model: customModel
                             xRow: 0
                             yRow: 4
-                            first: 2
+                            firstColumn: 2
                         }
                     }
                             model: customModel
                             xRow: 0
                             yRow: 5
-                            first: 2
+                            firstColumn: 2
                         }
                     }

doc/src/classes.qdoc +1 -1

                             </td>
                             <td valign="top">
                                 <ul>
+                                <li><a href="qxyseries.html">QXYSeries</a></li>
                                 <li><a href="qlineseries.html">QLineSeries</a></li>
                                 <li><a href="qareaseries.html">QAreaSeries</a></li>
                                 <li><a href="qscatterseries.html">QScatterSeries</a></li>
                                 <li><a href="qsplineseries.html">QSplineSeries</a></li>
-                                <li><a href="qxymodelmapper.html">QXYModelMapper</a></li>
                                 <li><a href="qhxymodelmapper.html">QHXYModelMapper</a></li>
                                 <li><a href="qvxymodelmapper.html">QVXYModelMapper</a></li>
                                 </ul>

src/xychart/qhxymodelmapper.cpp +109 -1

@@ -24,7 +24,6 QTCOMMERCIALCHART_BEGIN_NAMESPACE
24		24
25	/*!	25	/*!
26	\class QHXYModelMapper	26	\class QHXYModelMapper
27	\brief part of QtCommercial chart API.
28	\mainclass	27	\mainclass
29		28
30	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.	29	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
@@ -34,6 +33,19 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34	*/	33	*/
35		34
36	/*!	35	/*!
		36	\property QHXYModelMapper::series
		37	\brief Defines the QXYSeries object that is used by the mapper.
		38
		39	All the data in the series is discarded when it is set to the mapper.
		40	When new series is specified the old series is disconnected (it preserves its data)
		41	*/
		42
		43	/*!
		44	\property QHXYModelMapper::model
		45	\brief Defines the model that is used by the mapper.
		46	*/
		47
		48	/*!
37	\property QHXYModelMapper::xRow	49	\property QHXYModelMapper::xRow
38	\brief Defines which row of the model is kept in sync with the x values of the QXYSeries	50	\brief Defines which row of the model is kept in sync with the x values of the QXYSeries
39	Default value is: -1 (invalid mapping)	51	Default value is: -1 (invalid mapping)
@@ -47,6 +59,40 QTCOMMERCIALCHART_BEGIN_NAMESPACE
47	*/	59	*/
48		60
49	/*!	61	/*!
		62	\property QHXYModelMapper::firstColumn
		63	\brief Defines which column of the model contains the data for the first point of the series.
		64	Minimal and default value is: 0
		65	*/
		66	/*!
		67	\qmlproperty int QHXYModelMapper::firstColumn
		68	Defines which column of the model contains the data for the first point of the series.
		69	The default value is 0.
		70	*/
		71
		72	/*!
		73	\property QHXYModelMapper::columnCount
		74	\brief Defines the number of columns of the model that are mapped as the data for series
		75	Minimal and default value is: -1 (count limited by the number of columns in the model)
		76	*/
		77	/*!
		78	\qmlproperty int QHXYModelMapper::columnCount
		79	Defines the number of columns of the model that are mapped as the data for series. The default value is
		80	-1 (count limited by the number of columns in the model)
		81	*/
		82
		83	/*!
		84	\fn void QHXYModelMapper::seriesReplaced()
		85
		86	Emitted when the series to which mapper is connected to has changed.
		87	*/
		88
		89	/*!
		90	\fn void QHXYModelMapper::modelReplaced()
		91
		92	Emitted when the model to which mapper is connected to has changed.
		93	*/
		94
		95	/*!
50	\fn void QHXYModelMapper::xRowChanged()	96	\fn void QHXYModelMapper::xRowChanged()
51		97
52	Emitted when the xRow has changed.	98	Emitted when the xRow has changed.
@@ -59,6 +105,16 QTCOMMERCIALCHART_BEGIN_NAMESPACE
59	*/	105	*/
60		106
61	/*!	107	/*!
		108	\fn void QHXYModelMapper::firstColumnChanged()
		109	Emitted when the firstColumn has changed.
		110	*/
		111
		112	/*!
		113	\fn void QHXYModelMapper::columnCountChanged()
		114	Emitted when the columnCount has changed.
		115	*/
		116
		117	/*!
62	Constructs a mapper object which is a child of \a parent.	118	Constructs a mapper object which is a child of \a parent.
63	*/	119	*/
64	QHXYModelMapper::QHXYModelMapper(QObject *parent) :	120	QHXYModelMapper::QHXYModelMapper(QObject *parent) :
@@ -67,6 +123,32 QHXYModelMapper::QHXYModelMapper(QObject *parent) :
67	QXYModelMapper::setOrientation(Qt::Horizontal);	123	QXYModelMapper::setOrientation(Qt::Horizontal);
68	}	124	}
69		125
		126	QAbstractItemModel* QHXYModelMapper::model() const
		127	{
		128	return QXYModelMapper::model();
		129	}
		130
		131	void QHXYModelMapper::setModel(QAbstractItemModel *model)
		132	{
		133	if (model != QXYModelMapper::model()) {
		134	QXYModelMapper::setModel(model);
		135	emit modelReplaced();
		136	}
		137	}
		138
		139	QXYSeries* QHXYModelMapper::series() const
		140	{
		141	return QXYModelMapper::series();
		142	}
		143
		144	void QHXYModelMapper::setSeries(QXYSeries *series)
		145	{
		146	if (series != QXYModelMapper::series()) {
		147	QXYModelMapper::setSeries(series);
		148	emit seriesReplaced();
		149	}
		150	}
		151
70	int QHXYModelMapper::xRow() const	152	int QHXYModelMapper::xRow() const
71	{	153	{
72	return QXYModelMapper::xSection();	154	return QXYModelMapper::xSection();
@@ -93,6 +175,32 void QHXYModelMapper::setYRow(int yRow)
93	}	175	}
94	}	176	}
95		177
		178	int QHXYModelMapper::firstColumn() const
		179	{
		180	return first();
		181	}
		182
		183	void QHXYModelMapper::setFirstColumn(int firstColumn)
		184	{
		185	if (firstColumn != first()) {
		186	setFirst(firstColumn);
		187	emit firstColumnChanged();
		188	}
		189	}
		190
		191	int QHXYModelMapper::columnCount() const
		192	{
		193	return count();
		194	}
		195
		196	void QHXYModelMapper::setColumnCount(int columnCount)
		197	{
		198	if (columnCount != count()) {
		199	setCount(columnCount);
		200	emit firstColumnChanged();
		201	}
		202	}
		203
96	#include "moc_qhxymodelmapper.cpp"	204	#include "moc_qhxymodelmapper.cpp"
97		205
98	QTCOMMERCIALCHART_END_NAMESPACE	206	QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qhxymodelmapper.h +20 0

             class QTCOMMERCIALCHART_EXPORT QHXYModelMapper : public QXYModelMapper
             {
                 Q_OBJECT
+                Q_PROPERTY(QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+                Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
                 Q_PROPERTY(int xRow READ xRow WRITE setXRow NOTIFY xRowChanged)
                 Q_PROPERTY(int yRow READ yRow WRITE setYRow NOTIFY yRowChanged)
+                Q_PROPERTY(int firstColumn READ firstColumn WRITE setFirstColumn NOTIFY firstColumnChanged)
+                Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged)
             public:
                 explicit QHXYModelMapper(QObject *parent = 0);
+                QAbstractItemModel* model() const;
+                void setModel(QAbstractItemModel *model);
+                QXYSeries* series() const;
+                void setSeries(QXYSeries *series);
                 int xRow() const;
                 void setXRow(int xRow);
                 int yRow() const;
                 void setYRow(int yRow);
+                int firstColumn() const;
+                void setFirstColumn(int firstColumn);
+                int columnCount() const;
+                void setColumnCount(int columnCount);
             Q_SIGNALS:
+                void seriesReplaced();
+                void modelReplaced();
                 void xRowChanged();
                 void yRowChanged();
+                void firstColumnChanged();
+                void columnCountChanged();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qvxymodelmapper.cpp +109 -1

@@ -24,7 +24,6 QTCOMMERCIALCHART_BEGIN_NAMESPACE
24		24
25	/*!	25	/*!
26	\class QVXYModelMapper	26	\class QVXYModelMapper
27	\brief part of QtCommercial chart API.
28	\mainclass	27	\mainclass
29		28
30	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.	29	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
@@ -34,6 +33,19 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34	*/	33	*/
35		34
36	/*!	35	/*!
		36	\property QVXYModelMapper::series
		37	\brief Defines the QXYSeries object that is used by the mapper.
		38
		39	All the data in the series is discarded when it is set to the mapper.
		40	When new series is specified the old series is disconnected (it preserves its data)
		41	*/
		42
		43	/*!
		44	\property QVXYModelMapper::model
		45	\brief Defines the model that is used by the mapper.
		46	*/
		47
		48	/*!
37	\property QVXYModelMapper::xColumn	49	\property QVXYModelMapper::xColumn
38	\brief Defines which column of the model is kept in sync with the x values of QXYSeries	50	\brief Defines which column of the model is kept in sync with the x values of QXYSeries
39		51
@@ -48,6 +60,40 QTCOMMERCIALCHART_BEGIN_NAMESPACE
48	*/	60	*/
49		61
50	/*!	62	/*!
		63	\property QVXYModelMapper::firstRow
		64	\brief Defines which row of the model contains the data for the first point of the series.
		65	Minimal and default value is: 0
		66	*/
		67	/*!
		68	\qmlproperty int QVXYModelMapper::firstRow
		69	Defines which row of the model contains the data for the first point of the series.
		70	The default value is 0.
		71	*/
		72
		73	/*!
		74	\property QVXYModelMapper::rowCount
		75	\brief Defines the number of rows of the model that are mapped as the data for series
		76	Minimal and default value is: -1 (count limited by the number of rows in the model)
		77	*/
		78	/*!
		79	\qmlproperty int QVXYModelMapper::columnCount
		80	Defines the number of rows of the model that are mapped as the data for series. The default value is
		81	-1 (count limited by the number of rows in the model)
		82	*/
		83
		84	/*!
		85	\fn void QVXYModelMapper::seriesReplaced()
		86
		87	Emitted when the series to which mapper is connected to has changed.
		88	*/
		89
		90	/*!
		91	\fn void QVXYModelMapper::modelReplaced()
		92
		93	Emitted when the model to which mapper is connected to has changed.
		94	*/
		95
		96	/*!
51	\fn void QVXYModelMapper::xColumnChanged()	97	\fn void QVXYModelMapper::xColumnChanged()
52		98
53	Emitted when the xColumn has changed.	99	Emitted when the xColumn has changed.
@@ -60,6 +106,16 QTCOMMERCIALCHART_BEGIN_NAMESPACE
60	*/	106	*/
61		107
62	/*!	108	/*!
		109	\fn void QVXYModelMapper::firstRowChanged()
		110	Emitted when the firstRow has changed.
		111	*/
		112
		113	/*!
		114	\fn void QVXYModelMapper::rowCountChanged()
		115	Emitted when the rowCount has changed.
		116	*/
		117
		118	/*!
63	Constructs a mapper object which is a child of \a parent.	119	Constructs a mapper object which is a child of \a parent.
64	*/	120	*/
65	QVXYModelMapper::QVXYModelMapper(QObject *parent) :	121	QVXYModelMapper::QVXYModelMapper(QObject *parent) :
@@ -68,6 +124,32 QVXYModelMapper::QVXYModelMapper(QObject *parent) :
68	QXYModelMapper::setOrientation(Qt::Vertical);	124	QXYModelMapper::setOrientation(Qt::Vertical);
69	}	125	}
70		126
		127	QAbstractItemModel* QVXYModelMapper::model() const
		128	{
		129	return QXYModelMapper::model();
		130	}
		131
		132	void QVXYModelMapper::setModel(QAbstractItemModel *model)
		133	{
		134	if (model != QXYModelMapper::model()) {
		135	QXYModelMapper::setModel(model);
		136	emit modelReplaced();
		137	}
		138	}
		139
		140	QXYSeries* QVXYModelMapper::series() const
		141	{
		142	return QXYModelMapper::series();
		143	}
		144
		145	void QVXYModelMapper::setSeries(QXYSeries *series)
		146	{
		147	if (series != QXYModelMapper::series()) {
		148	QXYModelMapper::setSeries(series);
		149	emit seriesReplaced();
		150	}
		151	}
		152
71	int QVXYModelMapper::xColumn() const	153	int QVXYModelMapper::xColumn() const
72	{	154	{
73	return QXYModelMapper::xSection();	155	return QXYModelMapper::xSection();
@@ -94,6 +176,32 void QVXYModelMapper::setYColumn(int yColumn)
94	}	176	}
95	}	177	}
96		178
		179	int QVXYModelMapper::firstRow() const
		180	{
		181	return first();
		182	}
		183
		184	void QVXYModelMapper::setFirstRow(int firstRow)
		185	{
		186	if (firstRow != first()) {
		187	setFirst(firstRow);
		188	emit firstRowChanged();
		189	}
		190	}
		191
		192	int QVXYModelMapper::rowCount() const
		193	{
		194	return count();
		195	}
		196
		197	void QVXYModelMapper::setRowCount(int rowCount)
		198	{
		199	if (rowCount != count()) {
		200	setCount(rowCount);
		201	emit firstRowChanged();
		202	}
		203	}
		204
97	#include "moc_qvxymodelmapper.cpp"	205	#include "moc_qvxymodelmapper.cpp"
98		206
99	QTCOMMERCIALCHART_END_NAMESPACE	207	QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qvxymodelmapper.h +20 0

             class QTCOMMERCIALCHART_EXPORT QVXYModelMapper : public QXYModelMapper
             {
                 Q_OBJECT
+                Q_PROPERTY(QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+                Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
                 Q_PROPERTY(int xColumn READ xColumn WRITE setXColumn NOTIFY xColumnChanged)
                 Q_PROPERTY(int yColumn READ yColumn WRITE setYColumn NOTIFY yColumnChanged)
+                Q_PROPERTY(int firstRow READ firstRow WRITE setFirstRow NOTIFY firstRowChanged)
+                Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged)
             public:
                 explicit QVXYModelMapper(QObject *parent = 0);
+                QAbstractItemModel* model() const;
+                void setModel(QAbstractItemModel *model);
+                QXYSeries* series() const;
+                void setSeries(QXYSeries *series);
                 int xColumn() const;
                 void setXColumn(int xColumn);
                 int yColumn() const;
                 void setYColumn(int yColumn);
+                int firstRow() const;
+                void setFirstRow(int firstRow);
+                int rowCount() const;
+                void setRowCount(int rowCount);
             Q_SIGNALS:
+                void seriesReplaced();
+                void modelReplaced();
                 void xColumnChanged();
                 void yColumnChanged();
+                void firstRowChanged();
+                void rowCountChanged();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qxymodelmapper.cpp +24 -89

@@ -26,68 +26,6
26	QTCOMMERCIALCHART_BEGIN_NAMESPACE	26	QTCOMMERCIALCHART_BEGIN_NAMESPACE
27		27
28	/*!	28	/*!
29	\class QXYModelMapper
30	\brief part of QtCommercial chart API.
31	\mainclass
32
33	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
34	The instance of this class cannot be created directly. QHXYModelMapper of QVXYModelMapper should be used instead. This class is used to create a connection between QXYSeries and QAbstractItemModel derived model object.
35	It is possible to use both QAbstractItemModel and QXYSeries model API. QXYModelMapper makes sure that QXYSeries and the model are kept in sync.
36	NOTE: used model has to support adding/removing rows/columns and modifying the data of the cells.
37	*/
38
39	/*!
40	\property QXYModelMapper::series
41	\brief Defines the QPieSeries object that is used by the mapper.
42
43	All the data in the series is discarded when it is set to the mapper.
44	When new series is specified the old series is disconnected (it preserves its data)
45	*/
46
47	/*!
48	\property QXYModelMapper::model
49	\brief Defines the model that is used by the mapper.
50	*/
51
52	/*!
53	\property QXYModelMapper::first
54	\brief Defines which item of the model's row/column should be mapped as the first x/y pair
55
56	Minimal and default value is: 0
57	*/
58
59	/*!
60	\property QXYModelMapper::count
61	\brief Defines the number of rows/columns of the model that are mapped as the data for QXYSeries
62
63	Minimal and default value is: -1 (count limited by the number of rows/columns in the model)
64	*/
65
66	/*!
67	\fn void QXYModelMapper::seriesReplaced()
68
69	Emitted when the series to which mapper is connected to has changed.
70	*/
71
72	/*!
73	\fn void QXYModelMapper::modelReplaced()
74
75	Emitted when the model to which mapper is connected to has changed.
76	*/
77
78	/*!
79	\fn void QXYModelMapper::firstChanged()
80
81	Emitted when the value for the first has changed.
82	*/
83
84	/*!
85	\fn void QXYModelMapper::countChanged()
86
87	Emitted when the value for the count has changed.
88	*/
89
90	/*!
91	Constructs a mapper object which is a child of \a parent.	29	Constructs a mapper object which is a child of \a parent.
92	*/	30	*/
93	QXYModelMapper::QXYModelMapper(QObject *parent):	31	QXYModelMapper::QXYModelMapper(QObject *parent):
@@ -96,12 +34,18 QXYModelMapper::QXYModelMapper(QObject *parent):
96	{	34	{
97	}	35	}
98		36
		37	/*!
		38	\internal
		39	*/
99	QAbstractItemModel* QXYModelMapper::model() const	40	QAbstractItemModel* QXYModelMapper::model() const
100	{	41	{
101	Q_D(const QXYModelMapper);	42	Q_D(const QXYModelMapper);
102	return d->m_model;	43	return d->m_model;
103	}	44	}
104		45
		46	/*!
		47	\internal
		48	*/
105	void QXYModelMapper::setModel(QAbstractItemModel *model)	49	void QXYModelMapper::setModel(QAbstractItemModel *model)
106	{	50	{
107	if (model == 0)	51	if (model == 0)
@@ -120,16 +64,20 void QXYModelMapper::setModel(QAbstractItemModel *model)
120	connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));	64	connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));
121	connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));	65	connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));
122	connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));	66	connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
123
124	emit modelReplaced();
125	}	67	}
126		68
		69	/*!
		70	\internal
		71	*/
127	QXYSeries* QXYModelMapper::series() const	72	QXYSeries* QXYModelMapper::series() const
128	{	73	{
129	Q_D(const QXYModelMapper);	74	Q_D(const QXYModelMapper);
130	return d->m_series;	75	return d->m_series;
131	}	76	}
132		77
		78	/*!
		79	\internal
		80	*/
133	void QXYModelMapper::setSeries(QXYSeries *series)	81	void QXYModelMapper::setSeries(QXYSeries *series)
134	{	82	{
135	Q_D(QXYModelMapper);	83	Q_D(QXYModelMapper);
@@ -146,42 +94,44 void QXYModelMapper::setSeries(QXYSeries *series)
146	connect(d->m_series, SIGNAL(pointAdded(int)), d, SLOT(handlePointAdded(int)));	94	connect(d->m_series, SIGNAL(pointAdded(int)), d, SLOT(handlePointAdded(int)));
147	connect(d->m_series, SIGNAL(pointRemoved(int)), d, SLOT(handlePointRemoved(int)));	95	connect(d->m_series, SIGNAL(pointRemoved(int)), d, SLOT(handlePointRemoved(int)));
148	connect(d->m_series, SIGNAL(pointReplaced(int)), d, SLOT(handlePointReplaced(int)));	96	connect(d->m_series, SIGNAL(pointReplaced(int)), d, SLOT(handlePointReplaced(int)));
149
150	emit seriesReplaced();
151	}	97	}
152		98
		99	/*!
		100	\internal
		101	*/
153	int QXYModelMapper::first() const	102	int QXYModelMapper::first() const
154	{	103	{
155	Q_D(const QXYModelMapper);	104	Q_D(const QXYModelMapper);
156	return d->m_first;	105	return d->m_first;
157	}	106	}
158		107
		108	/*!
		109	\internal
		110	*/
159	void QXYModelMapper::setFirst(int first)	111	void QXYModelMapper::setFirst(int first)
160	{	112	{
161	Q_D(QXYModelMapper);	113	Q_D(QXYModelMapper);
162	if (first != d->m_first) {
163	d->m_first = qMax(first, 0);	114	d->m_first = qMax(first, 0);
164	d->initializeXYFromModel();	115	d->initializeXYFromModel();
165
166	emit firstChanged();
167	}
168	}	116	}
169		117
		118	/*!
		119	\internal
		120	*/
170	int QXYModelMapper::count() const	121	int QXYModelMapper::count() const
171	{	122	{
172	Q_D(const QXYModelMapper);	123	Q_D(const QXYModelMapper);
173	return d->m_count;	124	return d->m_count;
174	}	125	}
175		126
		127	/*!
		128	\internal
		129	*/
176	void QXYModelMapper::setCount(int count)	130	void QXYModelMapper::setCount(int count)
177	{	131	{
178	Q_D(QXYModelMapper);	132	Q_D(QXYModelMapper);
179	if (count != d->m_count) {
180	d->m_count = qMax(count, -1);	133	d->m_count = qMax(count, -1);
181	d->initializeXYFromModel();	134	d->initializeXYFromModel();
182
183	emit countChanged();
184	}
185	}	135	}
186		136
187	/*!	137	/*!
@@ -247,21 +197,6 void QXYModelMapper::setYSection(int ySection)
247	d->initializeXYFromModel();	197	d->initializeXYFromModel();
248	}	198	}
249		199
250	/*!
251	Resets the QXYModelMapper to the default state.
252	first: 0; count: -1; xSection: -1; ySection: -1;
253	*/
254	void QXYModelMapper::reset()
255	{
256	Q_D(QXYModelMapper);
257	d->m_first = 0;
258	d->m_count = -1;
259	d->m_orientation = Qt::Vertical;
260	d->m_xSection = -1;
261	d->m_ySection = -1;
262	d->initializeXYFromModel();
263	}
264
265	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	200	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
266		201
267	QXYModelMapperPrivate::QXYModelMapperPrivate(QXYModelMapper *q) :	202	QXYModelMapperPrivate::QXYModelMapperPrivate(QXYModelMapper *q) :

src/xychart/qxymodelmapper.h 0 -15

             class QTCOMMERCIALCHART_EXPORT QXYModelMapper : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
-                Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
-                Q_PROPERTY(int first READ first WRITE setFirst NOTIFY firstChanged)
-                Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged)
-                Q_ENUMS(Qt::Orientation)
             protected:
                 explicit QXYModelMapper(QObject *parent = 0);
-            public:
                 QAbstractItemModel* model() const;
                 void setModel(QAbstractItemModel *model);
                 int count() const;
                 void setCount(int count);
-                void reset();
-            protected:
                 Qt::Orientation orientation() const;
                 void setOrientation(Qt::Orientation orientation);
                 int ySection() const;
                 void setYSection(int ySection);
-            Q_SIGNALS:
-                void seriesReplaced();
-                void modelReplaced();
-                void firstChanged();
-                void countChanged();
             protected:
                 QXYModelMapperPrivate * const d_ptr;
                 Q_DECLARE_PRIVATE(QXYModelMapper)

tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp +23 -23

                 mapper->setYColumn(1);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
-                mapper->setFirst(first);
+                mapper->setFirstRow(first);
-                mapper->setCount(countLimit);
+                mapper->setRowCount(countLimit);
                 QCOMPARE(m_series->count(), expectedCount);
                 mapper->setYRow(1);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
-                mapper->setFirst(first);
+                mapper->setFirstColumn(first);
-                mapper->setCount(countLimit);
+                mapper->setColumnCount(countLimit);
                 QCOMPARE(m_series->count(), expectedCount);
                 // setup the mapper
                 createVerticalMapper();
                 QCOMPARE(m_series->count(), m_modelRowCount);
-                QCOMPARE(m_vMapper->count(), -1);
+                QCOMPARE(m_vMapper->rowCount(), -1);
                 m_series->append(QPointF(100, 100));
                 QCOMPARE(m_series->count(), m_modelRowCount + 1);
-                QCOMPARE(m_vMapper->count(), -1); // the value should not change as it indicates 'all' items there are in the model
+                QCOMPARE(m_vMapper->rowCount(), -1); // the value should not change as it indicates 'all' items there are in the model
                 m_series->remove(m_series->points().last());
                 QCOMPARE(m_series->count(), m_modelRowCount);
-                QCOMPARE(m_vMapper->count(), -1); // the value should not change as it indicates 'all' items there are in the model
+                QCOMPARE(m_vMapper->rowCount(), -1); // the value should not change as it indicates 'all' items there are in the model
                 m_series->replace(m_series->points().first(), QPointF(25.0, 75.0));
                 QCOMPARE(m_model->data(m_model->index(0, 0)).toReal(), 25.0);
                 QCOMPARE(m_series->count(), m_modelRowCount + insertCount);
                 int first = 3;
-                m_vMapper->setFirst(3);
+                m_vMapper->setFirstRow(3);
                 QCOMPARE(m_series->count(), m_modelRowCount + insertCount - first);
                 m_model->insertRows(3, insertCount);
                 QCOMPARE(m_series->count(), m_modelRowCount +  2 * insertCount - first);
                 int countLimit = 6;
-                m_vMapper->setCount(countLimit);
+                m_vMapper->setRowCount(countLimit);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount + 2 * insertCount - first));
                 m_model->insertRows(3, insertCount);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount + 3 * insertCount - first));
-                m_vMapper->setFirst(0);
+                m_vMapper->setFirstRow(0);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount + 3 * insertCount));
-                m_vMapper->setCount(-1);
+                m_vMapper->setRowCount(-1);
                 QCOMPARE(m_series->count(), m_modelRowCount + 3 * insertCount);
             }
                 QCOMPARE(m_series->count(), m_modelRowCount - removeCount);
                 int first = 1;
-                m_vMapper->setFirst(first);
+                m_vMapper->setFirstRow(first);
                 QCOMPARE(m_series->count(), m_modelRowCount - removeCount - first);
                 m_model->removeRows(1, removeCount);
                 QCOMPARE(m_series->count(), m_modelRowCount -  2 * removeCount - first);
                 int countLimit = 3;
-                m_vMapper->setCount(countLimit);
+                m_vMapper->setRowCount(countLimit);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount -  2 * removeCount - first));
                 m_model->removeRows(1, removeCount);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount -  3 * removeCount - first));
-                m_vMapper->setFirst(0);
+                m_vMapper->setFirstRow(0);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount -  3 * removeCount));
-                m_vMapper->setCount(-1);
+                m_vMapper->setRowCount(-1);
                 QCOMPARE(m_series->count(), m_modelRowCount -  3 * removeCount);
             }
                 QCOMPARE(m_series->count(), m_modelColumnCount + insertCount);
                 int first = 3;
-                m_hMapper->setFirst(3);
+                m_hMapper->setFirstColumn(3);
                 QCOMPARE(m_series->count(), m_modelColumnCount + insertCount - first);
                 m_model->insertColumns(3, insertCount);
                 QCOMPARE(m_series->count(), m_modelColumnCount +  2 * insertCount - first);
                 int countLimit = 6;
-                m_hMapper->setCount(countLimit);
+                m_hMapper->setColumnCount(countLimit);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount + 2 * insertCount - first));
                 m_model->insertColumns(3, insertCount);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount + 3 * insertCount - first));
-                m_hMapper->setFirst(0);
+                m_hMapper->setFirstColumn(0);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount + 3 * insertCount));
-                m_hMapper->setCount(-1);
+                m_hMapper->setColumnCount(-1);
                 QCOMPARE(m_series->count(), m_modelColumnCount + 3 * insertCount);
             }
                 QCOMPARE(m_series->count(), m_modelColumnCount - removeCount);
                 int first = 1;
-                m_hMapper->setFirst(first);
+                m_hMapper->setFirstColumn(first);
                 QCOMPARE(m_series->count(), m_modelColumnCount - removeCount - first);
                 m_model->removeColumns(1, removeCount);
                 QCOMPARE(m_series->count(), m_modelColumnCount -  2 * removeCount - first);
                 int countLimit = 3;
-                m_hMapper->setCount(countLimit);
+                m_hMapper->setColumnCount(countLimit);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount -  2 * removeCount - first));
                 m_model->removeColumns(1, removeCount);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount -  3 * removeCount - first));
-                m_hMapper->setFirst(0);
+                m_hMapper->setFirstColumn(0);
                 QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount -  3 * removeCount));
-                m_hMapper->setCount(-1);
+                m_hMapper->setColumnCount(-1);
                 QCOMPARE(m_series->count(), m_modelColumnCount -  3 * removeCount);
             }

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