HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r412:917c9ad18551

right click feature for bar series. Enables drilldown

sauimone -

r412:917c9ad18551

parent child

Context file:

r412:917c9ad18551

Collapse all files

src/barchart/barcategory.cpp created 644 +17 0

@@ -0,0 +1,17
	1	#include "barcategory_p.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4	BarCategory::BarCategory(QString name, QObject *parent) :
	5	QObject(parent)
	6	,mName(name)
	7	{
	8	}
	9
	10	void BarCategory::barRightClickEvent()
	11	{
	12	// TODO:
	13	emit rightClicked(mName);
	14	}
	15
	16	#include "moc_barcategory_p.cpp"
	17	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barcategory_p.h created 644 +26 0

@@ -0,0 +1,26
	1	#ifndef BARCATEGORY_P_H
	2	#define BARCATEGORY_P_H
	3
	4	#include <QObject>
	5	#include <qchartglobal.h>
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8	// Event handler for bar category
	9	class BarCategory : public QObject
	10	{
	11	Q_OBJECT
	12	public:
	13	explicit BarCategory(QString name, QObject *parent = 0);
	14
	15	signals:
	16	void rightClicked(QString name); // "We want something to happen that involves this category"
	17
	18	public slots:
	19	void barRightClickEvent();
	20
	21	private:
	22	QString mName;
	23	};
	24
	25	QTCOMMERCIALCHART_END_NAMESPACE
	26	#endif // BARCATEGORY_P_H

src/barchart/bar.cpp +7 -3

             Bar::Bar(QGraphicsItem *parent)
                 : QGraphicsObject(parent)
             {
-                setAcceptedMouseButtons(Qt::LeftButton);
+                setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 setAcceptHoverEvents(true);
             }
                 return r;
             }
-            void Bar::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
+            void Bar::mousePressEvent(QGraphicsSceneMouseEvent* event)
             {
-                emit clicked();
+                if (event->button() == Qt::LeftButton) {
+                    emit clicked();
+                } else if (event->button() == Qt::RightButton) {
+                    emit rightClicked();
+                }
             }
             void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent* event)

src/barchart/bar_p.h +1 -1

             Q_SIGNALS:
                 void clicked();
+                void rightClicked();
                 void hoverEntered(QPoint pos);
                 void hoverLeaved();
                 qreal mWidth;
                 qreal mXpos;
                 qreal mYpos;
-                QColor mColor;
                 QBrush mBrush;
                 QPen mPen;

src/barchart/barchart.pri +4 -3

                 $$PWD/qstackedbarseries.cpp \
                 $$PWD/separator.cpp \
                 $$PWD/stackedbarpresenter.cpp \
-                $$PWD/barvalue.cpp
+                $$PWD/barvalue.cpp \
+                $$PWD/barcategory.cpp
             PRIVATE_HEADERS += \
                 $$PWD/bar_p.h \
                 $$PWD/percentbarpresenter_p.h \
                 $$PWD/separator_p.h \
                 $$PWD/stackedbarpresenter_p.h \
-                $$PWD/barvalue_p.h
+                $$PWD/barvalue_p.h \
+                $$PWD/barcategory_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qbarseries.h \
                 $$PWD/qbarset.h \
                 $$PWD/qpercentbarseries.h \
                 $$PWD/qstackedbarseries.h

src/barchart/barchartmodel.cpp +11 -1

             #include <QVector>
             #include <QDebug>
             #include "barchartmodel_p.h"
+            #include "barcategory_p.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 QObject(parent)
                 ,mCategory(categories)
             {
+                for (int i=0; i<mCategory.count(); i++) {
+                    BarCategory* cat = new BarCategory(mCategory.at(i), this);
+                    mCategoryObjects.append(cat);
+                }
             }
             QStringList BarChartModel::category()
                 return max;
             }
-            QString BarChartModel::label(int category)
+            QString BarChartModel::categoryName(int category)
             {
                 return mCategory.at(category);
             }
+            BarCategory* BarChartModel::categoryObject(int category)
+            {
+                return mCategoryObjects.at(category);
+            }
             #include "moc_barchartmodel_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartmodel_p.h +4 -1

             // TODO: Implement as QAbstractItemModel?
             class QBarSet;
+            class BarCategory;
             class BarChartModel : public QObject //, public QAbstractItemModel
             {
                 qreal categorySum(int category);
                 qreal maxCategorySum();     // returns maximum sum of sets in all categories.
-                QString label(int category);
+                QString categoryName(int category);
+                BarCategory* categoryObject(int category);
             signals:
                 void modelUpdated();
                 QList<QBarSet*> mDataModel;
                 QStringList mCategory;
+                QList<BarCategory*> mCategoryObjects;
                 int mCurrentSet;

src/barchart/barpresenterbase.cpp +8 -5

             #include "barvalue_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
+            #include "barcategory_p.h"
             #include "qbarset.h"
             #include "qbarseries.h"
             #include <QDebug>
             void BarPresenterBase::dataChanged()
             {
                 // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
-                qDebug() << "datachanged";
+            //    qDebug() << "datachanged";
                 // Delete old bars
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 // Create new graphic items for bars
                 for (int c=0; c<mSeries->categoryCount(); c++) {
+                    BarCategory *category = mSeries->categoryObject(c);
                     for (int s=0; s<mSeries->barsetCount(); s++) {
                         QBarSet *set = mSeries->barsetAt(s);
                         Bar *bar = new Bar(this);
                         childItems().append(bar);
                         mBars.append(bar);
-                        connect(bar,SIGNAL(clicked()),set,SLOT(barClicked()));
+                        connect(bar,SIGNAL(clicked()),set,SLOT(barClickedEvent()));
-                        connect(bar,SIGNAL(hoverEntered(QPoint)),set,SLOT(barHoverEntered(QPoint)));
+                        connect(bar,SIGNAL(rightClicked()),category,SLOT(barRightClickEvent()));
-                        connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaved()));
+                        connect(bar,SIGNAL(hoverEntered(QPoint)),set,SLOT(barHoverEnterEvent(QPoint)));
+                        connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaveEvent()));
                     }
                 }
                 int count = mSeries->categoryCount();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
-                    label->set(mSeries->label(i));
+                    label->set(mSeries->categoryName(i));
                     childItems().append(label);
                     mLabels.append(label);
                 }

src/barchart/qbarseries.cpp +13 -3

             #include "qbarseries.h"
             #include "qbarset.h"
             #include "barchartmodel_p.h"
+            #include "barcategory_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 : QSeries(parent)
                 ,mModel(new BarChartModel(categories, this))
             {
+                for (int i=0; i<mModel->categoryCount(); i++) {
+                    BarCategory *categoryObject = mModel->categoryObject(i);
+                    connect(categoryObject, SIGNAL(rightClicked(QString)), this, SIGNAL(categoryRightClicked(QString)));
+                }
             }
             /*!
             /*!
                 \internal \a category
             */
-            QString QBarSeries::label(int category)
+            QString QBarSeries::categoryName(int category)
             {
-                return mModel->label(category);
+                return mModel->categoryName(category);
             }
             /*!
                 return *mModel;
             }
+            BarCategory* QBarSeries::categoryObject(int category)
+            {
+                return mModel->categoryObject(category);
+            }
             #include "moc_qbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h +5 -2

             class QBarSet;
             class BarChartModel;
+            class BarCategory;
             // Container for series
             class QTCOMMERCIALCHART_EXPORT QBarSeries : public QSeries
                 // TODO: Functions below this are not part of api and will be moved
                 // to private implementation, when we start using it
                 // TODO: TO PIMPL --->
-                QBarSet *barsetAt(int index);
+                QBarSet* barsetAt(int index);
-                QString label(int category);
+                QString categoryName(int category);
                 qreal min();
                 qreal max();
                 qreal valueAt(int set, int category);
                 qreal categorySum(int category);
                 qreal maxCategorySum();
                 BarChartModel& model();
+                BarCategory* categoryObject(int category);
                 // <--- TO PIMPL
             signals:
                 void changed(int index);
+                void categoryRightClicked(QString category);
                 // TODO: internal signals, these to private implementation.
                 // TODO: TO PIMPL --->

src/barchart/qbarset.cpp +3 -8

             /*!
                 \internal
             */
-            void QBarSet::barClicked()
+            void QBarSet::barClickedEvent()
             {
-            //    qDebug() << "QBarset::barClicked" << this;
                 // Some bar of this set has been clicked
                 // TODO: What happens then?
                 emit clicked();     // Notify that set has been clicked
             /*!
                 \internal \a pos
             */
-            void QBarSet::barHoverEntered(QPoint pos)
+            void QBarSet::barHoverEnterEvent(QPoint pos)
             {
                 emit showToolTip(pos, mName);
                 emit hoverEnter(pos);
             /*!
                 \internal
             */
-            void QBarSet::barHoverLeaved()
+            void QBarSet::barHoverLeaveEvent()
             {
-            //    qDebug() << "QBarset::barHoverLeaved" << this;
-            //    if (mToolTipEnabled) {
-                    // TODO: do what?
-            //    }
                 // Emit signal to user of charts
                 emit hoverLeave();
             }

src/barchart/qbarset.h +3 -3

             public Q_SLOTS:
                 // These are for internal communication
                 // TODO: TO PIMPL --->
-                void barClicked();
+                void barClickedEvent();
-                void barHoverEntered(QPoint pos);
+                void barHoverEnterEvent(QPoint pos);
-                void barHoverLeaved();
+                void barHoverLeaveEvent();
                 // <--- TO PIMPL
             private:

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