HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1490:b134c8a9174e

reintroducing clicked and hovered signals to barset. Makes some things easier on QML api

sauimone -

r1490:b134c8a9174e

parent child

Context file:

r1490:b134c8a9174e

Collapse all files

src/barchart/bar.cpp +3 0

             {
                 Q_UNUSED(event)
                 emit clicked(m_barset, m_index);
+                emit clicked(m_index);
             }
             void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
             {
                 Q_UNUSED(event)
                 emit hovered(m_barset, true);
+                emit hovered(true);
             }
             void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
             {
                 Q_UNUSED(event)
                 emit hovered(m_barset, false);
+                emit hovered(false);
             }
             #include "moc_bar_p.cpp"

src/barchart/bar_p.h +2 0

             Q_SIGNALS:
                 void clicked(QBarSet *barset, int index);
                 void hovered(QBarSet *barset, bool status);
+                void clicked(int index);
+                void hovered(bool status);
             private:
                 int m_index;

src/barchart/barchartitem.cpp +2 0

                         m_bars.append(bar);
                         connect(bar, SIGNAL(clicked(QBarSet*,int)), m_series, SIGNAL(clicked(QBarSet*,int)));
                         connect(bar, SIGNAL(hovered(QBarSet*,bool)), m_series, SIGNAL(hovered(QBarSet*,bool)));
+                        connect(bar, SIGNAL(clicked(int)), set, SIGNAL(clicked(int)));
+                        connect(bar, SIGNAL(hovered(bool)), set, SIGNAL(hovered(bool)));
                         m_layout.append(QRectF(0, 0, 0, 0));
                         // Labels

src/barchart/qbarset.cpp +15 0

@@ -103,6 +103,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE
103	*/	103	*/
104		104
105	/*!	105	/*!
		106	\fn void QBarSet::clicked(int index)
		107
		108	The signal is emitted if the user clicks with a mouse on top of barset.
		109	Clicked bar inside set is indexed by \a index
		110	*/
		111
		112	/*!
		113	\fn void QBarSet::hovered(bool status)
		114
		115	The signal is emitted if mouse is hovered on top of barset.
		116	Parameter \a status is true, if mouse entered on top of barset, false if mouse left from top of barset.
		117	*/
		118
		119
		120	/*!
106	\fn void QBarSet::labelChanged()	121	\fn void QBarSet::labelChanged()
107	This signal is emitted when the label of the barSet has changed.	122	This signal is emitted when the label of the barSet has changed.
108	\sa label	123	\sa label

src/barchart/qbarset.h +2 0

                 void setLabelColor(QColor color);
             Q_SIGNALS:
+                void clicked(int index);
+                void hovered(bool status);
                 void penChanged();
                 void brushChanged();
                 void labelChanged();

tests/auto/qbarseries/tst_qbarseries.cpp +64 0

                 series->append(set2);
                 QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int)));
+                QSignalSpy setSpy1(set1, SIGNAL(clicked(int)));
+                QSignalSpy setSpy2(set2, SIGNAL(clicked(int)));
                 QChartView view(new QChart());
                 view.resize(400,300);
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
+                QCOMPARE(setSpy1.count(), 1);
+                QCOMPARE(setSpy2.count(), 0);
                 QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 0);
+                QList<QVariant> setSpyArg = setSpy1.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
+                QVERIFY(setSpyArg.at(0).toInt() == 0);
             //====================================================================================
             // barset 1, bar 1
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(186,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
+                QCOMPARE(setSpy1.count(), 1);
+                QCOMPARE(setSpy2.count(), 0);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 1);
+                setSpyArg = setSpy1.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
+                QVERIFY(setSpyArg.at(0).toInt() == 1);
             //====================================================================================
             // barset 1, bar 2
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(271,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
+                QCOMPARE(setSpy1.count(), 1);
+                QCOMPARE(setSpy2.count(), 0);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 2);
+                setSpyArg = setSpy1.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
+                QVERIFY(setSpyArg.at(0).toInt() == 2);
             //====================================================================================
             // barset 2, bar 0
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(127,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
+                QCOMPARE(setSpy1.count(), 0);
+                QCOMPARE(setSpy2.count(), 1);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 0);
+                setSpyArg = setSpy2.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
+                QVERIFY(setSpyArg.at(0).toInt() == 0);
             //====================================================================================
             // barset 2, bar 1
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(212,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
+                QCOMPARE(setSpy1.count(), 0);
+                QCOMPARE(setSpy2.count(), 1);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 1);
+                setSpyArg = setSpy2.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
+                QVERIFY(setSpyArg.at(0).toInt() == 1);
             //====================================================================================
             // barset 2, bar 2
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(296,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
+                QCOMPARE(setSpy1.count(), 0);
+                QCOMPARE(setSpy2.count(), 1);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 2);
+                setSpyArg = setSpy2.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
+                QVERIFY(setSpyArg.at(0).toInt() == 2);
             }
             void tst_QBarSeries::mousehovered_data()
                 series->append(set2);
                 QSignalSpy seriesSpy(series,SIGNAL(hovered(QBarSet*,bool)));
+                QSignalSpy setSpy1(set1, SIGNAL(hovered(bool)));
+                QSignalSpy setSpy2(set2, SIGNAL(hovered(bool)));
                 QChartView view(new QChart());
                 view.resize(400,300);
                 QTest::mouseMove(view.viewport(), QPoint(0, 142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 10000);
                 TRY_COMPARE(seriesSpy.count(), 0);
+                TRY_COMPARE(setSpy1.count(), 0);
+                TRY_COMPARE(setSpy2.count(), 0);
             //=======================================================================
             // move mouse on top of set1
                 QTest::mouseMove(view.viewport(), QPoint(102,142));
                 TRY_COMPARE(seriesSpy.count(), 1);
+                TRY_COMPARE(setSpy1.count(), 1);
+                TRY_COMPARE(setSpy2.count(), 0);
                 QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
                 QVERIFY(seriesSpyArg.at(1).toBool() == true);
+                QList<QVariant> setSpyArg = setSpy1.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
+                QVERIFY(setSpyArg.at(0).toBool() == true);
             //=======================================================================
             // move mouse from top of set1 to top of set2
                 QTest::mouseMove(view.viewport(), QPoint(127,142));
                 TRY_COMPARE(seriesSpy.count(), 2);
+                TRY_COMPARE(setSpy1.count(), 1);
+                TRY_COMPARE(setSpy2.count(), 1);
                 // should leave set1
                 seriesSpyArg = seriesSpy.takeFirst();
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
                 QVERIFY(seriesSpyArg.at(1).toBool() == false);
+                setSpyArg = setSpy1.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
+                QVERIFY(setSpyArg.at(0).toBool() == false);
                 // should enter set2
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
                 QVERIFY(seriesSpyArg.at(1).toBool() == true);
+                setSpyArg = setSpy2.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
+                QVERIFY(setSpyArg.at(0).toBool() == true);
             //=======================================================================
             // move mouse from top of set2 to background
                 QTest::mouseMove(view.viewport(), QPoint(127,0));
                 TRY_COMPARE(seriesSpy.count(), 1);
+                TRY_COMPARE(setSpy1.count(), 0);
+                TRY_COMPARE(setSpy2.count(), 1);
                 // should leave set2
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
                 QVERIFY(seriesSpyArg.at(1).toBool() == false);
+                setSpyArg = setSpy2.takeFirst();
+                QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
+                QVERIFY(setSpyArg.at(0).toBool() == false);
             }
             void tst_QBarSeries::clearWithAnimations()

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