HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1252:4e92004ccd6b

src/xychart/qhxymodelmapper.cpp created 644 +32 0

@@ -0,0 +1,32
	1	#include "qhxymodelmapper.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4
	5	QHXYModelMapper::QHXYModelMapper(QObject *parent) :
	6	QXYModelMapper(parent)
	7	{
	8	}
	9
	10	int QHXYModelMapper::xRow() const
	11	{
	12	return QXYModelMapper::xSection();
	13	}
	14
	15	void QHXYModelMapper::setXRow(int xRow)
	16	{
	17	return QXYModelMapper::setXSection(xRow);
	18	}
	19
	20	int QHXYModelMapper::yRow() const
	21	{
	22	return QXYModelMapper::ySection();
	23	}
	24
	25	void QHXYModelMapper::setYRow(int yRow)
	26	{
	27	return QXYModelMapper::setYSection(yRow);
	28	}
	29
	30	#include "moc_qhxymodelmapper.cpp"
	31
	32	QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qhxymodelmapper.h created 644 +27 0

@@ -0,0 +1,27
	1	#ifndef QHXYMODELMAPPER_H
	2	#define QHXYMODELMAPPER_H
	3
	4	#include <QXYModelMapper>
	5
	6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	7
	8	class QTCOMMERCIALCHART_EXPORT QHXYModelMapper : public QXYModelMapper
	9	{
	10	Q_OBJECT
	11	Q_PROPERTY(int xRow READ xRow WRITE setXRow)
	12	Q_PROPERTY(int yRow READ yRow WRITE setYRow)
	13
	14	public:
	15	explicit QHXYModelMapper(QObject *parent = 0);
	16
	17	int xRow() const;
	18	void setXRow(int xRow);
	19
	20	int yRow() const;
	21	void setYRow(int yRow);
	22
	23	};
	24
	25	QTCOMMERCIALCHART_END_NAMESPACE
	26
	27	#endif // QHXYMODELMAPPER_H

src/xychart/qvxymodelmapper.cpp created 644 +32 0

@@ -0,0 +1,32
	1	#include "qvxymodelmapper.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4
	5	QVXYModelMapper::QVXYModelMapper(QObject *parent) :
	6	QXYModelMapper(parent)
	7	{
	8	}
	9
	10	int QVXYModelMapper::xColumn() const
	11	{
	12	return QXYModelMapper::xSection();
	13	}
	14
	15	void QVXYModelMapper::setXColumn(int xColumn)
	16	{
	17	return QXYModelMapper::setXSection(xColumn);
	18	}
	19
	20	int QVXYModelMapper::yColumn() const
	21	{
	22	return QXYModelMapper::ySection();
	23	}
	24
	25	void QVXYModelMapper::setYColumn(int yColumn)
	26	{
	27	return QXYModelMapper::setYSection(yColumn);
	28	}
	29
	30	#include "moc_qvxymodelmapper.cpp"
	31
	32	QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qvxymodelmapper.h created 644 +27 0

@@ -0,0 +1,27
	1	#ifndef QVXYMODELMAPPER_H
	2	#define QVXYMODELMAPPER_H
	3
	4	#include <QXYModelMapper>
	5
	6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	7
	8	class QTCOMMERCIALCHART_EXPORT QVXYModelMapper : public QXYModelMapper
	9	{
	10	Q_OBJECT
	11	Q_PROPERTY(int xColumn READ xColumn WRITE setXColumn)
	12	Q_PROPERTY(int yColumn READ yColumn WRITE setYColumn)
	13
	14	public:
	15	explicit QVXYModelMapper(QObject *parent = 0);
	16
	17	int xColumn() const;
	18	void setXColumn(int xColumn);
	19
	20	int yColumn() const;
	21	void setYColumn(int yColumn);
	22
	23	};
	24
	25	QTCOMMERCIALCHART_END_NAMESPACE
	26
	27	#endif // QVXYMODELMAPPER_H

plugins/declarative/declarativemodel.cpp +3 -2

             {
             //    qDebug() << "DeclarativeTableModel::appendPoint:" << point;
                 QVariantList values;
-                values.insert(mapper->mapX(), point->x());
+                // TODO: XYModelMapper implementation has change, this code has to be updated.
-                values.insert(mapper->mapY(), point->y());
+            //    values.insert(mapper->mapX(), point->x());
+            //    values.insert(mapper->mapY(), point->y());
                 append(values);
             }

plugins/declarative/declarativexyseries.cpp +10 -8

@@ -29,15 +29,17 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29		29
30	DeclarativeXySeries::DeclarativeXySeries()	30	DeclarativeXySeries::DeclarativeXySeries()
31	{	31	{
		32	// TODO: XYModelMapper implementation has changed, this code has to be updated
		33
32	// All the inherited objects must be of type QXYSeries, so it is safe to cast	34	// All the inherited objects must be of type QXYSeries, so it is safe to cast
33	QXYSeries series = reinterpret_cast<QXYSeries >(this);	35	// QXYSeries series = reinterpret_cast<QXYSeries >(this);
34	// TODO: mapper should be available on the series by default	36	// // TODO: mapper should be available on the series by default
35	QXYModelMapper *mapper = new QXYModelMapper(series);	37	// QXYModelMapper *mapper = new QXYModelMapper(series);
36	mapper->setMapX(0);	38	// mapper->setMapX(0);
37	mapper->setMapY(1);	39	// mapper->setMapY(1);
38	mapper->setFirst(0);	40	// mapper->setFirst(0);
39	mapper->setCount(-1);	41	// mapper->setCount(-1);
40	mapper->setOrientation(Qt::Vertical);	42	// mapper->setOrientation(Qt::Vertical);
41	// series->setModelMapper(mapper);	43	// series->setModelMapper(mapper);
42	}	44	}
43		45

src/piechart/qpiemodelmapper.cpp +3 -4

             void QPieModelMapper::setSeries(QPieSeries *series)
             {
-                if (series == 0)
-                    return;
                 Q_D(QPieModelMapper);
                 if (d->m_series) {
                     disconnect(d->m_series, 0, d, 0);
                 }
+                if (series == 0)
+                    return;
                 d->m_series = series;
                 d->initializePieFromModel();
                 // connect the signals from the series
                 connect(d->m_series, SIGNAL(added(QList<QPieSlice*>)), d, SLOT(slicesAdded(QList<QPieSlice*>)));
                 connect(d->m_series, SIGNAL(removed(QList<QPieSlice*>)), d, SLOT(slicesRemoved(QList<QPieSlice*>)));
-                //        connect(d->m_model, SIGNAL(), d, SLOT());
             }
             int QPieModelMapper::first() const

src/xychart/qxymodelmapper.cpp +17 -17

                 m_first(0),
                 m_count(-1),
                 m_orientation(Qt::Vertical),
-                m_mapX(-1),
+                m_xSection(-1),
-                m_mapY(-1)
+                m_ySection(-1)
             {
             }
             void QXYModelMapper::setFirst(int first)
             {
                 m_first = qMax(first, 0);
-                emit updated();
+            //    emit updated();
             }
             int QXYModelMapper::count() const
             void QXYModelMapper::setCount(int count)
             {
                 m_count = qMax(count, -1);
-                emit updated();
+            //    emit updated();
             }
             Qt::Orientation QXYModelMapper::orientation() const
             void QXYModelMapper::setOrientation(Qt::Orientation orientation)
             {
                 m_orientation = orientation;
-                emit updated();
+            //    emit updated();
             }
-            int QXYModelMapper::mapX() const
+            int QXYModelMapper::xSection() const
             {
-                return m_mapX;
+                return m_xSection;
             }
-            void QXYModelMapper::setMapX(int mapX)
+            void QXYModelMapper::setXSection(int xSection)
             {
-                m_mapX = mapX;
+                m_xSection = xSection;
-                emit updated();
+            //    emit updated();
             }
-            int QXYModelMapper::mapY() const
+            int QXYModelMapper::ySection() const
             {
-                return m_mapY;
+                return m_ySection;
             }
-            void QXYModelMapper::setMapY(int mapY)
+            void QXYModelMapper::setYSection(int ySection)
             {
-                m_mapY = mapY;
+                m_ySection = ySection;
-                emit updated();
+            //    emit updated();
             }
             void QXYModelMapper::reset()
                 m_first = 0;
                 m_count = -1;
                 m_orientation = Qt::Vertical;
-                m_mapX = -1;
+                m_xSection = -1;
-                m_mapY = -1;
+                m_ySection = -1;
             }
             #include "moc_qxymodelmapper.cpp"

src/xychart/qxymodelmapper.h +11 -10

             class QTCOMMERCIALCHART_EXPORT QXYModelMapper : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(int mapX READ mapX WRITE setMapX)
+                Q_PROPERTY(int xSection READ xSection WRITE setXSection)
-                Q_PROPERTY(int mapY READ mapY WRITE setMapY)
+                Q_PROPERTY(int ySection READ ySection WRITE setYSection)
                 Q_PROPERTY(int first READ first WRITE setFirst)
                 Q_PROPERTY(int count READ count WRITE setCount)
                 Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
                 Q_ENUMS(Qt::Orientation)
             public:
-                explicit QXYModelMapper(QObject *parent = 0);
                 int first() const;
                 void setFirst(int first);
                 int count() const;
                 void setCount(int count);
+            protected:
+                explicit QXYModelMapper(QObject *parent = 0);
                 Qt::Orientation orientation() const;
                 void setOrientation(Qt::Orientation orientation);
-                int mapX() const;
+                int xSection() const;
-                void setMapX(int mapX);
+                void setXSection(int xSection);
-                int mapY() const;
+                int ySection() const;
-                void setMapY(int mapY);
+                void setYSection(int ySection);
                 void reset();
                 int m_first;
                 int m_count;
                 Qt::Orientation m_orientation;
-                int m_mapX;
+                int m_xSection;
-                int m_mapY;
+                int m_ySection;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/xychart.pri +7 -2

             SOURCES += \
                 $$PWD/xychart.cpp \
                 $$PWD/qxyseries.cpp \
-                $$PWD/qxymodelmapper.cpp
+                $$PWD/qxymodelmapper.cpp \
+                $$PWD/qvxymodelmapper.cpp \
+                $$PWD/qhxymodelmapper.cpp
             PRIVATE_HEADERS += \
                 $$PWD/xychart_p.h \
             PUBLIC_HEADERS += \
                 $$PWD/qxyseries.h \
-                $$PWD/qxymodelmapper.h
+                $$PWD/qxymodelmapper.h \
+                $$PWD/qvxymodelmapper.h \
+                $$PWD/qhxymodelmapper.h

tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp +3 0

                 mapper->setModel(otherModel);
                 mapper->setSeries(m_series);
                 QCOMPARE(m_series->count(), m_modelRowCount);
+                QCOMPARE(mapper->count(), -1);
                 m_series->append("1000", 1000);
                 QCOMPARE(m_series->count(), m_modelRowCount + 1);
+                QCOMPARE(mapper->count(), -1); // the value should not change as it indicates 'all' items there are in the model
                 m_series->remove(m_series->slices().last());
                 QCOMPARE(m_series->count(), m_modelRowCount);
+                QCOMPARE(mapper->count(), -1); // the value should not change as it indicates 'all' items there are in the model
                 otherModel->clear();
                 delete otherModel;

	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