HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r436:b334955b5e36

Remove click exploding and hover highlighting from pie series API. User should always implement their own.

Jani Honkonen -

r436:b334955b5e36

parent child

Context file:

r436:b334955b5e36

Collapse all files

example/piechart/main.cpp 0 -5

                 chartView->addSeries(series);
                 //! [1]
-                //! [2]
-                series->setHoverHighlighting();
-                series->setClickExplodes();
-                //! [2]
                 window.setCentralWidget(chartView);
                 window.resize(600, 600);
                 window.show();

example/piechartdrilldown/main.cpp 0 -2

                 QPieSeries* yearSeries = new QPieSeries(drilldownChart);
                 yearSeries->setTitle("Sales by year - All");
-                yearSeries->setHoverHighlighting();
                 QList<QString> months;
                 months << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 foreach (QString name, names) {
                     QPieSeries* series = new QPieSeries(drilldownChart);
                     series->setTitle("Sales by month - " + name);
-                    series->setHoverHighlighting();
                     foreach (QString month, months)
                         *series << new DrilldownSlice(qrand() % 1000, month, yearSeries);

src/piechart/qpieseries.cpp 0 -53

@@ -110,9 +110,6 bool QPieSeries::ChangeSet::isEmpty() const
110		110
111	By default the pie is defined as a full pie but it can be a partial pie.	111	By default the pie is defined as a full pie but it can be a partial pie.
112	This can be done by setting a starting angle and angle span to the series.	112	This can be done by setting a starting angle and angle span to the series.
113
114	To help with the most common user interaction scenarions there some convenience functions.
115	Like exploding a slice when clicked and higlighting when user hovers over a slice.
116	*/	113	*/
117		114
118	/*!	115	/*!
@@ -341,36 +338,6 void QPieSeries::setLabelsVisible(bool visible)
341	}	338	}
342		339
343	/*!	340	/*!
344	Convenience method for exploding a slice when user clicks the pie. Set \a enable to true to
345	explode slices by clicking.
346
347	\sa QPieSlice::isExploded(), QPieSlice::setExploded(), QPieSlice::setExplodeDistance()
348	*/
349	void QPieSeries::setClickExplodes(bool enable)
350	{
351	if (enable)
352	connect(this, SIGNAL(clicked(QPieSlice)), this, SLOT(toggleExploded(QPieSlice)));
353	else
354	disconnect(this, SLOT(toggleExploded(QPieSlice*)));
355	}
356
357	/*!
358	Convenience method for highlighting a slice when user hovers over the slice.
359	It changes the slice color to be lighter and shows the label of the slice.
360	Set \a enable to true to highlight a slice when user hovers on top of it.
361	*/
362	void QPieSeries::setHoverHighlighting(bool enable)
363	{
364	if (enable) {
365	connect(this, SIGNAL(hoverEnter(QPieSlice)), this, SLOT(highlightOn(QPieSlice)));
366	connect(this, SIGNAL(hoverLeave(QPieSlice)), this, SLOT(highlightOff(QPieSlice)));
367	} else {
368	disconnect(this, SLOT(hoverEnter(QPieSlice*)));
369	disconnect(this, SLOT(hoverLeave(QPieSlice*)));
370	}
371	}
372
373	/*!
374	Returns the sum of all slice values in this series.	341	Returns the sum of all slice values in this series.
375		342
376	\sa QPieSlice::value(), QPieSlice::setValue()	343	\sa QPieSlice::value(), QPieSlice::setValue()
@@ -462,26 +429,6 void QPieSeries::sliceHoverLeave()
462	emit hoverLeave(slice);	429	emit hoverLeave(slice);
463	}	430	}
464		431
465	void QPieSeries::toggleExploded(QPieSlice* slice)
466	{
467	Q_ASSERT(slice);
468	slice->setExploded(!slice->isExploded());
469	}
470
471	void QPieSeries::highlightOn(QPieSlice* slice)
472	{
473	Q_ASSERT(slice);
474	QColor c = slice->brush().color().lighter();
475	slice->setBrush(c);
476	}
477
478	void QPieSeries::highlightOff(QPieSlice* slice)
479	{
480	Q_ASSERT(slice);
481	QColor c = slice->brush().color().darker(150);
482	slice->setBrush(c);
483	}
484
485	void QPieSeries::updateDerivativeData()	432	void QPieSeries::updateDerivativeData()
486	{	433	{
487	m_total = 0;	434	m_total = 0;

src/piechart/qpieseries.h 0 -5

                 void setSpan(qreal startAngle, qreal angleSpan);
                 void setLabelsVisible(bool visible = true);
-                void setClickExplodes(bool enable = true);
-                void setHoverHighlighting(bool enable = true);
                 qreal total() const;
                 void sliceClicked();
                 void sliceHoverEnter();
                 void sliceHoverLeave();
-                void toggleExploded(QPieSlice* slice);
-                void highlightOn(QPieSlice* slice);
-                void highlightOff(QPieSlice* slice);
             private:
                 void updateDerivativeData();

src/piechart/qpieslice.cpp +2 -2

             /*!
                 Sets this slice \a exploded.
-                \sa isExploded(), setExplodeDistance(), QPieSeries::setClickExplodes()
+                \sa isExploded(), setExplodeDistance()
             */
             void QPieSlice::setExploded(bool exploded)
             {
             /*!
                 Sets the explosion \a distance of this slice.
                 It is the distance the slice is moved away from the pie center.
-                \sa explodeDistance(), isExploded(), QPieSeries::setClickExplodes()
+                \sa explodeDistance(), isExploded()
             */
             void QPieSlice::setExplodeDistance(qreal distance)
             {

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