HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1494:0e4d11fde6b8

Removed unnecessary signals from QPieSlice

Tero Ahola -

r1494:0e4d11fde6b8

parent child

Context file:

r1494:0e4d11fde6b8

Collapse all files

src/piechart/piechartitem.cpp +11 -5

                      PieSliceItem* sliceItem = new PieSliceItem(this);
                      m_sliceItems.insert(slice, sliceItem);
-                     // Note: do need to connect to slice valueChanged() etc.
+                     // Note: no need to connect to slice valueChanged() etc.
                      // This is handled through calculatedDataChanged signal.
                      connect(slice, SIGNAL(labelChanged()), this, SLOT(handleSliceChanged()));
                      connect(slice, SIGNAL(labelVisibleChanged()), this, SLOT(handleSliceChanged()));
-                     connect(slice, SIGNAL(explodedChanged()), this, SLOT(handleSliceChanged()));
                      connect(slice, SIGNAL(penChanged()), this, SLOT(handleSliceChanged()));
                      connect(slice, SIGNAL(brushChanged()), this, SLOT(handleSliceChanged()));
                      connect(slice, SIGNAL(labelBrushChanged()), this, SLOT(handleSliceChanged()));
                      connect(slice, SIGNAL(labelFontChanged()), this, SLOT(handleSliceChanged()));
-                     connect(slice, SIGNAL(labelPositionChanged()), this, SLOT(handleSliceChanged()));
-                     connect(slice, SIGNAL(labelArmLengthFactorChanged()), this, SLOT(handleSliceChanged()));
-                     connect(slice, SIGNAL(explodeDistanceFactorChanged()), this, SLOT(handleSliceChanged()));
+                     QPieSlicePrivate *p = QPieSlicePrivate::fromSlice(slice);
+                     connect(p, SIGNAL(labelPositionChanged()), this, SLOT(handleSliceChanged()));
+                     connect(p, SIGNAL(explodedChanged()), this, SLOT(handleSliceChanged()));
+                     connect(p, SIGNAL(labelArmLengthFactorChanged()), this, SLOT(handleSliceChanged()));
+                     connect(p, SIGNAL(explodeDistanceFactorChanged()), this, SLOT(handleSliceChanged()));
                      connect(sliceItem, SIGNAL(clicked(Qt::MouseButtons)), slice, SIGNAL(clicked()));
                      connect(sliceItem, SIGNAL(hovered(bool)), slice, SIGNAL(hovered(bool)));
              void PieChartItem::handleSliceChanged()
              {
                  QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
+                 if (!slice) {
+                     QPieSlicePrivate* slicep = qobject_cast<QPieSlicePrivate *>(sender());
+                     slice = slicep->q_ptr;
+                 }
                  Q_ASSERT(m_sliceItems.contains(slice));
                  PieSliceItem *sliceItem = m_sliceItems.value(slice);

src/piechart/qpieslice.cpp +4 -48

              */
              /*!
-                 \fn void QPieSlice::explodedChanged()
-                 This signal is emitted the the slice has been exploded from the pie or is returned back to the pie.
-                 \sa exploded
-             */
-             /*!
-                 \qmlsignal PieSlice::explodedChanged()
-                 This signal is emitted the the slice has been exploded from the pie or is returned back to the pie.
-                 \sa exploded
-             */
-             /*!
                  \property QPieSlice::pen
                  Pen used to draw the slice border.
              */
              */
              /*!
-                 \fn void QPieSlice::labelPositionChanged()
-                 This signal is emitted when the label position of the slice has changed.
-                 \sa labelPosition
-             */
-             /*!
-                 \qmlsignal PieSlice::labelPositionChanged()
-                 This signal is emitted when the label position of the slice has changed.
-                 \sa labelPosition
-             */
-             /*!
                  \property QPieSlice::labelArmLengthFactor
                  Defines the length of the label arm.
                  The factor is relative to pie radius. For example:
              */
              /*!
-                 \fn void QPieSlice::labelArmLengthFactorChanged()
-                 This signal is emitted when the label arm factor of the slice has changed.
-                 \sa labelArmLengthFactor
-             */
-             /*!
-                 \qmlsignal PieSlice::labelArmLengthFactorChanged()
-                 This signal is emitted when the label arm factor of the slice has changed.
-                 \sa labelArmLengthFactor
-             */
-             /*!
                  \property QPieSlice::explodeDistanceFactor
                  When the slice is exploded this factor defines how far the slice is exploded away from the pie.
                  The factor is relative to pie radius. For example:
              */
              /*!
-                 \fn void QPieSlice::explodeDistanceFactorChanged()
-                 This signal is emitted when the explode distance factor of the slice has changed.
-                 \sa explodeDistanceFactor
-             */
-             /*!
-                 \qmlsignal PieSlice::explodeDistanceFactorChanged()
-                 This signal is emitted when the explode distance factor of the slice has changed.
-                 \sa explodeDistanceFactor
-             */
-             /*!
                  \property QPieSlice::percentage
                  Percentage of the slice compared to the sum of all slices in the series.
                  The actual value ranges from 0.0 to 1.0.
              {
                  if (d_ptr->m_data.m_isExploded != exploded) {
                      d_ptr->m_data.m_isExploded = exploded;
-                     emit explodedChanged();
+                     emit d_ptr->explodedChanged();
                  }
              }
              {
                  if (d_ptr->m_data.m_labelPosition != position) {
                      d_ptr->m_data.m_labelPosition = position;
-                     emit labelPositionChanged();
+                     emit d_ptr->labelPositionChanged();
                  }
              }
              {
                  if (!qFuzzyIsNull(d_ptr->m_data.m_labelArmLengthFactor - factor)) {
                      d_ptr->m_data.m_labelArmLengthFactor = factor;
-                     emit labelArmLengthFactorChanged();
+                     emit d_ptr->labelArmLengthFactorChanged();
                  }
              }
              {
                  if (!qFuzzyIsNull(d_ptr->m_data.m_explodeDistanceFactor - factor)) {
                      d_ptr->m_data.m_explodeDistanceFactor = factor;
-                     emit explodeDistanceFactorChanged();
+                     emit d_ptr->explodeDistanceFactorChanged();
                  }
              }

src/piechart/qpieslice.h +6 -10

                  Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
                  Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged)
                  Q_PROPERTY(bool labelVisible READ isLabelVisible WRITE setLabelVisible NOTIFY labelVisibleChanged)
-                 Q_PROPERTY(LabelPosition labelPosition READ labelPosition WRITE setLabelPosition NOTIFY labelPositionChanged)
-                 Q_PROPERTY(bool exploded READ isExploded WRITE setExploded NOTIFY explodedChanged)
+                 Q_PROPERTY(LabelPosition labelPosition READ labelPosition WRITE setLabelPosition)
+                 Q_PROPERTY(bool exploded READ isExploded WRITE setExploded)
                  Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
                  Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
                  Q_PROPERTY(int borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged)
                  Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)
                  Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)
                  Q_PROPERTY(QFont labelFont READ labelFont WRITE setLabelFont NOTIFY labelFontChanged)
-                 Q_PROPERTY(qreal labelArmLengthFactor READ labelArmLengthFactor WRITE setLabelArmLengthFactor NOTIFY labelArmLengthFactorChanged)
-                 Q_PROPERTY(qreal explodeDistanceFactor READ explodeDistanceFactor WRITE setExplodeDistanceFactor NOTIFY explodeDistanceFactorChanged)
+                 Q_PROPERTY(qreal labelArmLengthFactor READ labelArmLengthFactor WRITE setLabelArmLengthFactor)
+                 Q_PROPERTY(qreal explodeDistanceFactor READ explodeDistanceFactor WRITE setExplodeDistanceFactor)
                  Q_PROPERTY(qreal percentage READ percentage NOTIFY percentageChanged)
                  Q_PROPERTY(qreal startAngle READ startAngle NOTIFY startAngleChanged)
                  Q_PROPERTY(qreal angleSpan READ angleSpan NOTIFY angleSpanChanged)
                  QPieSeries *series() const;
              Q_SIGNALS:
+                 void clicked();
+                 void hovered(bool state);
                  void labelChanged();
                  void valueChanged();
                  void labelVisibleChanged();
-                 void labelPositionChanged();
-                 void explodedChanged();
                  void penChanged();
                  void brushChanged();
                  void labelBrushChanged();
                  void labelFontChanged();
-                 void labelArmLengthFactorChanged();
-                 void explodeDistanceFactorChanged();
                  void percentageChanged();
                  void startAngleChanged();
                  void angleSpanChanged();
                  void borderColorChanged();
                  void borderWidthChanged();
                  void labelColorChanged();
-                 void clicked();
-                 void hovered(bool state);
              private:
                  QPieSlicePrivate * const d_ptr;

src/piechart/qpieslice_p.h +6 0

                  void setStartAngle(qreal angle);
                  void setAngleSpan(qreal span);
+             Q_SIGNALS:
+                 void labelPositionChanged();
+                 void explodedChanged();
+                 void labelArmLengthFactorChanged();
+                 void explodeDistanceFactorChanged();
              private:
                  friend class QPieSeries;
                  friend class QPieSeriesPrivate;

tests/auto/qpieslice/tst_qpieslice.cpp 0 -8

                  QSignalSpy valueSpy(&slice, SIGNAL(valueChanged()));
                  QSignalSpy labelSpy(&slice, SIGNAL(labelChanged()));
-                 QSignalSpy explodedSpy(&slice, SIGNAL(explodedChanged()));
                  QSignalSpy penSpy(&slice, SIGNAL(penChanged()));
                  QSignalSpy brushSpy(&slice, SIGNAL(brushChanged()));
                  QSignalSpy labelBrushSpy(&slice, SIGNAL(labelBrushChanged()));
                  QSignalSpy labelFontSpy(&slice, SIGNAL(labelFontChanged()));
-                 QSignalSpy labelPositionSpy(&slice, SIGNAL(labelPositionChanged()));
-                 QSignalSpy labelArmLengthFactorSpy(&slice, SIGNAL(labelArmLengthFactorChanged()));
-                 QSignalSpy explodeDistanceFactorSpy(&slice, SIGNAL(explodeDistanceFactorChanged()));
                  QSignalSpy colorSpy(&slice, SIGNAL(colorChanged()));
                  QSignalSpy borderColorSpy(&slice, SIGNAL(borderColorChanged()));
                  QSignalSpy borderWidthSpy(&slice, SIGNAL(borderWidthChanged()));
                  TRY_COMPARE(valueSpy.count(), 1);
                  TRY_COMPARE(labelSpy.count(), 1);
-                 TRY_COMPARE(explodedSpy.count(), 1);
                  TRY_COMPARE(penSpy.count(), 2);
                  TRY_COMPARE(brushSpy.count(), 1);
                  TRY_COMPARE(labelBrushSpy.count(), 1);
                  TRY_COMPARE(labelFontSpy.count(), 1);
-                 TRY_COMPARE(labelPositionSpy.count(), 1);
-                 TRY_COMPARE(labelArmLengthFactorSpy.count(), 1);
-                 TRY_COMPARE(explodeDistanceFactorSpy.count(), 1);
                  TRY_COMPARE(colorSpy.count(), 1);
                  TRY_COMPARE(borderColorSpy.count(), 1);
                  TRY_COMPARE(borderWidthSpy.count(), 1);

tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml 0 -4

                      target: null
                      onValueChanged:             console.log("slice.onValueChanged: " + series.at(0).value);
                      onLabelVisibleChanged:      console.log("slice.onLabelVisibleChanged: " + series.at(0).labelVisible);
-                     onLabelPositionChanged:     console.log("slice.onLabelPositionChanged: " + series.at(0).labelPosition);
-                     onExplodedChanged:          console.log("slice.onExplodedChanged: " + series.at(0).exploded);
                      onPenChanged:               console.log("slice.onPenChanged: " + series.at(0).pen);
                      onBorderColorChanged:       console.log("slice.onBorderColorChanged: " + series.at(0).borderColor);
                      onBorderWidthChanged:       console.log("slice.onBorderWidthChanged: " + series.at(0).borderWidth);
                      onLabelColorChanged:        console.log("slice.onLabelColorChanged: " + series.at(0).labelColor);
                      onLabelBrushChanged:        console.log("slice.onLabelBrushChanged: " + series.at(0).labelBrush);
                      onLabelFontChanged:         console.log("slice.onLabelFontChanged: " + series.at(0).labelFont);
-                     onLabelArmLengthFactorChanged:  console.log("slice.onLabelArmLengthFactorChanged: " + series.at(0).labelArmLengthFactor);
-                     onExplodeDistanceFactorChanged: console.log("slice.onExplodeDistanceFactorChanged: " + series.at(0).explodeDistanceFactor);
                      onPercentageChanged:        console.log("slice.onPercentageChanged: " + series.at(0).percentage);
                      onStartAngleChanged:        console.log("slice.onStartAngleChanged: " + series.at(0).startAngle);
                      onAngleSpanChanged:         console.log("slice.onAngleSpanChanged: " + series.at(0).angleSpan);

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