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

                  By default the pie is defined as a full pie but it can be a partial pie.
                  This can be done by setting a starting angle and angle span to the series.
-                 To help with the most common user interaction scenarions there some convenience functions.
-                 Like exploding a slice when clicked and higlighting when user hovers over a slice.
              */
              /*!
              }
              /*!
-                 Convenience method for exploding a slice when user clicks the pie. Set \a enable to true to
-                 explode slices by clicking.
-                 \sa QPieSlice::isExploded(), QPieSlice::setExploded(), QPieSlice::setExplodeDistance()
-             */
-             void QPieSeries::setClickExplodes(bool enable)
+             {
-                 if (enable)
-                     connect(this, SIGNAL(clicked(QPieSlice*)), this, SLOT(toggleExploded(QPieSlice*)));
-                 else
-                     disconnect(this, SLOT(toggleExploded(QPieSlice*)));
+             }
-             /*!
-                 Convenience method for highlighting a slice when user hovers over the slice.
-                 It changes the slice color to be lighter and shows the label of the slice.
-                 Set \a enable to true to highlight a slice when user hovers on top of it.
-             */
-             void QPieSeries::setHoverHighlighting(bool enable)
+             {
-                 if (enable) {
-                     connect(this, SIGNAL(hoverEnter(QPieSlice*)), this, SLOT(highlightOn(QPieSlice*)));
-                     connect(this, SIGNAL(hoverLeave(QPieSlice*)), this, SLOT(highlightOff(QPieSlice*)));
-                 } else {
-                     disconnect(this, SLOT(hoverEnter(QPieSlice*)));
-                     disconnect(this, SLOT(hoverLeave(QPieSlice*)));
+                 }
+             }
-             /*!
                  Returns the sum of all slice values in this series.
                  \sa QPieSlice::value(), QPieSlice::setValue()
                  emit hoverLeave(slice);
              }
-             void QPieSeries::toggleExploded(QPieSlice* slice)
+             {
-                 Q_ASSERT(slice);
-                 slice->setExploded(!slice->isExploded());
+             }
-             void QPieSeries::highlightOn(QPieSlice* slice)
+             {
-                 Q_ASSERT(slice);
-                 QColor c = slice->brush().color().lighter();
-                 slice->setBrush(c);
+             }
-             void QPieSeries::highlightOff(QPieSlice* slice)
+             {
-                 Q_ASSERT(slice);
-                 QColor c = slice->brush().color().darker(150);
-                 slice->setBrush(c);
+             }
              void QPieSeries::updateDerivativeData()
              {
                  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