HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1688:daa1eadf0e06

horizontal percent barchart & example

sauimone -

r1688:daa1eadf0e06

parent child

Context file:

r1688:daa1eadf0e06

Collapse all files

examples/horizontalpercentbarchart/horizontalpercentbarchart.pro created 644 +6 0

@@ -0,0 +1,6
	1	!include( ../examples.pri ) {
	2	error( "Couldn't find the examples.pri file!" )
	3	}
	4
	5	TARGET = horizontalpercentbarchart
	6	SOURCES += main.cpp

examples/horizontalpercentbarchart/main.cpp created 644 +95 0

@@ -0,0 +1,95
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 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 <QApplication>
	22	#include <QMainWindow>
	23	#include <QChartView>
	24	#include <QBarSeries>
	25	#include <QBarSet>
	26	#include <QLegend>
	27	#include <QBarCategoriesAxis>
	28	#include <QHorizontalPercentBarSeries>
	29
	30	QTCOMMERCIALCHART_USE_NAMESPACE
	31
	32	int main(int argc, char *argv[])
	33	{
	34	QApplication a(argc, argv);
	35
	36	//![1]
	37	QBarSet *set0 = new QBarSet("Jane");
	38	QBarSet *set1 = new QBarSet("John");
	39	QBarSet *set2 = new QBarSet("Axel");
	40	QBarSet *set3 = new QBarSet("Mary");
	41	QBarSet *set4 = new QBarSet("Samantha");
	42
	43	*set0 << 1 << 2 << 3 << 4 << 5 << 6;
	44	*set1 << 5 << 0 << 0 << 4 << 0 << 7;
	45	*set2 << 3 << 5 << 8 << 13 << 8 << 5;
	46	*set3 << 5 << 6 << 7 << 3 << 4 << 5;
	47	*set4 << 9 << 7 << 5 << 3 << 1 << 2;
	48	//![1]
	49
	50	//![2]
	51	QHorizontalPercentBarSeries *series = new QHorizontalPercentBarSeries();
	52	series->append(set0);
	53	series->append(set1);
	54	series->append(set2);
	55	series->append(set3);
	56	series->append(set4);
	57
	58	//![2]
	59
	60	//![3]
	61	QChart* chart = new QChart();
	62	chart->addSeries(series);
	63	chart->setTitle("Simple horizontal stacked barchart example");
	64	chart->createDefaultAxes();
	65	chart->setAnimationOptions(QChart::SeriesAnimations);
	66	//![3]
	67
	68	//![4]
	69	QStringList categories;
	70	categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
	71	QBarCategoriesAxis* axis = new QBarCategoriesAxis();
	72	axis->append(categories);
	73	chart->createDefaultAxes();
	74	chart->setAxisY(axis,series);
	75	//![4]
	76
	77	//![5]
	78	chart->legend()->setVisible(true);
	79	chart->legend()->setAlignment(Qt::AlignBottom);
	80	//![5]
	81
	82	//![6]
	83	QChartView* chartView = new QChartView(chart);
	84	chartView->setRenderHint(QPainter::Antialiasing);
	85	//![6]
	86
	87	//![7]
	88	QMainWindow window;
	89	window.setCentralWidget(chartView);
	90	window.resize(400, 300);
	91	window.show();
	92	//![7]
	93
	94	return a.exec();
	95	}

src/animations/horizontalpercentbaranimation.cpp created 644 +64 0

@@ -0,0 +1,64
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 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 "horizontalpercentbaranimation_p.h"
	22	#include "abstractbarchartitem_p.h"
	23	#include <QTimer>
	24
	25	Q_DECLARE_METATYPE(QVector<QRectF>)
	26
	27	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	28
	29	HorizontalPercentBarAnimation::HorizontalPercentBarAnimation(AbstractBarChartItem *item) :
	30	AbstractBarAnimation(item)
	31	{
	32	}
	33
	34	HorizontalPercentBarAnimation::~HorizontalPercentBarAnimation()
	35	{
	36
	37	}
	38
	39
	40	QVariant HorizontalPercentBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
	41	{
	42	QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
	43	QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
	44	QVector<QRectF> result;
	45
	46	Q_ASSERT(startVector.count() == endVector.count());
	47
	48	qreal xAxis = m_item->geometry().x();
	49
	50	for(int i = 0; i < startVector.count(); i++) {
	51	qreal h = endVector[i].height();
	52	qreal w = endVector[i].width() * progress;
	53	qreal x = xAxis + ((endVector[i].left() - xAxis) * progress);
	54	qreal y = endVector[i].top();
	55
	56	QRectF value(x,y,w,h);
	57	result << value;
	58	}
	59	return qVariantFromValue(result);
	60	}
	61
	62	#include "moc_horizontalpercentbaranimation_p.cpp"
	63
	64	QTCOMMERCIALCHART_END_NAMESPACE

src/animations/horizontalpercentbaranimation_p.h created 644 +52 0

@@ -0,0 +1,52
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 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	// W A R N I N G
	22	// -------------
	23	//
	24	// This file is not part of the QtCommercial Chart API. It exists purely as an
	25	// implementation detail. This header file may change from version to
	26	// version without notice, or even be removed.
	27	//
	28	// We mean it.
	29
	30	#ifndef HORIZONTALPERCENTBARANIMATION_P_H
	31	#define HORIZONTALPERCENTBARANIMATION_P_H
	32
	33	#include "abstractbaranimation_p.h"
	34	#include "chartanimation_p.h"
	35	#include "abstractbarchartitem_p.h"
	36
	37	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	38
	39	class HorizontalPercentBarAnimation : public AbstractBarAnimation
	40	{
	41	Q_OBJECT
	42	public:
	43	explicit HorizontalPercentBarAnimation(AbstractBarChartItem *item);
	44	~HorizontalPercentBarAnimation();
	45
	46	virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
	47
	48	};
	49
	50	QTCOMMERCIALCHART_END_NAMESPACE
	51
	52	#endif // HORIZONTALPERCENTBARANIMATION_P_H

src/barchart/horizontalpercentbarchartitem.cpp created 644 +102 0

@@ -0,0 +1,102
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 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 "horizontalpercentbarchartitem_p.h"
	22	#include "qabstractbarseries_p.h"
	23	#include "qbarset_p.h"
	24	#include "bar_p.h"
	25	#include <QDebug>
	26
	27	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	28
	29	HorizontalPercentBarChartItem::HorizontalPercentBarChartItem(QAbstractBarSeries series, ChartPresenter presenter) :
	30	AbstractBarChartItem(series, presenter)
	31	{
	32	}
	33
	34	QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout()
	35	{
	36	QVector<QRectF> layout;
	37
	38	// Use temporary qreals for accuracy
	39	qreal categoryCount = m_series->d_func()->categoryCount();
	40	qreal setCount = m_series->count();
	41	bool barsVisible = m_series->isVisible();
	42
	43	// Domain:
	44	qreal width = geometry().width();
	45	qreal height = geometry().height();
	46	qreal rangeY = m_domainMaxY - m_domainMinY;
	47	qreal rangeX = m_domainMaxX - m_domainMinX;
	48	qreal scaleY = (height / rangeY);
	49	qreal scaleX = (width / rangeX);
	50	qreal barHeight = scaleY * m_series->d_func()->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
	51
	52	int itemIndex(0);
	53	for (int category = 0; category < categoryCount; category++) {
	54	qreal colSum = m_series->d_func()->categorySum(category);
	55	qreal percentage = (100 / colSum);
	56	qreal xPos = rangeX * m_domainMinX + geometry().left();
	57	for (int set = 0; set < setCount; set++) {
	58	QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
	59
	60	qreal yPos = -(barSet->pos(category) - m_domainMinY -0.5) * scaleY + m_rect.bottom() - barHeight/2;
	61
	62	qreal barWidth = barSet->value(category) * percentage * scaleX;
	63	Bar* bar = m_bars.at(itemIndex);
	64
	65	QRectF rect(xPos, yPos - barHeight, barWidth, barHeight);
	66	layout.append(rect);
	67	bar->setPen(barSet->m_pen);
	68	bar->setBrush(barSet->m_brush);
	69	if (qFuzzyIsNull(barHeight)) {
	70	bar->setVisible(false);
	71	} else {
	72	bar->setVisible(barsVisible);
	73	}
	74
	75	QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
	76
	77	if (!qFuzzyIsNull(m_series->d_func()->valueAt(set,category))) {
	78	int p = m_series->d_func()->percentageAt(set,category) * 100;
	79	QString vString(QString::number(p));
	80	vString.truncate(3);
	81	vString.append("%");
	82	label->setText(vString);
	83	} else {
	84	label->setText(QString(""));
	85	}
	86
	87	label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
	88	,yPos - barHeight/2 - label->boundingRect().height()/2);
	89	label->setFont(barSet->m_labelFont);
	90	label->setBrush(barSet->m_labelBrush);
	91
	92	itemIndex++;
	93	xPos += barWidth;
	94	}
	95	}
	96	return layout;
	97	}
	98
	99	#include "moc_horizontalpercentbarchartitem_p.cpp"
	100
	101	QTCOMMERCIALCHART_END_NAMESPACE
	102

src/barchart/horizontalpercentbarchartitem_p.h created 644 +50 0

@@ -0,0 +1,50
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 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	// W A R N I N G
	22	// -------------
	23	//
	24	// This file is not part of the QtCommercial Chart API. It exists purely as an
	25	// implementation detail. This header file may change from version to
	26	// version without notice, or even be removed.
	27	//
	28	// We mean it.
	29
	30	#ifndef HORIZONTALPERCENTBARCHARTITEM_P_H
	31	#define HORIZONTALPERCENTBARCHARTITEM_P_H
	32
	33	#include "abstractbarchartitem_p.h"
	34	#include <QGraphicsItem>
	35
	36	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	37
	38	class HorizontalPercentBarChartItem : public AbstractBarChartItem
	39	{
	40	Q_OBJECT
	41	public:
	42	HorizontalPercentBarChartItem(QAbstractBarSeries series, ChartPresenter presenter);
	43
	44	private:
	45	virtual QVector<QRectF> calculateLayout();
	46	};
	47
	48	QTCOMMERCIALCHART_END_NAMESPACE
	49
	50	#endif // HORIZONTALPERCENTBARCHARTITEM_P_H

src/barchart/qhorizontalpercentbarseries.cpp created 644 +75 0

@@ -0,0 +1,75
	1	#include "qhorizontalpercentbarseries.h"
	2	#include "qhorizontalpercentbarseries_p.h"
	3	#include "horizontalpercentbarchartitem_p.h"
	4	#include "horizontalpercentbaranimation_p.h"
	5
	6	#include "chartdataset_p.h"
	7	#include "charttheme_p.h"
	8
	9	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	10
	11	QHorizontalPercentBarSeries::QHorizontalPercentBarSeries(QObject *parent) :
	12	QAbstractBarSeries(*new QHorizontalPercentBarSeriesPrivate(this), parent)
	13	{
	14	}
	15
	16	QAbstractSeries::SeriesType QHorizontalPercentBarSeries::type() const
	17	{
	18	return QAbstractSeries::SeriesTypeHorizontalPercentBar;
	19	}
	20
	21
	22
	23	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	24
	25	QHorizontalPercentBarSeriesPrivate::QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries *q) : QAbstractBarSeriesPrivate(q)
	26	{
	27
	28	}
	29
	30	void QHorizontalPercentBarSeriesPrivate::scaleDomain(Domain& domain)
	31	{
	32	qreal minX(domain.minX());
	33	qreal minY(domain.minY());
	34	qreal maxX(domain.maxX());
	35	qreal maxY(domain.maxY());
	36	int tickXCount(domain.tickXCount());
	37	int tickYCount(domain.tickYCount());
	38
	39	qreal y = categoryCount();
	40	minX = 0;
	41	maxX = 100;
	42	minY = qMin(minY, - (qreal)0.5);
	43	maxY = qMax(maxY, y - (qreal)0.5);
	44	tickYCount = y+1;
	45
	46	domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
	47	}
	48
	49	Chart* QHorizontalPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
	50	{
	51	Q_Q(QHorizontalPercentBarSeries);
	52
	53	HorizontalPercentBarChartItem* bar = new HorizontalPercentBarChartItem(q,presenter);
	54	if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
	55	bar->setAnimator(presenter->animator());
	56	bar->setAnimation(new HorizontalPercentBarAnimation(bar));
	57	}
	58	presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
	59	return bar;
	60	}
	61
	62	QAbstractAxis::AxisType QHorizontalPercentBarSeriesPrivate::defaultAxisXType() const
	63	{
	64	return QAbstractAxis::AxisTypeValues;
	65	}
	66
	67	QAbstractAxis::AxisType QHorizontalPercentBarSeriesPrivate::defaultAxisYType() const
	68	{
	69	return QAbstractAxis::AxisTypeCategories;
	70	}
	71
	72
	73	#include "moc_qhorizontalpercentbarseries.cpp"
	74
	75	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qhorizontalpercentbarseries.h created 644 +44 0

@@ -0,0 +1,44
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 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 QHORIZONTALPERCENTBARSERIES_H
	22	#define QHORIZONTALPERCENTBARSERIES_H
	23
	24	#include <qabstractbarseries.h>
	25
	26	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	27
	28	class QHorizontalPercentBarSeriesPrivate;
	29
	30	class QTCOMMERCIALCHART_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries
	31	{
	32	Q_OBJECT
	33	public:
	34	explicit QHorizontalPercentBarSeries(QObject *parent = 0);
	35	QAbstractSeries::SeriesType type() const;
	36
	37	private:
	38	Q_DECLARE_PRIVATE(QHorizontalPercentBarSeries)
	39	Q_DISABLE_COPY(QHorizontalPercentBarSeries)
	40	};
	41
	42	QTCOMMERCIALCHART_END_NAMESPACE
	43
	44	#endif // QHORIZONTALPERCENTBARSERIES_H

src/barchart/qhorizontalpercentbarseries_p.h created 644 +53 0

@@ -0,0 +1,53
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 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	// W A R N I N G
	22	// -------------
	23	//
	24	// This file is not part of the QtCommercial Chart API. It exists purely as an
	25	// implementation detail. This header file may change from version to
	26	// version without notice, or even be removed.
	27	//
	28	// We mean it.
	29
	30	#ifndef QHORIZONTALPERCENTBARSERIES_P_H
	31	#define QHORIZONTALPERCENTBARSERIES_P_H
	32
	33	#include "qabstractbarseries_p.h"
	34	#include "domain_p.h"
	35
	36	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	37
	38	class QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate
	39	{
	40	public:
	41	QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries* q);
	42	Chart* createGraphics(ChartPresenter* presenter);
	43	void scaleDomain(Domain& domain);
	44	QAbstractAxis::AxisType defaultAxisXType() const;
	45	QAbstractAxis::AxisType defaultAxisYType() const;
	46
	47	private:
	48	Q_DECLARE_PUBLIC(QHorizontalPercentBarSeries)
	49	};
	50
	51	QTCOMMERCIALCHART_END_NAMESPACE
	52
	53	#endif // QHORIZONTALPERCENTBARSERIES_P_H

examples/examples.pro +2 -1

             CURRENTLY_BUILDING_COMPONENTS = "examples"
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             SUBDIRS += \
                        areachart \
                        customchart \
                        linechart \
                        percentbarchart \
                        piechart \
                        piechartdrilldown \
                        presenterchart \
                        scatterchart \
                        scatterinteractions \
                        splinechart \
                        stackedbarchart \
                        stackedbarchartdrilldown \
                        zoomlinechart \
                        modeldata \
                        barchart \
                        legend \
                        barmodelmapper \
                        qmlpiechart \
                        lineandbar \
                        horizontalbarchart \
-                       horizontalstackedbarchart
+                       horizontalstackedbarchart \
+                       horizontalpercentbarchart

src/animations/animations.pri +4 -3

             INCLUDEPATH += $$PWD
             DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/axisanimation.cpp \
                 $$PWD/chartanimator.cpp \
                 $$PWD/xyanimation.cpp \
                 $$PWD/pieanimation.cpp \
                 $$PWD/piesliceanimation.cpp \
                 $$PWD/splineanimation.cpp \
                 $$PWD/baranimation.cpp \
                 $$PWD/stackedbaranimation.cpp \
                 $$PWD/percentbaranimation.cpp \
                 $$PWD/abstractbaranimation.cpp \
                 $$PWD/horizontalbaranimation.cpp \
-                $$PWD/horizontalstackedbaranimation.cpp
+                $$PWD/horizontalstackedbaranimation.cpp \
+                $$PWD/horizontalpercentbaranimation.cpp
             PRIVATE_HEADERS += \
                 $$PWD/axisanimation_p.h \
                 $$PWD/chartanimator_p.h \
                 $$PWD/chartanimation_p.h \
                 $$PWD/xyanimation_p.h \
                 $$PWD/pieanimation_p.h \
                 $$PWD/piesliceanimation_p.h \
                 $$PWD/splineanimation_p.h \
                 $$PWD/baranimation_p.h \
                 $$PWD/stackedbaranimation_p.h \
                 $$PWD/percentbaranimation_p.h \
                 $$PWD/abstractbaranimation_p.h \
                 $$PWD/horizontalbaranimation_p.h \
-                $$PWD/horizontalstackedbaranimation_p.h
+                $$PWD/horizontalstackedbaranimation_p.h \
+                $$PWD/horizontalpercentbaranimation_p.h

src/animations/horizontalstackedbaranimation.cpp +1 -1

             /****************************************************************************
             **
             ** 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 "horizontalstackedbaranimation_p.h"
             #include "abstractbarchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             HorizontalStackedBarAnimation::HorizontalStackedBarAnimation(AbstractBarChartItem *item) :
                 AbstractBarAnimation(item)
             {
             }
             HorizontalStackedBarAnimation::~HorizontalStackedBarAnimation()
             {
             }
             QVariant HorizontalStackedBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
                 QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
                 QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
                 QVector<QRectF> result;
                 Q_ASSERT(startVector.count() == endVector.count());
                 qreal xAxis = m_item->geometry().x();
                 for(int i = 0; i < startVector.count(); i++) {
                     qreal h = endVector[i].height();
-                    qreal w = startVector[i].width() + ((endVector[i].width() - startVector[i].width()) * progress);
+                    qreal w = endVector[i].width() * progress;
                     qreal x = xAxis + ((endVector[i].left() - xAxis) * progress);
                     qreal y = endVector[i].top();
                     QRectF value(x,y,w,h);
                     result << value;
                 }
                 return qVariantFromValue(result);
             }
             #include "moc_horizontalstackedbaranimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchart.pri +8 -3

             INCLUDEPATH += $$PWD
             DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/bar.cpp \
                 $$PWD/abstractbarchartitem.cpp \
                 $$PWD/percentbarchartitem.cpp \
                 $$PWD/barchartitem.cpp \
                 $$PWD/qabstractbarseries.cpp \
                 $$PWD/qbarset.cpp \
                 $$PWD/qpercentbarseries.cpp \
                 $$PWD/qstackedbarseries.cpp \
                 $$PWD/qbarseries.cpp \
                 $$PWD/stackedbarchartitem.cpp \
                 $$PWD/qbarmodelmapper.cpp \
                 $$PWD/qvbarmodelmapper.cpp \
                 $$PWD/qhbarmodelmapper.cpp \
                 $$PWD/qhorizontalbarseries.cpp \
                 $$PWD/horizontalbarchartitem.cpp \
                 $$PWD/qhorizontalstackedbarseries.cpp \
-                $$PWD/horizontalstackedbarchartitem.cpp
+                $$PWD/horizontalstackedbarchartitem.cpp \
+                $$PWD/qhorizontalpercentbarseries.cpp \
+                $$PWD/horizontalpercentbarchartitem.cpp
             PRIVATE_HEADERS += \
                 $$PWD/bar_p.h \
                 $$PWD/abstractbarchartitem_p.h \
                 $$PWD/percentbarchartitem_p.h \
                 $$PWD/stackedbarchartitem_p.h \
                 $$PWD/barchartitem_p.h \
                 $$PWD/qbarset_p.h \
                 $$PWD/qabstractbarseries_p.h \
                 $$PWD/qstackedbarseries_p.h\
                 $$PWD/qpercentbarseries_p.h \
                 $$PWD/qbarseries_p.h \
                 $$PWD/qbarmodelmapper_p.h \
                 $$PWD/qhorizontalbarseries_p.h \
                 $$PWD/horizontalbarchartitem_p.h \
                 $$PWD/qhorizontalstackedbarseries_p.h \
-                $$PWD/horizontalstackedbarchartitem_p.h
+                $$PWD/horizontalstackedbarchartitem_p.h \
+                $$PWD/qhorizontalpercentbarseries_p.h \
+                $$PWD/horizontalpercentbarchartitem_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qabstractbarseries.h \
                 $$PWD/qbarset.h \
                 $$PWD/qpercentbarseries.h \
                 $$PWD/qstackedbarseries.h \
                 $$PWD/qbarseries.h \
                 $$PWD/qbarmodelmapper.h \
                 $$PWD/qvbarmodelmapper.h \
                 $$PWD/qhbarmodelmapper.h \
                 $$PWD/qhorizontalbarseries.h \
-                $$PWD/qhorizontalstackedbarseries.h
+                $$PWD/qhorizontalstackedbarseries.h \
+                $$PWD/qhorizontalpercentbarseries.h

src/barchart/qabstractbarseries.h +1 0

             /****************************************************************************
             **
             ** 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 ABSTRACTBARSERIES_H
             #define ABSTRACTBARSERIES_H
             #include <qabstractseries.h>
             #include <QStringList>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSet;
             class QAbstractBarSeriesPrivate;
             // Container for series
             class QTCOMMERCIALCHART_EXPORT QAbstractBarSeries : public QAbstractSeries
             {
                 Q_OBJECT
                 Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
             protected:
                 explicit QAbstractBarSeries(QObject *parent = 0);
             public:
                 virtual ~QAbstractBarSeries();
                 void setBarWidth(qreal width);
                 qreal barWidth() const;
                 bool append(QBarSet *set);
                 bool remove(QBarSet *set);
                 bool append(QList<QBarSet* > sets);
                 bool insert(int index, QBarSet *set);
                 int count() const;
                 QList<QBarSet*> barSets() const;
                 void clear();
                 void setLabelsVisible(bool visible = true);
                 bool isLabelsVisible() const;
             protected:
                 explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d,QObject *parent = 0);
             Q_SIGNALS:
                 void clicked(int index, QBarSet *barset);
                 void hovered(bool status, QBarSet *barset);
                 void countChanged();
                 void labelsVisibleChanged();
                 void barsetsAdded(QList<QBarSet*> sets);
                 void barsetsRemoved(QList<QBarSet*> sets);
             protected:
                 Q_DECLARE_PRIVATE(QAbstractBarSeries)
                 friend class AbstractBarChartItem;
                 friend class PercentBarChartItem;
                 friend class StackedBarChartItem;
                 friend class BarChartItem;
                 friend class HorizontalBarChartItem;
                 friend class HorizontalStackedBarChartItem;
+                friend class HorizontalPercentBarChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // ABSTRACTBARSERIES_H

src/barchart/qbarset.h +1 0

             /****************************************************************************
             **
             ** 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 QBARSET_H
             #define QBARSET_H
             #include <qchartglobal.h>
             #include <QPen>
             #include <QBrush>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSetPrivate;
             class QTCOMMERCIALCHART_EXPORT QBarSet : public QObject
             {
                 Q_OBJECT
                 Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
                 Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
                 Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
                 Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)
                 Q_PROPERTY(QFont labelFont READ labelFont WRITE setLabelFont NOTIFY labelFontChanged)
                 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
                 Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
                 Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)
             public:
                 explicit QBarSet(const QString label, QObject *parent = 0);
                 virtual ~QBarSet();
                 void setLabel(const QString label);
                 QString label() const;
                 void append(const qreal value);
                 void append(const QList<qreal> &values);
                 QBarSet& operator << (const qreal &value);
                 void insert(const int index, const qreal value);
                 void remove(const int index, const int count = 1);
                 void replace(const int index, const qreal value);
                 qreal at(const int index) const;
                 qreal operator [] (const int index) const;
                 int count() const;
                 qreal sum() const;
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setLabelBrush(const QBrush &brush);
                 QBrush labelBrush() const;
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
                 QColor color();
                 void setColor(QColor color);
                 QColor borderColor();
                 void setBorderColor(QColor color);
                 QColor labelColor();
                 void setLabelColor(QColor color);
             Q_SIGNALS:
                 void clicked(int index);
                 void hovered(bool status);
                 void penChanged();
                 void brushChanged();
                 void labelChanged();
                 void labelBrushChanged();
                 void labelFontChanged();
                 void colorChanged(QColor color);
                 void borderColorChanged(QColor color);
                 void labelColorChanged(QColor color);
                 void valuesAdded(int index, int count);
                 void valuesRemoved(int index, int count);
                 void valueChanged(int index);
             private:
                 QScopedPointer<QBarSetPrivate> d_ptr;
                 Q_DISABLE_COPY(QBarSet)
                 friend class QAbstractBarSeries;
                 friend class BarLegendMarker;
                 friend class AbstractBarChartItem;
                 friend class QAbstractBarSeriesPrivate;
                 friend class StackedBarChartItem;
                 friend class PercentBarChartItem;
                 friend class BarChartItem;
                 friend class HorizontalBarChartItem;
                 friend class HorizontalStackedBarChartItem;
+                friend class HorizontalPercentBarChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARSET_H

src/barchart/qhorizontalbarseries.cpp +2 -2

             #include "qhorizontalbarseries.h"
             #include "qhorizontalbarseries_p.h"
             #include "horizontalbarchartitem_p.h"
             #include "horizontalbaranimation_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QHorizontalBarSeries::QHorizontalBarSeries(QObject *parent) :
                 QAbstractBarSeries(*new QHorizontalBarSeriesPrivate(this), parent)
             {
             }
             QAbstractSeries::SeriesType QHorizontalBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeHorizontalBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QHorizontalBarSeriesPrivate::QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q) : QAbstractBarSeriesPrivate(q)
             {
             }
             void QHorizontalBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
                 qreal y = categoryCount();
                 qreal x = max();
                 minX = qMin(minX, x);
-                minY = qMin(minY, -0.5);
+                minY = qMin(minY, - (qreal)0.5);
                 maxX = qMax(maxX, x);
-                maxY = qMax(maxY, y -0.5);
+                maxY = qMax(maxY, y - (qreal)0.5);
                 tickYCount = y+1;
                 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
             }
             Chart* QHorizontalBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QHorizontalBarSeries);
                 HorizontalBarChartItem* bar = new HorizontalBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     bar->setAnimator(presenter->animator());
                     bar->setAnimation(new HorizontalBarAnimation(bar));
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
             QAbstractAxis::AxisType QHorizontalBarSeriesPrivate::defaultAxisXType() const
             {
                 return QAbstractAxis::AxisTypeValues;
             }
             QAbstractAxis::AxisType QHorizontalBarSeriesPrivate::defaultAxisYType() const
             {
                 return QAbstractAxis::AxisTypeCategories;
             }
             #include "moc_qhorizontalbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qhorizontalstackedbarseries.cpp +2 -2

             #include "qhorizontalstackedbarseries.h"
             #include "qhorizontalstackedbarseries_p.h"
             #include "horizontalstackedbarchartitem_p.h"
             #include "horizontalstackedbaranimation_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QHorizontalStackedBarSeries::QHorizontalStackedBarSeries(QObject *parent) :
                 QAbstractBarSeries(*new QHorizontalStackedBarSeriesPrivate(this), parent)
             {
             }
             QAbstractSeries::SeriesType QHorizontalStackedBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeHorizontalStackedBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QHorizontalStackedBarSeriesPrivate::QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q) : QAbstractBarSeriesPrivate(q)
             {
             }
             void QHorizontalStackedBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
                 qreal y = categoryCount();
                 qreal x = maxCategorySum();
                 minX = qMin(minX, x);
-                minY = qMin(minY, -0.5);
+                minY = qMin(minY, - (qreal)0.5);
                 maxX = qMax(maxX, x);
-                maxY = qMax(maxY, y -0.5);
+                maxY = qMax(maxY, y - (qreal)0.5);
                 tickYCount = y+1;
                 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
             }
             Chart* QHorizontalStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QHorizontalStackedBarSeries);
                 HorizontalStackedBarChartItem* bar = new HorizontalStackedBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     bar->setAnimator(presenter->animator());
                     bar->setAnimation(new HorizontalStackedBarAnimation(bar));
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
             QAbstractAxis::AxisType QHorizontalStackedBarSeriesPrivate::defaultAxisXType() const
             {
                 return QAbstractAxis::AxisTypeValues;
             }
             QAbstractAxis::AxisType QHorizontalStackedBarSeriesPrivate::defaultAxisYType() const
             {
                 return QAbstractAxis::AxisTypeCategories;
             }
             #include "moc_qhorizontalstackedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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