From 9b9f57363ab7e622665584407141066f448dbaba 2012-04-19 14:54:24 From: Michal Klocek Date: 2012-04-19 14:54:24 Subject: [PATCH] Removes selected() signal form legend and API for now --- diff --git a/src/barchart/qbarset_p.h b/src/barchart/qbarset_p.h index 6e79e89..ac738b8 100644 --- a/src/barchart/qbarset_p.h +++ b/src/barchart/qbarset_p.h @@ -16,7 +16,6 @@ public: Q_SIGNALS: void clicked(QString category); - void selected(); void restructuredBars(); void updatedBars(); void labelsVisibleChanged(bool visible); diff --git a/src/legend/legendmarker.cpp b/src/legend/legendmarker.cpp index fd884b7..f0d0a6e 100644 --- a/src/legend/legendmarker.cpp +++ b/src/legend/legendmarker.cpp @@ -32,6 +32,7 @@ #include #include #include +#include QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -114,7 +115,7 @@ void LegendMarker::updateLayout() void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event) { QGraphicsObject::mousePressEvent(event); - emit selected(); + qDebug()<<"Not implemented"; //TODO: selected signal removed for now } ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -122,7 +123,7 @@ void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event) AreaLegendMarker::AreaLegendMarker(QAreaSeries *series,QLegend *legend) : LegendMarker(series,legend), m_series(series) { - QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected())); + //QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected())); QObject::connect(series->d_func(),SIGNAL(updated()), this, SLOT(updated())); updated(); } @@ -138,7 +139,7 @@ void AreaLegendMarker::updated() BarLegendMarker::BarLegendMarker(QBarSeries *barseries,QBarSet *barset, QLegend *legend) : LegendMarker(barseries,legend), m_barset(barset) { - QObject::connect(this, SIGNAL(selected()),barset->d_ptr.data(), SIGNAL(selected())); + //QObject::connect(this, SIGNAL(selected()),barset->d_ptr.data(), SIGNAL(selected())); QObject::connect(barset->d_ptr.data(), SIGNAL(updatedBars()), this, SLOT(updated())); updated(); } @@ -154,7 +155,7 @@ void BarLegendMarker::updated() PieLegendMarker::PieLegendMarker(QPieSeries* series,QPieSlice *pieslice, QLegend *legend) : LegendMarker(series,legend), m_pieslice(pieslice) { - QObject::connect(this, SIGNAL(selected()),pieslice, SIGNAL(clicked())); + //QObject::connect(this, SIGNAL(selected()),pieslice, SIGNAL(clicked())); QObject::connect(pieslice, SIGNAL(changed()), this, SLOT(updated())); updated(); } @@ -170,7 +171,7 @@ void PieLegendMarker::updated() XYLegendMarker::XYLegendMarker(QXYSeries *series, QLegend *legend) : LegendMarker(series,legend), m_series(series) { - QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected())); + //QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected())); QObject::connect(series->d_func(),SIGNAL(updated()), this, SLOT(updated())); updated(); } diff --git a/src/legend/legendmarker_p.h b/src/legend/legendmarker_p.h index 4687180..132cc39 100644 --- a/src/legend/legendmarker_p.h +++ b/src/legend/legendmarker_p.h @@ -67,9 +67,6 @@ protected: // From QGraphicsObject void mousePressEvent(QGraphicsSceneMouseEvent *event); -Q_SIGNALS: - void selected(); - public Q_SLOTS: virtual void updated() = 0; diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp index f30fa7e..9aebd72 100644 --- a/src/xychart/qxyseries.cpp +++ b/src/xychart/qxyseries.cpp @@ -48,12 +48,6 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \brief Signal is emitted when user clicks the \a point on chart. */ -/*! - \fn void QXYSeries::selected() - - The signal is emitted if the user selects/deselects the XY series. The logic for maintaining selections should be - implemented by the user of QXYSeries API. -*/ /*! \fn void QXYSeriesPrivate::pointReplaced(int index) diff --git a/src/xychart/qxyseries.h b/src/xychart/qxyseries.h index ea37219..bad8494 100644 --- a/src/xychart/qxyseries.h +++ b/src/xychart/qxyseries.h @@ -68,12 +68,8 @@ public: virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); void setModelMappingRange(int first, int count = -1); -//private Q_SLOTS: -// void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight); - Q_SIGNALS: void clicked(const QPointF &point); - void selected(); private: Q_DECLARE_PRIVATE(QXYSeries);