HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1580:6d8ed28d1429

Removed QPointF from QBarSet

sauimone -

r1580:6d8ed28d1429

parent child

Context file:

r1580:6d8ed28d1429

Collapse all files

examples/examples.pro 0 -1

             TEMPLATE = subdirs
             SUBDIRS += \
                        areachart \
-                       barchart \
                        #customchart \
                        linechart \
                        percentbarchart \

examples/legend/mainwidget.cpp +3 -3

             #include <QLabel>
             #include <QDebug>
             #include <QBarSet>
-            #include <QBarSeries>
+            #include <QGroupedBarSeries>
             #include <QLegend>
             #include <QFormLayout>
             void MainWidget::createSeries()
             {
-                m_series = new QBarSeries();
+                m_series = new QGroupedBarSeries();
                 addBarset();
                 addBarset();
                 addBarset();
             {
                 QBarSet *barSet = new QBarSet(QString("set ") + QString::number(m_series->count()));
                 qreal delta = m_series->count() * 0.1;
-                *barSet << QPointF(0.0 + delta, 1 + delta) << QPointF(1.0 + delta, 2 + delta) << QPointF(2.0 + delta, 3 + delta) << QPointF(3.0 + delta, 4 + delta);
+                *barSet << 1 + delta << 2 + delta << 3 + delta << 4 + delta;
                 m_series->append(barSet);
             }

examples/legend/mainwidget.h +2 -2

             #include <QGraphicsGridLayout>
             #include <QDoubleSpinBox>
             #include <QGroupBox>
-            #include <QBarSeries>
+            #include <QGroupedBarSeries>
             QTCOMMERCIALCHART_USE_NAMESPACE
             private:
                 QChart *m_chart;
-                QBarSeries *m_series;
+                QGroupedBarSeries *m_series;
                 QChartView *m_chartView;
                 QGridLayout *m_mainLayout;

plugins/declarative/declarativebarseries.cpp 0 -2

                 for (int i(0); i < values.count(); i++) {
                     if (values.at(i).canConvert(QVariant::Double))
                         QBarSet::append(values[i].toDouble());
-                    else if (values.at(i).canConvert(QVariant::PointF))
-                        QBarSet::append(values[i].toPointF());
                 }
             }

plugins/declarative/declarativebarseries.h +1 -3

             public: // From QBarSet
                 Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
-                Q_INVOKABLE void append(qreal x, qreal y) { QBarSet::append(QPointF(x, y)); }
                 Q_INVOKABLE void remove(const int index, const int count = 1) { QBarSet::remove(index, count); }
                 Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); }
-                Q_INVOKABLE void replace(int index, qreal x, qreal y) { QBarSet::replace(index, QPointF(x, y)); }
+                Q_INVOKABLE qreal at(int index) { return QBarSet::at(index); }
-                Q_INVOKABLE QPointF at(int index) { return QBarSet::at(index); }
             Q_SIGNALS:
                 void countChanged(int count);

src/barchart/barchartitem.cpp +9 -9

                 for (int category = 0; category < categoryCount; category++) {
                     qreal yPos = height + scaleY * m_domainMinY + geometry().topLeft().y();
                     for (int set = 0; set < setCount; set++) {
-                        QBarSet* barSet = m_series->d_func()->barsetAt(set);
+                        QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-                        qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
+                        qreal xPos = (barSet->m_values.at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
-                        qreal barHeight = barSet->at(category).y() * scaleY;
+                        qreal barHeight = barSet->m_values.at(category).y() * scaleY;
                         Bar* bar = m_bars.at(itemIndex);
                         QRectF rect(xPos, yPos - barHeight, barWidth, barHeight);
                         layout.append(rect);
-                        bar->setPen(barSet->pen());
+                        bar->setPen(barSet->m_pen);
-                        bar->setBrush(barSet->brush());
+                        bar->setBrush(barSet->m_brush);
                         bar->setVisible(barsVisible);
                         QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
-                        if (!qFuzzyIsNull(barSet->at(category).y())) {
+                        if (!qFuzzyIsNull(barSet->m_values.at(category).y())) {
-                            label->setText(QString::number(barSet->at(category).y()));
+                            label->setText(QString::number(barSet->m_values.at(category).y()));
                         } else {
                             label->setText(QString(""));
                         }
                         label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                                       ,yPos - barHeight/2 - label->boundingRect().height()/2);
-                        label->setFont(barSet->labelFont());
+                        label->setFont(barSet->m_labelFont);
-                        label->setBrush(barSet->labelBrush());
+                        label->setBrush(barSet->m_labelBrush);
                         itemIndex++;
                     }

src/barchart/groupedbarchartitem.cpp +10 -9

             #include "qbarset_p.h"
             #include "qbarseries_p.h"
             #include "qbarset.h"
+            #include "qbarset_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 for (int category = 0; category < categoryCount; category++) {
                     qreal yPos = height + scaleY * m_domainMinY + geometry().topLeft().y();
                     for (int set = 0; set < setCount; set++) {
-                        QBarSet* barSet = m_series->d_func()->barsetAt(set);
+                        QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-                        qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left();
+                        qreal xPos = (barSet->m_values.at(category).x() - m_domainMinX) * scaleX + m_rect.left();
                         xPos -= setCount*barWidth/2;
                         xPos += set*barWidth;
-                        qreal barHeight = barSet->at(category).y() * scaleY;
+                        qreal barHeight = barSet->m_values.at(category).y() * scaleY;
                         Bar* bar = m_bars.at(itemIndex);
                         QRectF rect(xPos, yPos - barHeight, barWidth, barHeight);
                         layout.append(rect);
-                        bar->setPen(barSet->pen());
+                        bar->setPen(barSet->m_pen);
-                        bar->setBrush(barSet->brush());
+                        bar->setBrush(barSet->m_brush);
                         bar->setVisible(barsVisible);
                         QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
-                        if (!qFuzzyIsNull(barSet->at(category).y())) {
+                        if (!qFuzzyIsNull(barSet->m_values.at(category).y())) {
-                            label->setText(QString::number(barSet->at(category).y()));
+                            label->setText(QString::number(barSet->m_values.at(category).y()));
                         } else {
                             label->setText(QString(""));
                         }
                         label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                                       ,yPos - barHeight/2 - label->boundingRect().height()/2);
-                        label->setFont(barSet->labelFont());
+                        label->setFont(barSet->m_labelFont);
-                        label->setBrush(barSet->labelBrush());
+                        label->setBrush(barSet->m_labelBrush);
                         itemIndex++;
                     }

src/barchart/percentbarchartitem.cpp +8 -7

             #include "qbarseries_p.h"
             #include "qbarset.h"
             #include "chartanimator_p.h"
+            #include "qbarset_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     qreal percentage = (100 / colSum);
                     qreal yPos = height + scaleY * m_domainMinY + geometry().topLeft().y();
                     for (int set=0; set < setCount; set++) {
-                        QBarSet* barSet = m_series->d_func()->barsetAt(set);
+                        QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-                        qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
+                        qreal xPos = (barSet->m_values.at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
-                        qreal barHeight = barSet->at(category).y() * percentage * scaleY;
+                        qreal barHeight = barSet->m_values.at(category).y() * percentage * scaleY;
                         Bar* bar = m_bars.at(itemIndex);
-                        bar->setPen(barSet->pen());
+                        bar->setPen(barSet->m_pen);
-                        bar->setBrush(barSet->brush());
+                        bar->setBrush(barSet->m_brush);
                         bar->setVisible(barsVisible);
                         QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
                         label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                                       ,yPos - barHeight/2 - label->boundingRect().height()/2);
-                        label->setFont(barSet->labelFont());
+                        label->setFont(barSet->m_labelFont);
-                        label->setBrush(barSet->labelBrush());
+                        label->setBrush(barSet->m_labelBrush);
                         itemIndex++;
                         yPos -= barHeight;

src/barchart/qbarmodelmapper.cpp +3 -3

                 for(int i = firstIndex + m_firstBarSetSection; i < firstIndex + m_firstBarSetSection + sets.count(); i++) {
                     m_model->setHeaderData(i, m_orientation == Qt::Vertical ? Qt::Horizontal : Qt::Vertical, sets.at(i - firstIndex - m_firstBarSetSection)->label());
                     for (int j = 0; j < sets.at(i - firstIndex - m_firstBarSetSection)->count(); j++)
-                        m_model->setData(barModelIndex(i, j), sets.at(i - firstIndex - m_firstBarSetSection)->at(j).y());
+                        m_model->setData(barModelIndex(i, j), sets.at(i - firstIndex - m_firstBarSetSection)->at(j));
                 }
                 blockModelSignals(false);
                 initializeBarFromModel();
                     m_model->insertColumns(index + m_first, count);
                 for (int j = index; j < index + count; j++)
-                    m_model->setData(barModelIndex(barSetIndex + m_firstBarSetSection, j), m_barSets.at(barSetIndex)->at(j).y());
+                    m_model->setData(barModelIndex(barSetIndex + m_firstBarSetSection, j), m_barSets.at(barSetIndex)->at(j));
                 blockModelSignals(false);
                 initializeBarFromModel();
                 int barSetIndex = m_barSets.indexOf(qobject_cast<QBarSet *>(QObject::sender()));
                 blockModelSignals();
-                m_model->setData(barModelIndex(barSetIndex + m_firstBarSetSection, index), m_barSets.at(barSetIndex)->at(index).y());
+                m_model->setData(barModelIndex(barSetIndex + m_firstBarSetSection, index), m_barSets.at(barSetIndex)->at(index));
                 blockModelSignals(false);
                 initializeBarFromModel();
             }

src/barchart/qbarseries.cpp +8 -8

                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
-                        qreal temp = m_barSets.at(i)->at(j).y();
+                        qreal temp = m_barSets.at(i)->at(j);
                         if (temp < min)
                             min = temp;
                     }
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
-                        qreal temp = m_barSets.at(i)->at(j).y();
+                        qreal temp = m_barSets.at(i)->at(j);
                         if (temp > max)
                             max = temp;
                     }
                     return 0;
                 }
-                return m_barSets.at(set)->at(category).y();
+                return m_barSets.at(set)->at(category);
             }
             qreal QBarSeriesPrivate::percentageAt(int set, int category)
                     return 0;
                 }
-                qreal value = m_barSets.at(set)->at(category).y();
+                qreal value = m_barSets.at(set)->at(category);
                 qreal sum = categorySum(category);
                 if ( qFuzzyIsNull(sum) ) {
                     return 0;
                 int count = m_barSets.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_barSets.at(set)->count())
-                        sum += m_barSets.at(set)->at(category).y();
+                        sum += m_barSets.at(set)->at(category);
                 }
                 return sum;
             }
                 int count = m_barSets.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_barSets.at(set)->count())
-                        sum += qAbs(m_barSets.at(set)->at(category).y());
+                        sum += qAbs(m_barSets.at(set)->at(category));
                 }
                 return sum;
             }
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
-                        qreal temp = m_barSets.at(i)->at(j).x();
+                        qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x();
                         if (temp < min)
                             min = temp;
                     }
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
-                        qreal temp = m_barSets.at(i)->at(j).x();
+                        qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x();
                         if (temp > max)
                             max = temp;
                     }

src/barchart/qbarset.cpp +16 -75

             }
             /*!
-                Appends a point to set. Parameter \a value x coordinate defines the
+                Appends new value \a value to the end of set.
-                position in x-axis and y coordinate defines the height of bar.
-                Depending on presentation (QBarSeries, QGroupedBarSeries, QStackedBarSeries, QPercentBarSeries)
-                the x values are used or ignored.
-            */
-            void QBarSet::append(const QPointF value)
-                int index = d_ptr->m_values.count();
-                d_ptr->append(value);
-                emit valuesAdded(index, 1);
-            /*!
-                Appends a list of \a values to set. Works like append with single point.
-                \sa append()
-            */
-            void QBarSet::append(const QList<QPointF> &values)
-                int index = d_ptr->m_values.count();
-                d_ptr->append(values);
-                emit valuesAdded(index, values.count());
-            /*!
-                Appends new value \a value to the end of set. Internally the value is converted to QPointF,
-                with x coordinate being the index of appended value and y coordinate is the value.
             */
             void QBarSet::append(const qreal value)
             {
-                // Convert to QPointF and use other append(QPointF) method.
+                // Convert to QPointF
-                append(QPointF(d_ptr->m_values.count(), value));
+                d_ptr->append(QPointF(d_ptr->m_values.count(), value));
             }
             /*!
                 Appends a list of reals to set. Works like append with single real value. The \a values in list
-                are converted to QPointF, where x coordinate is the index of point and y coordinate is the value.
+                are appended to end of barset
                 \sa append()
             */
             void QBarSet::append(const QList<qreal> &values)
             */
             QBarSet& QBarSet::operator << (const qreal &value)
             {
-                append(value);
+            //    append(value);
-                return *this;
+                d_ptr->append(QPointF(d_ptr->m_values.count(), value));
-            /*!
-                Convinience operator. Same as append, with QPointF \a value.
-                \sa append()
-            */
-            QBarSet& QBarSet::operator << (const QPointF &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 QBarSet::insert(const int index, const QPointF 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()
             */
                 }
             }
-            /*!
-                Sets a new value \a value to set, indexed by \a index
-            */
-            void QBarSet::replace(const int index, const QPointF value)
-                if (index >= 0 && index < d_ptr->m_values.count()) {
-                    d_ptr->replace(index,value);
-                    emit valueChanged(index);
             /*!
-                Returns value of set indexed by \a index. Note that all appended values are stored internally as QPointF.
+                Returns value of set indexed by \a index.
-                The returned QPointF has x coordinate, which is index (if appended with qreal append) or the x value
+                If the index is out of bounds 0.0 is returned.
-                of the QPointF (if appended with QPointF append).
-                If the index is out of bounds QPointF(0, 0.0) is returned.
             */
-            QPointF QBarSet::at(const int index) const
+            qreal QBarSet::at(const int index) const
             {
                 if (index < 0 || index >= d_ptr->m_values.count()) {
-                    return QPointF(index, 0.0);
+                    return 0;
                 }
-                return d_ptr->m_values.at(index);
+                return d_ptr->m_values.at(index).y();
             }
             /*!
-                Returns value of set indexed by \a index. ote that all appended values are stored internally as QPointF.
+                Returns value of set indexed by \a index.
-                The returned QPointF has x coordinate, which is index (if appended with qreal append) or the x value
+                If the index is out of bounds 0.0 is returned.
-                of the QPointF (if appended with QPointF append).
             */
-            QPointF QBarSet::operator [](const int index) const
+            qreal QBarSet::operator [](const int index) const
             {
-                return d_ptr->m_values.at(index);
+                return at(index);
             }
             /*!
             }
             /*!
-                Returns sum of all values in barset. The sum is sum of y coordinates in the QPointF representation.
+                Returns sum of all values in barset.
             */
             qreal QBarSet::sum() const
             {
                 qreal total(0);
                 for (int i=0; i < d_ptr->m_values.count(); i++) {
-                    //total += d_ptr->m_values.at(i);
                     total += d_ptr->m_values.at(i).y();
                 }
                 return total;

src/barchart/qbarset.h +5 -7

                 void setLabel(const QString label);
                 QString label() const;
-                void append(const QPointF value);
-                void append(const QList<QPointF> &values);
                 void append(const qreal value);
                 void append(const QList<qreal> &values);
                 QBarSet& operator << (const qreal &value);
-                QBarSet& operator << (const QPointF &value);
                 void insert(const int index, const qreal value);
-                void insert(const int index, const QPointF value);
                 void remove(const int index, const int count = 1);
                 void replace(const int index, const qreal value);
-                void replace(const int index, const QPointF value);
+                qreal at(const int index) const;
-                QPointF at(const int index) const;
+                qreal operator [] (const int index) const;
-                QPointF operator [] (const int index) const;
                 int count() const;
                 qreal sum() const;
                 friend class BarLegendMarker;
                 friend class BarChartItem;
                 friend class QBarSeriesPrivate;
+                friend class StackedBarChartItem;
+                friend class PercentBarChartItem;
+                friend class GroupedBarChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbarchartitem.cpp +9 -9

                 for (int category = 0; category < categoryCount; category++) {
                     qreal yPos = height + rangeY * m_domainMinY + geometry().topLeft().y();
                     for (int set=0; set < setCount; set++) {
-                        QBarSet* barSet = m_series->d_func()->barsetAt(set);
+                        QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-                        qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
+                        qreal xPos = (barSet->m_values.at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
-                        qreal barHeight = barSet->at(category).y() * scaleY;
+                        qreal barHeight = barSet->m_values.at(category).y() * scaleY;
                         Bar* bar = m_bars.at(itemIndex);
-                        bar->setPen(barSet->pen());
+                        bar->setPen(barSet->m_pen);
-                        bar->setBrush(barSet->brush());
+                        bar->setBrush(barSet->m_brush);
                         bar->setVisible(barsVisible);
                         QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
                         QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
-                        if (!qFuzzyIsNull(barSet->at(category).y())) {
+                        if (!qFuzzyIsNull(barSet->m_values.at(category).y())) {
-                            label->setText(QString::number(barSet->at(category).y()));
+                            label->setText(QString::number(barSet->m_values.at(category).y()));
                         } else {
                             label->setText(QString(""));
                         }
                         label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                                       ,yPos - barHeight/2 - label->boundingRect().height()/2);
-                        label->setFont(barSet->labelFont());
+                        label->setFont(barSet->m_labelFont);
-                        label->setBrush(barSet->labelBrush());
+                        label->setBrush(barSet->m_labelBrush);
                         itemIndex++;
                         yPos -= barHeight;
                     }

tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp +1 -1

                 createVerticalMapper();
                 QVERIFY(m_model->setData(m_model->index(1, 0), 44));
-                QCOMPARE(m_series->barSets().at(0)->at(1).y(), 44.0);
+                QCOMPARE(m_series->barSets().at(0)->at(1), 44.0);
                 QCOMPARE(m_model->data(m_model->index(1, 0)).toReal(), 44.0);
             }

tests/auto/qbarseries/tst_qbarseries.cpp +12 -6

                 QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
-                *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+            //    *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+                *set1 << 10 << 10 << 10;
                 series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
-                *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+            //    *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+                *set2 << 10 << 10 << 10;
                 series->append(set2);
                 QSignalSpy seriesSpy(series,SIGNAL(clicked(int,QBarSet*)));
                 QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
-                *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+            //    *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+                *set1 << 10 << 10 << 10;
                 series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
-                *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+            //    *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+                *set2 << 10 << 10 << 10;
                 series->append(set2);
                 QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*)));
                 QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
-                *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+            //    *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+                *set1 << 10 << 10 << 10;
                 series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
-                *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+            //    *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+                *set2 << 10 << 10 << 10;
                 series->append(set2);
                 QChartView view(new QChart());

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

                 for (int i=0; i<count; i++) {
                     m_barset->append(value);
-                    QCOMPARE(m_barset->at(i).y(), value);
+                    QCOMPARE(m_barset->at(i), value);
                     sum += value;
                     value += 1.0;
                 }
                 for (int i=0; i<count; i++) {
                     *m_barset << value;
-                    QCOMPARE(m_barset->at(i).y(), value);
+                    QCOMPARE(m_barset->at(i), value);
                     sum += value;
                     value += 1.0;
                 }
                 QSignalSpy valueSpy(m_barset,SIGNAL(valuesAdded(int,int)));
                 m_barset->insert(0, 1.0);       // 1.0
-                QCOMPARE(m_barset->at(0).y(), 1.0);
+                QCOMPARE(m_barset->at(0), 1.0);
                 QCOMPARE(m_barset->count(), 1);
                 QVERIFY(qFuzzyCompare(m_barset->sum(), 1.0));
                 m_barset->insert(0, 2.0);       // 2.0 1.0
-                QCOMPARE(m_barset->at(0).y(), 2.0);
+                QCOMPARE(m_barset->at(0), 2.0);
-                QCOMPARE(m_barset->at(1).y(), 1.0);
+                QCOMPARE(m_barset->at(1), 1.0);
                 QCOMPARE(m_barset->count(), 2);
                 QVERIFY(qFuzzyCompare(m_barset->sum(), 3.0));
                 m_barset->insert(1, 3.0);       // 2.0 3.0 1.0
-                QCOMPARE(m_barset->at(1).y(), 3.0);
+                QCOMPARE(m_barset->at(1), 3.0);
-                QCOMPARE(m_barset->at(0).y(), 2.0);
+                QCOMPARE(m_barset->at(0), 2.0);
-                QCOMPARE(m_barset->at(2).y(), 1.0);
+                QCOMPARE(m_barset->at(2), 1.0);
                 QCOMPARE(m_barset->count(), 3);
                 QVERIFY(qFuzzyCompare(m_barset->sum(), 6.0));
                 QCOMPARE(valueSpy.count(), 3);
                 // Remove middle
                 m_barset->remove(2);                // 1.0 2.0 4.0
-                QCOMPARE(m_barset->at(0).y(), 1.0);
+                QCOMPARE(m_barset->at(0), 1.0);
-                QCOMPARE(m_barset->at(1).y(), 2.0);
+                QCOMPARE(m_barset->at(1), 2.0);
-                QCOMPARE(m_barset->at(2).y(), 4.0);
+                QCOMPARE(m_barset->at(2), 4.0);
                 QCOMPARE(m_barset->count(), 3);
                 QCOMPARE(m_barset->sum(), 7.0);
                 QCOMPARE(valueSpy.count(), 1);
                 // Remove first
                 m_barset->remove(0);                // 2.0 4.0
-                QCOMPARE(m_barset->at(0).y(), 2.0);
+                QCOMPARE(m_barset->at(0), 2.0);
-                QCOMPARE(m_barset->at(1).y(), 4.0);
+                QCOMPARE(m_barset->at(1), 4.0);
                 QCOMPARE(m_barset->count(), 2);
                 QCOMPARE(m_barset->sum(), 6.0);
                 m_barset->replace(0, 5.0);          // 5.0 2.0 3.0 4.0
                 QCOMPARE(m_barset->count(), 4);
                 QCOMPARE(m_barset->sum(), 14.0);
-                QCOMPARE(m_barset->at(0).y(), 5.0);
+                QCOMPARE(m_barset->at(0), 5.0);
                 // Replace last
                 m_barset->replace(3, 6.0);
                 QCOMPARE(m_barset->count(), 4);     // 5.0 2.0 3.0 6.0
                 QCOMPARE(m_barset->sum(), 16.0);
-                QCOMPARE(m_barset->at(0).y(), 5.0);
+                QCOMPARE(m_barset->at(0), 5.0);
-                QCOMPARE(m_barset->at(1).y(), 2.0);
+                QCOMPARE(m_barset->at(1), 2.0);
-                QCOMPARE(m_barset->at(2).y(), 3.0);
+                QCOMPARE(m_barset->at(2), 3.0);
-                QCOMPARE(m_barset->at(3).y(), 6.0);
+                QCOMPARE(m_barset->at(3), 6.0);
                 // Illegal indexes
                 m_barset->replace(4, 6.0);
                 m_barset->replace(-1, 6.0);
                 QCOMPARE(m_barset->count(), 4);     // 5.0 2.0 3.0 6.0
                 QCOMPARE(m_barset->sum(), 16.0);
-                m_barset->replace(4, QPointF(1.0, 1.0));
+                m_barset->replace(4, 1.0);
                 QCOMPARE(m_barset->count(), 4);     // 5.0 2.0 3.0 6.0
                 QCOMPARE(m_barset->sum(), 16.0);
-                m_barset->replace(-1, QPointF(1.0, 1.0));
+                m_barset->replace(-1, 1.0);
                 QCOMPARE(m_barset->count(), 4);     // 5.0 2.0 3.0 6.0
                 QCOMPARE(m_barset->sum(), 16.0);
                 m_barset->append(3.0);
                 m_barset->append(4.0);
-                QCOMPARE(m_barset->at(0).y(), 1.0);
+                QCOMPARE(m_barset->at(0), 1.0);
-                QCOMPARE(m_barset->at(1).y(), 2.0);
+                QCOMPARE(m_barset->at(1), 2.0);
-                QCOMPARE(m_barset->at(2).y(), 3.0);
+                QCOMPARE(m_barset->at(2), 3.0);
-                QCOMPARE(m_barset->at(3).y(), 4.0);
+                QCOMPARE(m_barset->at(3), 4.0);
             }
             void tst_QBarSet::atOperator_data()
                 m_barset->append(3.0);
                 m_barset->append(4.0);
-                QCOMPARE(m_barset->operator [](0).y(), 1.0);
+                QCOMPARE(m_barset->operator [](0), 1.0);
-                QCOMPARE(m_barset->operator [](1).y(), 2.0);
+                QCOMPARE(m_barset->operator [](1), 2.0);
-                QCOMPARE(m_barset->operator [](2).y(), 3.0);
+                QCOMPARE(m_barset->operator [](2), 3.0);
-                QCOMPARE(m_barset->operator [](3).y(), 4.0);
+                QCOMPARE(m_barset->operator [](3), 4.0);
             }
             void tst_QBarSet::count_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