HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1794:efd4a5fe5972

population pyramid example. Added grouping option to barseries to give some control over layout

sauimone -

r1794:efd4a5fe5972

parent child

Context file:

r1794:efd4a5fe5972

Collapse all files

examples/populationpyramid/main.cpp created 644 +93 0

@@ -0,0 +1,93
	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 <QHorizontalBarSeries>
	29
	30	QTCOMMERCIALCHART_USE_NAMESPACE
	31
	32	int main(int argc, char *argv[])
	33	{
	34	QApplication a(argc, argv);
	35
	36	//![1]
	37	QBarSet *male = new QBarSet("Male");
	38	QBarSet *female = new QBarSet("Female");
	39
	40	// From wikipedia
	41	*male << -145596 << -149894 << -167327 << -164118 << -170710 << -169408 << -158395 << -176975 << -191803 << -191198 << -196815
	42	<< -207826 << -145517 << -113204 << -90986 << -70909 << -40013 << -15887 << -5769;
	43
	44	*female << 139353 << 143522 << 161212 << 156824 << 163226 << 161766 << 150595 << 170779 << 185979 << 187897 << 196158
	45	<< 209062 << 152460 << 129230 << 114778 << 109611 << 83845 << 44605 << 22328;
	46
	47	//![1]
	48
	49	//![2]
	50	QHorizontalBarSeries *series = new QHorizontalBarSeries();
	51	series->append(male);
	52	series->append(female);
	53	series->setBarWidth(0.5);
	54	series->setGrouping(false);
	55	//![2]
	56
	57	//![3]
	58	QChart* chart = new QChart();
	59	chart->addSeries(series);
	60	chart->setTitle("Population of Finland in 2005 by age group");
	61	chart->createDefaultAxes();
	62	chart->setAnimationOptions(QChart::SeriesAnimations);
	63	//![3]
	64
	65	//![4]
	66	QStringList categories;
	67	categories << "0-4" << "5-9" << "10-14" << "15-19" << "20-24" << "25-29" << "30-34" << "35-39" << "40-44" << "45-49"
	68	<< "50-54" << "55-59" << "60-64" << "65-69" << "70-74" << "75-79" << "80-84" << "85-89" << "90-";
	69
	70	QBarCategoriesAxis* axis = new QBarCategoriesAxis();
	71	axis->append(categories);
	72	chart->setAxisY(axis,series);
	73	//![4]
	74
	75	//![5]
	76	chart->legend()->setVisible(true);
	77	chart->legend()->setAlignment(Qt::AlignBottom);
	78	//![5]
	79
	80	//![6]
	81	QChartView* chartView = new QChartView(chart);
	82	chartView->setRenderHint(QPainter::Antialiasing);
	83	//![6]
	84
	85	//![7]
	86	QMainWindow window;
	87	window.setCentralWidget(chartView);
	88	window.resize(400, 800);
	89	window.show();
	90	//![7]
	91
	92	return a.exec();
	93	}

examples/populationpyramid/populationpyramid.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 = populationpyramid
	6	SOURCES += main.cpp

examples/examples.pro +2 -1

                        donut \
                        donutbreakdown \
                        scrollchart \
-                       datetimeaxis
+                       datetimeaxis \
+                       populationpyramid

src/barchart/abstractbarchartitem_p.h +1 -2

                 AbstractBarAnimation *m_animation;
-                // Not owned.
+                QAbstractBarSeries *m_series; // Not owned.
-                QAbstractBarSeries *m_series;
                 QList<Bar *> m_bars;
                 QList<QGraphicsSimpleTextItem *> m_labels;
             };

src/barchart/horizontal/bar/horizontalbarchartitem.cpp +12 -1

                 qreal rangeX = m_domainMaxX - m_domainMinX;
                 qreal scaleY = (height / rangeY);
                 qreal scaleX = (width / rangeX);
-                qreal barHeight = (scaleY / setCount) * m_series->d_func()->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
+                qreal barHeight;
+             // On horizontal chart barWidth of the barseries means height of the rect.
+                if (m_series->d_func()->m_grouping) {
+                    barHeight = (scaleY / setCount) * m_series->d_func()->barWidth();
+                } else {
+                    barHeight = scaleY * m_series->d_func()->barWidth();
+                }
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {
                         QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
                         qreal yPos = m_rect.bottom() + (m_domainMinY - barSet->pos(category)) * scaleY;
+                        if (m_series->d_func()->m_grouping) {
                             yPos += setCount*barHeight/2;
                             yPos -= set*barHeight;
+                        } else {
+                            yPos += barHeight/2;
+                        }
                         qreal barWidth = barSet->value(category) * scaleX;
                         Bar* bar = m_bars.at(itemIndex);

src/barchart/qabstractbarseries.cpp +18 -1

                 return d->m_labelsVisible;
             }
+            void QAbstractBarSeries::setGrouping(bool grouping)
+            {
+                Q_D(QAbstractBarSeries);
+                d->setGrouping(grouping);
+            }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) :
                 QAbstractSeriesPrivate(q),
                 m_barWidth(0.5),  // Default value is 50% of category width
                 m_labelsVisible(false),
-                m_visible(true)
+                m_visible(true),
+                m_grouping(true)
             {
             }
                 emit labelsVisibleChanged(visible);
             }
+            void QAbstractBarSeriesPrivate::setGrouping(bool grouping)
+            {
+                if (m_grouping != grouping) {
+                    m_grouping = grouping;
+                    emit updatedBars();
+                }
+            }
             qreal QAbstractBarSeriesPrivate::min()
             {
                 if (m_barSets.count() <= 0) {

src/barchart/qabstractbarseries.h +4 0

                 void setLabelsVisible(bool visible = true);
                 bool isLabelsVisible() const;
+                // TODO. Good name for this. This affects how bars are laid out on chart. (for example with pyramid chart)
+                // Also do we support same for stacked and percent bar charts or just normal bar charts?
+                void setGrouping(bool grouping = true);
             protected:
                 explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d,QObject *parent = 0);

src/barchart/qabstractbarseries_p.h +4 0

                 void setVisible(bool visible);
                 void setLabelsVisible(bool visible);
+                void setGrouping(bool grouping);
                 void scaleDomain(Domain& domain);
                 ChartElement* createGraphics(ChartPresenter* presenter);
                 qreal m_barWidth;
                 bool m_labelsVisible;
                 bool m_visible;
+                bool m_grouping;
             private:
                 Q_DECLARE_PUBLIC(QAbstractBarSeries)
+                friend class HorizontalBarChartItem;
+                friend class BarChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/bar/barchartitem.cpp +15 -2

                 qreal rangeX = m_domainMaxX - m_domainMinX;
                 qreal scaleY = (height / rangeY);
                 qreal scaleX = (width / rangeX);
-                qreal barWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
+                qreal barWidth;
+                if (m_series->d_func()->m_grouping) {
+                    barWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
+                } else {
+                    barWidth = scaleX * m_series->d_func()->barWidth();
+                }
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {
                     for (int set = 0; set < setCount; set++) {
                         QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-                        qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + m_rect.left();
+                        qreal xPos;
+                        if (m_series->d_func()->m_grouping) {
+                            xPos = (barSet->pos(category) - m_domainMinX) * scaleX + m_rect.left();
                             xPos -= setCount*barWidth/2;
                             xPos += set*barWidth;
+                        } else {
+                            xPos = (barSet->pos(category) - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
+                        }
                         qreal barHeight = barSet->value(category) * scaleY;
                         Bar* bar = m_bars.at(itemIndex);

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