HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1802:32b55bc3549f

Implemented QBarSeries::take(), updated tests

sauimone -

r1802:32b55bc3549f

parent child

Context file:

r1802:32b55bc3549f

Collapse all files

src/barchart/qabstractbarseries.cpp +29 -2

             }
             /*!
-                Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set.
+                Removes barset from series. Releases ownership of \a set. Deletes the set, if remove
+                was successful.
                 Returns true, if set was removed.
             */
             bool QAbstractBarSeries::remove(QBarSet *set)
                     set->setParent(0);
                     emit barsetsRemoved(sets);
                     emit countChanged();
+                    delete set;
+                    set = 0;
+                }
+                return success;
+            }
+            /*!
+                Takes a single \a set from the series. Does not delete the barset object.
+                NOTE: The series remains as the barset's parent object. You must set the
+                parent object to take full ownership.
+                Returns true if take was successfull.
+            */
+            bool QAbstractBarSeries::take(QBarSet *set)
+            {
+                Q_D(QAbstractBarSeries);
+                bool success = d->remove(set);
+                if (success) {
+                    QList<QBarSet*> sets;
+                    sets.append(set);
+                    emit barsetsRemoved(sets);
+                    emit countChanged();
                 }
                 return success;
             }
             }
             /*!
-                Removes all of the bar sets from the series
+                Removes all barsets from the series. Deletes removed sets.
             */
             void QAbstractBarSeries::clear()
             {
                 if (success) {
                     emit barsetsRemoved(sets);
                     emit countChanged();
+                    foreach (QBarSet* set, sets) {
+                        delete set;
+                    }
                 }
             }

src/barchart/qabstractbarseries.h +1 0

                 bool append(QBarSet *set);
                 bool remove(QBarSet *set);
+                bool take(QBarSet *set);
                 bool append(QList<QBarSet* > sets);
                 bool insert(int index, QBarSet *set);
                 int count() const;

tests/auto/qbarseries/tst_qbarseries.cpp +33 -1

             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_DECLARE_METATYPE(QBarSet*)
+            Q_DECLARE_METATYPE(QList<QBarSet*>)
             class tst_QBarSeries : public QObject
             {
                 void append();
                 void remove_data();
                 void remove();
+                void take_data();
+                void take();
                 void appendList_data();
                 void appendList();
                 void count_data();
             void tst_QBarSeries::initTestCase()
             {
                 qRegisterMetaType<QBarSet*>("QBarSet*");
+                qRegisterMetaType<QList<QBarSet*>>("QList<QBarSet*>");
             }
             void tst_QBarSeries::cleanupTestCase()
             {
                 foreach(QBarSet* s, m_testSets) {
                     m_barseries_with_sets->remove(s);
-                    delete s;
                 }
                 m_testSets.clear();
                 QVERIFY(m_barseries_with_sets->count() == 0);
             }
+            void tst_QBarSeries::take_data()
+            {
+            }
+            void tst_QBarSeries::take()
+            {
+                int count = m_testSets.count();
+                QVERIFY(m_barseries_with_sets->count() == count);
+                QSignalSpy countSpy(m_barseries_with_sets,SIGNAL(countChanged()));
+                QSignalSpy removedSpy(m_barseries_with_sets,SIGNAL(barsetsRemoved(QList<QBarSet *>)));
+                for (int i=0; i<m_testSets.count(); i++) {
+                    QBarSet* set = m_testSets.at(i);
+                    bool success = m_barseries_with_sets->take(set);
+                    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
+                    QVERIFY(success);
+                    TRY_COMPARE(countSpy.count(),1);
+                    TRY_COMPARE(removedSpy.count(),1);
+                    QList<QVariant> removedSpyArg = removedSpy.takeFirst();
+                    QList<QBarSet*> removedSets = qvariant_cast<QList<QBarSet*>> (removedSpyArg.at(0));
+                    QCOMPARE(removedSets.at(0), m_testSets.at(i));
+                    countSpy.takeFirst();
+                }
+            }
             void tst_QBarSeries::appendList_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