HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2508:25def4b65f99

QBoxSet changed from list to table mode. New example for file reading....

Mika Salmela -

r2508:25def4b65f99

parent child

Context file:

r2508:25def4b65f99

Collapse all files

examples/boxplotchart/boxdatareader.cpp created 644 +59 0

@@ -0,0 +1,59
	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 "boxdatareader.h"
	22
	23	#include <QDebug>
	24
	25	BoxDataReader::BoxDataReader(QIODevice *fileHandle) :
	26	QTextStream(fileHandle)
	27	{
	28	}
	29
	30	QBoxSet* BoxDataReader::readBox()
	31	{
	32	QString line = readLine();
	33	if (line.startsWith("#"))
	34	return 0;
	35
	36	QStringList strList = line.split(" ", QString::SkipEmptyParts);
	37	QList<qreal> sortedList;
	38	foreach (QString str, strList) {
	39	sortedList.append(str.toDouble());
	40	}
	41
	42	qSort(sortedList.begin(), sortedList.end());
	43	qDebug() << "sortedList = " << sortedList;
	44
	45	int count = sortedList.count();
	46	int median = (int)(count / 2);
	47	int lowerQ = (int)(median / 2);
	48	int upperQ = median + lowerQ + 1;
	49
	50	QBoxSet *box = new QBoxSet();
	51	box->setLowerExtreme(sortedList.at(0));
	52	box->setLowerQuartile(sortedList.at(lowerQ));
	53	box->setMedian(sortedList.at(median));
	54	box->setUpperQuartile(sortedList.at(upperQ));
	55	box->setUpperExtreme(sortedList.last());
	56
	57	return box;
	58	}
	59

examples/boxplotchart/boxdatareader.h created 644 +41 0

@@ -0,0 +1,41
	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 BOXDATAREADER_H
	22	#define BOXDATAREADER_H
	23
	24	#include <QTextStream>
	25	#include <QBoxSet>
	26
	27	QTCOMMERCIALCHART_USE_NAMESPACE
	28
	29	class BoxDataReader : public QTextStream
	30	{
	31	public:
	32	explicit BoxDataReader(QIODevice *fileHandle);
	33	QBoxSet* readBox();
	34
	35	protected:
	36	qreal findMedian(int begin, int end);
	37
	38	private:
	39	};
	40
	41	#endif // BOXDATAREADER_H

examples/boxplotchart/boxplotdata.qrc created 644 +5 0

@@ -0,0 +1,5
	1	<RCC>
	2	<qresource prefix="/">
	3	<file alias="stock">stock_data.txt</file>
	4	</qresource>
	5	</RCC>

examples/boxplotchart/stock_data.txt created 644 +5 0

@@ -0,0 +1,5
	1	1.0 1.2 2.0 2.4 2.5 3.0 3.5 3.7 4.0 4.7 5.0
	2	4.6 4.7 5.2 7.3 8.4 8.8 9.1 8.3 7.4 6.4 5.3
	3	3.5 7.2 5.4 6.3 7.4 8.3 8.8 3.3 5.4 5.7 3.9
	4	#0 1 2 3 4 5 6 7 8 9 10
	5	# * * *

examples/boxplotchart/boxplotchart.pro +8 -1

@@ -3,4 +3,11
3	}	3	}
4		4
5	TARGET = boxplotchart	5	TARGET = boxplotchart
6	SOURCES += main.cpp	6	SOURCES += main.cpp \
		7	boxdatareader.cpp
		8
		9	RESOURCES += \
		10	boxplotdata.qrc
		11
		12	HEADERS += \
		13	boxdatareader.h

examples/boxplotchart/main.cpp +47 -72

@@ -27,104 +27,79
27	#include <QBarCategoryAxis>	27	#include <QBarCategoryAxis>
28	#include <QLineSeries>	28	#include <QLineSeries>
29	#include <QScatterSeries>	29	#include <QScatterSeries>
		30	#include <QTextStream>
30		31
31	#include <QBrush>	32	#include <QBrush>
32	#include <QColor>	33	#include <QColor>
33		34
		35	#include "boxdatareader.h"
		36
		37	#include <QDebug>
		38
34	QTCOMMERCIALCHART_USE_NAMESPACE	39	QTCOMMERCIALCHART_USE_NAMESPACE
35		40
36	int main(int argc, char *argv[])	41	int main(int argc, char *argv[])
37	{	42	{
38	QApplication a(argc, argv);	43	QApplication a(argc, argv);
39
40	//![1]
41	QBoxSet *set0 = new QBoxSet();
42	QBoxSet *set1 = new QBoxSet();
43	QBoxSet *set2 = new QBoxSet();
44	QBoxSet *set3 = new QBoxSet();
45	QBoxSet *set4 = new QBoxSet();
46	QBoxSet *set5 = new QBoxSet();
47	QBoxSet *set6 = new QBoxSet();
48	QBoxSet *set7 = new QBoxSet();
49	QBoxSet *set8 = new QBoxSet();
50	QBoxSet *set9 = new QBoxSet();
51	QBoxSet *set10 = new QBoxSet();
52	QBoxSet *set11 = new QBoxSet();
53
54	// low bot med top upp
55	*set0 << 3 << 4 << 4.4 << 6 << 7;
56	*set1 << 5 << 6 << 7.5 << 8 << 12;
57	*set2 << 3 << 5 << 5.7 << 8 << 9;
58	*set3 << 5 << 6 << 6.8 << 7 << 8;
59	*set4 << 4 << 5 << 5.2 << 6 << 7;
60	*set5 << 4 << 7 << 8.2 << 9 << 10;
61	*set6 << 2.5 << 5 << 5.4 << 6 << 7;
62	*set7 << 5 << 6.3 << 7.5 << 8 << 12;
63	*set8 << 2.6 << 5.1 << 5.7 << 8 << 9;
64	*set9 << 3.1 << 5.8 << 6.8 << 7 << 8;
65	*set10 << 4.2 << 5 << 5.8 << 6 << 7;
66	*set11 << 4.7 << 7 << 8.2 << 9 << 10;
67
68	//![1]	44	//![1]
69		45
70	//![2]	46	//![2]
71	QBoxPlotSeries *series = new QBoxPlotSeries();	47	QBoxPlotSeries *series = new QBoxPlotSeries();
72	series->append(set0);
73	series->append(set1);
74	series->append(set2);
75	series->append(set3);
76	series->append(set4);
77	series->append(set5);
78	series->append(set6);
79	series->append(set7);
80	series->append(set8);
81	series->append(set9);
82	series->append(set10);
83	series->append(set11);
84	series->setName("Box & Whiskers");	48	series->setName("Box & Whiskers");
85	//![2]	49	//![2]
86		50
87	QLineSeries *lineSeries = new QLineSeries();	51	QFile stockData(":stock");
88	lineSeries->append(0, 4.4);	52	if (!stockData.open(QIODevice::ReadOnly \| QIODevice::Text)) {
89	lineSeries->append(1, 7.5);	53	return 1;
90	lineSeries->append(2, 5.7);	54	}
91	lineSeries->append(3, 6.8);	55
92	lineSeries->append(4, 5.2);	56	BoxDataReader dataReader(&stockData);
93	lineSeries->append(5, 8.2);	57	while (!dataReader.atEnd()) {
94	lineSeries->append(6, 5.4);	58	QBoxSet *set = dataReader.readBox();
95	lineSeries->append(7, 7.5);	59	if (set)
96	~~lineS~~eries->append(8, ~~5.7~~);	60	series->append(set);
97	lineSeries->append(9, 6.8);	61	}
98	lineSeries->append(10, 5.2);	62
99	lineSeries->append(11, 8.2);	63	// QTextStream stream(&stockData);
100	lineSeries->setName("Medians");	64	// while (!stream.atEnd()) {
101		65	// QString line = stream.readLine();
102	QScatterSeries *scatterSeries = new QScatterSeries();	66	// if (line.startsWith("#"))
103	scatterSeries->setName("Outliers");	67	// continue;
104	scatterSeries->setMarkerShape(QScatterSeries::MarkerShapeCircle);	68	// QStringList strList = line.split(" ", QString::SkipEmptyParts);
105	scatterSeries->setMarkerSize(7.0);	69	// QList<qreal> realList;
106	scatterSeries->setBrush(QBrush(Qt::white));	70	// foreach (QString str, strList) {
107	scatterSeries->setPen(QPen(Qt::black, 1.0));	71	// realList.append(str.toDouble());
108	scatterSeries->append(1, 4);	72	// }
109	scatterSeries->append(1, 4.1);	73
110	scatterSeries->append(1, 4.2);	74	// qSort(realList.begin(), realList.end());
111	scatterSeries->append(1, 4.3);	75
112	*scatterSeries << QPointF(3, 8.5) << QPointF(3, 8.6);	76	// int count = realList.count();
		77	// int median = (int)(count / 2);
		78	// int lowerQ = (int)(median / 2);
		79	// int upperQ = median + lowerQ + 1;
		80	// QBoxSet *set = new QBoxSet();
		81
		82	// set->setLowerExtreme(realList.at(0));
		83	// set->setLowerQuartile(realList.at(lowerQ));
		84	// set->setMedian(realList.at(median));
		85	// set->setUpperQuartile(realList.at(upperQ));
		86	// set->setUpperExtreme(realList.last());
		87
		88	// series->append(set);
		89	// }
113		90
114	//![3]	91	//![3]
115	QChart *chart = new QChart();	92	QChart *chart = new QChart();
116	chart->addSeries(series);	93	chart->addSeries(series);
117	chart->addSeries(lineSeries);
118	chart->addSeries(scatterSeries);
119	chart->setTitle("Simple boxplotchart example");	94	chart->setTitle("Simple boxplotchart example");
120	chart->setAnimationOptions(QChart::SeriesAnimations);	95	chart->setAnimationOptions(QChart::SeriesAnimations);
121	//![3]	96	//![3]
122		97
123	//![4]	98	//![4]
124	QStringList categories;	99	//QStringList categories;
125	categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";	100	//categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
126	QBarCategoryAxis *axis = new QBarCategoryAxis();	101	QBarCategoryAxis *axis = new QBarCategoryAxis();
127	axis->append(categories);	102	//axis->append(categories);
128	chart->createDefaultAxes();	103	chart->createDefaultAxes();
129	chart->setAxisX(axis, series);	104	chart->setAxisX(axis, series);
130	//![4]	105	//![4]

src/boxplotchart/qboxset.cpp +35 -54

             #include "qboxset_p.h"
             #include "charthelpers_p.h"
+            #include <QDebug> //TODO: remove on release
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
             */
             void QBoxSet::append(const qreal value)
             {
-                int index = d_ptr->m_values.count();
+                //int index = d_ptr->m_values.count();
                 d_ptr->append(value);
-                emit valuesAdded(index, 1);
+                emit valuesAdded(d_ptr->m_valuesCount, 1);
             }
             /*!
             */
             void QBoxSet::append(const QList<qreal> &values)
             {
-                int index = d_ptr->m_values.count();
+                //int index = d_ptr->m_values.count();
                 d_ptr->append(values);
-                emit valuesAdded(index, values.count());
+                emit valuesAdded(d_ptr->m_valuesCount, values.count());
             }
             /*!
             void QBoxSet::setLowerExtreme(const qreal value)
             {
                 d_ptr->replace(QBoxSetPrivate::PosLowerExtreme, value);
+                emit d_ptr->restructuredBox();
                 emit valueChanged(QBoxSetPrivate::PosLowerExtreme);
             }
             */
             qreal QBoxSet::lowerExtreme()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosLowerExtreme);
+                return d_ptr->m_values[QBoxSetPrivate::PosLowerExtreme];
             }
             /*!
             void QBoxSet::setLowerQuartile(const qreal value)
             {
                 d_ptr->replace(QBoxSetPrivate::PosLowerQuartile, value);
+                emit d_ptr->restructuredBox();
                 emit valueChanged(QBoxSetPrivate::PosLowerQuartile);
             }
             */
             qreal QBoxSet::lowerQuartile()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosLowerQuartile);
+                return d_ptr->m_values[QBoxSetPrivate::PosLowerQuartile];
             }
             /*!
             void QBoxSet::setMedian(const qreal value)
             {
                 d_ptr->replace(QBoxSetPrivate::PosMedian, value);
+                emit d_ptr->restructuredBox();
                 emit valueChanged(QBoxSetPrivate::PosMedian);
             }
             */
             qreal QBoxSet::median()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosMedian);
+                return d_ptr->m_values[QBoxSetPrivate::PosMedian];
             }
             /*!
             void QBoxSet::setUpperQuartile(const qreal value)
             {
                 d_ptr->replace(QBoxSetPrivate::PosUpperQuartile, value);
+                emit d_ptr->restructuredBox();
                 emit valueChanged(QBoxSetPrivate::PosUpperQuartile);
             }
             */
             qreal QBoxSet::upperQuartile()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosUpperQuartile);
+                return d_ptr->m_values[QBoxSetPrivate::PosUpperQuartile];
             }
             /*!
             */
             void QBoxSet::setUpperExtreme(const qreal value)
             {
-                d_ptr->replace(QBoxSetPrivate::PosUpperQuartile, value);
+                d_ptr->replace(QBoxSetPrivate::PosUpperExtreme, value);
-                emit valueChanged(QBoxSetPrivate::PosUpperQuartile);
+                emit d_ptr->restructuredBox();
+                emit valueChanged(QBoxSetPrivate::PosUpperExtreme);
             }
             /*!
             */
             qreal QBoxSet::upperExtreme()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosUpperExtreme);
+                return d_ptr->m_values[QBoxSetPrivate::PosUpperExtreme];
             }
             /*!
             /*!
                 Inserts new \a value on the \a index position.
                 The value that is currently at this postion is moved to postion index + 1
-                \sa remove()
             */
             void QBoxSet::insert(const int index, const qreal value)
             {
             }
             /*!
-                Removes \a count number of values from the set starting at \a index.
-                \sa insert()
-            */
-            void QBoxSet::remove(const int index, const int count)
-                int removedCount = d_ptr->remove(index, count);
-                if (removedCount > 0)
-                    emit valuesRemoved(index, removedCount);
-                return;
-            /*!
                 Sets a new value \a value to set, indexed by \a index
             */
             void QBoxSet::replace(const int index, const qreal value)
             {
-                if (index >= 0 && index < d_ptr->m_values.count()) {
+                if (index >= 0 && index < 5) {
                     d_ptr->replace(index, value);
                     emit valueChanged(index);
                 }
             */
             qreal QBoxSet::at(const int index) const
             {
-                if (index < 0 || index >= d_ptr->m_values.count())
+                if (index < 0 || index >= 5)
                     return 0;
-                return d_ptr->m_values.at(index);
+                return d_ptr->m_values[index];
             }
             /*!
             */
             int QBoxSet::count() const
             {
-                return d_ptr->m_values.count();
+                return d_ptr->m_valuesCount;
             }
             /*!
             QBoxSetPrivate::QBoxSetPrivate(QBoxSet *parent) : QObject(parent),
                 q_ptr(parent),
+                m_valuesCount(5),
+                m_appendCount(0),
                 m_pen(QPen(Qt::NoPen)),
                 m_brush(QBrush(Qt::NoBrush))
             {
+                m_values = new qreal[m_valuesCount];
             }
             QBoxSetPrivate::~QBoxSetPrivate()
             void QBoxSetPrivate::append(qreal value)
             {
-                if (isValidValue(value)) {
+                if (isValidValue(value) && m_appendCount < m_valuesCount) {
-                    m_values.append(value);
+                    m_values[m_appendCount++] = value;
                     emit restructuredBox();
                 }
             }
             void QBoxSetPrivate::append(QList<qreal> values)
             {
                 for (int i = 0; i < values.count(); i++) {
-                    if (isValidValue(values.at(i)))
+                    if (isValidValue(values.at(i)) && m_appendCount < m_valuesCount)
-                        m_values.append(values.at(i));
+                        m_values[m_appendCount++] = values.at(i);
                 }
                 emit restructuredBox();
             }
             void QBoxSetPrivate::insert(const int index, const qreal value)
             {
                 if (isValidValue(value)) {
-                    m_values.insert(index, value);
+                    for (int i = 4; i > index; i--)
+                        m_values[i] = m_values[i - 1];
+                    m_values[index] = value;
                     emit restructuredBox();
                 }
             }
-            int QBoxSetPrivate::remove(const int index, const int count)
-                int removeCount = count;
-                if ((index < 0) || (m_values.count() == 0))
-                    return 0; // Invalid index or not values in list, remove nothing.
-                else if ((index + count) > m_values.count())
-                    removeCount = m_values.count() - index; // Trying to remove more items than list has. Limit amount to be removed.
-                int c = 0;
-                while (c < removeCount) {
-                    m_values.removeAt(index);
-                    c++;
-                emit restructuredBox();
-                return removeCount;
             void QBoxSetPrivate::replace(const int index, const qreal value)
             {
-                m_values.replace(index, value);
+                m_values[index] = value;
                 emit updatedLayout();
             }
             qreal QBoxSetPrivate::value(const int index)
             {
-                if (index < 0 || index >= m_values.count())
+                if (index < 0 || index >= m_valuesCount)
                     return 0;
-                return m_values.at(index);
+                return m_values[index];
             }
             #include "moc_qboxset.cpp"

src/boxplotchart/qboxset_p.h +4 -1

             public:
                 QBoxSet * const q_ptr;
                 //QString m_label;
-                QList<qreal> m_values;
+                //QList<qreal> m_values;
+                const int m_valuesCount;
+                qreal *m_values;
+                int m_appendCount;
                 QPen m_pen;
                 QBrush m_brush;
                 QBrush m_labelBrush;

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