HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1237:64e92d4f2959

Added Vertical and Horizontal PieModelMapper

Marek Rosa -

r1237:64e92d4f2959

parent child

Context file:

r1237:64e92d4f2959

Collapse all files

src/piechart/qhpiemodelmapper.cpp created 644 +33 0

@@ -0,0 +1,33
	1	#include "qhpiemodelmapper.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4
	5	QHPieModelMapper::QHPieModelMapper(QObject *parent) :
	6	QPieModelMapper(parent)
	7	{
	8	QPieModelMapper::setOrientation(Qt::Horizontal);
	9	}
	10
	11	int QHPieModelMapper::valuesRow() const
	12	{
	13	return QPieModelMapper::valuesIndex();
	14	}
	15
	16	void QHPieModelMapper::setValuesRow(int valuesRow)
	17	{
	18	QPieModelMapper::setValuesIndex(valuesRow);
	19	}
	20
	21	int QHPieModelMapper::labelsRow() const
	22	{
	23	return QPieModelMapper::labelsIndex();
	24	}
	25
	26	void QHPieModelMapper::setLabelsRow(int labelsRow)
	27	{
	28	QPieModelMapper::setLabelsIndex(labelsRow);
	29	}
	30
	31	#include "moc_qhpiemodelmapper.cpp"
	32
	33	QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qhpiemodelmapper.h created 644 +27 0

@@ -0,0 +1,27
	1	#ifndef QHPIEMODELMAPPER_H
	2	#define QHPIEMODELMAPPER_H
	3
	4	#include "qpiemodelmapper.h"
	5
	6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	7
	8	class QTCOMMERCIALCHART_EXPORT QHPieModelMapper : public QPieModelMapper
	9	{
	10	Q_OBJECT
	11	Q_PROPERTY(int valuesRow READ valuesRow WRITE setValuesRow)
	12	Q_PROPERTY(int labelsRow READ labelsRow WRITE setLabelsRow)
	13
	14	public:
	15	QHPieModelMapper(QObject *parent = 0);
	16
	17	int valuesRow() const;
	18	void setValuesRow(int valuesRow);
	19
	20	int labelsRow() const;
	21	void setLabelsRow(int labelsRow);
	22
	23	};
	24
	25	QTCOMMERCIALCHART_END_NAMESPACE
	26
	27	#endif // QHPIEMODELMAPPER_H

src/piechart/qvpiemodelmapper.cpp created 644 +34 0

@@ -0,0 +1,34
	1	#include "qpiemodelmapper_p.h"
	2	#include "qvpiemodelmapper.h"
	3
	4	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	5
	6	QVPieModelMapper::QVPieModelMapper(QObject *parent) :
	7	QPieModelMapper(parent)
	8	{
	9	QPieModelMapper::setOrientation(Qt::Vertical);
	10	}
	11
	12	int QVPieModelMapper::valuesColumn() const
	13	{
	14	return QPieModelMapper::valuesIndex();
	15	}
	16
	17	void QVPieModelMapper::setValuesColumn(int valuesColumn)
	18	{
	19	QPieModelMapper::setValuesIndex(valuesColumn);
	20	}
	21
	22	int QVPieModelMapper::labelsColumn() const
	23	{
	24	return QPieModelMapper::labelsIndex();
	25	}
	26
	27	void QVPieModelMapper::setLabelsColumn(int labelsColumn)
	28	{
	29	QPieModelMapper::setLabelsIndex(labelsColumn);
	30	}
	31
	32	#include "moc_qvpiemodelmapper.cpp"
	33
	34	QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qvpiemodelmapper.h created 644 +26 0

@@ -0,0 +1,26
	1	#ifndef QVPIEMODELMAPPER_H
	2	#define QVPIEMODELMAPPER_H
	3
	4	#include "qpiemodelmapper.h"
	5
	6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	7
	8	class QTCOMMERCIALCHART_EXPORT QVPieModelMapper : public QPieModelMapper
	9	{
	10	Q_OBJECT
	11	Q_PROPERTY(int valuesColumn READ valuesColumn WRITE setValuesColumn)
	12	Q_PROPERTY(int labelsColumn READ labelsColumn WRITE setLabelsColumn)
	13
	14	public:
	15	explicit QVPieModelMapper(QObject *parent = 0);
	16
	17	int valuesColumn() const;
	18	void setValuesColumn(int valuesColumn);
	19
	20	int labelsColumn() const;
	21	void setLabelsColumn(int labelsColumn);
	22	};
	23
	24	QTCOMMERCIALCHART_END_NAMESPACE
	25
	26	#endif // QVPIEMODELMAPPER_H

src/piechart/piechart.pri +6 -2

                 $$PWD/piesliceitem.cpp \
                 $$PWD/piechartitem.cpp \
                 $$PWD/qpieslice.cpp \
-                $$PWD/qpiemodelmapper.cpp
+                $$PWD/qpiemodelmapper.cpp \
+                $$PWD/qvpiemodelmapper.cpp \
+                $$PWD/qhpiemodelmapper.cpp
             PRIVATE_HEADERS += \
                 $$PWD/pieslicedata_p.h \
             PUBLIC_HEADERS += \
                 $$PWD/qpieseries.h \
                 $$PWD/qpieslice.h \
-                $$PWD/qpiemodelmapper.h
+                $$PWD/qpiemodelmapper.h \
+                $$PWD/qvpiemodelmapper.h \
+                $$PWD/qhpiemodelmapper.h

src/piechart/qpiemodelmapper.h +26 -7

+            /****************************************************************************
+            **
+            ** 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 QPIEMODELMAPPER_H
             #define QPIEMODELMAPPER_H
             class QTCOMMERCIALCHART_EXPORT QPieModelMapper : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(int valuesIndex READ valuesIndex WRITE setValuesIndex)
-                Q_PROPERTY(int labelsIndex READ labelsIndex WRITE setLabelsIndex)
                 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:
+            protected:
                 QPieModelMapper(QObject *parent = 0);
+            public:
                 QAbstractItemModel* model() const;
                 void setModel(QAbstractItemModel *model);
                 int count() const;
                 void setCount(int count);
-                Qt::Orientation orientation() const;
+                void reset();
-                void setOrientation(Qt::Orientation orientation);
+            protected:
                 int valuesIndex() const;
                 void setValuesIndex(int valuesIndex);
                 int labelsIndex() const;
                 void setLabelsIndex(int labelsIndex);
-                void reset();
+                Qt::Orientation orientation() const;
+                void setOrientation(Qt::Orientation orientation);
             protected:
                 QPieModelMapperPrivate * const d_ptr;

tests/tablemodelchart/tablewidget.cpp +4 -4

             #include <QXYModelMapper>
             #include "customtablemodel.h"
             #include <QPieSeries>
-            #include <QPieModelMapper>
+            #include <QVPieModelMapper>
             #include <QPieSlice>
             #include <QAreaSeries>
             #include <QBarSeries>
                         // pie 1
                         m_pieSeries = new QPieSeries;
-                        m_pieMapper = new QPieModelMapper;
+                        m_pieMapper = new QVPieModelMapper;
-                        m_pieMapper->setValuesIndex(1);
+                        m_pieMapper->setValuesColumn(1);
-                        m_pieMapper->setLabelsIndex(7);
+                        m_pieMapper->setLabelsColumn(7);
                         m_pieMapper->setSeries(m_pieSeries);
                         m_pieMapper->setModel(m_model);
                         m_pieMapper->setFirst(2);

tests/tablemodelchart/tablewidget.h +2 -2

             #include "qchartview.h"
             //#include "qxyseries.h"
             #include <QPieSeries>
-            #include <QPieModelMapper>
+            #include <QVPieModelMapper>
             class CustomTableModel;
             class QTableView;
                 QRadioButton* m_areaRadioButton;
                 QRadioButton* m_barRadioButton;
                 QSpinBox* m_linesCountSpinBox;
-                QPieModelMapper *m_pieMapper;
+                QVPieModelMapper *m_pieMapper;
                 QPieSeries* m_pieSeries;
             //    QPieSeries* specialPie;
             };

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