HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r547:2c194d26bbea

Separated legend marker to private header. Added signals for left and right mouse click

sauimone -

r547:2c194d26bbea

parent child

Context file:

r547:2c194d26bbea

Collapse all files

src/legendmarker.cpp created 644 +63 0

@@ -0,0 +1,63
	1	#include "qchartglobal.h"
	2	#include "legendmarker_p.h"
	3	#include <QPainter>
	4	#include <QGraphicsSceneEvent>
	5
	6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	7
	8	LegendMarker::LegendMarker(QSeries* series, QGraphicsItem *parent)
	9	: QGraphicsObject(parent)
	10	,mSeries(series)
	11	,mBoundingRect(0,0,1,1)
	12	{
	13	setAcceptedMouseButtons(Qt::LeftButton\|Qt::RightButton);
	14	}
	15
	16	void LegendMarker::setBoundingRect(const QRectF rect)
	17	{
	18	mBoundingRect = rect;
	19	}
	20
	21	void LegendMarker::setBrush(const QBrush brush)
	22	{
	23	mBrush = brush;
	24	}
	25
	26	void LegendMarker::setName(const QString name)
	27	{
	28	mName = name;
	29	}
	30
	31	QString LegendMarker::name() const
	32	{
	33	return mName;
	34	}
	35
	36	QColor LegendMarker::color() const
	37	{
	38	return mBrush.color();
	39	}
	40
	41	void LegendMarker::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
	42	{
	43	painter->setBrush(mBrush);
	44	painter->drawRect(mBoundingRect);
	45	}
	46
	47	QRectF LegendMarker::boundingRect() const
	48	{
	49	return mBoundingRect;
	50	}
	51
	52	void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event)
	53	{
	54	if (event->button() == Qt::LeftButton) {
	55	emit clicked(mSeries, mName);
	56	} else if (event->button() == Qt::RightButton) {
	57	emit rightClicked(mSeries, mName);
	58	}
	59	}
	60
	61	#include "moc_legendmarker_p.cpp"
	62
	63	QTCOMMERCIALCHART_END_NAMESPACE

src/legendmarker_p.h created 644 +44 0

@@ -0,0 +1,44
	1	#ifndef LEGENDMARKER_P_H
	2	#define LEGENDMARKER_P_H
	3
	4	#include "qchartglobal.h"
	5	#include <QGraphicsObject>
	6	#include <QBrush>
	7
	8	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	9
	10	class QSeries;
	11
	12
	13	class LegendMarker : public QGraphicsObject
	14	{
	15	Q_OBJECT
	16	public:
	17	LegendMarker(QSeries* series, QGraphicsItem *parent = 0);
	18	void setBoundingRect(const QRectF rect);
	19	void setBrush(const QBrush brush);
	20	void setName(const QString name);
	21	QString name() const;
	22	QColor color() const;
	23
	24	void paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget = 0);
	25
	26	QRectF boundingRect() const;
	27
	28	public:
	29	// From QGraphicsObject
	30	void mousePressEvent(QGraphicsSceneMouseEvent *event);
	31
	32	Q_SIGNALS:
	33	void clicked(QSeries* series, QString name);
	34	void rightClicked(QSeries* series, QString name);
	35
	36	private:
	37	QRectF mBoundingRect;
	38	QBrush mBrush;
	39	QString mName;
	40	QSeries* mSeries;
	41	};
	42
	43	QTCOMMERCIALCHART_END_NAMESPACE
	44	#endif // LEGENDMARKER_P_H

src/chartpresenter.cpp 0 0

NO CONTENT: modified file

src/qlegend.cpp +12 -33

             #include "qchartglobal.h"
             #include "qlegend.h"
             #include "qseries.h"
+            #include "legendmarker_p.h"
             #include <QPainter>
             #include <QPen>
-            QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            #include <QGraphicsSceneEvent>
-            // TODO: this to legendmarker_p.h header
-            class LegendMarker : public QGraphicsItem
-            public:
-                LegendMarker(QGraphicsItem *parent = 0) : QGraphicsItem(parent)
-                  ,mBoundingRect(0,0,1,1)
-                {}
-                void setBoundingRect(const QRectF rect) { mBoundingRect = rect; }
-                void setBrush(const QBrush brush) { mBrush = brush; }
-                void setName(const QString name) { mName = name; }
-                QString name() const { return mName; }
-                QColor color() const { return mBrush.color(); }
-                void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
+            QTCOMMERCIALCHART_BEGIN_NAMESPACE
-                    painter->setBrush(mBrush);
-                    painter->drawRect(mBoundingRect);
-                QRectF boundingRect() const { return mBoundingRect; }
-            private:
-                QRectF mBoundingRect;
-                QBrush mBrush;
-                QString mName;
-            };
             QLegend::QLegend(QGraphicsItem *parent)
                 : QGraphicsObject(parent)
                 ,mBoundingRect(0,0,1,1)
                 ,mBackgroundBrush(Qt::darkGray)     // TODO: from theme?
             {
             }
             void QLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 painter->setBrush(mBackgroundBrush);
                 painter->drawRect(mBoundingRect);
                 foreach(LegendMarker* m, mMarkers) {
                     QRectF r = m->boundingRect();
                     painter->setPen(m->color());
-                    painter->drawText(r.x() + 20, r.y() + r.height(), m->name());
+                    painter->drawText(r.x() + r.width()*2, r.y() + r.height(), m->name());
                 }
             }
             QRectF QLegend::boundingRect() const
             {
                 return mBoundingRect;
             }
             void QLegend::setBackgroundBrush(const QBrush& brush)
             {
                 mBackgroundBrush = brush;
             }
             QBrush QLegend::backgroundBrush() const
             {
                 return mBackgroundBrush;
             }
             void QLegend::handleSeriesAdded(QSeries* series,Domain* domain)
             {
                 mSeriesList.append(series);
                 dataChanged();
                 layoutChanged();
             }
             void QLegend::handleSeriesRemoved(QSeries* series)
             {
                 mSeriesList.removeOne(series);
                 dataChanged();
                 layoutChanged();
             }
             void QLegend::handleGeometryChanged(const QRectF& size)
             {
                 mBoundingRect = size;
                 layoutChanged();
             }
             void QLegend::dataChanged()
             {
-                foreach (QGraphicsItem* i, childItems()) {
+                foreach (LegendMarker* marker, mMarkers) {
-                    delete i;
+                    disconnect(marker,SIGNAL(clicked(QSeries*,QString)),this,SIGNAL(clicked(QSeries*,QString)));
+                    disconnect(marker,SIGNAL(rightClicked(QSeries*,QString)),this,SIGNAL(rightClicked(QSeries*,QString)));
+                    delete marker;
                 }
                 mMarkers.clear();
                 foreach (QSeries* s, mSeriesList) {
                     for (int i=0; i<s->legendEntries().count(); i++) {
-                        LegendMarker *marker = new LegendMarker(this);
+                        LegendMarker *marker = new LegendMarker(s, this);
                         marker->setBrush(s->legendEntries().at(i).mBrush);
                         marker->setName(s->legendEntries().at(i).mName);
                         mMarkers.append(marker);
-            //            childItems().append(marker);
+                        childItems().append(marker);
+                        connect(marker,SIGNAL(clicked(QSeries*,QString)),this,SIGNAL(clicked(QSeries*,QString)));
+                        connect(marker,SIGNAL(rightClicked(QSeries*,QString)),this,SIGNAL(rightClicked(QSeries*,QString)));
                     }
                 }
             }
             void QLegend::layoutChanged()
             {
                 // Calculate layout for markers and text
                 if (mMarkers.count() <= 0) {
                     // Nothing to do
                     return;
                 }
                 // TODO: marker defined by series.
                 QSizeF markerSize(10,10);
                 // TODO: better layout, this is just concept.
                 // Leave some space around markers like this: | x x x x |
                 qreal steps = mMarkers.count();
                 qreal xStep = mBoundingRect.width() / steps;
                 qreal yStep = mBoundingRect.height() / steps;
                 qreal x = mBoundingRect.x() + 5;
                 qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2;
                 foreach (LegendMarker* m, mMarkers) {
                     qDebug() << "marker x:" << x;
                     qDebug() << "marker y:" << y;
                     m->setBoundingRect(QRectF(x,y,markerSize.width(),markerSize.height()));
                     x += xStep;
                 }
             }
             #include "moc_qlegend.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qlegend.h +3 0

             #ifndef QLEGEND_H
             #define QLEGEND_H
             #include "qchartglobal.h"
             #include "qseries.h"
             #include <QGraphicsObject>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Domain;
             class LegendMarker;
             class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsObject
             {
                 Q_OBJECT
             public:
                 explicit QLegend(QGraphicsItem *parent = 0);
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                 QRectF boundingRect() const;
                 void setBackgroundBrush(const QBrush& brush);
                 QBrush backgroundBrush() const;
             signals:
+                // for interactions.
+                void clicked(QSeries* series, QString name);
+                void rightClicked(QSeries* series, QString name);
             public slots:
                 void handleSeriesAdded(QSeries* series,Domain* domain);
                 void handleSeriesRemoved(QSeries* series);
                 void handleGeometryChanged(const QRectF& size);
             private:
                 void dataChanged();
                 void layoutChanged();
                 QRectF mBoundingRect;
                 QList<QSeries*> mSeriesList;
                 QList<LegendMarker*> mMarkers;
                 QBrush mBackgroundBrush;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QLEGEND_H

src/src.pro +4 -2

             !include( ../common.pri ):error( Couldn't find the common.pri file! )
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
                 chartdataset.cpp \
                 chartpresenter.cpp \
                 charttheme.cpp \
                 domain.cpp \
                 qchart.cpp \
                 qchartview.cpp \
                 qseries.cpp \
-                qlegend.cpp
+                qlegend.cpp \
+                legendmarker.cpp
             PRIVATE_HEADERS += \
                 chartdataset_p.h \
                 chartitem_p.h \
                 chartpresenter_p.h \
                 charttheme_p.h \
-                domain_p.h
+                domain_p.h \
+                legendmarker_p.h
             PUBLIC_HEADERS += \
                 qchart.h \
                 qchartglobal.h \
                 qseries.h \
                 qchartview.h \
                 qlegend.h
             include(animations/animations.pri)
             include(axis/axis.pri)
             include(xychart/xychart.pri)
             include(linechart/linechart.pri)
             include(areachart/areachart.pri)
             include(barchart/barchart.pri)
             include(piechart/piechart.pri)
             include(scatterseries/scatter.pri)
             include(splinechart/splinechart.pri)
             THEMES += themes/chartthemedefault_p.h \
                 themes/chartthemeicy_p.h \
                 themes/chartthemegrayscale_p.h \
                 themes/chartthemescientific_p.h \
                 themes/chartthemevanilla_p.h
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             INCLUDEPATH += linechart \
                 barchart \
                 themes \
                 .
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target \
                 public_headers
             install_build_public_headers.name = bild_public_headers
             install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_public_headers.input = PUBLIC_HEADERS
             install_build_public_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PUBLIC_HEADER_DIR
             install_build_public_headers.CONFIG += target_predeps \
                 no_link
             install_build_private_headers.name = bild_private_headers
             install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_private_headers.input = PRIVATE_HEADERS
             install_build_private_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PRIVATE_HEADER_DIR
             install_build_private_headers.CONFIG += target_predeps \
                 no_link
             QMAKE_EXTRA_COMPILERS += install_build_public_headers \
                 install_build_private_headers
             chartversion.target = qchartversion_p.h
             chartversion.commands = @echo \
                 "build_time" \
                 > \
                 $$chartversion.target;
             chartversion.depends = $$HEADERS \
                 $$SOURCES
             PRE_TARGETDEPS += qchartversion_p.h
             QMAKE_CLEAN += qchartversion_p.h
             QMAKE_EXTRA_TARGETS += chartversion
             unix:QMAKE_DISTCLEAN += -r \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR

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