@@ -82,31 +82,15 void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event) | |||
|
82 | 82 | switch (mType) |
|
83 | 83 | { |
|
84 | 84 | case LegendMarkerTypeSeries: { |
|
85 | ||
|
86 | if (event->button() == Qt::LeftButton) { | |
|
87 | emit clicked(mSeries); | |
|
88 | } else if (event->button() == Qt::RightButton) { | |
|
89 | emit rightClicked(mSeries); | |
|
90 | } | |
|
85 | emit clicked(mSeries,event->button()); | |
|
91 | 86 | break; |
|
92 | 87 | } |
|
93 | 88 | case LegendMarkerTypeBarset: { |
|
94 | ||
|
95 | if (event->button() == Qt::LeftButton) { | |
|
96 | emit clicked(mBarset); | |
|
97 | } else if (event->button() == Qt::RightButton) { | |
|
98 | emit rightClicked(mBarset); | |
|
99 | } | |
|
89 | emit clicked(mBarset,event->button()); | |
|
100 | 90 | break; |
|
101 | 91 | } |
|
102 | ||
|
103 | 92 | case LegendMarkerTypePieslice: { |
|
104 | ||
|
105 | if (event->button() == Qt::LeftButton) { | |
|
106 | emit clicked(mPieslice); | |
|
107 | } else if (event->button() == Qt::RightButton) { | |
|
108 | emit rightClicked(mPieslice); | |
|
109 | } | |
|
93 | emit clicked(mPieslice,event->button()); | |
|
110 | 94 | break; |
|
111 | 95 | } |
|
112 | 96 | default: { |
@@ -43,12 +43,9 public: | |||
|
43 | 43 | void mousePressEvent(QGraphicsSceneMouseEvent *event); |
|
44 | 44 | |
|
45 | 45 | Q_SIGNALS: |
|
46 | void clicked(QSeries* series); | |
|
47 | void rightClicked(QSeries* series); | |
|
48 | void clicked(QBarSet* barset); | |
|
49 | void rightClicked(QBarSet* barset); | |
|
50 | void clicked(QPieSlice* pieslice); | |
|
51 | void rightClicked(QPieSlice* pieslice); | |
|
46 | void clicked(QSeries* series, Qt::MouseButton button); | |
|
47 | void clicked(QBarSet* barset, Qt::MouseButton button); | |
|
48 | void clicked(QPieSlice* pieslice, Qt::MouseButton button); | |
|
52 | 49 | |
|
53 | 50 | private: |
|
54 | 51 | QRectF mBoundingRect; |
@@ -141,8 +141,7 void QLegend::createMarker(QXYSeries* series) | |||
|
141 | 141 | LegendMarker* marker = new LegendMarker(series,this); |
|
142 | 142 | marker->setName(series->name()); |
|
143 | 143 | marker->setBrush(series->brush()); |
|
144 |
connect(marker,SIGNAL(clicked(QSeries*)),this,SIGNAL( |
|
|
145 | connect(marker,SIGNAL(rightClicked(QSeries*)),this,SIGNAL(markerRightClicked(QSeries*))); | |
|
144 | connect(marker,SIGNAL(clicked(QSeries*,Qt::MouseButton)),this,SIGNAL(clicked(QSeries*,Qt::MouseButton))); | |
|
146 | 145 | mMarkers.append(marker); |
|
147 | 146 | childItems().append(marker); |
|
148 | 147 | } |
@@ -153,8 +152,7 void QLegend::createMarkers(QBarSeries *series) | |||
|
153 | 152 | LegendMarker* marker = new LegendMarker(series,this); |
|
154 | 153 | marker->setName(s->name()); |
|
155 | 154 | marker->setBrush(s->brush()); |
|
156 |
connect(marker,SIGNAL(clicked(QBarSet*)),this,SIGNAL( |
|
|
157 | connect(marker,SIGNAL(rightClicked(QBarSet*)),this,SIGNAL(markerRightClicked(QBarSet*))); | |
|
155 | connect(marker,SIGNAL(clicked(QBarSet*,Qt::MouseButton)),this,SIGNAL(clicked(QBarSet*,Qt::MouseButton))); | |
|
158 | 156 | mMarkers.append(marker); |
|
159 | 157 | childItems().append(marker); |
|
160 | 158 | } |
@@ -166,8 +164,7 void QLegend::createMarkers(QPieSeries *series) | |||
|
166 | 164 | LegendMarker* marker = new LegendMarker(series,this); |
|
167 | 165 | marker->setName(s->label()); |
|
168 | 166 | marker->setBrush(s->sliceBrush()); |
|
169 |
connect(marker,SIGNAL(clicked(QPieSlice*)),this,SIGNAL( |
|
|
170 | connect(marker,SIGNAL(rightClicked(QPieSlice*)),this,SIGNAL(markerRightClicked(QPieSlice*))); | |
|
167 | connect(marker,SIGNAL(clicked(QPieSlice*,Qt::MouseButton)),this,SIGNAL(clicked(QPieSlice*,Qt::MouseButton))); | |
|
171 | 168 | mMarkers.append(marker); |
|
172 | 169 | childItems().append(marker); |
|
173 | 170 | } |
@@ -30,12 +30,9 public: | |||
|
30 | 30 | |
|
31 | 31 | signals: |
|
32 | 32 | // for interactions. |
|
33 | void clicked(QSeries* series); | |
|
34 | void rightClicked(QSeries* series); | |
|
35 | void clicked(QBarSet* barset); | |
|
36 | void rightClicked(QBarSet* series); | |
|
37 | void clicked(QPieSlice* slice); | |
|
38 | void rightClicked(QPieSlice* series); | |
|
33 | void clicked(QSeries* series, Qt::MouseButton button); | |
|
34 | void clicked(QBarSet* barset, Qt::MouseButton button); | |
|
35 | void clicked(QPieSlice* slice, Qt::MouseButton button); | |
|
39 | 36 | |
|
40 | 37 | public slots: |
|
41 | 38 | void handleSeriesAdded(QSeries* series,Domain* domain); |
General Comments 0
You need to be logged in to leave comments.
Login now