HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2512:985019be9a8f

Datareader fixes...

Mika Salmela -

r2512:985019be9a8f

parent child

Context file:

r2512:985019be9a8f

Collapse all files

examples/boxplotchart/boxdatareader.cpp +24 -11

             /****************************************************************************
             **
             ** 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 "boxdatareader.h"
             #include <QDebug>
-            BoxDataReader::BoxDataReader(QIODevice *fileHandle) :
+            BoxDataReader::BoxDataReader(QIODevice *device) :
-                QTextStream(fileHandle)
+                QTextStream(device)
             {
             }
             QBoxSet* BoxDataReader::readBox()
             {
                 QString line = readLine();
                 if (line.startsWith("#"))
                     return 0;
                 QStringList strList = line.split(" ", QString::SkipEmptyParts);
-                QList<qreal> sortedList;
+                sortedList.clear();
                 foreach (QString str, strList) {
                     sortedList.append(str.toDouble());
                 }
                 qSort(sortedList.begin(), sortedList.end());
-            qDebug() << "sortedList = " << sortedList;
                 int count = sortedList.count();
-                int median = (int)(count / 2);
-                int lowerQ = (int)(median / 2);
-                int upperQ = median + lowerQ + 1;
                 QBoxSet *box = new QBoxSet();
-                box->setLowerExtreme(sortedList.at(0));
+                box->setLowerExtreme(sortedList.first());
-                box->setLowerQuartile(sortedList.at(lowerQ));
-                box->setMedian(sortedList.at(median));
-                box->setUpperQuartile(sortedList.at(upperQ));
                 box->setUpperExtreme(sortedList.last());
+                box->setMedian(findMedian(0, count));
+                box->setLowerQuartile(findMedian(0, count / 2));
+                if (count % 2)
+                    box->setUpperQuartile(findMedian(count / 2 + 1, count));
+                else // even amount of numbers
+                    box->setUpperQuartile(findMedian(count / 2, count));
+                qDebug() << "Box = " << box->lowerExtreme() << ", " << box->lowerQuartile() << ", " <<
+                            box->median() << ", " << box->upperQuartile() << ", " << box->upperExtreme();
                 return box;
             }
+            qreal BoxDataReader::findMedian(int begin, int end)
+            {
+                int count = end - begin;
+                if (count % 2 ) {
+                    return sortedList.at((int) (count/2) + begin);
+                } else {
+                    qreal right = sortedList.at(count / 2 + begin);
+                    qreal left = sortedList.at(count / 2 - 1 + begin);
+                    return (right + left) / 2.0;
+                }
+            }

examples/boxplotchart/boxdatareader.h +2 -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$
             **
             ****************************************************************************/
             #ifndef BOXDATAREADER_H
             #define BOXDATAREADER_H
             #include <QTextStream>
             #include <QBoxSet>
             QTCOMMERCIALCHART_USE_NAMESPACE
             class BoxDataReader : public QTextStream
             {
             public:
-                explicit BoxDataReader(QIODevice *fileHandle);
+                explicit BoxDataReader(QIODevice *device);
                 QBoxSet* readBox();
             protected:
                 qreal findMedian(int begin, int end);
             private:
+                QList<qreal> sortedList;
             };
             #endif // BOXDATAREADER_H

examples/boxplotchart/main.cpp 0 -34

             /****************************************************************************
             **
             ** 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]
             //![2]
                 QBoxPlotSeries *series = new QBoxPlotSeries();
                 series->setName("Box & Whiskers");
             //![2]
                 QFile stockData(":stock");
                 if (!stockData.open(QIODevice::ReadOnly | QIODevice::Text)) {
                     return 1;
                 }
                 BoxDataReader dataReader(&stockData);
                 while (!dataReader.atEnd()) {
                     QBoxSet *set = dataReader.readBox();
                     if (set)
                         series->append(set);
                 }
-            //    QTextStream stream(&stockData);
-            //    while (!stream.atEnd()) {
-            //        QString line = stream.readLine();
-            //        if (line.startsWith("#"))
-            //            continue;
-            //        QStringList strList = line.split(" ", QString::SkipEmptyParts);
-            //        QList<qreal> realList;
-            //        foreach (QString str, strList) {
-            //            realList.append(str.toDouble());
-            //        }
-            //        qSort(realList.begin(), realList.end());
-            //        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->setTitle("Simple boxplotchart example");
                 chart->setAnimationOptions(QChart::SeriesAnimations);
             //![3]
             //![4]
                 //QStringList categories;
                 //categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 QBarCategoryAxis *axis = new QBarCategoryAxis();
                 //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();
             }

examples/boxplotchart/stock_data.txt +3 0

+.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0
+            #0   1   2   3   4   5   6   7   8   9
+.3 5.1 3.9 4.5 4.4 4.9 5.0 4.7 4.1 4.6 4.4 4.3 4.8 4.4 4.2 4.5 4.4
 .0 1.2 2.0 2.4 2.5 3.0 3.5 3.7 4.0 4.7 5.0
 .6 4.7 5.2 7.3 8.4 8.8 9.1 8.3 7.4 6.4 5.3
 .5 7.2 5.4 6.3 7.4 8.3 8.8 3.3 5.4 5.7 3.9
             #0   1   2   3   4   5   6   7   8   9   10
             #        *           *           *

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