HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2513:aab694c96f4f

Added label to boxset...

Mika Salmela -

r2513:aab694c96f4f

parent child

Context file:

r2513:aab694c96f4f

Collapse all files

examples/boxplotchart/boxdatareader.cpp +4 -3

                 QStringList strList = line.split(" ", QString::SkipEmptyParts);
                 sortedList.clear();
-                foreach (QString str, strList) {
-                    sortedList.append(str.toDouble());
+                for (int i = 1; i < strList.count(); i++) {
+                    sortedList.append(strList.at(i).toDouble());
                 }
                 qSort(sortedList.begin(), sortedList.end());
                 int count = sortedList.count();
-                QBoxSet *box = new QBoxSet();
+                QBoxSet *box = new QBoxSet(strList.first());
                 box->setLowerExtreme(sortedList.first());
                 box->setUpperExtreme(sortedList.last());
                 box->setMedian(findMedian(0, count));

examples/boxplotchart/stock_data.txt +5 -5

@@ -1,8 +1,8
1	1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0	1	Jan 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0
2	#0 1 2 3 4 5 6 7 8 9	2	#0 1 2 3 4 5 6 7 8 9
3	4.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	3	Feb 4.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
4	1.0 1.2 2.0 2.4 2.5 3.0 3.5 3.7 4.0 4.7 5.0	4	Mar 1.0 1.2 2.0 2.4 2.5 3.0 3.5 3.7 4.0 4.7 5.0
5	4.6 4.7 5.2 7.3 8.4 8.8 9.1 8.3 7.4 6.4 5.3	5	Apr 4.6 4.7 5.2 7.3 8.4 8.8 9.1 8.3 7.4 6.4 5.3
6	3.5 7.2 5.4 6.3 7.4 8.3 8.8 3.3 5.4 5.7 3.9	6	May 3.5 7.2 5.4 6.3 7.4 8.3 8.8 3.3 5.4 5.7 3.9
7	#0 1 2 3 4 5 6 7 8 9 10	7	#0 1 2 3 4 5 6 7 8 9 10
8	# * * *	8	# * * *

src/boxplotchart/qboxplotseries.cpp +7 -2

             {
                 QStringList categories;
                 if (axis->categories().isEmpty()) {
-                    for (int i(1); i < m_boxSets.count() + 1; i++)
+                    for (int i(1); i < m_boxSets.count() + 1; i++) {
-                        categories << QString::number(i);
+                        QBoxSet *set = m_boxSets.at(i - 1);
+                        if (set->label().isEmpty())
+                            categories << QString::number(i);
+                        else
+                            categories << set->label();
+                    }
                     axis->append(categories);
                 }
             }

src/boxplotchart/qboxset.cpp +22 -5

             /*!
                 Constructs QBoxSet with parent of \a parent
             */
-            QBoxSet::QBoxSet(QObject *parent)
+            QBoxSet::QBoxSet(const QString label, QObject *parent)
                 : QObject(parent),
-                  d_ptr(new QBoxSetPrivate(this))
+                  d_ptr(new QBoxSetPrivate(label, this))
             {
             }
-            QBoxSet::QBoxSet(qreal value1, qreal value2, qreal value3, qreal value4, qreal value5, QObject *parent)
+            QBoxSet::QBoxSet(qreal value1, qreal value2, qreal value3, qreal value4, qreal value5, const QString label, QObject *parent)
                 : QObject(parent),
-                  d_ptr(new QBoxSetPrivate(this))
+                  d_ptr(new QBoxSetPrivate(label, this))
             {
                 d_ptr->append(value1);
                 d_ptr->append(value2);
             }
             /*!
+                Sets new \a label for set.
+            */
+            void QBoxSet::setLabel(const QString label)
+            {
+                d_ptr->m_label = label;
+            }
+            /*!
+                Returns label of the set.
+            */
+            QString QBoxSet::label() const
+            {
+                return d_ptr->m_label;
+            }
+            /*!
                 Convenience operator. Same as append, with real \a value.
                 \sa append()
             */
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QBoxSetPrivate::QBoxSetPrivate(QBoxSet *parent) : QObject(parent),
+            QBoxSetPrivate::QBoxSetPrivate(const QString label, QBoxSet *parent) : QObject(parent),
                 q_ptr(parent),
+                m_label(label),
                 m_valuesCount(5),
                 m_appendCount(0),
                 m_pen(QPen(Qt::NoPen)),

src/boxplotchart/qboxset.h +5 -2

                 Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
             public:
-                explicit QBoxSet(QObject *parent = 0);
+                explicit QBoxSet(const QString label = "", QObject *parent = 0);
-                explicit QBoxSet(qreal value1, qreal value2, qreal value3, qreal value4, qreal value5, QObject *parent = 0);
+                explicit QBoxSet(const qreal value1, const qreal value2, const qreal value3, const qreal value4, const qreal value5, const QString label = "", QObject *parent = 0);
                 virtual ~QBoxSet();
                 void append(const qreal value);
                 void setUpperExtreme(const qreal value);
                 qreal upperExtreme();
+                void setLabel(const QString label);
+                QString label() const;
                 QBoxSet &operator << (const qreal &value);
                 void insert(const int index, const qreal value);

src/boxplotchart/qboxset_p.h +2 -2

                 };
             public:
-                QBoxSetPrivate(QBoxSet *parent);
+                QBoxSetPrivate(const QString label, QBoxSet *parent);
                 ~QBoxSetPrivate();
                 void append(qreal value);
             public:
                 QBoxSet * const q_ptr;
-                //QString m_label;
+                QString m_label;
                 //QList<qreal> m_values;
                 const int m_valuesCount;
                 qreal *m_values;

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