HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2480:9f82dd068147

Added handling of model mapping, meaning mostly animation changes....

Mika Salmela -

r2480:9f82dd068147

parent child

Context file:

r2480:9f82dd068147

Collapse all files

tests/boxplottester/customtablemodel.cpp created 644 +144 0

@@ -0,0 +1,144
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2013 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "customtablemodel.h"
	22	#include <QVector>
	23	#include <QTime>
	24	#include <QRect>
	25	#include <QColor>
	26
	27	const QString categories[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Nov", "Dec"};
	28
	29	CustomTableModel::CustomTableModel(QObject *parent) :
	30	QAbstractTableModel(parent)
	31	{
	32	// qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
	33
	34	m_columnCount = 6;
	35	m_rowCount = 5;
	36	QVector<qreal>* dataVec_Jan = new QVector<qreal>(m_rowCount);
	37	dataVec_Jan->insert(0, 3.0);
	38	dataVec_Jan->insert(1, 4.0);
	39	dataVec_Jan->insert(2, 4.4);
	40	dataVec_Jan->insert(3, 6.0);
	41	dataVec_Jan->insert(4, 7.0);
	42	m_data.append(dataVec_Jan);
	43
	44	QVector<qreal>* dataVec_Feb = new QVector<qreal>(m_rowCount);
	45	dataVec_Feb->insert(0, 5.0);
	46	dataVec_Feb->insert(1, 6.0);
	47	dataVec_Feb->insert(2, 7.5);
	48	dataVec_Feb->insert(3, 8.0);
	49	dataVec_Feb->insert(4, 12.0);
	50	m_data.append(dataVec_Feb);
	51
	52	QVector<qreal>* dataVec_Mar = new QVector<qreal>(m_rowCount);
	53	dataVec_Mar->insert(0, 3.0);
	54	dataVec_Mar->insert(1, 4.0);
	55	dataVec_Mar->insert(2, 5.7);
	56	dataVec_Mar->insert(3, 8.0);
	57	dataVec_Mar->insert(4, 9.0);
	58	m_data.append(dataVec_Mar);
	59
	60	QVector<qreal>* dataVec_Apr = new QVector<qreal>(m_rowCount);
	61	dataVec_Apr->insert(0, 5.0);
	62	dataVec_Apr->insert(1, 6.0);
	63	dataVec_Apr->insert(2, 6.8);
	64	dataVec_Apr->insert(3, 7.0);
	65	dataVec_Apr->insert(4, 8.0);
	66	m_data.append(dataVec_Apr);
	67
	68	QVector<qreal>* dataVec_May = new QVector<qreal>(m_rowCount);
	69	dataVec_May->insert(0, 4.0);
	70	dataVec_May->insert(1, 5.0);
	71	dataVec_May->insert(2, 5.2);
	72	dataVec_May->insert(3, 6.0);
	73	dataVec_May->insert(4, 7.0);
	74	m_data.append(dataVec_May);
	75
	76	QVector<qreal>* dataVec_Jun = new QVector<qreal>(m_rowCount);
	77	dataVec_Jun->insert(0, 4.0);
	78	dataVec_Jun->insert(1, 7.0);
	79	dataVec_Jun->insert(2, 8.2);
	80	dataVec_Jun->insert(3, 9.0);
	81	dataVec_Jun->insert(4, 10.0);
	82	m_data.append(dataVec_Jun);
	83	}
	84
	85	int CustomTableModel::rowCount(const QModelIndex &parent) const
	86	{
	87	Q_UNUSED(parent)
	88	return m_rowCount;
	89	}
	90
	91	int CustomTableModel::columnCount(const QModelIndex &parent) const
	92	{
	93	Q_UNUSED(parent)
	94	return m_data.count();
	95	}
	96
	97	QVariant CustomTableModel::headerData(int section, Qt::Orientation orientation, int role) const
	98	{
	99	if (role != Qt::DisplayRole)
	100	return QVariant();
	101
	102	if (orientation == Qt::Horizontal)
	103	return categories[section];
	104	else
	105	return QString("%1").arg(section + 1);
	106	}
	107
	108	QVariant CustomTableModel::data(const QModelIndex &index, int role) const
	109	{
	110	if (role == Qt::DisplayRole) {
	111	return m_data[index.column()]->at(index.row());
	112	} else if (role == Qt::EditRole) {
	113	return m_data[index.column()]->at(index.row());
	114	} else if (role == Qt::BackgroundRole) {
	115	QRect rect;
	116	foreach (rect, m_mapping)
	117	if (rect.contains(index.column(), index.row()))
	118	return QColor(m_mapping.key(rect));
	119
	120	// cell not mapped return white color
	121	return QColor(Qt::white);
	122	}
	123	return QVariant();
	124	}
	125
	126	bool CustomTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
	127	{
	128	if (index.isValid() && role == Qt::EditRole) {
	129	m_data[index.column()]->replace(index.row(), value.toDouble());
	130	emit dataChanged(index, index);
	131	return true;
	132	}
	133	return false;
	134	}
	135
	136	Qt::ItemFlags CustomTableModel::flags(const QModelIndex &index) const
	137	{
	138	return QAbstractItemModel::flags(index) \| Qt::ItemIsEditable;
	139	}
	140
	141	void CustomTableModel::addMapping(QString color, QRect area)
	142	{
	143	m_mapping.insertMulti(color, area);
	144	}

tests/boxplottester/customtablemodel.h created 644 +51 0

@@ -0,0 +1,51
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2013 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#ifndef CUSTOMTABLEMODEL_H
	22	#define CUSTOMTABLEMODEL_H
	23
	24	#include <QAbstractTableModel>
	25	#include <QHash>
	26	#include <QRect>
	27
	28	class CustomTableModel : public QAbstractTableModel
	29	{
	30	Q_OBJECT
	31	public:
	32	explicit CustomTableModel(QObject *parent = 0);
	33
	34	int rowCount(const QModelIndex &parent = QModelIndex()) const;
	35	int columnCount(const QModelIndex &parent = QModelIndex()) const;
	36	QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
	37	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
	38	bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
	39	Qt::ItemFlags flags(const QModelIndex &index) const;
	40
	41	void addMapping(QString color, QRect area);
	42	void clearMapping() { m_mapping.clear(); }
	43
	44	private:
	45	QList<QVector<qreal> * > m_data;
	46	QHash<QString, QRect> m_mapping;
	47	int m_columnCount;
	48	int m_rowCount;
	49	};
	50
	51	#endif // CUSTOMTABLEMODEL_H

src/animations/boxplotanimation.cpp +19 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "boxplotanimation_p.h"
             #include "boxplotchartitem_p.h"
             #include "boxwhiskersdata_p.h"
             #include "boxwhiskersanimation_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxPlotAnimation::BoxPlotAnimation(BoxPlotChartItem *item)
                   : m_item(item)
             {
             }
             BoxPlotAnimation::~BoxPlotAnimation()
             {
             }
             void BoxPlotAnimation::addBox(BoxWhiskers *box)
             {
                 BoxWhiskersAnimation *animation = m_animations.value(box);
                 if (!animation) {
                     animation = new BoxWhiskersAnimation(box);
                     m_animations.insert(box, animation);
                     BoxWhiskersData start;
                     start.m_median = box->m_data.m_median;
                     animation->setup(start, box->m_data);
                 } else {
                     animation->stop();
                     animation->setEndData(box->m_data);
                 }
             }
             ChartAnimation *BoxPlotAnimation::boxAnimation(BoxWhiskers *box)
             {
                 // TODO: Check for missing animation
-                return m_animations.value(box);
+                BoxWhiskersAnimation *animation = m_animations.value(box);
+                animation->m_moveMedianLine = false;
+                return animation;
+            }
+            ChartAnimation *BoxPlotAnimation::boxChangeAnimation(BoxWhiskers *box)
+            {
+                BoxWhiskersAnimation *animation = m_animations.value(box);
+                animation->m_moveMedianLine = true;
+                animation->setEndData(box->m_data);
+                return animation;
+            }
+            void BoxPlotAnimation::setAnimationStart(BoxWhiskers *box)
+            {
+                BoxWhiskersAnimation *animation = m_animations.value(box);
+                animation->setStartData(box->m_data);
             }
             //#include "moc_boxplotanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxplotanimation_p.h +3 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef BOXPLOTANIMATION_P_H
             #define BOXPLOTANIMATION_P_H
             #include "chartanimation_p.h"
             #include "boxwhiskers_p.h"
             #include "boxwhiskersdata_p.h"
             #include "boxwhiskersanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BoxPlotChartItem;
             class BoxPlotAnimation /*: public ChartAnimation*/
             {
                 //Q_OBJECT
             public:
                 BoxPlotAnimation(BoxPlotChartItem *item);
                 ~BoxPlotAnimation();
                 void addBox(BoxWhiskers *box);
                 ChartAnimation *boxAnimation(BoxWhiskers *box);
+                ChartAnimation *boxChangeAnimation(BoxWhiskers *box);
+                void setAnimationStart(BoxWhiskers *box);
             protected:
                 BoxPlotChartItem *m_item;
                 QHash<BoxWhiskers *, BoxWhiskersAnimation *> m_animations;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BOXPLOTANIMATION_P_H

src/animations/boxwhiskersanimation.cpp +22 -20

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "boxwhiskersanimation_p.h"
             #include "boxplotanimation_p.h"
             #include "boxplotchartitem_p.h"
             #include "boxwhiskersdata_p.h"
             #include <QDebug>
             Q_DECLARE_METATYPE(QVector<QRectF>)
             Q_DECLARE_METATYPE(QTCOMMERCIALCHART_NAMESPACE::BoxWhiskersData)
             Q_DECLARE_METATYPE(qreal)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BoxWhiskersAnimation::BoxWhiskersAnimation(BoxPlotChartItem *item)
-                : ChartAnimation(item),
-                  m_item(item)
-                setDuration(ChartAnimationDuration);
-                setEasingCurve(QEasingCurve::OutQuart);
             BoxWhiskersAnimation::BoxWhiskersAnimation(BoxWhiskers *box)
                 : ChartAnimation(box),
                   m_box(box)
             {
                 setDuration(ChartAnimationDuration);
                 setEasingCurve(QEasingCurve::OutQuart);
             }
             BoxWhiskersAnimation::~BoxWhiskersAnimation()
             {
             }
             QVariant BoxWhiskersAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
                 BoxWhiskersData startData = qvariant_cast<BoxWhiskersData>(from);
                 BoxWhiskersData endData = qvariant_cast<BoxWhiskersData>(to);
                 BoxWhiskersData result;
                 if (endData.m_index == 1) {
                     //qDebug() << "endData.m_lowerExtreme = " << endData.m_lowerExtreme;
                     //qDebug() << "endData.m_median = " << endData.m_median;
                 }
-                result.m_lowerExtreme = endData.m_median + progress * (endData.m_lowerExtreme - endData.m_median);
+                if (m_moveMedianLine) {
-                result.m_lowerQuartile = endData.m_median + progress * (endData.m_lowerQuartile - endData.m_median);
+                    result.m_lowerExtreme = startData.m_lowerExtreme + progress * (endData.m_lowerExtreme - startData.m_lowerExtreme);
-                result.m_median = endData.m_median;
+                    result.m_lowerQuartile = startData.m_lowerQuartile + progress * (endData.m_lowerQuartile - startData.m_lowerQuartile);
-                result.m_upperQuartile = endData.m_median + progress * (endData.m_upperQuartile - endData.m_median);
+                    result.m_median = startData.m_median + progress * (endData.m_median - startData.m_median);
-                result.m_upperExtreme = endData.m_median + progress * (endData.m_upperExtreme - endData.m_median);
+                    result.m_upperQuartile = startData.m_upperQuartile + progress * (endData.m_upperQuartile - startData.m_upperQuartile);
+                    result.m_upperExtreme = startData.m_upperExtreme + progress * (endData.m_upperExtreme - startData.m_upperExtreme);
+                } else {
+                    result.m_lowerExtreme = endData.m_median + progress * (endData.m_lowerExtreme - endData.m_median);
+                    result.m_lowerQuartile = endData.m_median + progress * (endData.m_lowerQuartile - endData.m_median);
+                    result.m_median = endData.m_median;
+                    result.m_upperQuartile = endData.m_median + progress * (endData.m_upperQuartile - endData.m_median);
+                    result.m_upperExtreme = endData.m_median + progress * (endData.m_upperExtreme - endData.m_median);
+                }
                 result.m_index = endData.m_index;
                 result.m_boxItems = endData.m_boxItems;
-            //    result.m_lowerExtreme = endData.m_lowerExtreme;
-            //    result.m_lowerQuartile = endData.m_lowerQuartile;
-            //    result.m_median = endData.m_median;
-            //    result.m_upperQuartile = endData.m_upperQuartile;
-            //    result.m_upperExtreme = endData.m_upperExtreme;
-            //    result.m_index = endData.m_index;
-            //    result.m_boxItems = endData.m_boxItems;
                 result.m_maxX = endData.m_maxX;
                 result.m_minX = endData.m_minX;
                 result.m_maxY = endData.m_maxY;
                 result.m_minY = endData.m_minY;
                 result.m_seriesIndex = endData.m_seriesIndex;
                 result.m_seriesCount = endData.m_seriesCount;
                 return qVariantFromValue(result);
             }
             void BoxWhiskersAnimation::updateCurrentValue(const QVariant &value)
             {
                 BoxWhiskersData data = qvariant_cast<BoxWhiskersData>(value);
                 m_box->setLayout(data);
             }
             void BoxWhiskersAnimation::setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData)
             {
                 setKeyValueAt(0.0, qVariantFromValue(startData));
                 setKeyValueAt(1.0, qVariantFromValue(endData));
             }
             void BoxWhiskersAnimation::setEndData(const BoxWhiskersData &endData)
             {
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
                 setEndValue(qVariantFromValue(endData));
             }
+            void BoxWhiskersAnimation::setStartData(const BoxWhiskersData &endData)
+            {
+                if (state() != QAbstractAnimation::Stopped)
+                    stop();
+                setStartValue(qVariantFromValue(endData));
+            }
             #include "moc_boxwhiskersanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxwhiskersanimation_p.h +5 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef BOXWHISKERSANIMATION_P_H
             #define BOXWHISKERSANIMATION_P_H
             #include "chartanimation_p.h"
             #include "boxwhiskers_p.h"
             #include "boxwhiskersdata_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BoxPlotChartItem;
             class BoxWhiskersAnimation : public ChartAnimation
             {
                 Q_OBJECT
             public:
-                BoxWhiskersAnimation(BoxPlotChartItem *item);
                 BoxWhiskersAnimation(BoxWhiskers *box);
                 ~BoxWhiskersAnimation();
             public: // from QVariantAnimation
                 virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
                 virtual void updateCurrentValue(const QVariant &value);
                 void setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData);
                 void setEndData(const BoxWhiskersData &endData);
+                void setStartData(const BoxWhiskersData &endData);
+                void moveMedianLine(bool move);
             protected:
+                friend class BoxPlotAnimation;
                 BoxPlotChartItem *m_item;
                 BoxWhiskers *m_box;
                 BoxWhiskersData *m_boxData;
+                bool    m_moveMedianLine;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BOXWHISKERSANIMATION_P_H

src/boxplotchart/boxplotchartitem.cpp +18 -16

             /****************************************************************************
             **
             ** 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 "boxplotchartitem_p.h"
             #include "qboxplotseries_p.h"
             #include "bar_p.h"
             #include "qbarset_p.h"
             #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             #include "boxwhiskers_p.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxPlotChartItem::BoxPlotChartItem(QBoxPlotSeries *series, QGraphicsItem* item) :
                 ChartItem(series->d_func(), item),
                 m_series(series),
                 m_animation(0),
                 m_animate(0)
             {
                 connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
                 connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged()));
                 connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleUpdatedBars()));
                 connect(series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdatedBars()));
                 // QBoxPlotSeriesPrivate calls handleDataStructureChanged(), don't do it here
                 setZValue(ChartPresenter::BoxPlotSeriesZValue);
                 m_barSets = m_series->barSets();
             }
             BoxPlotChartItem::~BoxPlotChartItem()
             {
                 qDebug() << "BoxPlotChartItem::~BoxPlotChartItem() " << m_seriesIndex;
             }
             void BoxPlotChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(painter);
                 Q_UNUSED(option);
                 Q_UNUSED(widget);
                 //painter->setClipRect(QRectF(QPointF(0,0),domain()->size()));
                 //qDebug() << "ALERT EMPTY: BoxPlotChartItem::paint";
             }
             void BoxPlotChartItem::setAnimation(BoxPlotAnimation *animation)
             {
                 //qDebug() << "BoxPlotChartItem::setAnimation :" << animation;
                 m_animation = animation;
                 if (m_animation) {
                     foreach (BoxWhiskers *item, m_boxTable.values()) {
                         m_animation->addBox(item);
                     }
                     handleDomainUpdated();
                 }
             }
             void BoxPlotChartItem::handleDataStructureChanged()
             {
                 //qDebug() << "BoxPlotChartItem::handleDataStructureChanged()";
                 int setCount = m_series->count();
                 for (int s = 0; s < setCount; s++) {
                     QBarSet *set = m_series->d_func()->barsetAt(s);
                     BoxWhiskers *boxWhiskersItem = m_boxTable.value(set);
                     if (boxWhiskersItem == 0) {
                         // Item is not yet created, make a box and add it to hash table
                         boxWhiskersItem = new BoxWhiskers(domain(), this);
                         m_boxTable.insert(set, boxWhiskersItem);
                         boxWhiskersItem->setBrush(m_series->brush());
                         boxWhiskersItem->setPen(m_series->pen());
                     }
                     updateBoxGeometry(boxWhiskersItem, s);
                     boxWhiskersItem->updateGeometry();
                     if (m_animation)
                         m_animation->addBox(boxWhiskersItem);
                 }
                 //
                 handleDomainUpdated();
             }
             void BoxPlotChartItem::handleUpdatedBars()
             {
                 //qDebug() << "BoxPlotChartItem::handleUpdatedBars()";
                 foreach (BoxWhiskers *item, m_boxTable.values()) {
                     item->setBrush(m_series->brush());
                     item->setPen(m_series->pen());
                 }
             }
             void BoxPlotChartItem::handleDomainUpdated()
             {
                 //qDebug() << "BoxPlotChartItem::handleDomainUpdated() domain()->size() = " << domain()->size();
                 if ((domain()->size().width() <= 0) || (domain()->size().height() <= 0))
                     return;
                 // Set my bounding rect to same as domain size
                 m_boundingRect.setRect(0.0, 0.0, domain()->size().width(), domain()->size().height());
                 foreach (BoxWhiskers *item, m_boxTable.values()) {
                     // Update the domain size for each BoxWhisker item
                     item->setDomainSize(domain()->size());
                     // If the animation is set, start the animation for each BoxWhisker item
                     if (m_animation) {
                         presenter()->startAnimation(m_animation->boxAnimation(item));
                     }
                 }
             }
             void BoxPlotChartItem::handleLayoutChanged()
             {
-                //qDebug() << "BoxPlotChartItem::handleLayoutChanged() domain()->size() = " << domain()->size();
+                foreach (BoxWhiskers *item, m_boxTable.values()) {
-                //foreach (BoxWhiskers *boxWhiskersItem, m_boxes)
+                    if (m_animation)
-                //    boxWhiskersItem->updateGeometry();
+                        m_animation->setAnimationStart(item);
-            void BoxPlotChartItem::handleSeriesRemove(QAbstractSeries *series)
+                    bool dirty = updateBoxGeometry(item, item->m_data.m_index);
+                    if (dirty && m_animation)
-                qDebug() << "BoxPlotChartItem::handleSeriesRemove " << m_seriesIndex;
+                        presenter()->startAnimation(m_animation->boxChangeAnimation(item));
-                QBoxPlotSeries *removedSeries = static_cast<QBoxPlotSeries *>(series);
+                    else
-                if (m_series == removedSeries) {
+                        item->updateGeometry();
-                    return;
                 }
-                m_seriesCount = m_seriesCount - 1;
-                handleDataStructureChanged();
             }
             QRectF BoxPlotChartItem::boundingRect() const
             {
                 return m_boundingRect;
             }
             void BoxPlotChartItem::initializeLayout()
             {
                 qDebug() << "ALERT EMPTY: BoxPlotChartItem::initializeLayout";
             }
             QVector<QRectF> BoxPlotChartItem::calculateLayout()
             {
                 return QVector<QRectF>();
             }
-            void BoxPlotChartItem::updateBoxGeometry(BoxWhiskers *box, int index)
+            bool BoxPlotChartItem::updateBoxGeometry(BoxWhiskers *box, int index)
             {
+                bool changed = false;
                 QBarSet *set = m_series->d_func()->barsetAt(index);
-                //QBarSet *set = m_barSets.at(index);
                 BoxWhiskersData &data = box->m_data;
+                if ((data.m_lowerExtreme != set->at(0)) || (data.m_lowerQuartile != set->at(1)) ||
+                    (data.m_median != set->at(2)) || (data.m_upperQuartile != set->at(3)) || (data.m_upperExtreme != set->at(4)))
+                    changed = true;
                 data.m_lowerExtreme = set->at(0);
                 data.m_lowerQuartile = set->at(1);
                 data.m_median = set->at(2);
                 data.m_upperQuartile = set->at(3);
                 data.m_upperExtreme = set->at(4);
                 data.m_index = index;
                 data.m_boxItems = m_series->count();
                 data.m_maxX = domain()->maxX();
                 data.m_minX = domain()->minX();
                 data.m_maxY = domain()->maxY();
                 data.m_minY = domain()->minY();
                 data.m_seriesIndex = m_seriesIndex;
                 data.m_seriesCount = m_seriesCount;
+                return changed;
             }
             #include "moc_boxplotchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/boxplotchart/boxplotchartitem_p.h +1 -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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef BOXPLOTCHARTITEM_H
             #define BOXPLOTCHARTITEM_H
             #include "boxwhiskers_p.h"
             #include "qboxplotseries.h"
             #include "chartitem_p.h"
             #include "boxplotanimation_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BoxPlotSeriesPrivate;
             class BoxPlotChartItem : public ChartItem
             {
                 Q_OBJECT
             public:
                 BoxPlotChartItem(QBoxPlotSeries *series, QGraphicsItem* item =0);
                 ~BoxPlotChartItem();
                 void setAnimation(BoxPlotAnimation *animation);
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
             public Q_SLOTS:
                 void handleDataStructureChanged();
                 void handleDomainUpdated();
                 void handleLayoutChanged();
                 void handleUpdatedBars();
-                void handleSeriesRemove(QAbstractSeries *series);
             private:
                 virtual QVector<QRectF> calculateLayout();
                 void initializeLayout();
-                void updateBoxGeometry(BoxWhiskers *box, int index);
+                bool updateBoxGeometry(BoxWhiskers *box, int index);
             protected:
                 friend class QBoxPlotSeriesPrivate;
                 QBoxPlotSeries *m_series; // Not owned.
                 QList<BoxWhiskers *> m_boxes;
                 QHash<QBarSet *, BoxWhiskers *> m_boxTable;
                 QList<QBarSet *> m_barSets;
                 int m_seriesIndex;
                 int m_seriesCount;
                 BoxPlotAnimation *m_animation;
                 bool m_animate;
                 QRectF m_boundingRect;
                 //QList<BoxPlotAnimation *> m_animations;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BOXPLOTCHARTITEM_H

tests/boxplottester/boxplottester.pro +4 -2

             !include( ../tests.pri ) {
                 error( "Couldn't find the test.pri file!" )
             }
             TEMPLATE = app
             QT += core gui opengl
             contains(QT_MAJOR_VERSION, 5) {
                 QT += widgets
             }
             SOURCES += main.cpp \
-                mainwidget.cpp
+                mainwidget.cpp \
+                customtablemodel.cpp
             HEADERS += \
-                mainwidget.h
+                mainwidget.h \
+                customtablemodel.h

tests/boxplottester/mainwidget.cpp +44 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "mainwidget.h"
+            #include "customtablemodel.h"
+            #include <QVBarModelMapper>
+            #include <QTableView>
+            #include <QHeaderView>
             #include <QChartView>
             #include <QBoxPlotSeries>
             #include <QBarSet>
             #include <QLegend>
             #include <QBarCategoryAxis>
             #include <QBrush>
             #include <QColor>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGridLayout>
             #include <QHBoxLayout>
             #include <QLabel>
             #include <QSpacerItem>
             #include <QMessageBox>
             #include <cmath>
             #include <QDebug>
             #include <QStandardItemModel>
             #include <QBarCategoryAxis>
             QTCOMMERCIALCHART_USE_NAMESPACE
             QString addCategories[] = {"Jul", "Aug", "Sep", "Nov", "Dec"};
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent),
                 m_chart(0),
                 rowPos(0),
                 nSeries(0),
                 nNewBoxes(0)
             {
                 m_chart = new QChart();
                 // Grid layout for the controls for configuring the chart widget
                 QGridLayout *grid = new QGridLayout();
                 // Create add a series button
                 QPushButton *addSeriesButton = new QPushButton("Add a series");
                 connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
                 grid->addWidget(addSeriesButton, rowPos++, 1);
                 // Create remove a series button
                 QPushButton *removeSeriesButton = new QPushButton("Remove a series");
                 connect(removeSeriesButton, SIGNAL(clicked()), this, SLOT(removeSeries()));
                 grid->addWidget(removeSeriesButton, rowPos++, 1);
                 // Create add a single box button
                 QPushButton *addBoxButton = new QPushButton("Add a box");
                 connect(addBoxButton, SIGNAL(clicked()), this, SLOT(addBox()));
                 grid->addWidget(addBoxButton, rowPos++, 1);
                 initThemeCombo(grid);
                 initCheckboxes(grid);
+                m_model = new CustomTableModel;
+                QTableView *tableView = new QTableView;
+                tableView->setModel(m_model);
+                tableView->setMaximumWidth(200);
+                grid->addWidget(tableView, rowPos++, 0, 3, 2, Qt::AlignLeft);
+            #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+                tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+                tableView->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+            #else
+                tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+                tableView->verticalHeader()->setResizeMode(QHeaderView::Stretch);
+            #endif
                 // add row with empty label to make all the other rows static
                 grid->addWidget(new QLabel(""), grid->rowCount(), 0);
                 grid->setRowStretch(grid->rowCount() - 1, 1);
                 // Create chart view with the chart
                 m_chartView = new QChartView(m_chart, this);
                 //m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
                 // Another grid layout as a main layout
                 QGridLayout *mainLayout = new QGridLayout();
                 mainLayout->addLayout(grid, 0, 0);
                 mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
                 setLayout(mainLayout);
                 legendToggled(false);
                 animationToggled(false);
             }
             // Combo box for selecting theme
             void MainWidget::initThemeCombo(QGridLayout *grid)
             {
                 QComboBox *chartTheme = new QComboBox();
                 chartTheme->addItem("Default");
                 chartTheme->addItem("Light");
                 chartTheme->addItem("Blue Cerulean");
                 chartTheme->addItem("Dark");
                 chartTheme->addItem("Brown Sand");
                 chartTheme->addItem("Blue NCS");
                 chartTheme->addItem("High Contrast");
                 chartTheme->addItem("Blue Icy");
                 connect(chartTheme, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(changeChartTheme(int)));
                 grid->addWidget(new QLabel("Chart theme:"), rowPos, 0);
                 grid->addWidget(chartTheme, rowPos++, 1);
             }
             // Different check boxes for customizing chart
             void MainWidget::initCheckboxes(QGridLayout *grid)
             {
                 QCheckBox *animationCheckBox = new QCheckBox("Animation");
                 connect(animationCheckBox, SIGNAL(toggled(bool)), this, SLOT(animationToggled(bool)));
                 animationCheckBox->setChecked(false);
                 grid->addWidget(animationCheckBox, rowPos++, 0);
                 QCheckBox *legendCheckBox = new QCheckBox("Legend");
                 connect(legendCheckBox, SIGNAL(toggled(bool)), this, SLOT(legendToggled(bool)));
                 legendCheckBox->setChecked(false);
                 grid->addWidget(legendCheckBox, rowPos++, 0);
                 QCheckBox *titleCheckBox = new QCheckBox("Title");
                 connect(titleCheckBox, SIGNAL(toggled(bool)), this, SLOT(titleToggled(bool)));
                 titleCheckBox->setChecked(false);
                 grid->addWidget(titleCheckBox, rowPos++, 0);
+                QCheckBox *modelMapperCheckBox = new QCheckBox("Use model mapper");
+                connect(modelMapperCheckBox, SIGNAL(toggled(bool)), this, SLOT(modelMapperToggled(bool)));
+                modelMapperCheckBox->setChecked(false);
+                grid->addWidget(modelMapperCheckBox, rowPos++, 0);
             }
             void MainWidget::addSeries()
             {
                 qDebug() << "BoxPlotTester::MainWidget::addSeries()";
                 if (nSeries > 9)
                     return;
                 // Initial data
                 //![1]
                 QBarSet *set0 = new QBarSet("Jan");
                 QBarSet *set1 = new QBarSet("Feb");
                 QBarSet *set2 = new QBarSet("Mar");
                 QBarSet *set3 = new QBarSet("Apr");
                 QBarSet *set4 = new QBarSet("May");
                 QBarSet *set5 = new QBarSet("Jun");
                 //      low  bot   med   top  upp
                 *set0 << 3 << 4 << 4.4 << 6 << 7;
                 *set1 << 5 << 6 << 7.5 << 8 << 12;
                 *set2 << 3 << 5 << 5.7 << 8 << 9;
                 *set3 << 5 << 6 << 6.8 << 7 << 8;
                 *set4 << 4 << 5 << 5.2 << 6 << 7;
                 *set5 << 4 << 7 << 8.2 << 9 << 10;
                 m_series[nSeries] = new QBoxPlotSeries();
                 m_series[nSeries]->append(set0);
                 m_series[nSeries]->append(set1);
                 m_series[nSeries]->append(set2);
                 m_series[nSeries]->append(set3);
                 m_series[nSeries]->append(set4);
                 m_series[nSeries]->append(set5);
                 m_series[nSeries]->type();
                 m_series[nSeries]->setName("Box & Whiskers");
                 m_chart->addSeries(m_series[nSeries]);
                 if (nSeries == 0) {
                     QStringList categories;
                     categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                     m_axis = new QBarCategoryAxis();
                     m_axis->append(categories);
                     m_chart->createDefaultAxes();
                     m_chart->setAxisX(m_axis, m_series[nSeries]);
                 }
                 nSeries++;
             }
             void MainWidget::removeSeries()
             {
                 if (nSeries > 0) {
                     nSeries--;
                     m_chart->removeSeries(m_series[nSeries]);
                     delete m_series[nSeries];
                 }
             }
             void MainWidget::addBox()
             {
                 qDebug() << "BoxPlotTester::MainWidget::addBox()";
                 QBarSet *newSet = new QBarSet("New");
                 *newSet << 5 << 6 << 6.8 << 7 << 8;
                 m_series[0]->append(newSet);
                 m_axis->append(addCategories[nNewBoxes]);
                 nNewBoxes++;
             }
             void MainWidget::animationToggled(bool enabled)
             {
                 qDebug() << "BoxPlotTester::Animation toggled to " << enabled;
                 if (enabled)
                     m_chart->setAnimationOptions(QChart::SeriesAnimations);
                 else
                     m_chart->setAnimationOptions(QChart::NoAnimation);
             }
             void MainWidget::legendToggled(bool enabled)
             {
                 qDebug() << "BoxPlotTester::Legend toggled to " << enabled;
                 m_chart->legend()->setVisible(enabled);
                 if (enabled)
                     m_chart->legend()->setAlignment(Qt::AlignBottom);
             }
             void MainWidget::titleToggled(bool enabled)
             {
                 qDebug() << "BoxPlotTester::Title toggled to " << enabled;
                 if (enabled)
                     m_chart->setTitle("Simple boxplotchart example");
                 else
                     m_chart->setTitle("");
             }
+            void MainWidget::modelMapperToggled(bool enabled)
+            {
+                if (enabled) {
+                    m_series[nSeries] = new QBoxPlotSeries();
+                    int first = 0;
+                    int count = 5;
+                    QVBarModelMapper *mapper = new QVBarModelMapper(this);
+                    mapper->setFirstBarSetColumn(0);
+                    mapper->setLastBarSetColumn(5);
+                    mapper->setFirstRow(first);
+                    mapper->setRowCount(count);
+                    mapper->setSeries(m_series[nSeries]);
+                    mapper->setModel(m_model);
+                    m_chart->addSeries(m_series[nSeries]);
+                    nSeries++;
+                } else {
+                    removeSeries();
+                }
+            }
             void MainWidget::changeChartTheme(int themeIndex)
             {
                 qDebug() << "BoxPlotTester::changeChartTheme: " << themeIndex;
                 if (themeIndex == 0)
                     m_chart->setTheme(QChart::ChartThemeLight);
                 else
                     m_chart->setTheme((QChart::ChartTheme) (themeIndex - 1));
             }

tests/boxplottester/mainwidget.h +3 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 MAINWIDGET_H
             #define MAINWIDGET_H
             #include "qchartglobal.h"
             #include "qchart.h"
             #include "qchartview.h"
+            #include "customtablemodel.h"
             #include <QWidget>
             #include <QBoxPlotSeries>
             #include <QBarCategoryAxis>
             class QGridLayout;
             QTCOMMERCIALCHART_USE_NAMESPACE
             class MainWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit MainWidget(QWidget *parent = 0);
             signals:
             private:
                 void initThemeCombo(QGridLayout *grid);
                 void initCheckboxes(QGridLayout *grid);
             private slots:
                 void addSeries();
                 void removeSeries();
                 void addBox();
                 void animationToggled(bool enabled);
                 void legendToggled(bool enabled);
                 void titleToggled(bool enabled);
+                void modelMapperToggled(bool enabled);
                 void changeChartTheme(int themeIndex);
             private:
                 QChart *m_chart;
                 QChartView *m_chartView;
                 QGridLayout *m_scatterLayout;
                 QBarCategoryAxis *m_axis;
+                CustomTableModel *m_model;
                 int rowPos;
                 int nSeries;
                 int nNewBoxes;
                 QBoxPlotSeries *m_series[10];
             };
             #endif // MAINWIDGET_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