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

@@ -1,6 +1,13
1	!include( ../examples.pri ) {	1	!include( ../examples.pri ) {
2	error( "Couldn't find the examples.pri file!" )	2	error( "Couldn't find the examples.pri file!" )
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

             /****************************************************************************
             **
             ** 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 <QApplication>
             #include <QMainWindow>
             #include <QChartView>
             #include <QBoxPlotSeries>
             #include <QBoxSet>
             #include <QLegend>
             #include <QBarCategoryAxis>
             #include <QLineSeries>
             #include <QScatterSeries>
+            #include <QTextStream>
             #include <QBrush>
             #include <QColor>
+            #include "boxdatareader.h"
+            #include <QDebug>
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
-            //![1]
-                QBoxSet *set0 = new QBoxSet();
-                QBoxSet *set1 = new QBoxSet();
-                QBoxSet *set2 = new QBoxSet();
-                QBoxSet *set3 = new QBoxSet();
-                QBoxSet *set4 = new QBoxSet();
-                QBoxSet *set5 = new QBoxSet();
-                QBoxSet *set6 = new QBoxSet();
-                QBoxSet *set7 = new QBoxSet();
-                QBoxSet *set8 = new QBoxSet();
-                QBoxSet *set9 = new QBoxSet();
-                QBoxSet *set10 = new QBoxSet();
-                QBoxSet *set11 = new QBoxSet();
-                //      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;
-                *set6 << 2.5 << 5 << 5.4 << 6 << 7;
-                *set7 << 5 << 6.3 << 7.5 << 8 << 12;
-                *set8 << 2.6 << 5.1 << 5.7 << 8 << 9;
-                *set9 << 3.1 << 5.8 << 6.8 << 7 << 8;
-                *set10 << 4.2 << 5 << 5.8 << 6 << 7;
-                *set11 << 4.7 << 7 << 8.2 << 9 << 10;
             //![1]
             //![2]
                 QBoxPlotSeries *series = new QBoxPlotSeries();
-                series->append(set0);
-                series->append(set1);
-                series->append(set2);
-                series->append(set3);
-                series->append(set4);
-                series->append(set5);
-                series->append(set6);
-                series->append(set7);
-                series->append(set8);
-                series->append(set9);
-                series->append(set10);
-                series->append(set11);
                 series->setName("Box & Whiskers");
             //![2]
-                QLineSeries *lineSeries = new QLineSeries();
+                QFile stockData(":stock");
-                lineSeries->append(0, 4.4);
+                if (!stockData.open(QIODevice::ReadOnly | QIODevice::Text)) {
-                lineSeries->append(1, 7.5);
+                    return 1;
-                lineSeries->append(2, 5.7);
-                lineSeries->append(3, 6.8);
-                lineSeries->append(4, 5.2);
+                BoxDataReader dataReader(&stockData);
-                lineSeries->append(5, 8.2);
+                while (!dataReader.atEnd()) {
-                lineSeries->append(6, 5.4);
+                    QBoxSet *set = dataReader.readBox();
-                lineSeries->append(7, 7.5);
+                    if (set)
-                lineSeries->append(8, 5.7);
+                        series->append(set);
-                lineSeries->append(9, 6.8);
-                lineSeries->append(10, 5.2);
-                lineSeries->append(11, 8.2);
+            //    QTextStream stream(&stockData);
-                lineSeries->setName("Medians");
+            //    while (!stream.atEnd()) {
+            //        QString line = stream.readLine();
-                QScatterSeries *scatterSeries = new QScatterSeries();
+            //        if (line.startsWith("#"))
-                scatterSeries->setName("Outliers");
+            //            continue;
-                scatterSeries->setMarkerShape(QScatterSeries::MarkerShapeCircle);
+            //        QStringList strList = line.split(" ", QString::SkipEmptyParts);
-                scatterSeries->setMarkerSize(7.0);
+            //        QList<qreal> realList;
-                scatterSeries->setBrush(QBrush(Qt::white));
+            //        foreach (QString str, strList) {
-                scatterSeries->setPen(QPen(Qt::black, 1.0));
+            //            realList.append(str.toDouble());
-                scatterSeries->append(1, 4);
+            //        }
-                scatterSeries->append(1, 4.1);
-                scatterSeries->append(1, 4.2);
+            //        qSort(realList.begin(), realList.end());
-                scatterSeries->append(1, 4.3);
-                *scatterSeries << QPointF(3, 8.5) << QPointF(3, 8.6);
+            //        int count = realList.count();
+            //        int median = (int)(count / 2);
+            //        int lowerQ = (int)(median / 2);
+            //        int upperQ = median + lowerQ + 1;
+            //        QBoxSet *set = new QBoxSet();
+            //        set->setLowerExtreme(realList.at(0));
+            //        set->setLowerQuartile(realList.at(lowerQ));
+            //        set->setMedian(realList.at(median));
+            //        set->setUpperQuartile(realList.at(upperQ));
+            //        set->setUpperExtreme(realList.last());
+            //        series->append(set);
+            //    }
             //![3]
                 QChart *chart = new QChart();
                 chart->addSeries(series);
-                chart->addSeries(lineSeries);
-                chart->addSeries(scatterSeries);
                 chart->setTitle("Simple boxplotchart example");
                 chart->setAnimationOptions(QChart::SeriesAnimations);
             //![3]
             //![4]
-                QStringList categories;
+                //QStringList categories;
-                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
+                //categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 QBarCategoryAxis *axis = new QBarCategoryAxis();
-                axis->append(categories);
+                //axis->append(categories);
                 chart->createDefaultAxes();
                 chart->setAxisX(axis, series);
             //![4]
             //![5]
                 chart->legend()->setVisible(true);
                 chart->legend()->setAlignment(Qt::AlignBottom);
             //![5]
             //![6]
                 QChartView *chartView = new QChartView(chart);
                 chartView->setRenderHint(QPainter::Antialiasing);
             //![6]
             //![7]
                 QMainWindow window;
                 window.setCentralWidget(chartView);
                 window.resize(600, 400);
                 window.show();
             //![7]
                 return a.exec();
             }

src/boxplotchart/qboxset.cpp +35 -54

             /****************************************************************************
             **
             ** 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 "qboxset.h"
             #include "qboxset_p.h"
             #include "charthelpers_p.h"
+            #include <QDebug> //TODO: remove on release
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 Constructs QBoxSet with parent of \a parent
             */
             QBoxSet::QBoxSet(QObject *parent)
                 : QObject(parent),
                   d_ptr(new QBoxSetPrivate(this))
             {
             }
             QBoxSet::QBoxSet(qreal value1, qreal value2, qreal value3, qreal value4, qreal value5, QObject *parent)
                 : QObject(parent),
                   d_ptr(new QBoxSetPrivate(this))
             {
                 d_ptr->append(value1);
                 d_ptr->append(value2);
                 d_ptr->append(value3);
                 d_ptr->append(value4);
                 d_ptr->append(value5);
             }
             /*!
                 Destroys the boxset
             */
             QBoxSet::~QBoxSet()
             {
                 // NOTE: d_ptr destroyed by QObject
             }
             /*!
                 Appends new value \a value to the end of set.
             */
             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);
             }
             /*!
                 Appends a list of reals to set. Works like append with single real value. The \a values in list
                 are appended to end of boxset
                 \sa append()
             */
             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());
             }
             /*!
                 Sets new value \a value as the lower extreme for the set.
             */
             void QBoxSet::setLowerExtreme(const qreal value)
             {
                 d_ptr->replace(QBoxSetPrivate::PosLowerExtreme, value);
+                emit d_ptr->restructuredBox();
                 emit valueChanged(QBoxSetPrivate::PosLowerExtreme);
             }
             /*!
                 Returns the lower extreme value of the set.
             */
             qreal QBoxSet::lowerExtreme()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosLowerExtreme);
+                return d_ptr->m_values[QBoxSetPrivate::PosLowerExtreme];
             }
             /*!
                 Sets new value \a value as the lower quartile for the set.
             */
             void QBoxSet::setLowerQuartile(const qreal value)
             {
                 d_ptr->replace(QBoxSetPrivate::PosLowerQuartile, value);
+                emit d_ptr->restructuredBox();
                 emit valueChanged(QBoxSetPrivate::PosLowerQuartile);
             }
             /*!
                 Returns the lower quartile value of the set.
             */
             qreal QBoxSet::lowerQuartile()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosLowerQuartile);
+                return d_ptr->m_values[QBoxSetPrivate::PosLowerQuartile];
             }
             /*!
                 Sets new value \a value as the median for the set.
             */
             void QBoxSet::setMedian(const qreal value)
             {
                 d_ptr->replace(QBoxSetPrivate::PosMedian, value);
+                emit d_ptr->restructuredBox();
                 emit valueChanged(QBoxSetPrivate::PosMedian);
             }
             /*!
                 Returns the median value of the set.
             */
             qreal QBoxSet::median()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosMedian);
+                return d_ptr->m_values[QBoxSetPrivate::PosMedian];
             }
             /*!
                 Sets new value \a value as the upper quartile for the set.
             */
             void QBoxSet::setUpperQuartile(const qreal value)
             {
                 d_ptr->replace(QBoxSetPrivate::PosUpperQuartile, value);
+                emit d_ptr->restructuredBox();
                 emit valueChanged(QBoxSetPrivate::PosUpperQuartile);
             }
             /*!
                 Returns the upper quartile value of the set.
             */
             qreal QBoxSet::upperQuartile()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosUpperQuartile);
+                return d_ptr->m_values[QBoxSetPrivate::PosUpperQuartile];
             }
             /*!
                 Sets new value \a value as the upper extreme for the set.
             */
             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);
             }
             /*!
                 Returns the upper extreme value of the set.
             */
             qreal QBoxSet::upperExtreme()
             {
-                return d_ptr->m_values.at(QBoxSetPrivate::PosUpperExtreme);
+                return d_ptr->m_values[QBoxSetPrivate::PosUpperExtreme];
             }
             /*!
                 Convenience operator. Same as append, with real \a value.
                 \sa append()
             */
             QBoxSet &QBoxSet::operator << (const qreal &value)
             {
                 append(value);
                 return *this;
             }
             /*!
                 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)
             {
                 d_ptr->insert(index, value);
                 emit valuesAdded(index, 1);
             }
             /*!
-                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);
                 }
             }
             /*!
                 Returns value of set indexed by \a index.
                 If the index is out of bounds 0.0 is returned.
             */
             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];
             }
             /*!
                 Returns value of set indexed by \a index.
                 If the index is out of bounds 0.0 is returned.
             */
             qreal QBoxSet::operator [](const int index) const
             {
                 return at(index);
             }
             /*!
                 Returns count of values in set.
             */
             int QBoxSet::count() const
             {
-                return d_ptr->m_values.count();
+                return d_ptr->m_valuesCount;
             }
             /*!
                 Sets pen for set. Boxes of this set are drawn using \a pen
             */
             void QBoxSet::setPen(const QPen &pen)
             {
                 if (d_ptr->m_pen != pen) {
                     d_ptr->m_pen = pen;
                     emit d_ptr->updatedBox();
                     emit penChanged();
                 }
             }
             /*!
                 Returns pen of the set.
             */
             QPen QBoxSet::pen() const
             {
                 return d_ptr->m_pen;
             }
             /*!
                 Sets brush for the set. Boxes of this set are drawn using \a brush
             */
             void QBoxSet::setBrush(const QBrush &brush)
             {
                 if (d_ptr->m_brush != brush) {
                     d_ptr->m_brush = brush;
                     emit d_ptr->updatedBox();
                     emit brushChanged();
                 }
             }
             /*!
                 Returns brush of the set.
             */
             QBrush QBoxSet::brush() const
             {
                 return d_ptr->m_brush;
             }
             /*!
                 Returns the color of the brush of boxset.
             */
             QColor QBoxSet::color()
             {
                 return brush().color();
             }
             /*!
                 Sets the \a color of brush for this boxset
             */
             void QBoxSet::setColor(QColor color)
             {
                 QBrush b = brush();
                 if ((b.color() != color) || (b.style() == Qt::NoBrush)) {
                     b.setColor(color);
                     if (b.style() == Qt::NoBrush) {
                         // Set tyle to Qt::SolidPattern. (Default is Qt::NoBrush)
                         // This prevents theme to override color defined in QML side:
                         // BoxSet { label: "Bob"; color:"red"; values: [1,2,3] }
                         // The color must be obeyed, since user wanted it.
                         b.setStyle(Qt::SolidPattern);
                     }
                     setBrush(b);
                     emit colorChanged(color);
                 }
             }
             /*!
                 Returns the color of pen of this boxset
             */
             QColor QBoxSet::borderColor()
             {
                 return pen().color();
             }
             /*!
                 Sets the color of pen for this boxset
             */
             void QBoxSet::setBorderColor(QColor color)
             {
                 QPen p = pen();
                 if (p.color() != color) {
                     p.setColor(color);
                     setPen(p);
                     emit borderColorChanged(color);
                 }
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             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"
             #include "moc_qboxset_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/boxplotchart/qboxset_p.h +4 -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 QBOXSET_P_H
             #define QBOXSET_P_H
             #include "qboxset.h"
             #include <QMap>
             #include <QPen>
             #include <QBrush>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBoxSetPrivate : public QObject
             {
                 Q_OBJECT
             public:
                 enum DataPositions {
                     PosLowerExtreme,
                     PosLowerQuartile,
                     PosMedian,
                     PosUpperQuartile,
                     PosUpperExtreme
                 };
             public:
                 QBoxSetPrivate(QBoxSet *parent);
                 ~QBoxSetPrivate();
                 void append(qreal value);
                 void append(QList<qreal> values);
                 void insert(const int index, const qreal value);
                 int remove(const int index, const int count);
                 void replace(const int index, const qreal value);
                 qreal value(const int index);
             Q_SIGNALS:
                 void restructuredBox();
                 void updatedBox();
                 void updatedLayout();
             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;
                 QFont m_labelFont;
                 friend class QBoxSet;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBOXSET_P_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