HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1429:39a4e8ac4330

changed barset name to label to be consistent with pie series. Series have names, barsets and pieslices have labels

sauimone -

r1429:39a4e8ac4330

parent child

Context file:

r1429:39a4e8ac4330

Collapse all files

src/barchart/qbarmodelmapper.cpp +1 -1

                         if (section >= m_firstBarSetSection && section <= m_lastBarSetSection) {
                             QBarSet* bar = m_series->barSets().at(section - m_firstBarSetSection);
                             if (bar)
-                                bar->setName(m_model->headerData(section, orientation).toString());
+                                bar->setLabel(m_model->headerData(section, orientation).toString());
                         }
                     }
                 }

src/barchart/qbarseries.cpp +6 0

             {
                 Q_D(QBarSeries);
                 d->setBarWidth(width);
+                emit barWidthChanged();
             }
             /*!
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsAdded(sets);
+                    emit barsetCountChanged();
                 }
                 return success;
             }
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsRemoved(sets);
+                    emit barsetCountChanged();
                 }
                 return success;
             }
                 bool success = d->append(sets);
                 if (success) {
                     emit barsetsAdded(sets);
+                    emit barsetCountChanged();
                 }
                 return success;
             }
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsAdded(sets);
+                    emit barsetCountChanged();
                 }
                 return success;
             }
                 bool success = d->remove(sets);
                 if (success) {
                     emit barsetsRemoved(sets);
+                    emit barsetCountChanged();
                 }
             }

src/barchart/qbarseries.h +5 -3

             class QTCOMMERCIALCHART_EXPORT QBarSeries : public QAbstractSeries
             {
                 Q_OBJECT
-                Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)
+                Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth NOTIFY barWidthChanged)
-                Q_PROPERTY(int count READ barsetCount)
+                Q_PROPERTY(int count READ barsetCount NOTIFY barsetCountChanged)
-                Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible)
+                Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
             public:
                 explicit QBarSeries(QObject *parent = 0);
             Q_SIGNALS:
                 void clicked(QBarSet *barset, int index);
                 void hovered(QBarSet* barset, bool status);
+                void barWidthChanged();
+                void barsetCountChanged();
                 void labelsVisibleChanged();
                 void barsetsAdded(QList<QBarSet*> sets);

src/barchart/qbarset.cpp +17 -23

             */
             /*!
-                \property QBarSet::name
+                \property QBarSet::label
-                \brief Defines the name of the barSet.
+                \brief Defines the label of the barSet.
             */
             /*!
             */
             /*!
-                \fn void QBarSet::nameChanged()
+                \fn void QBarSet::labelChanged()
-                This signal is emitted when the name of the barSet has changed.
+                This signal is emitted when the label of the barSet has changed.
-                \sa name
+                \sa label
             */
             /*!
             */
             /*!
-                \fn void QBarSet::labelChanged()
-                This signal is emitted when the label of the barSet has changed.
-            */
-            /*!
                 \fn void QBarSet::labelBrushChanged()
                 This signal is emitted when the brush of the barSet's label has changed.
             void valueChanged(int index);
             /*!
-                Constructs QBarSet with a name of \a name and with parent of \a parent
+                Constructs QBarSet with a label of \a label and with parent of \a parent
             */
-            QBarSet::QBarSet(const QString name, QObject *parent)
+            QBarSet::QBarSet(const QString label, QObject *parent)
                 : QObject(parent)
-                ,d_ptr(new QBarSetPrivate(name,this))
+                ,d_ptr(new QBarSetPrivate(label,this))
             {
             }
             }
             /*!
-                Sets new \a name for set.
+                Sets new \a label for set.
             */
-            void QBarSet::setName(const QString name)
+            void QBarSet::setLabel(const QString label)
             {
-                d_ptr->m_name = name;
+                d_ptr->m_label = label;
-                emit nameChanged();
+                emit labelChanged();
             }
             /*!
-                Returns name of the set.
+                Returns label of the set.
             */
-            QString QBarSet::name() const
+            QString QBarSet::label() const
             {
-                return d_ptr->m_name;
+                return d_ptr->m_label;
             }
             /*!
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QBarSetPrivate::QBarSetPrivate(const QString name, QBarSet *parent) : QObject(parent),
+            QBarSetPrivate::QBarSetPrivate(const QString label, QBarSet *parent) : QObject(parent),
                 q_ptr(parent),
-                m_name(name)
+                m_label(label)
             {
             }

src/barchart/qbarset.h +8 -9

             class QTCOMMERCIALCHART_EXPORT QBarSet : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(QString name READ name WRITE setName)
+                Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
-                Q_PROPERTY(QPen pen READ pen WRITE setPen)
+                Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
-                Q_PROPERTY(QBrush brush READ brush WRITE setBrush)
+                Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
-                Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush)
+                Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)
-                Q_PROPERTY(QFont labelFont READ labelFont WRITE setLabelFont)
+                Q_PROPERTY(QFont labelFont READ labelFont WRITE setLabelFont NOTIFY labelFontChanged)
             public:
-                explicit QBarSet(const QString name, QObject *parent = 0);
+                explicit QBarSet(const QString label, QObject *parent = 0);
                 virtual ~QBarSet();
-                void setName(const QString name);
+                void setLabel(const QString label);
-                QString name() const;
+                QString label() const;
                 void append(const QPointF value);
                 void append(const QList<QPointF> values);
                 QFont labelFont() const;
             Q_SIGNALS:
-                void nameChanged();
                 void penChanged();
                 void brushChanged();
                 void labelChanged();

src/barchart/qbarset_p.h +2 -2

                 Q_OBJECT
             public:
-                QBarSetPrivate(const QString name, QBarSet *parent);
+                QBarSetPrivate(const QString label, QBarSet *parent);
                 ~QBarSetPrivate();
                 void append(QPointF value);
             public:
                 QBarSet * const q_ptr;
-                QString m_name;
+                QString m_label;
                 QList<QPointF> m_values;
                 QPen m_pen;
                 QBrush m_brush;

src/legend/legendmarker.cpp +3 -3

                 return m_rectItem->brush();
             }
-            void LegendMarker::setLabel(const QString name)
+            void LegendMarker::setLabel(const QString label)
             {
-                m_textItem->setText(name);
+                m_textItem->setText(label);
                 updateLayout();
             }
             void BarLegendMarker::updated()
             {
                 setBrush(m_barset->brush());
-                setLabel(m_barset->name());
+                setLabel(m_barset->label());
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

tests/auto/qbarset/tst_qbarset.cpp +15 -15

             private slots:
                 void qbarset_data();
                 void qbarset();
-                void name_data();
+                void label_data();
-                void name();
+                void label();
                 void append_data();
                 void append();
                 void appendOperator_data();
             void tst_QBarSet::init()
             {
-                 m_barset = new QBarSet(QString("Name"));
+                 m_barset = new QBarSet(QString("label"));
             }
             void tst_QBarSet::cleanup()
             void tst_QBarSet::qbarset()
             {
-                QBarSet barset(QString("Name"));
+                QBarSet barset(QString("label"));
-                QCOMPARE(barset.name(), QString("Name"));
+                QCOMPARE(barset.label(), QString("label"));
                 QCOMPARE(barset.count(), 0);
                 QVERIFY(qFuzzyIsNull(barset.sum()));
             }
-            void tst_QBarSet::name_data()
+            void tst_QBarSet::label_data()
             {
-                QTest::addColumn<QString> ("name");
+                QTest::addColumn<QString> ("label");
                 QTest::addColumn<QString> ("result");
-                QTest::newRow("name0") << QString("name0") << QString("name0");
+                QTest::newRow("label0") << QString("label0") << QString("label0");
-                QTest::newRow("name1") << QString("name1") << QString("name1");
+                QTest::newRow("label1") << QString("label1") << QString("label1");
             }
-            void tst_QBarSet::name()
+            void tst_QBarSet::label()
             {
-                QFETCH(QString, name);
+                QFETCH(QString, label);
                 QFETCH(QString, result);
-                QSignalSpy nameSpy(m_barset,SIGNAL(nameChanged()));
+                QSignalSpy labelSpy(m_barset,SIGNAL(labelChanged()));
-                m_barset->setName(name);
+                m_barset->setLabel(label);
-                QCOMPARE(m_barset->name(), result);
+                QCOMPARE(m_barset->label(), result);
-                QVERIFY(nameSpy.count() == 1);
+                QVERIFY(labelSpy.count() == 1);
             }
             void tst_QBarSet::append_data()

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