HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1508:692534957d8b

PieModelMapper removed from the docs

Marek Rosa -

r1508:692534957d8b

parent child

Context file:

r1508:692534957d8b

Collapse all files

doc/src/classes.qdoc 0 -1

                                 <ul>
                                 <li><a href="qpieseries.html">QPieSeries</a></li>
                                 <li><a href="qpieslice.html">QPieSlice</a></li>
-                                <li><a href="qpiemodelmapper.html">QPieModelMapper</a></li>
                                 <li><a href="qhpiemodelmapper.html">QHPieModelMapper</a></li>
                                 <li><a href="qvpiemodelmapper.html">QVPieModelMapper</a></li>
                                 </ul>

src/piechart/qhpiemodelmapper.cpp +51 -1

@@ -24,7 +24,6 QTCOMMERCIALCHART_BEGIN_NAMESPACE
24		24
25	/*!	25	/*!
26	\class QHPieModelMapper	26	\class QHPieModelMapper
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 QHPieModelMapper::series
		37	\brief Defines the QPieSeries 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 QHPieModelMapper::model
		45	\brief Defines the model that is used by the mapper.
		46	*/
		47
		48	/*!
37	\property QHPieModelMapper::valuesRow	49	\property QHPieModelMapper::valuesRow
38	\brief Defines which row of the model is kept in sync with the values of the pie's slices	50	\brief Defines which row of the model is kept in sync with the values of the pie's slices
39		51
@@ -70,6 +82,18 QTCOMMERCIALCHART_BEGIN_NAMESPACE
70	*/	82	*/
71		83
72	/*!	84	/*!
		85	\fn void QHPieModelMapper::seriesReplaced()
		86
		87	Emitted when the series to which mapper is connected to has changed.
		88	*/
		89
		90	/*!
		91	\fn void QHPieModelMapper::modelReplaced()
		92
		93	Emitted when the model to which mapper is connected to has changed.
		94	*/
		95
		96	/*!
73	\fn void QHPieModelMapper::valuesRowChanged()	97	\fn void QHPieModelMapper::valuesRowChanged()
74		98
75	Emitted when the valuesRow has changed.	99	Emitted when the valuesRow has changed.
@@ -100,6 +124,32 QHPieModelMapper::QHPieModelMapper(QObject *parent) :
100	setOrientation(Qt::Horizontal);	124	setOrientation(Qt::Horizontal);
101	}	125	}
102		126
		127	QAbstractItemModel* QHPieModelMapper::model() const
		128	{
		129	return QPieModelMapper::model();
		130	}
		131
		132	void QHPieModelMapper::setModel(QAbstractItemModel *model)
		133	{
		134	if (model != QPieModelMapper::model()) {
		135	QPieModelMapper::setModel(model);
		136	emit modelReplaced();
		137	}
		138	}
		139
		140	QPieSeries* QHPieModelMapper::series() const
		141	{
		142	return QPieModelMapper::series();
		143	}
		144
		145	void QHPieModelMapper::setSeries(QPieSeries *series)
		146	{
		147	if (series != QPieModelMapper::series()) {
		148	QPieModelMapper::setSeries(series);
		149	emit seriesReplaced();
		150	}
		151	}
		152
103	/*!	153	/*!
104	Returns which row of the model is kept in sync with the values of the pie's slices	154	Returns which row of the model is kept in sync with the values of the pie's slices
105	*/	155	*/

src/piechart/qhpiemodelmapper.h +10 0

             class QTCOMMERCIALCHART_EXPORT QHPieModelMapper : public QPieModelMapper
             {
                 Q_OBJECT
+                Q_PROPERTY(QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+                Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
                 Q_PROPERTY(int valuesRow READ valuesRow WRITE setValuesRow NOTIFY valuesRowChanged)
                 Q_PROPERTY(int labelsRow READ labelsRow WRITE setLabelsRow NOTIFY labelsRowChanged)
                 Q_PROPERTY(int firstColumn READ firstColumn WRITE setFirstColumn NOTIFY firstColumnChanged)
             public:
                 explicit QHPieModelMapper(QObject *parent = 0);
+                QAbstractItemModel* model() const;
+                void setModel(QAbstractItemModel *model);
+                QPieSeries* series() const;
+                void setSeries(QPieSeries *series);
                 int valuesRow() const;
                 void setValuesRow(int valuesRow);
                 void setColumnCount(int columnCount);
             Q_SIGNALS:
+                void seriesReplaced();
+                void modelReplaced();
                 void valuesRowChanged();
                 void labelsRowChanged();
                 void firstColumnChanged();

src/piechart/qpiemodelmapper.cpp 0 -56

@@ -26,45 +26,6
26		26
27	QTCOMMERCIALCHART_BEGIN_NAMESPACE	27	QTCOMMERCIALCHART_BEGIN_NAMESPACE
28		28
29	/*!
30	\class QPieModelMapper
31	\brief part of QtCommercial chart API.
32	\mainclass
33
34	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
35	The instance of this class cannot be created directly. QHPieModelMapper of QVPieModelMapper should be used instead. This class is used to create a connection between QPieSeries and QAbstractItemModel derived model object.
36	It is possible to use both QAbstractItemModel and QPieSeries model API. QPieModelMapper makes sure that Pie and the model are kept in sync.
37	NOTE: used model has to support adding/removing rows/columns and modifying the data of the cells.
38	*/
39
40	/*!
41	\property QPieModelMapper::series
42	\brief Defines the QPieSeries object that is used by the mapper.
43
44	All the data in the series is discarded when it is set to the mapper.
45	When new series is specified the old series is disconnected (it preserves its data)
46	*/
47
48	/*!
49	\property QPieModelMapper::model
50	\brief Defines the model that is used by the mapper.
51	*/
52
53	/*!
54	\fn void QPieModelMapper::seriesReplaced()
55
56	Emitted when the series to which mapper is connected to has changed.
57	*/
58
59	/*!
60	\fn void QPieModelMapper::modelReplaced()
61
62	Emitted when the model to which mapper is connected to has changed.
63	*/
64
65	/*!
66	Constructs a mapper object which is a child of \a parent.
67	*/
68	QPieModelMapper::QPieModelMapper(QObject *parent) :	29	QPieModelMapper::QPieModelMapper(QObject *parent) :
69	QObject(parent),	30	QObject(parent),
70	d_ptr(new QPieModelMapperPrivate(this))	31	d_ptr(new QPieModelMapperPrivate(this))
@@ -95,8 +56,6 void QPieModelMapper::setModel(QAbstractItemModel *model)
95	connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));	56	connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));
96	connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));	57	connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));
97	connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));	58	connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
98
99	emit modelReplaced();
100	}	59	}
101		60
102	QPieSeries* QPieModelMapper::series() const	61	QPieSeries* QPieModelMapper::series() const
@@ -120,8 +79,6 void QPieModelMapper::setSeries(QPieSeries *series)
120	// connect the signals from the series	79	// connect the signals from the series
121	connect(d->m_series, SIGNAL(added(QList<QPieSlice>)), d, SLOT(slicesAdded(QList<QPieSlice>)));	80	connect(d->m_series, SIGNAL(added(QList<QPieSlice>)), d, SLOT(slicesAdded(QList<QPieSlice>)));
122	connect(d->m_series, SIGNAL(removed(QList<QPieSlice>)), d, SLOT(slicesRemoved(QList<QPieSlice>)));	81	connect(d->m_series, SIGNAL(removed(QList<QPieSlice>)), d, SLOT(slicesRemoved(QList<QPieSlice>)));
123
124	emit seriesReplaced();
125	}	82	}
126		83
127	/*!	84	/*!
@@ -229,19 +186,6 void QPieModelMapper::setLabelsSection(int labelsSection)
229	d->initializePieFromModel();	186	d->initializePieFromModel();
230	}	187	}
231		188
232	/*!
233	Resets the QPieModelMapper to the default state.
234	first: 0; count: -1; valuesSection: -1; labelsSection: -1;
235	*/
236	void QPieModelMapper::reset()
237	{
238	Q_D(QPieModelMapper);
239	d->m_first = 0;
240	d->m_count = -1;
241	d->m_valuesSection = -1;
242	d->m_labelsSection = -1;
243	}
244
245	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	189	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
246		190
247	QPieModelMapperPrivate::QPieModelMapperPrivate(QPieModelMapper *q) :	191	QPieModelMapperPrivate::QPieModelMapperPrivate(QPieModelMapper *q) :

src/piechart/qpiemodelmapper.h 0 -11

             class QTCOMMERCIALCHART_EXPORT QPieModelMapper : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
-                Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
-                Q_ENUMS(Qt::Orientation)
             protected:
                 QPieModelMapper(QObject *parent = 0);
-            public:
                 QAbstractItemModel* model() const;
                 void setModel(QAbstractItemModel *model);
                 QPieSeries* series() const;
                 void setSeries(QPieSeries *series);
-                void reset();
-            protected:
                 int first() const;
                 void setFirst(int first);
                 Qt::Orientation orientation() const;
                 void setOrientation(Qt::Orientation orientation);
-            Q_SIGNALS:
-                void seriesReplaced();
-                void modelReplaced();
             protected:
                 QPieModelMapperPrivate * const d_ptr;
                 Q_DECLARE_PRIVATE(QPieModelMapper)

src/piechart/qvpiemodelmapper.cpp +51 -1

@@ -24,7 +24,6 QTCOMMERCIALCHART_BEGIN_NAMESPACE
24		24
25	/*!	25	/*!
26	\class QVPieModelMapper	26	\class QVPieModelMapper
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 QVPieModelMapper::series
		37	\brief Defines the QPieSeries 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 QVPieModelMapper::model
		45	\brief Defines the model that is used by the mapper.
		46	*/
		47
		48	/*!
37	\property QVPieModelMapper::valuesColumn	49	\property QVPieModelMapper::valuesColumn
38	\brief Defines which column of the model is kept in sync with the values of the pie's slices	50	\brief Defines which column of the model is kept in sync with the values of the pie's slices
39		51
@@ -70,6 +82,18 QTCOMMERCIALCHART_BEGIN_NAMESPACE
70	*/	82	*/
71		83
72	/*!	84	/*!
		85	\fn void QVPieModelMapper::seriesReplaced()
		86
		87	Emitted when the series to which mapper is connected to has changed.
		88	*/
		89
		90	/*!
		91	\fn void QVPieModelMapper::modelReplaced()
		92
		93	Emitted when the model to which mapper is connected to has changed.
		94	*/
		95
		96	/*!
73	\fn void QVPieModelMapper::valuesColumnChanged()	97	\fn void QVPieModelMapper::valuesColumnChanged()
74		98
75	Emitted when the valuesColumn has changed.	99	Emitted when the valuesColumn has changed.
@@ -100,6 +124,32 QVPieModelMapper::QVPieModelMapper(QObject *parent) :
100	QPieModelMapper::setOrientation(Qt::Vertical);	124	QPieModelMapper::setOrientation(Qt::Vertical);
101	}	125	}
102		126
		127	QAbstractItemModel* QVPieModelMapper::model() const
		128	{
		129	return QPieModelMapper::model();
		130	}
		131
		132	void QVPieModelMapper::setModel(QAbstractItemModel *model)
		133	{
		134	if (model != QPieModelMapper::model()) {
		135	QPieModelMapper::setModel(model);
		136	emit modelReplaced();
		137	}
		138	}
		139
		140	QPieSeries* QVPieModelMapper::series() const
		141	{
		142	return QPieModelMapper::series();
		143	}
		144
		145	void QVPieModelMapper::setSeries(QPieSeries *series)
		146	{
		147	if (series != QPieModelMapper::series()) {
		148	QPieModelMapper::setSeries(series);
		149	emit seriesReplaced();
		150	}
		151	}
		152
103	/*!	153	/*!
104	Returns which column of the model is kept in sync with the values of the pie's slices	154	Returns which column of the model is kept in sync with the values of the pie's slices
105	*/	155	*/

src/piechart/qvpiemodelmapper.h +10 0

             class QTCOMMERCIALCHART_EXPORT QVPieModelMapper : public QPieModelMapper
             {
                 Q_OBJECT
+                Q_PROPERTY(QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+                Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
                 Q_PROPERTY(int valuesColumn READ valuesColumn WRITE setValuesColumn NOTIFY valuesColumnChanged)
                 Q_PROPERTY(int labelsColumn READ labelsColumn WRITE setLabelsColumn NOTIFY labelsColumnChanged)
                 Q_PROPERTY(int firstRow READ firstRow WRITE setFirstRow NOTIFY firstRowChanged)
             public:
                 explicit QVPieModelMapper(QObject *parent = 0);
+                QAbstractItemModel* model() const;
+                void setModel(QAbstractItemModel *model);
+                QPieSeries* series() const;
+                void setSeries(QPieSeries *series);
                 int valuesColumn() const;
                 void setValuesColumn(int valuesColumn);
                 void setRowCount(int rowCount);
             Q_SIGNALS:
+                void seriesReplaced();
+                void modelReplaced();
                 void valuesColumnChanged();
                 void labelsColumnChanged();
                 void firstRowChanged();

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