@@ -1,121 +1,105 | |||||
1 | #include "qchartglobal.h" |
|
1 | #include "qchartglobal.h" | |
2 | #include "legendmarker_p.h" |
|
2 | #include "legendmarker_p.h" | |
3 | #include <QPainter> |
|
3 | #include <QPainter> | |
4 | #include <QGraphicsSceneEvent> |
|
4 | #include <QGraphicsSceneEvent> | |
5 |
|
5 | |||
6 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
6 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
7 |
|
7 | |||
8 | LegendMarker::LegendMarker(QSeries* series, QGraphicsItem *parent) |
|
8 | LegendMarker::LegendMarker(QSeries* series, QGraphicsItem *parent) | |
9 | : QGraphicsObject(parent) |
|
9 | : QGraphicsObject(parent) | |
10 | ,mBoundingRect(0,0,1,1) |
|
10 | ,mBoundingRect(0,0,1,1) | |
11 | ,mName("") |
|
11 | ,mName("") | |
12 | ,mSeries(series) |
|
12 | ,mSeries(series) | |
13 | ,mBarset(0) |
|
13 | ,mBarset(0) | |
14 | ,mPieslice(0) |
|
14 | ,mPieslice(0) | |
15 | ,mType(LegendMarkerTypeSeries) |
|
15 | ,mType(LegendMarkerTypeSeries) | |
16 | { |
|
16 | { | |
17 | setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); |
|
17 | setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); | |
18 | } |
|
18 | } | |
19 |
|
19 | |||
20 | LegendMarker::LegendMarker(QBarSet* barset, QGraphicsItem *parent) |
|
20 | LegendMarker::LegendMarker(QBarSet* barset, QGraphicsItem *parent) | |
21 | : QGraphicsObject(parent) |
|
21 | : QGraphicsObject(parent) | |
22 | ,mBoundingRect(0,0,1,1) |
|
22 | ,mBoundingRect(0,0,1,1) | |
23 | ,mName("") |
|
23 | ,mName("") | |
24 | ,mSeries(0) |
|
24 | ,mSeries(0) | |
25 | ,mBarset(barset) |
|
25 | ,mBarset(barset) | |
26 | ,mPieslice(0) |
|
26 | ,mPieslice(0) | |
27 | ,mType(LegendMarkerTypeBarset) |
|
27 | ,mType(LegendMarkerTypeBarset) | |
28 | { |
|
28 | { | |
29 | setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); |
|
29 | setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); | |
30 | } |
|
30 | } | |
31 |
|
31 | |||
32 | LegendMarker::LegendMarker(QPieSlice* pieslice, QGraphicsItem *parent) |
|
32 | LegendMarker::LegendMarker(QPieSlice* pieslice, QGraphicsItem *parent) | |
33 | : QGraphicsObject(parent) |
|
33 | : QGraphicsObject(parent) | |
34 | ,mBoundingRect(0,0,1,1) |
|
34 | ,mBoundingRect(0,0,1,1) | |
35 | ,mName("") |
|
35 | ,mName("") | |
36 | ,mSeries(0) |
|
36 | ,mSeries(0) | |
37 | ,mBarset(0) |
|
37 | ,mBarset(0) | |
38 | ,mPieslice(pieslice) |
|
38 | ,mPieslice(pieslice) | |
39 | ,mType(LegendMarkerTypePieslice) |
|
39 | ,mType(LegendMarkerTypePieslice) | |
40 | { |
|
40 | { | |
41 | setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); |
|
41 | setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); | |
42 | } |
|
42 | } | |
43 |
|
43 | |||
44 | void LegendMarker::setBoundingRect(const QRectF rect) |
|
44 | void LegendMarker::setBoundingRect(const QRectF rect) | |
45 | { |
|
45 | { | |
46 | mBoundingRect = rect; |
|
46 | mBoundingRect = rect; | |
47 | } |
|
47 | } | |
48 |
|
48 | |||
49 | void LegendMarker::setBrush(const QBrush brush) |
|
49 | void LegendMarker::setBrush(const QBrush brush) | |
50 | { |
|
50 | { | |
51 | mBrush = brush; |
|
51 | mBrush = brush; | |
52 | } |
|
52 | } | |
53 |
|
53 | |||
54 | QBrush LegendMarker::brush() const |
|
54 | QBrush LegendMarker::brush() const | |
55 | { |
|
55 | { | |
56 | return mBrush; |
|
56 | return mBrush; | |
57 | } |
|
57 | } | |
58 |
|
58 | |||
59 | void LegendMarker::setName(const QString name) |
|
59 | void LegendMarker::setName(const QString name) | |
60 | { |
|
60 | { | |
61 | mName = name; |
|
61 | mName = name; | |
62 | } |
|
62 | } | |
63 |
|
63 | |||
64 | QString LegendMarker::name() const |
|
64 | QString LegendMarker::name() const | |
65 | { |
|
65 | { | |
66 | return mName; |
|
66 | return mName; | |
67 | } |
|
67 | } | |
68 |
|
68 | |||
69 | void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) |
|
69 | void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) | |
70 | { |
|
70 | { | |
71 | painter->setBrush(mBrush); |
|
71 | painter->setBrush(mBrush); | |
72 | painter->drawRect(mBoundingRect); |
|
72 | painter->drawRect(mBoundingRect); | |
73 | } |
|
73 | } | |
74 |
|
74 | |||
75 | QRectF LegendMarker::boundingRect() const |
|
75 | QRectF LegendMarker::boundingRect() const | |
76 | { |
|
76 | { | |
77 | return mBoundingRect; |
|
77 | return mBoundingRect; | |
78 | } |
|
78 | } | |
79 |
|
79 | |||
80 | void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event) |
|
80 | void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event) | |
81 | { |
|
81 | { | |
82 | switch (mType) |
|
82 | switch (mType) | |
83 | { |
|
83 | { | |
84 | case LegendMarkerTypeSeries: { |
|
84 | case LegendMarkerTypeSeries: { | |
85 |
|
85 | emit clicked(mSeries,event->button()); | ||
86 | if (event->button() == Qt::LeftButton) { |
|
|||
87 | emit clicked(mSeries); |
|
|||
88 | } else if (event->button() == Qt::RightButton) { |
|
|||
89 | emit rightClicked(mSeries); |
|
|||
90 | } |
|
|||
91 | break; |
|
86 | break; | |
92 | } |
|
87 | } | |
93 | case LegendMarkerTypeBarset: { |
|
88 | case LegendMarkerTypeBarset: { | |
94 |
|
89 | emit clicked(mBarset,event->button()); | ||
95 | if (event->button() == Qt::LeftButton) { |
|
|||
96 | emit clicked(mBarset); |
|
|||
97 | } else if (event->button() == Qt::RightButton) { |
|
|||
98 | emit rightClicked(mBarset); |
|
|||
99 | } |
|
|||
100 | break; |
|
90 | break; | |
101 | } |
|
91 | } | |
102 |
|
||||
103 | case LegendMarkerTypePieslice: { |
|
92 | case LegendMarkerTypePieslice: { | |
104 |
|
93 | emit clicked(mPieslice,event->button()); | ||
105 | if (event->button() == Qt::LeftButton) { |
|
|||
106 | emit clicked(mPieslice); |
|
|||
107 | } else if (event->button() == Qt::RightButton) { |
|
|||
108 | emit rightClicked(mPieslice); |
|
|||
109 | } |
|
|||
110 | break; |
|
94 | break; | |
111 | } |
|
95 | } | |
112 | default: { |
|
96 | default: { | |
113 | break; |
|
97 | break; | |
114 | } |
|
98 | } | |
115 | } |
|
99 | } | |
116 |
|
100 | |||
117 | } |
|
101 | } | |
118 |
|
102 | |||
119 | #include "moc_legendmarker_p.cpp" |
|
103 | #include "moc_legendmarker_p.cpp" | |
120 |
|
104 | |||
121 | QTCOMMERCIALCHART_END_NAMESPACE |
|
105 | QTCOMMERCIALCHART_END_NAMESPACE |
@@ -1,65 +1,62 | |||||
1 | #ifndef LEGENDMARKER_P_H |
|
1 | #ifndef LEGENDMARKER_P_H | |
2 | #define LEGENDMARKER_P_H |
|
2 | #define LEGENDMARKER_P_H | |
3 |
|
3 | |||
4 | #include "qchartglobal.h" |
|
4 | #include "qchartglobal.h" | |
5 | #include <QGraphicsObject> |
|
5 | #include <QGraphicsObject> | |
6 | #include <QBrush> |
|
6 | #include <QBrush> | |
7 |
|
7 | |||
8 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
8 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
9 |
|
9 | |||
10 | class QSeries; |
|
10 | class QSeries; | |
11 | class QBarSet; |
|
11 | class QBarSet; | |
12 | class QPieSlice; |
|
12 | class QPieSlice; | |
13 |
|
13 | |||
14 | // TODO: split this to 3 different markers for series, barset and pieslice. Current implementation is easier to misuse... |
|
14 | // TODO: split this to 3 different markers for series, barset and pieslice. Current implementation is easier to misuse... | |
15 | class LegendMarker : public QGraphicsObject |
|
15 | class LegendMarker : public QGraphicsObject | |
16 | { |
|
16 | { | |
17 | Q_OBJECT |
|
17 | Q_OBJECT | |
18 |
|
18 | |||
19 | enum LegendMarkerType { |
|
19 | enum LegendMarkerType { | |
20 | LegendMarkerTypeSeries, |
|
20 | LegendMarkerTypeSeries, | |
21 | LegendMarkerTypeBarset, |
|
21 | LegendMarkerTypeBarset, | |
22 | LegendMarkerTypePieslice |
|
22 | LegendMarkerTypePieslice | |
23 | }; |
|
23 | }; | |
24 |
|
24 | |||
25 | public: |
|
25 | public: | |
26 | LegendMarker(QSeries* series, QGraphicsItem *parent = 0); |
|
26 | LegendMarker(QSeries* series, QGraphicsItem *parent = 0); | |
27 | LegendMarker(QBarSet* barset, QGraphicsItem *parent = 0); |
|
27 | LegendMarker(QBarSet* barset, QGraphicsItem *parent = 0); | |
28 | LegendMarker(QPieSlice* pieslice, QGraphicsItem *parent = 0); |
|
28 | LegendMarker(QPieSlice* pieslice, QGraphicsItem *parent = 0); | |
29 | void setBoundingRect(const QRectF rect); |
|
29 | void setBoundingRect(const QRectF rect); | |
30 |
|
30 | |||
31 | void setBrush(const QBrush brush); |
|
31 | void setBrush(const QBrush brush); | |
32 | QBrush brush() const; |
|
32 | QBrush brush() const; | |
33 |
|
33 | |||
34 | void setName(const QString name); |
|
34 | void setName(const QString name); | |
35 | QString name() const; |
|
35 | QString name() const; | |
36 |
|
36 | |||
37 | void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); |
|
37 | void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); | |
38 |
|
38 | |||
39 | QRectF boundingRect() const; |
|
39 | QRectF boundingRect() const; | |
40 |
|
40 | |||
41 | public: |
|
41 | public: | |
42 | // From QGraphicsObject |
|
42 | // From QGraphicsObject | |
43 | void mousePressEvent(QGraphicsSceneMouseEvent *event); |
|
43 | void mousePressEvent(QGraphicsSceneMouseEvent *event); | |
44 |
|
44 | |||
45 | Q_SIGNALS: |
|
45 | Q_SIGNALS: | |
46 | void clicked(QSeries* series); |
|
46 | void clicked(QSeries* series, Qt::MouseButton button); | |
47 | void rightClicked(QSeries* series); |
|
47 | void clicked(QBarSet* barset, Qt::MouseButton button); | |
48 | void clicked(QBarSet* barset); |
|
48 | void clicked(QPieSlice* pieslice, Qt::MouseButton button); | |
49 | void rightClicked(QBarSet* barset); |
|
|||
50 | void clicked(QPieSlice* pieslice); |
|
|||
51 | void rightClicked(QPieSlice* pieslice); |
|
|||
52 |
|
49 | |||
53 | private: |
|
50 | private: | |
54 | QRectF mBoundingRect; |
|
51 | QRectF mBoundingRect; | |
55 | QBrush mBrush; |
|
52 | QBrush mBrush; | |
56 | QString mName; |
|
53 | QString mName; | |
57 | QSeries* mSeries; |
|
54 | QSeries* mSeries; | |
58 | QBarSet* mBarset; |
|
55 | QBarSet* mBarset; | |
59 | QPieSlice* mPieslice; |
|
56 | QPieSlice* mPieslice; | |
60 |
|
57 | |||
61 | LegendMarkerType mType; |
|
58 | LegendMarkerType mType; | |
62 | }; |
|
59 | }; | |
63 |
|
60 | |||
64 | QTCOMMERCIALCHART_END_NAMESPACE |
|
61 | QTCOMMERCIALCHART_END_NAMESPACE | |
65 | #endif // LEGENDMARKER_P_H |
|
62 | #endif // LEGENDMARKER_P_H |
@@ -1,206 +1,203 | |||||
1 | #include "qchartglobal.h" |
|
1 | #include "qchartglobal.h" | |
2 | #include "qlegend.h" |
|
2 | #include "qlegend.h" | |
3 | #include "qseries.h" |
|
3 | #include "qseries.h" | |
4 | #include "legendmarker_p.h" |
|
4 | #include "legendmarker_p.h" | |
5 | #include "qxyseries.h" |
|
5 | #include "qxyseries.h" | |
6 | #include "qlineseries.h" |
|
6 | #include "qlineseries.h" | |
7 | #include "qareaseries.h" |
|
7 | #include "qareaseries.h" | |
8 | #include "qscatterseries.h" |
|
8 | #include "qscatterseries.h" | |
9 | #include "qsplineseries.h" |
|
9 | #include "qsplineseries.h" | |
10 | #include "qbarseries.h" |
|
10 | #include "qbarseries.h" | |
11 | #include "qstackedbarseries.h" |
|
11 | #include "qstackedbarseries.h" | |
12 | #include "qpercentbarseries.h" |
|
12 | #include "qpercentbarseries.h" | |
13 | #include "qbarset.h" |
|
13 | #include "qbarset.h" | |
14 | #include "qpieseries.h" |
|
14 | #include "qpieseries.h" | |
15 | #include "qpieslice.h" |
|
15 | #include "qpieslice.h" | |
16 | #include <QPainter> |
|
16 | #include <QPainter> | |
17 | #include <QPen> |
|
17 | #include <QPen> | |
18 |
|
18 | |||
19 | #include <QGraphicsSceneEvent> |
|
19 | #include <QGraphicsSceneEvent> | |
20 |
|
20 | |||
21 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
21 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
22 |
|
22 | |||
23 | QLegend::QLegend(QGraphicsItem *parent) |
|
23 | QLegend::QLegend(QGraphicsItem *parent) | |
24 | : QGraphicsObject(parent) |
|
24 | : QGraphicsObject(parent) | |
25 | ,mBoundingRect(0,0,1,1) |
|
25 | ,mBoundingRect(0,0,1,1) | |
26 | ,mBackgroundBrush(Qt::darkGray) // TODO: from theme? |
|
26 | ,mBackgroundBrush(Qt::darkGray) // TODO: from theme? | |
27 | { |
|
27 | { | |
28 | } |
|
28 | } | |
29 |
|
29 | |||
30 | void QLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) |
|
30 | void QLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) | |
31 | { |
|
31 | { | |
32 | painter->setBrush(mBackgroundBrush); |
|
32 | painter->setBrush(mBackgroundBrush); | |
33 | painter->drawRect(mBoundingRect); |
|
33 | painter->drawRect(mBoundingRect); | |
34 |
|
34 | |||
35 | foreach(LegendMarker* m, mMarkers) { |
|
35 | foreach(LegendMarker* m, mMarkers) { | |
36 | QRectF r = m->boundingRect(); |
|
36 | QRectF r = m->boundingRect(); | |
37 | painter->setBrush(m->brush()); |
|
37 | painter->setBrush(m->brush()); | |
38 | painter->drawText(r.x() + r.width()*2, r.y() + r.height(), m->name()); |
|
38 | painter->drawText(r.x() + r.width()*2, r.y() + r.height(), m->name()); | |
39 | } |
|
39 | } | |
40 | } |
|
40 | } | |
41 |
|
41 | |||
42 | QRectF QLegend::boundingRect() const |
|
42 | QRectF QLegend::boundingRect() const | |
43 | { |
|
43 | { | |
44 | return mBoundingRect; |
|
44 | return mBoundingRect; | |
45 | } |
|
45 | } | |
46 |
|
46 | |||
47 | void QLegend::setBackgroundBrush(const QBrush& brush) |
|
47 | void QLegend::setBackgroundBrush(const QBrush& brush) | |
48 | { |
|
48 | { | |
49 | mBackgroundBrush = brush; |
|
49 | mBackgroundBrush = brush; | |
50 | } |
|
50 | } | |
51 |
|
51 | |||
52 | QBrush QLegend::backgroundBrush() const |
|
52 | QBrush QLegend::backgroundBrush() const | |
53 | { |
|
53 | { | |
54 | return mBackgroundBrush; |
|
54 | return mBackgroundBrush; | |
55 | } |
|
55 | } | |
56 |
|
56 | |||
57 | void QLegend::handleSeriesAdded(QSeries* series,Domain* domain) |
|
57 | void QLegend::handleSeriesAdded(QSeries* series,Domain* domain) | |
58 | { |
|
58 | { | |
59 | mSeriesList.append(series); |
|
59 | mSeriesList.append(series); | |
60 |
|
60 | |||
61 | switch (series->type()) |
|
61 | switch (series->type()) | |
62 | { |
|
62 | { | |
63 | case QSeries::SeriesTypeLine: { |
|
63 | case QSeries::SeriesTypeLine: { | |
64 |
|
64 | |||
65 | QLineSeries* lineSeries = static_cast<QLineSeries*>(series); |
|
65 | QLineSeries* lineSeries = static_cast<QLineSeries*>(series); | |
66 | createMarker(lineSeries); |
|
66 | createMarker(lineSeries); | |
67 | break; |
|
67 | break; | |
68 | } |
|
68 | } | |
69 | case QSeries::SeriesTypeArea: { |
|
69 | case QSeries::SeriesTypeArea: { | |
70 |
|
70 | |||
71 | QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series); |
|
71 | QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series); | |
72 | createMarker(areaSeries->upperSeries()); |
|
72 | createMarker(areaSeries->upperSeries()); | |
73 | createMarker(areaSeries->lowerSeries()); |
|
73 | createMarker(areaSeries->lowerSeries()); | |
74 | break; |
|
74 | break; | |
75 | } |
|
75 | } | |
76 |
|
76 | |||
77 | case QSeries::SeriesTypeBar: { |
|
77 | case QSeries::SeriesTypeBar: { | |
78 |
|
78 | |||
79 | QBarSeries* barSeries = static_cast<QBarSeries*>(series); |
|
79 | QBarSeries* barSeries = static_cast<QBarSeries*>(series); | |
80 | createMarkers(barSeries); |
|
80 | createMarkers(barSeries); | |
81 | break; |
|
81 | break; | |
82 | } |
|
82 | } | |
83 |
|
83 | |||
84 | case QSeries::SeriesTypeStackedBar: { |
|
84 | case QSeries::SeriesTypeStackedBar: { | |
85 |
|
85 | |||
86 | QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series); |
|
86 | QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series); | |
87 | createMarkers(stackedBarSeries); |
|
87 | createMarkers(stackedBarSeries); | |
88 | break; |
|
88 | break; | |
89 | } |
|
89 | } | |
90 |
|
90 | |||
91 | case QSeries::SeriesTypePercentBar: { |
|
91 | case QSeries::SeriesTypePercentBar: { | |
92 |
|
92 | |||
93 | QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series); |
|
93 | QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series); | |
94 | createMarkers(percentBarSeries); |
|
94 | createMarkers(percentBarSeries); | |
95 | break; |
|
95 | break; | |
96 | } |
|
96 | } | |
97 |
|
97 | |||
98 | case QSeries::SeriesTypeScatter: { |
|
98 | case QSeries::SeriesTypeScatter: { | |
99 |
|
99 | |||
100 | QScatterSeries *scatterSeries = static_cast<QScatterSeries *>(series); |
|
100 | QScatterSeries *scatterSeries = static_cast<QScatterSeries *>(series); | |
101 | createMarker(scatterSeries); |
|
101 | createMarker(scatterSeries); | |
102 | break; |
|
102 | break; | |
103 | } |
|
103 | } | |
104 |
|
104 | |||
105 | case QSeries::SeriesTypePie: { |
|
105 | case QSeries::SeriesTypePie: { | |
106 |
|
106 | |||
107 | QPieSeries *pieSeries = static_cast<QPieSeries *>(series); |
|
107 | QPieSeries *pieSeries = static_cast<QPieSeries *>(series); | |
108 | createMarkers(pieSeries); |
|
108 | createMarkers(pieSeries); | |
109 | break; |
|
109 | break; | |
110 | } |
|
110 | } | |
111 |
|
111 | |||
112 | case QSeries::SeriesTypeSpline: { |
|
112 | case QSeries::SeriesTypeSpline: { | |
113 |
|
113 | |||
114 | QSplineSeries* splineSeries = static_cast<QSplineSeries*>(series); |
|
114 | QSplineSeries* splineSeries = static_cast<QSplineSeries*>(series); | |
115 | break; |
|
115 | break; | |
116 | } |
|
116 | } | |
117 | default: { |
|
117 | default: { | |
118 | qDebug()<< "QLegend::handleSeriesAdded" << series->type() << "not implemented."; |
|
118 | qDebug()<< "QLegend::handleSeriesAdded" << series->type() << "not implemented."; | |
119 | break; |
|
119 | break; | |
120 | } |
|
120 | } | |
121 | } |
|
121 | } | |
122 |
|
122 | |||
123 | layoutChanged(); |
|
123 | layoutChanged(); | |
124 | } |
|
124 | } | |
125 |
|
125 | |||
126 | void QLegend::handleSeriesRemoved(QSeries* series) |
|
126 | void QLegend::handleSeriesRemoved(QSeries* series) | |
127 | { |
|
127 | { | |
128 | // TODO: delete markers, disconnect. |
|
128 | // TODO: delete markers, disconnect. | |
129 | mSeriesList.removeOne(series); |
|
129 | mSeriesList.removeOne(series); | |
130 | layoutChanged(); |
|
130 | layoutChanged(); | |
131 | } |
|
131 | } | |
132 |
|
132 | |||
133 | void QLegend::handleGeometryChanged(const QRectF& size) |
|
133 | void QLegend::handleGeometryChanged(const QRectF& size) | |
134 | { |
|
134 | { | |
135 | mBoundingRect = size; |
|
135 | mBoundingRect = size; | |
136 | layoutChanged(); |
|
136 | layoutChanged(); | |
137 | } |
|
137 | } | |
138 |
|
138 | |||
139 | void QLegend::createMarker(QXYSeries* series) |
|
139 | void QLegend::createMarker(QXYSeries* series) | |
140 | { |
|
140 | { | |
141 | LegendMarker* marker = new LegendMarker(series,this); |
|
141 | LegendMarker* marker = new LegendMarker(series,this); | |
142 | marker->setName(series->name()); |
|
142 | marker->setName(series->name()); | |
143 | marker->setBrush(series->brush()); |
|
143 | marker->setBrush(series->brush()); | |
144 |
connect(marker,SIGNAL(clicked(QSeries*)),this,SIGNAL( |
|
144 | connect(marker,SIGNAL(clicked(QSeries*,Qt::MouseButton)),this,SIGNAL(clicked(QSeries*,Qt::MouseButton))); | |
145 | connect(marker,SIGNAL(rightClicked(QSeries*)),this,SIGNAL(markerRightClicked(QSeries*))); |
|
|||
146 | mMarkers.append(marker); |
|
145 | mMarkers.append(marker); | |
147 | childItems().append(marker); |
|
146 | childItems().append(marker); | |
148 | } |
|
147 | } | |
149 |
|
148 | |||
150 | void QLegend::createMarkers(QBarSeries *series) |
|
149 | void QLegend::createMarkers(QBarSeries *series) | |
151 | { |
|
150 | { | |
152 | foreach(QBarSet* s, series->barSets()) { |
|
151 | foreach(QBarSet* s, series->barSets()) { | |
153 | LegendMarker* marker = new LegendMarker(series,this); |
|
152 | LegendMarker* marker = new LegendMarker(series,this); | |
154 | marker->setName(s->name()); |
|
153 | marker->setName(s->name()); | |
155 | marker->setBrush(s->brush()); |
|
154 | marker->setBrush(s->brush()); | |
156 |
connect(marker,SIGNAL(clicked(QBarSet*)),this,SIGNAL( |
|
155 | connect(marker,SIGNAL(clicked(QBarSet*,Qt::MouseButton)),this,SIGNAL(clicked(QBarSet*,Qt::MouseButton))); | |
157 | connect(marker,SIGNAL(rightClicked(QBarSet*)),this,SIGNAL(markerRightClicked(QBarSet*))); |
|
|||
158 | mMarkers.append(marker); |
|
156 | mMarkers.append(marker); | |
159 | childItems().append(marker); |
|
157 | childItems().append(marker); | |
160 | } |
|
158 | } | |
161 | } |
|
159 | } | |
162 |
|
160 | |||
163 | void QLegend::createMarkers(QPieSeries *series) |
|
161 | void QLegend::createMarkers(QPieSeries *series) | |
164 | { |
|
162 | { | |
165 | foreach(QPieSlice* s, series->slices()) { |
|
163 | foreach(QPieSlice* s, series->slices()) { | |
166 | LegendMarker* marker = new LegendMarker(series,this); |
|
164 | LegendMarker* marker = new LegendMarker(series,this); | |
167 | marker->setName(s->label()); |
|
165 | marker->setName(s->label()); | |
168 | marker->setBrush(s->sliceBrush()); |
|
166 | marker->setBrush(s->sliceBrush()); | |
169 |
connect(marker,SIGNAL(clicked(QPieSlice*)),this,SIGNAL( |
|
167 | connect(marker,SIGNAL(clicked(QPieSlice*,Qt::MouseButton)),this,SIGNAL(clicked(QPieSlice*,Qt::MouseButton))); | |
170 | connect(marker,SIGNAL(rightClicked(QPieSlice*)),this,SIGNAL(markerRightClicked(QPieSlice*))); |
|
|||
171 | mMarkers.append(marker); |
|
168 | mMarkers.append(marker); | |
172 | childItems().append(marker); |
|
169 | childItems().append(marker); | |
173 | } |
|
170 | } | |
174 | } |
|
171 | } | |
175 |
|
172 | |||
176 | void QLegend::layoutChanged() |
|
173 | void QLegend::layoutChanged() | |
177 | { |
|
174 | { | |
178 | // Calculate layout for markers and text |
|
175 | // Calculate layout for markers and text | |
179 | if (mMarkers.count() <= 0) { |
|
176 | if (mMarkers.count() <= 0) { | |
180 | // Nothing to do |
|
177 | // Nothing to do | |
181 | return; |
|
178 | return; | |
182 | } |
|
179 | } | |
183 |
|
180 | |||
184 | // TODO: marker defined by series. |
|
181 | // TODO: marker defined by series. | |
185 | QSizeF markerSize(10,10); |
|
182 | QSizeF markerSize(10,10); | |
186 |
|
183 | |||
187 | // TODO: better layout, this is just concept. |
|
184 | // TODO: better layout, this is just concept. | |
188 | // Leave some space around markers like this: | x x x x | |
|
185 | // Leave some space around markers like this: | x x x x | | |
189 | qreal steps = mMarkers.count(); |
|
186 | qreal steps = mMarkers.count(); | |
190 |
|
187 | |||
191 | qreal xStep = mBoundingRect.width() / steps; |
|
188 | qreal xStep = mBoundingRect.width() / steps; | |
192 | qreal yStep = mBoundingRect.height() / steps; |
|
189 | qreal yStep = mBoundingRect.height() / steps; | |
193 | qreal x = mBoundingRect.x() + 5; |
|
190 | qreal x = mBoundingRect.x() + 5; | |
194 | qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2; |
|
191 | qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2; | |
195 | foreach (LegendMarker* m, mMarkers) { |
|
192 | foreach (LegendMarker* m, mMarkers) { | |
196 | qDebug() << "marker x:" << x; |
|
193 | qDebug() << "marker x:" << x; | |
197 | qDebug() << "marker y:" << y; |
|
194 | qDebug() << "marker y:" << y; | |
198 | m->setBoundingRect(QRectF(x,y,markerSize.width(),markerSize.height())); |
|
195 | m->setBoundingRect(QRectF(x,y,markerSize.width(),markerSize.height())); | |
199 | x += xStep; |
|
196 | x += xStep; | |
200 | } |
|
197 | } | |
201 | } |
|
198 | } | |
202 |
|
199 | |||
203 |
|
200 | |||
204 |
|
201 | |||
205 | #include "moc_qlegend.cpp" |
|
202 | #include "moc_qlegend.cpp" | |
206 | QTCOMMERCIALCHART_END_NAMESPACE |
|
203 | QTCOMMERCIALCHART_END_NAMESPACE |
@@ -1,63 +1,60 | |||||
1 | #ifndef QLEGEND_H |
|
1 | #ifndef QLEGEND_H | |
2 | #define QLEGEND_H |
|
2 | #define QLEGEND_H | |
3 |
|
3 | |||
4 | #include "qchartglobal.h" |
|
4 | #include "qchartglobal.h" | |
5 | #include "qseries.h" |
|
5 | #include "qseries.h" | |
6 | #include <QGraphicsObject> |
|
6 | #include <QGraphicsObject> | |
7 |
|
7 | |||
8 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
8 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
9 |
|
9 | |||
10 | class Domain; |
|
10 | class Domain; | |
11 | class LegendMarker; |
|
11 | class LegendMarker; | |
12 | class QPieSlice; |
|
12 | class QPieSlice; | |
13 | class QXYSeries; |
|
13 | class QXYSeries; | |
14 | class QBarSet; |
|
14 | class QBarSet; | |
15 | class QBarSeries; |
|
15 | class QBarSeries; | |
16 | class QPieSeries; |
|
16 | class QPieSeries; | |
17 |
|
17 | |||
18 | class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsObject |
|
18 | class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsObject | |
19 | { |
|
19 | { | |
20 | Q_OBJECT |
|
20 | Q_OBJECT | |
21 | public: |
|
21 | public: | |
22 |
|
22 | |||
23 | explicit QLegend(QGraphicsItem *parent = 0); |
|
23 | explicit QLegend(QGraphicsItem *parent = 0); | |
24 |
|
24 | |||
25 | void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); |
|
25 | void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); | |
26 | QRectF boundingRect() const; |
|
26 | QRectF boundingRect() const; | |
27 |
|
27 | |||
28 | void setBackgroundBrush(const QBrush& brush); |
|
28 | void setBackgroundBrush(const QBrush& brush); | |
29 | QBrush backgroundBrush() const; |
|
29 | QBrush backgroundBrush() const; | |
30 |
|
30 | |||
31 | signals: |
|
31 | signals: | |
32 | // for interactions. |
|
32 | // for interactions. | |
33 | void clicked(QSeries* series); |
|
33 | void clicked(QSeries* series, Qt::MouseButton button); | |
34 | void rightClicked(QSeries* series); |
|
34 | void clicked(QBarSet* barset, Qt::MouseButton button); | |
35 | void clicked(QBarSet* barset); |
|
35 | void clicked(QPieSlice* slice, Qt::MouseButton button); | |
36 | void rightClicked(QBarSet* series); |
|
|||
37 | void clicked(QPieSlice* slice); |
|
|||
38 | void rightClicked(QPieSlice* series); |
|
|||
39 |
|
36 | |||
40 | public slots: |
|
37 | public slots: | |
41 | void handleSeriesAdded(QSeries* series,Domain* domain); |
|
38 | void handleSeriesAdded(QSeries* series,Domain* domain); | |
42 | void handleSeriesRemoved(QSeries* series); |
|
39 | void handleSeriesRemoved(QSeries* series); | |
43 | void handleGeometryChanged(const QRectF& size); |
|
40 | void handleGeometryChanged(const QRectF& size); | |
44 |
|
41 | |||
45 | private: |
|
42 | private: | |
46 | // PIMPL ---> |
|
43 | // PIMPL ---> | |
47 | void createMarker(QXYSeries* series); |
|
44 | void createMarker(QXYSeries* series); | |
48 | void createMarkers(QBarSeries* series); |
|
45 | void createMarkers(QBarSeries* series); | |
49 | void createMarkers(QPieSeries* series); |
|
46 | void createMarkers(QPieSeries* series); | |
50 | void layoutChanged(); |
|
47 | void layoutChanged(); | |
51 | // <--- PIMPL |
|
48 | // <--- PIMPL | |
52 |
|
49 | |||
53 |
|
50 | |||
54 | QRectF mBoundingRect; |
|
51 | QRectF mBoundingRect; | |
55 | QList<QSeries*> mSeriesList; |
|
52 | QList<QSeries*> mSeriesList; | |
56 | QList<LegendMarker*> mMarkers; |
|
53 | QList<LegendMarker*> mMarkers; | |
57 |
|
54 | |||
58 | QBrush mBackgroundBrush; |
|
55 | QBrush mBackgroundBrush; | |
59 | }; |
|
56 | }; | |
60 |
|
57 | |||
61 | QTCOMMERCIALCHART_END_NAMESPACE |
|
58 | QTCOMMERCIALCHART_END_NAMESPACE | |
62 |
|
59 | |||
63 | #endif // QLEGEND_H |
|
60 | #endif // QLEGEND_H |
General Comments 0
You need to be logged in to leave comments.
Login now