HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1314:f6f67dde6408

Implemented QAbstractSeries::chart()...

Jani Honkonen -

r1314:f6f67dde6408

parent child

Context file:

r1314:f6f67dde6408

Collapse all files

src/chartdataset.cpp +7 -3

             ****************************************************************************/
             #include "chartdataset_p.h"
+            #include "qchart.h"
             #include "qaxis.h"
             #include "qaxis_p.h"
             #include "qabstractseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartDataSet::ChartDataSet(QObject *parent):QObject(parent),
+            ChartDataSet::ChartDataSet(QChart *parent):QObject(parent),
                 m_axisX(new QAxis(this)),
                 m_axisY(new QAxis(this)),
                 m_domainIndex(0),
                 m_indexSeriesMap.insert(key,series);
-                series->d_ptr->m_dataset=this;
+                series->d_ptr->m_chart = qobject_cast<QChart*>(parent());
+                series->d_ptr->m_dataset = this;
                 emit seriesAdded(series,domain);
                 Q_ASSERT(key!=-1);
                 m_indexSeriesMap.remove(key);
                 series->setParent(0);
-                series->d_ptr->m_dataset=0;
+                series->d_ptr->m_chart = 0;
+                series->d_ptr->m_dataset = 0;
                 QList<QAxis*> axes =  m_seriesAxisMap.values();

src/chartdataset_p.h +1 -1

             {
                 Q_OBJECT
             public:
-                ChartDataSet(QObject* parent=0);
+                ChartDataSet(QChart* parent=0);
                 virtual ~ChartDataSet();
                 void addSeries(QAbstractSeries* series,QAxis *axisY = 0);

src/qabstractseries.cpp +12 0

                 return d_ptr->m_name;
             }
+            /*!
+                \brief Returns the chart where series belongs to.
+                Set automatically when the series is added to the chart
+                and unset when the series is removed from the chart.
+            */
+            QChart* QAbstractSeries::chart() const
+            {
+                return d_ptr->m_chart;
+            }
             ///////////////////////////////////////////////////////////////////////////////////////////////////
             QAbstractSeriesPrivate::QAbstractSeriesPrivate(QAbstractSeries* q):
                 q_ptr(q),
+                m_chart(0),
                 m_dataset(0)
             {
             }

src/qabstractseries_p.h +1 0

             protected:
                 QAbstractSeries *q_ptr;
+                QChart *m_chart;
                 ChartDataSet *m_dataset;
                 QString m_name;

tests/auto/qchart/tst_qchart.cpp +11 -2

                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 if(!axis) axis = m_chart->axisY();
+                QVERIFY(!series->chart());
                 m_chart->addSeries(series,axis);
+                QVERIFY(series->chart() == m_chart);
                 QCOMPARE(m_chart->axisY(series),axis);
                 m_chart->removeSeries(series);
+                QVERIFY(!series->chart());
             }
             void tst_QChart::animationOptions_data()
                 QLineSeries* series0 = new QLineSeries(this);
                 QLineSeries* series1 = new QLineSeries(this);
                 QLineSeries* series2 = new QLineSeries(this);
+                QSignalSpy deleteSpy1(series0, SIGNAL(destroyed()));
+                QSignalSpy deleteSpy2(series1, SIGNAL(destroyed()));
+                QSignalSpy deleteSpy3(series2, SIGNAL(destroyed()));
                 m_chart->addSeries(series0);
                 m_chart->addSeries(series1);
                 QVERIFY(m_chart->axisY(series2)!=0);
                 m_chart->removeAllSeries();
                 QVERIFY(m_chart->axisY(series0)==0);
                 QVERIFY(m_chart->axisY(series1)==0);
                 QVERIFY(m_chart->axisY(series2)==0);
+                QCOMPARE(deleteSpy1.count(), 1);
+                QCOMPARE(deleteSpy2.count(), 1);
+                QCOMPARE(deleteSpy3.count(), 1);
             }
             void tst_QChart::removeSeries_data()
             {
                 QFETCH(QAbstractSeries *, series);
                 QFETCH(QAxis *, axis);
+                QSignalSpy deleteSpy(series, SIGNAL(destroyed()));
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 if(!axis) axis = m_chart->axisY();
                 QCOMPARE(m_chart->axisY(series),axis);
                 m_chart->removeSeries(series);
                 QVERIFY(m_chart->axisY(series)==0);
+                QCOMPARE(deleteSpy.count(), 0);
             }
             void tst_QChart::scrollDown_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