HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r975:b81e04837829

barchart: removed tooltip. hoverEntered and hoverLeaved signals combined to hovered(bool) signal

sauimone -

r975:b81e04837829

parent child

Context file:

r975:b81e04837829

Collapse all files

examples/stackedbarchartdrilldown/main.cpp 0 -1

                             *weeklyCrop << (qrand() % 20);
                         // Get the drilldown series from season series and add crop to it.
                         seasonSeries->drilldownSeries(month)->appendBarSet(weeklyCrop);
-                        seasonSeries->drilldownSeries(month)->setToolTipEnabled(true);
                         *monthlyCrop << weeklyCrop->sum();
                     }
                     seasonSeries->appendBarSet(monthlyCrop);

src/barchart/bar.cpp +4 -2

             void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
             {
-                emit hoverEntered(event->lastScreenPos());
+                emit hovered(true);
+                emit hovered(m_barset, true);
             }
             void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
             {
                 Q_UNUSED(event)
-                emit hoverLeaved();
+                emit hovered(false);
+                emit hovered(m_barset, false);
             }
             #include "moc_bar_p.cpp"

src/barchart/bar_p.h +2 -2

             Q_SIGNALS:
                 void clicked(QString category, Qt::MouseButtons button);
                 void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
-                void hoverEntered(QPoint pos);
+                void hovered(bool status);
-                void hoverLeaved();
+                void hovered(QBarSet *barset, bool status);
             private:
                 QString m_category;

src/barchart/barchartitem.cpp +2 -12

             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include "chartdataset_p.h"
-            #include <QToolTip>
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 m_series(series)
             {
                 setFlag(ItemClipsChildrenToShape);
-                connect(series->d_func(), SIGNAL(showToolTip(QPoint,QString)), this, SLOT(showToolTip(QPoint,QString)));
                 connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
                 connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleModelChanged()));
                 setZValue(ChartPresenter::BarSeriesZValue);
             BarChartItem::~BarChartItem()
             {
-                disconnect(this,SLOT(showToolTip(QPoint,QString)));
             }
             void BarChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             void BarChartItem::dataChanged()
             {
-                // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
                 foreach(QGraphicsItem *item, childItems()) {
                     delete item;
                 }
                         m_bars.append(bar);
                         connect(bar, SIGNAL(clicked(QString,Qt::MouseButtons)), set, SIGNAL(clicked(QString,Qt::MouseButtons)));
                         connect(bar, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)), m_series, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)));
-                        connect(bar, SIGNAL(hoverEntered(QPoint)), set->d_ptr.data(), SLOT(barHoverEnterEvent(QPoint)));
+                        connect(bar, SIGNAL(hovered(bool)), set, SIGNAL(hovered(bool)));
-                        connect(bar, SIGNAL(hoverLeaved()), set->d_ptr.data(), SLOT(barHoverLeaveEvent()));
+                        connect(bar, SIGNAL(hovered(QBarSet*,bool)), m_series, SIGNAL(hovered(QBarSet*,bool)));
                         m_layout.append(QRectF(0, 0, 0, 0));
                     }
                 }
                 update();
             }
-            void BarChartItem::showToolTip(QPoint pos, QString tip)
-                // TODO: cool tooltip instead of default
-                QToolTip::showText(pos, tip);
             #include "moc_barchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartitem_p.h 0 -3

                 void handleGeometryChanged(const QRectF &size);
                 void handleLayoutChanged();
-                // Internal slots
-                void showToolTip(QPoint pos, QString tip);      // shows tooltip (if enabled)
             protected:
                 // TODO: consider these.

src/barchart/qbarseries.cpp 0 -27

@@ -205,17 +205,6 QList<QBarSet*> QBarSeries::barSets() const
205	}	205	}
206		206
207	/*!	207	/*!
208	Enables or disables tooltip depending on parameter \a enabled.
209	Tooltip shows the name of set, when mouse is hovering on top of bar.
210	Calling without parameter \a enabled, enables the tooltip
211	*/
212	void QBarSeries::setToolTipEnabled(bool enabled)
213	{
214	Q_D(QBarSeries);
215	d->setToolTipEnabled(enabled);
216	}
217
218	/*!
219	\fn bool QBarSeries::setModel(QAbstractItemModel *model)	208	\fn bool QBarSeries::setModel(QAbstractItemModel *model)
220	Sets the \a model to be used as a data source	209	Sets the \a model to be used as a data source
221	*/	210	*/
@@ -289,22 +278,6 QString QBarSeriesPrivate::categoryName(int category)
289	return m_internalModel->categoryName(category);	278	return m_internalModel->categoryName(category);
290	}	279	}
291		280
292	void QBarSeriesPrivate::setToolTipEnabled(bool enabled)
293	{
294	// TODO: what if we add sets after call to this function? Those sets won't have tooltip enabled.
295	if (enabled) {
296	for (int i=0; i<m_internalModel->barsetCount(); i++) {
297	QBarSet *set = m_internalModel->barsetAt(i);
298	connect(set->d_ptr.data(), SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
299	}
300	} else {
301	for (int i=0; i<m_internalModel->barsetCount(); i++) {
302	QBarSet *set = m_internalModel->barsetAt(i);
303	disconnect(set->d_ptr.data(), SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
304	}
305	}
306	}
307
308	qreal QBarSeriesPrivate::min()	281	qreal QBarSeriesPrivate::min()
309	{	282	{
310	return m_internalModel->min();	283	return m_internalModel->min();

src/barchart/qbarseries.h +1 -3

             Q_SIGNALS:
                 void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
                 void selected();
+                void hovered(QBarSet* barset, bool status);
-            public Q_SLOTS:
-                void setToolTipEnabled(bool enabled = true);           // enables tooltips
             protected:
                 Q_DECLARE_PRIVATE(QBarSeries)

src/barchart/qbarseries_p.h 0 -4

                 void selected();
                 void updatedBars();
                 void restructuredBars();
-                void showToolTip(QPoint pos, QString tip);
-            public Q_SLOTS:
-                void setToolTipEnabled(bool enabled = true);           // enables tooltips
             private Q_SLOTS:
                 // slots for updating bars when data in model changes

src/barchart/qbarset.cpp +5 -32

@@ -20,7 +20,6
20		20
21	#include "qbarset.h"	21	#include "qbarset.h"
22	#include "qbarset_p.h"	22	#include "qbarset_p.h"
23	#include <QToolTip>
24		23
25	QTCOMMERCIALCHART_BEGIN_NAMESPACE	24	QTCOMMERCIALCHART_BEGIN_NAMESPACE
26		25
@@ -46,6 +45,11 QTCOMMERCIALCHART_BEGIN_NAMESPACE
46	*/	45	*/
47		46
48	/*!	47	/*!
		48	\fn void QBarSet::hovered(bool status)
		49	\brief signals that mouse has hovered over the set. If \a status is true, then mouse was entered. If \a status is false, then mouse was left.
		50	*/
		51
		52	/*!
49	Constructs QBarSet with a name of \a name and with parent of \a parent	53	Constructs QBarSet with a name of \a name and with parent of \a parent
50	*/	54	*/
51	QBarSet::QBarSet(QString name, QObject *parent)	55	QBarSet::QBarSet(QString name, QObject *parent)
@@ -257,21 +261,6 bool QBarSet::labelsVisible() const
257	return d_ptr->m_labelsVisible;	261	return d_ptr->m_labelsVisible;
258	}	262	}
259		263
260	/*
261	void QBarSet::barHoverEnterEvent(QPoint pos)
262	{
263	emit showToolTip(pos, m_name);
264	emit hoverEnter(pos);
265	}
266	*/
267	/*
268	void QBarSet::barHoverLeaveEvent()
269	{
270	// Emit signal to user of charts
271	emit hoverLeave();
272	}
273	*/
274
275	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	264	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
276		265
277	QBarSetPrivate::QBarSetPrivate(QString name, QBarSet *parent) : QObject(parent),	266	QBarSetPrivate::QBarSetPrivate(QString name, QBarSet *parent) : QObject(parent),
@@ -286,22 +275,6 QBarSetPrivate::~QBarSetPrivate()
286	{	275	{
287		276
288	}	277	}
289
290
291	//TODO: fixme , refactor it and get rid of it
292	void QBarSetPrivate::barHoverEnterEvent(QPoint pos)
293	{
294	emit showToolTip(pos, m_name);
295	emit hoverEnter(pos);
296	}
297
298	//TODO: fixme , refactor it and get rid of it
299	void QBarSetPrivate::barHoverLeaveEvent()
300	{
301	// Emit signal to user of charts
302	emit hoverLeave();
303	}
304
305	#include "moc_qbarset.cpp"	278	#include "moc_qbarset.cpp"
306	#include "moc_qbarset_p.cpp"	279	#include "moc_qbarset_p.cpp"
307		280

src/barchart/qbarset.h +3 -1

                 bool labelsVisible() const;
             Q_SIGNALS:
-                void clicked(QString category, Qt::MouseButtons button);                         // Clicked and hover signals exposed to user
+                void clicked(QString category, Qt::MouseButtons button);
+                void selected();
+                void hovered(bool status);
             private:
                 QScopedPointer<QBarSetPrivate> d_ptr;

src/barchart/qbarset_p.h 0 -7

                 void clicked(QString category, Qt::MouseButtons button);
                 void structureChanged();
                 void valueChanged();
-                void hoverEnter(QPoint pos);
-                void hoverLeave();
-                void showToolTip(QPoint pos, QString tip);
                 void labelsVisibleChanged(bool visible);
-            public Q_SLOTS:
-                void barHoverEnterEvent(QPoint pos);
-                void barHoverLeaveEvent();
             public:
                 QBarSet * const q_ptr;
                 QString m_name;

test/chartwidgettest/mainwidget.cpp 0 -3

                         series->appendBarSet(set);
                     }
-                    // TODO: new implementation of setFloatingValuesEnabled with signals
-                    //series->setFloatingValuesEnabled(true);
-                    series->setToolTipEnabled(true);
                     m_chart->addSeries(series);
                 } else if (seriesName == "Spline") {
                     for (int j(0); j < data.count(); j ++) {

test/tablemodelchart/tablewidget.cpp 0 -1

                         QBarSeries* barSeries = new QBarSeries(QStringList());
                         barSeries->setModel(m_model);
                         barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
-                        barSeries->setToolTipEnabled(true);
                         m_chart->addSeries(barSeries);
                         QList<QBarSet*> barsets = barSeries->barSets();
                         for (int i = 0; i < barsets.count(); i++) {

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