HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r968:ecf1d49ffcb6

fixed barchart signals with pimpl. drilldown works now

sauimone -

r968:ecf1d49ffcb6

parent child

Context file:

r968:ecf1d49ffcb6

Collapse all files

src/barchart/bar.cpp +4 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            Bar::Bar(QString category, QGraphicsItem *parent)
+            Bar::Bar(QBarSet *barset, QString category, QGraphicsItem *parent) : QGraphicsRectItem(parent),
-                : QGraphicsRectItem(parent),
+                m_category(category),
-                m_category(category)
+                m_barset(barset)
             {
                 setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton);
                 setAcceptHoverEvents(true);
             void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit clicked(m_category, event->button());
+                emit clicked(m_barset, m_category, event->button());
             }
             void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event)

src/barchart/bar_p.h +5 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class QBarSet;
             // Single visual bar item of chart
             class Bar : public QObject, public QGraphicsRectItem
             {
                 Q_OBJECT
             public:
-                Bar(QString category, QGraphicsItem *parent = 0);
+                Bar(QBarSet *barset, QString category, QGraphicsItem *parent = 0);
             public:
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
             Q_SIGNALS:
                 void clicked(QString category, Qt::MouseButtons button);
+                void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
                 void hoverEntered(QPoint pos);
                 void hoverLeaved();
             private:
                 QString m_category;
+                QBarSet *m_barset;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartitem.cpp +3 -2

                     QString category = m_series->d_func()->categoryName(c);
                     for (int s = 0; s < m_series->barsetCount(); s++) {
                         QBarSet *set = m_series->d_func()->barsetAt(s);
-                        Bar *bar = new Bar(category,this);
+                        Bar *bar = new Bar(set,category,this);
                         m_bars.append(bar);
                         connect(bar, SIGNAL(clicked(QString,Qt::MouseButtons)), set, SIGNAL(clicked(QString,Qt::MouseButtons)));
+                        connect(bar, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)), m_series, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)));
                         connect(bar, SIGNAL(hoverEntered(QPoint)), set->d_ptr.data(), SLOT(barHoverEnterEvent(QPoint)));
                         connect(bar, SIGNAL(hoverLeaved()), set->d_ptr.data(), SLOT(barHoverLeaveEvent()));
                         m_layout.append(QRectF(0, 0, 0, 0));
                         QBarSet *set = m_series->d_func()->barsetAt(s);
                         BarLabel *value = new BarLabel(*set, this);
                         m_labels.append(value);
-                        connect(set,SIGNAL(labelsVisibleChanged(bool)),value,SLOT(labelsVisibleChanged(bool)));
+                        connect(set->d_ptr.data(),SIGNAL(labelsVisibleChanged(bool)),value,SLOT(labelsVisibleChanged(bool)));
                     }
                 }
             }

src/barchart/qbarseries.cpp +2 -11

             {
                 Q_D(QBarSeries);
                 d->m_internalModel->appendBarSet(set);
-                QObject::connect(set->d_ptr.data(), SIGNAL(clicked(QString,Qt::MouseButtons)), d, SLOT(barsetClicked(QString,Qt::MouseButtons)));
                 QObject::connect(set->d_ptr.data(), SIGNAL(valueChanged()), d, SLOT(barsetChanged()));
                 emit d->restructuredBars();
             }
             void QBarSeries::removeBarSet(QBarSet *set)
             {
                 Q_D(QBarSeries);
-                QObject::disconnect(set->d_ptr.data(), SIGNAL(clicked(QString,Qt::MouseButtons)), d, SLOT(barsetClicked(QString,Qt::MouseButtons)));
                 d->m_internalModel->removeBarSet(set);
                 emit d->restructuredBars();
             }
                 Q_D(QBarSeries);
                 foreach (QBarSet* barset, sets) {
                     d->m_internalModel->appendBarSet(barset);
-                    QObject::connect(barset, SIGNAL(clicked(QString,Qt::MouseButtons)), this, SLOT(barsetClicked(QString,Qt::MouseButtons)));
                     QObject::connect(barset, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
                 }
                 emit d->restructuredBars();
                 Q_D(QBarSeries);
                 foreach (QBarSet* barset, sets) {
-                    QObject::disconnect(barset, SIGNAL(clicked(QString,Qt::MouseButtons)), this, SLOT(barsetClicked(QString,Qt::MouseButtons)));
                     d->m_internalModel->removeBarSet(barset);
                 }
                 emit d->restructuredBars();
                 if (enabled) {
                     for (int i=0; i<m_internalModel->barsetCount(); i++) {
                         QBarSet *set = m_internalModel->barsetAt(i);
-                        connect(set, SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
+                        connect(set->d_ptr.data(), SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
                     }
                 } else {
                     for (int i=0; i<m_internalModel->barsetCount(); i++) {
                         QBarSet *set = m_internalModel->barsetAt(i);
-                        disconnect(set, SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
+                        disconnect(set->d_ptr.data(), SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
                     }
                 }
             }
-            void QBarSeriesPrivate::barsetClicked(QString category, Qt::MouseButtons button)
-                emit clicked(qobject_cast<QBarSet*>(sender()), category, button);
             qreal QBarSeriesPrivate::min()
             {
                 return m_internalModel->min();

src/barchart/qbarseries_p.h +1 -2

                 BarChartModel& modelInternal();
             Q_SIGNALS:
-                void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);        // Up to user of api, what to do with these signals
+                void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
                 void selected();
                 void updatedBars();
                 void restructuredBars();
             public Q_SLOTS:
                 void setToolTipEnabled(bool enabled = true);           // enables tooltips
-                void barsetClicked(QString category, Qt::MouseButtons button);
             private Q_SLOTS:
                 // slots for updating bars when data in model changes

src/barchart/qbarset.cpp 0 -2

             QBarSet::QBarSet(QString name, QObject *parent)
                 : QObject(parent)
                 ,d_ptr(new QBarSetPrivate(name,this))
-            //    ,m_name(name)
-            //    ,m_labelsVisible(false)
             {
             }

src/barchart/qbarset.h +1 0

                 friend class QBarSeries;
                 friend class BarLegendMarker;
                 friend class BarChartItem;
+                friend class QBarSeriesPrivate;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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