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

             INCLUDEPATH += $$PWD
             DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qpieseries.cpp \
                 $$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 \
                 $$PWD/piechartitem_p.h \
                 $$PWD/piesliceitem_p.h \
                 $$PWD/qpieseries_p.h \
                 $$PWD/qpiemodelmapper_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
             #include "qchartglobal.h"
             #include <QObject>
             class QAbstractItemModel;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieModelMapperPrivate;
             class QPieSeries;
             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);
                 QPieSeries* series() const;
                 void setSeries(QPieSeries *series);
                 int first() const;
                 void setFirst(int first);
                 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;
                 Q_DECLARE_PRIVATE(QPieModelMapper)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QPIEMODELMAPPER_H

tests/tablemodelchart/tablewidget.cpp +4 -4

             /****************************************************************************
             **
             ** 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 "tablewidget.h"
             #include <QGridLayout>
             #include <QTableView>
             #include <QChart>
             #include <QStyledItemDelegate>
             #include <QLineSeries>
             #include <QSplineSeries>
             #include <QScatterSeries>
             #include <QXYModelMapper>
             #include "customtablemodel.h"
             #include <QPieSeries>
-            #include <QPieModelMapper>
+            #include <QVPieModelMapper>
             #include <QPieSlice>
             #include <QAreaSeries>
             #include <QBarSeries>
             #include <QGroupedBarSeries>
             #include <QBarSet>
             #include <QBarModelMapper>
             #include <QPushButton>
             #include <QRadioButton>
             #include <QLabel>
             #include <QSpinBox>
             #include <QTime>
             #include <QHeaderView>
             TableWidget::TableWidget(QWidget *parent)
                 : QWidget(parent)
                 //      specialPie(0)
             {
                 setGeometry(1900, 100, 1000, 600);
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
                 // create simple model for storing data
                 // user's table data model
                 m_model = new CustomTableModel;
                 m_tableView = new QTableView;
                 m_tableView->setModel(m_model);
                 //    m_tableView->setMinimumHeight(300);
                 m_tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
                 m_tableView->verticalHeader()->setResizeMode(QHeaderView::Stretch);
                 m_chart = new QChart;
                 m_chart->legend()->setVisible(true);
                 m_chart->setAnimationOptions(QChart::SeriesAnimations);
                 m_chartView = new QChartView(m_chart);
                 m_chartView->setRenderHint(QPainter::Antialiasing);
                 m_chartView->setMinimumSize(640, 480);
                 // add, remove data buttons
                 QPushButton* addRowAboveButton = new QPushButton("Add row above");
                 connect(addRowAboveButton, SIGNAL(clicked()), this, SLOT(addRowAbove()));
                 QPushButton* addRowBelowButton = new QPushButton("Add row below");
                 connect(addRowBelowButton, SIGNAL(clicked()), this, SLOT(addRowBelow()));
                 QPushButton* removeRowButton = new QPushButton("Remove row");
                 connect(removeRowButton, SIGNAL(clicked()), this, SLOT(removeRow()));
                 QPushButton* addColumnRightButton = new QPushButton("Add column to the right");
                 connect(addColumnRightButton, SIGNAL(clicked()), this, SLOT(addColumnRight()));
                 QPushButton* removeColumnButton = new QPushButton("Remove column");
                 connect(removeColumnButton, SIGNAL(clicked()), this, SLOT(removeColumn()));
                 QPushButton* specialPieButton = new QPushButton("Add slices from series");
                 connect(specialPieButton, SIGNAL(clicked()), this, SLOT(testPie()));
                 QPushButton* specialPieButton2 = new QPushButton("Remove slices from series");
                 connect(specialPieButton2, SIGNAL(clicked()), this, SLOT(testPie2()));
                 QPushButton* specialPieButton3 = new QPushButton("Remove slices from series");
                 connect(specialPieButton3, SIGNAL(clicked()), this, SLOT(testPie3()));
                 //    QLabel *spinBoxLabel = new QLabel("Rows affected:");
                 // spin box for setting number of affected items (add, remove)
                 m_linesCountSpinBox = new QSpinBox;
                 m_linesCountSpinBox->setRange(1, 10);
                 m_linesCountSpinBox->setValue(1);
                 // buttons layout
                 QVBoxLayout* buttonsLayout = new QVBoxLayout;
                 //    buttonsLayout->addWidget(spinBoxLabel);
                 //    buttonsLayout->addWidget(m_linesCountSpinBox);
                 //    buttonsLayout->addWidget(addRowAboveButton);
                 buttonsLayout->addWidget(addRowBelowButton);
                 buttonsLayout->addWidget(removeRowButton);
                 //    buttonsLayout->addWidget(addColumnRightButton);
                 //    buttonsLayout->addWidget(removeColumnButton);
                 buttonsLayout->addWidget(specialPieButton);
                 buttonsLayout->addWidget(specialPieButton2);
                 buttonsLayout->addWidget(specialPieButton3);
                 buttonsLayout->addStretch();
                 // chart type radio buttons
                 m_lineRadioButton = new QRadioButton("Line");
                 m_splineRadioButton = new QRadioButton("Spline");
                 m_scatterRadioButton = new QRadioButton("Scatter");
                 m_pieRadioButton = new QRadioButton("Pie");
                 m_areaRadioButton = new QRadioButton("Area");
                 m_barRadioButton = new QRadioButton("Bar");
                 connect(m_lineRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_splineRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_scatterRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_pieRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_areaRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_barRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 m_lineRadioButton->setChecked(true);
                 // radio buttons layout
                 QVBoxLayout* radioLayout = new QVBoxLayout;
                 radioLayout->addWidget(m_lineRadioButton);
                 radioLayout->addWidget(m_splineRadioButton);
                 //    radioLayout->addWidget(m_scatterRadioButton);
                 radioLayout->addWidget(m_pieRadioButton);
                 //    radioLayout->addWidget(m_areaRadioButton);
                 radioLayout->addWidget(m_barRadioButton);
                 radioLayout->addStretch();
                 // create main layout
                 QGridLayout* mainLayout = new QGridLayout;
                 mainLayout->addLayout(buttonsLayout, 2, 0);
                 mainLayout->addLayout(radioLayout, 3, 0);
                 mainLayout->addWidget(m_tableView, 1, 0);
                 mainLayout->addWidget(m_chartView, 1, 1, 2, 1);
                 setLayout(mainLayout);
                 m_lineRadioButton->setFocus();
             }
             void TableWidget::addRowAbove()
             {
                 m_model->insertRows(m_tableView->currentIndex().row(), m_linesCountSpinBox->value());
             }
             void TableWidget::addRowBelow()
             {
                 m_model->insertRows(m_tableView->currentIndex().row() + 1, m_linesCountSpinBox->value());
             }
             void TableWidget::removeRow()
             {
                 m_model->removeRows(m_tableView->currentIndex().row(), qMin(m_model->rowCount() - m_tableView->currentIndex().row(), m_linesCountSpinBox->value()));
             }
             void TableWidget::addColumnRight()
             {
                 m_model->insertColumns(m_tableView->currentIndex().column() + 1, m_linesCountSpinBox->value());
             }
             void TableWidget::removeColumn()
             {
                 m_model->removeColumns(m_tableView->currentIndex().column(), qMin(m_model->columnCount() - m_tableView->currentIndex().column(), m_linesCountSpinBox->value()));
             }
             void TableWidget::updateChartType(bool toggle)
             {
                 // this if is needed, so that the function is only called once.
                 // For the radioButton that was enabled.
                 if (toggle) {
                     //        specialPie = 0;
                     m_chart->removeAllSeries();
                     //        m_chart->axisX()->setNiceNumbersEnabled(false);
                     //        m_chart->axisY()->setNiceNumbersEnabled(false);
                     //        // renable axes of the chart (pie hides them)
                     //        // x axis
                     //        QAxis *axis = m_chart->axisX();
                     //        axis->setAxisVisible(true);
                     //        axis->setGridLineVisible(true);
                     //        axis->setLabelsVisible(true);
                     //        // y axis
                     //        axis = m_chart->axisY();
                     //        axis->setAxisVisible(true);
                     //        axis->setGridLineVisible(true);
                     //        axis->setLabelsVisible(true);
                     //        m_model->clearMapping();
                     QString seriesColorHex = "#000000";
                     //        QPen pen;
                     //        pen.setWidth(2);
                     if (m_lineRadioButton->isChecked())
                     {
                         //            m_chart->setAnimationOptions(QChart::NoAnimation);
                         //            // series 1
                         //            m_series = new QLineSeries;
                         //            m_series->setModel(m_model);
                         //            QXYModelMapper *mapper = new QXYModelMapper;
                         //            mapper->setMapX(0);
                         //            mapper->setMapY(1);
                         //            mapper->setFirst(3);
                         //            mapper->setCount(4);
                         //            m_series->setModelMapper(mapper);
                         //            //            m_series->setModelMapping(0,1, Qt::Vertical);
                         //            //            m_series->setModelMappingRange(3, 4);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(0, 3, 2, 4));
                         //            // series 2
                         //            m_series = new QLineSeries;
                         //            m_series->setModel(m_model);
                         //            mapper = new QXYModelMapper;
                         //            mapper->setMapX(3);
                         //            mapper->setMapY(4);
                         //            //            mapper->setFirst(3);
                         //            //            mapper->setCount(4);
                         //            m_series->setModelMapper(mapper);
                         //            //            m_series->setModelMapping(2,3, Qt::Vertical);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(3, 0, 2, 1000));
                         //            // series 3
                         //            m_series = new QLineSeries;
                         //            m_series->setModel(m_model);
                         //            mapper = new QXYModelMapper;
                         //            mapper->setMapX(5);
                         //            mapper->setMapY(6);
                         //            mapper->setFirst(2);
                         //            mapper->setCount(-1);
                         //            m_series->setModelMapper(mapper);
                         //            //            m_series->setModelMapping(4,5, Qt::Vertical);
                         //            //            m_series->setModelMappingRange(2, -1);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(5, 2, 2, 1000));
                     }
                     else if (m_splineRadioButton->isChecked())
                     {
                         //            m_chart->setAnimationOptions(QChart::NoAnimation);
                         //            // series 1
                         //            m_series = new QSplineSeries;
                         //            m_series->setModel(m_model);
                         //            QXYModelMapper *mapper = new QXYModelMapper;
                         //            mapper->setMapX(0);
                         //            mapper->setMapY(1);
                         //            mapper->setFirst(0);
                         //            mapper->setCount(-1);
                         //            m_series->setModelMapper(mapper);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(0, 0, 2, 1000));
                         //            // series 2
                         //            m_series = new QSplineSeries;
                         //            m_series->setModel(m_model);
                         //            mapper = new QXYModelMapper;
                         //            mapper->setMapX(2);
                         //            mapper->setMapY(3);
                         //            mapper->setFirst(2);
                         //            mapper->setCount(4);
                         //            m_series->setModelMapper(mapper);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(2, 2, 2, 4));
                         //            // series 3
                         //            m_series = new QSplineSeries;
                         //            m_series->setModel(m_model);
                         //            mapper = new QXYModelMapper;
                         //            mapper->setMapX(4);
                         //            mapper->setMapY(5);
                         //            mapper->setFirst(2);
                         //            mapper->setCount(-1);
                         //            m_series->setModelMapper(mapper);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(4, 2, 2, 1000));
                     }
                     //        else if (m_scatterRadioButton->isChecked())
                     //        {
                     //            m_chart->setAnimationOptions(QChart::NoAnimation);
                     //            // series 1
                     //            m_series = new QScatterSeries;
                     //            m_series->setModel(m_model);
                     //            m_series->setModelMapping(0,1, Qt::Vertical);
                     //            //            m_series->setModelMappingRange(2, 0);
                     //            //        series->setModelMapping(0,1, Qt::Horizontal);
                     //            m_chart->addSeries(m_series);
                     //            seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                     //            m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 1000));
                     //            // series 2
                     //            m_series = new QScatterSeries;
                     //            m_series->setModel(m_model);
                     //            m_series->setModelMapping(2,3, Qt::Vertical);
                     //            //            m_series->setModelMappingRange(1, 6);
                     //            //        series->setModelMapping(2,3, Qt::Horizontal);
                     //            m_chart->addSeries(m_series);
                     //            seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                     //            m_model->addMapping(seriesColorHex, QRect(2, 1, 2, 6));
                     //            // series 3
                     //            m_series = new QScatterSeries;
                     //            m_series->setModel(m_model);
                     //            m_series->setModelMapping(4,5, Qt::Vertical);
                     //            //        series->setModelMapping(4,5, Qt::Horizontal);
                     //            m_chart->addSeries(m_series);
                     //            seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                     //            m_model->addMapping(seriesColorHex, QRect(4, 0, 2, 1000));
                     //        }
                     else if (m_pieRadioButton->isChecked())
                     {
                         m_chart->setAnimationOptions(QChart::SeriesAnimations);
                         // 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);
                                     m_pieMapper->setCount(5);
                         //                    pieSeries->setModelMapper(mapper);
                         m_pieSeries->setLabelsVisible(true);
                         m_pieSeries->setPieSize(0.75);
                         //            pieSeries->setHorizontalPosition(0.2);
                         //            pieSeries->setVerticalPosition(0.3);
                         m_chart->addSeries(m_pieSeries);
                         seriesColorHex = "#" + QString::number(m_pieSeries->slices().at(m_pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 5));
                         //                            pieSeries->slices().at(0)->setValue(400);
                         //                            pieSeries->slices().at(0)->setLabel(QString("36"));
                         //            // pie 2
                         //            pieSeries = new QPieSeries;
                         //            pieSeries->setModel(m_model);
                         //            pieSeries->setModelMapping(1,1, Qt::Vertical);
                         //            pieSeries->setModelMappingRange(2, -1);
                         //            pieSeries->setLabelsVisible(true);
                         //            pieSeries->setPieSize(0.35);
                         //            pieSeries->setHorizontalPosition(0.8);
                         //            pieSeries->setVerticalPosition(0.3);
                         //            m_chart->addSeries(pieSeries);
                         //            seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(1, 2, 1, 1000));
                         //            // pie 3
                         //            pieSeries = new QPieSeries;
                         //            pieSeries->setModel(m_model);
                         //            pieSeries->setModelMapping(2,2, Qt::Vertical);
                         //            pieSeries->setLabelsVisible(true);
                         //            pieSeries->setPieSize(0.35);
                         //            pieSeries->setHorizontalPosition(0.5);
                         //            pieSeries->setVerticalPosition(0.75);
                         //            m_chart->addSeries(pieSeries);
                         //            seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(2, 0, 1, 1000));
                         //            // special pie
                         //            specialPie = new QPieSeries;
                         //            specialPie->append(17, "1");
                         //            specialPie->append(45, "2");
                         //            specialPie->append(77, "3");
                         //            specialPie->append(37, "4");
                         //            specialPie->append(27, "5");
                         //            specialPie->append(47, "6");
                         //            specialPie->setPieSize(0.35);
                         //            specialPie->setHorizontalPosition(0.8);
                         //            specialPie->setVerticalPosition(0.75);
                         //            specialPie->setLabelsVisible(true);
                         //            m_chart->addSeries(specialPie);
                     }
                     //        else if (m_areaRadioButton->isChecked())
                     //        {
                     //            m_chart->setAnimationOptions(QChart::NoAnimation);
                     //            QLineSeries* upperLineSeries = new QLineSeries;
                     //            upperLineSeries->setModel(m_model);
                     //            upperLineSeries->setModelMapping(0, 1, Qt::Vertical);
                     //            //            upperLineSeries->setModelMappingRange(1, 5);
                     //            QLineSeries* lowerLineSeries = new QLineSeries;
                     //            lowerLineSeries->setModel(m_model);
                     //            lowerLineSeries->setModelMapping(2, 3, Qt::Vertical);
                     //            QAreaSeries* areaSeries = new QAreaSeries(upperLineSeries, lowerLineSeries);
                     //            m_chart->addSeries(areaSeries);
                     //            seriesColorHex = "#" + QString::number(areaSeries->brush().color().rgb(), 16).right(6).toUpper();
                     //            m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 5));
                     //            m_model->addMapping(seriesColorHex, QRect(2, 0, 2, 1000));
                     //        }
                     else if (m_barRadioButton->isChecked())
                     {
                         //                    m_chart->setAnimationOptions(QChart::SeriesAnimations);
                         //                    QGroupedBarSeries* barSeries = new QGroupedBarSeries();
                         //                    barSeries->setCategories(QStringList());
                         //                    barSeries->setModel(m_model);
                         //                    //            barSeries->setModelMappingRange(2, 5);
                         ////                    barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
                         //                    QBarModelMapper *mapper = new QBarModelMapper;
                         //                    mapper->setMapCategories(5);
                         //                    mapper->setMapBarBottom(2);
                         //                    mapper->setMapBarTop(4);
                         //                    barSeries->setModelMapper(mapper);
                         //                    m_chart->addSeries(barSeries);
                         //                    QList<QBarSet*> barsets = barSeries->barSets();
                         //                    for (int i = 0; i < barsets.count(); i++) {
                         //                        seriesColorHex = "#" + QString::number(barsets.at(i)->brush().color().rgb(), 16).right(6).toUpper();
                         //                        m_model->addMapping(seriesColorHex, QRect(2 + i, 0, 1, 1000));
                         //                    }
                     }
                     if (!m_barRadioButton->isChecked()) {
                         m_chart->axisX()->setRange(0, 500);
                         m_chart->axisY()->setRange(0, 220);
                     }
                     m_chart->legend()->setVisible(true);
                     // repaint table view colors
                     m_tableView->repaint();
                     m_tableView->setFocus();
                 }
             }
             void TableWidget::testPie()
             {
                 //    m_pieMapper->setCount(-1);
                 QPieSlice *slice = new QPieSlice("Hehe", 145);
                 slice->setLabelVisible();
                 m_pieSeries->append(slice);
                 slice = new QPieSlice("Hoho", 34);
                 slice->setLabelVisible();
                 m_pieSeries->append(slice);
                 //    m_series->modelMapper()->setMapX(4);
                 //    m_tableView->setColumnWidth(10, 250);
                 //    if (specialPie) {
                 //        specialPie->remove(specialPie->slices().at(2));
                 //        //    specialPie->insert(4, new QPieSlice(45, "Hello"));//specialPie->slices.at(2));
                 //        specialPie->append(4, "heloo");
                 //    }
             }
             void TableWidget::testPie2()
             {
                 QPieSlice *slice;
                 if (m_pieSeries->count() > 0) {
                     slice = m_pieSeries->slices().last();
                     m_pieSeries->remove(slice);
                 }
                 if (m_pieSeries->count() > 0) {
                     slice = m_pieSeries->slices().first();
                     m_pieSeries->remove(slice);
                 }
             }
             void TableWidget::testPie3()
             {
                 QPieSlice *slice;
                 if (m_pieSeries->count() > 0) {
                     slice = m_pieSeries->slices().last();
                     slice->setLabel("Dalej");
                     slice->setValue(222);
                 }
                 if (m_pieSeries->count() > 0) {
                     slice = m_pieSeries->slices().first();
                     slice->setLabel("Prawie");
                     slice->setValue(111);
                 }
             }
             TableWidget::~TableWidget()
             {
             }

tests/tablemodelchart/tablewidget.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 TABLEWIDGET_H
             #define TABLEWIDGET_H
             #include <QtGui/QWidget>
             //#include <QChartGlobal>
             #include "qchartview.h"
             //#include "qxyseries.h"
             #include <QPieSeries>
-            #include <QPieModelMapper>
+            #include <QVPieModelMapper>
             class CustomTableModel;
             class QTableView;
             class QRadioButton;
             class QSpinBox;
             QTCOMMERCIALCHART_USE_NAMESPACE
             class TableWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 TableWidget(QWidget *parent = 0);
                 ~TableWidget();
                 public slots:
                 void addRowAbove();
                 void addRowBelow();
                 void removeRow();
                 void addColumnRight();
                 void removeColumn();
                 void updateChartType(bool toggle);
                 void testPie();
                 void testPie2();
                 void testPie3();
                 private:
                 QChartView* m_chartView;
                 QChart* m_chart;
                 QXYSeries* m_series;
                 CustomTableModel* m_model;
                 QTableView* m_tableView;
                 QRadioButton* m_lineRadioButton;
                 QRadioButton* m_splineRadioButton;
                 QRadioButton* m_scatterRadioButton;
                 QRadioButton* m_pieRadioButton;
                 QRadioButton* m_areaRadioButton;
                 QRadioButton* m_barRadioButton;
                 QSpinBox* m_linesCountSpinBox;
-                QPieModelMapper *m_pieMapper;
+                QVPieModelMapper *m_pieMapper;
                 QPieSeries* m_pieSeries;
             //    QPieSeries* specialPie;
             };
             #endif // TABLEWIDGET_H

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