diff --git a/example/piechart/customslice.cpp b/example/piechart/customslice.cpp index 46c223e..4132a55 100644 --- a/example/piechart/customslice.cpp +++ b/example/piechart/customslice.cpp @@ -4,6 +4,8 @@ CustomSlice::CustomSlice(qreal value, QObject* parent) :QPieSlice(parent) { setValue(value); + setLabelVisible(true); + setExploded(true); connect(this, SIGNAL(changed()), this, SLOT(updateLabel())); connect(this, SIGNAL(hoverEnter()), this, SLOT(toggleExploded())); connect(this, SIGNAL(hoverLeave()), this, SLOT(toggleExploded())); @@ -11,7 +13,7 @@ CustomSlice::CustomSlice(qreal value, QObject* parent) void CustomSlice::updateLabel() { - setLabel(QString::number(this->percentage())); + setLabel(QString::number(this->percentage()*100) + "%"); } void CustomSlice::toggleExploded() diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp index 690556c..2c167eb 100644 --- a/src/piechart/qpieseries.cpp +++ b/src/piechart/qpieseries.cpp @@ -248,6 +248,7 @@ void QPieSeries::highlightOn(QPieSlice* slice) Q_ASSERT(slice); QColor c = slice->brush().color().lighter(); slice->setBrush(c); + slice->setLabelVisible(true); } void QPieSeries::highlightOff(QPieSlice* slice) @@ -255,6 +256,7 @@ void QPieSeries::highlightOff(QPieSlice* slice) Q_ASSERT(slice); QColor c = slice->brush().color().darker(150); slice->setBrush(c); + slice->setLabelVisible(false); } void QPieSeries::updateDerivativeData() diff --git a/src/piechart/qpieslice.cpp b/src/piechart/qpieslice.cpp index 55c14b4..ede577f 100644 --- a/src/piechart/qpieslice.cpp +++ b/src/piechart/qpieslice.cpp @@ -10,7 +10,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE QPieSlice::QPieSlice(QObject *parent) :QObject(parent), m_value(0), - m_isLabelVisible(true), + m_isLabelVisible(false), m_isExploded(false), m_explodeDistance(DEFAULT_EXPOLODE_DISTANCE), m_percentage(0), diff --git a/src/piechart/qpieslice.h b/src/piechart/qpieslice.h index c84225b..3e5010d 100644 --- a/src/piechart/qpieslice.h +++ b/src/piechart/qpieslice.h @@ -17,7 +17,7 @@ class QTCOMMERCIALCHART_EXPORT QPieSlice : public QObject public: QPieSlice(QObject *parent = 0); - QPieSlice(qreal value, QString label, bool labelVisible = true, QObject *parent = 0); + QPieSlice(qreal value, QString label, bool labelVisible = false, QObject *parent = 0); virtual ~QPieSlice(); // data