diff --git a/src/legendmarker.cpp b/src/legendmarker.cpp index d4dfe98..30189e8 100644 --- a/src/legendmarker.cpp +++ b/src/legendmarker.cpp @@ -10,87 +10,87 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE LegendMarker::LegendMarker(QSeries *series, QGraphicsItem *parent) : QGraphicsObject(parent), - mPos(0,0), - mSize(0,0), - mBoundingRect(0,0,0,0), - mMarkerBoundingRect(0,0,0,0), - mSeries(series), - mBarset(0), - mPieslice(0), - mType(LegendMarkerTypeSeries), - mTextItem(new QGraphicsSimpleTextItem(this)) + m_pos(0,0), + m_size(0,0), + m_boundingRect(0,0,0,0), + m_markerBoundingRect(0,0,0,0), + m_series(series), + m_barset(0), + m_pieslice(0), + m_type(LegendMarkerTypeSeries), + m_textItem(new QGraphicsSimpleTextItem(this)) { setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); } LegendMarker::LegendMarker(QSeries *series, QBarSet *barset, QGraphicsItem *parent) : QGraphicsObject(parent), - mPos(0,0), - mSize(0,0), - mBoundingRect(0,0,0,0), - mMarkerBoundingRect(0,0,0,0), - mSeries(series), - mBarset(barset), - mPieslice(0), - mType(LegendMarkerTypeBarset), - mTextItem(new QGraphicsSimpleTextItem(this)) + m_pos(0,0), + m_size(0,0), + m_boundingRect(0,0,0,0), + m_markerBoundingRect(0,0,0,0), + m_series(series), + m_barset(barset), + m_pieslice(0), + m_type(LegendMarkerTypeBarset), + m_textItem(new QGraphicsSimpleTextItem(this)) { setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); } LegendMarker::LegendMarker(QSeries *series, QPieSlice *pieslice, QGraphicsItem *parent) : QGraphicsObject(parent), - mPos(0,0), - mSize(0,0), - mBoundingRect(0,0,0,0), - mMarkerBoundingRect(0,0,0,0), - mSeries(series), - mBarset(0), - mPieslice(pieslice), - mType(LegendMarkerTypePieslice), - mTextItem(new QGraphicsSimpleTextItem(this)) + m_pos(0,0), + m_size(0,0), + m_boundingRect(0,0,0,0), + m_markerBoundingRect(0,0,0,0), + m_series(series), + m_barset(0), + m_pieslice(pieslice), + m_type(LegendMarkerTypePieslice), + m_textItem(new QGraphicsSimpleTextItem(this)) { setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); } void LegendMarker::setPos(qreal x, qreal y) { - mPos = QPointF(x,y); + m_pos = QPointF(x,y); layoutChanged(); } void LegendMarker::setPen(const QPen &pen) { - mPen = pen; + m_pen = pen; } QPen LegendMarker::pen() const { - return mPen; + return m_pen; } void LegendMarker::setBrush(const QBrush &brush) { - mBrush = brush; + m_brush = brush; } QBrush LegendMarker::brush() const { - return mBrush; + return m_brush; } void LegendMarker::setName(const QString name) { - mTextItem.setText(name); + m_textItem->setText(name); layoutChanged(); } QString LegendMarker::name() const { - return mTextItem.text(); + return m_textItem->text(); } QSeries* LegendMarker::series() const { - return mSeries; + return m_series; } void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) @@ -98,14 +98,14 @@ void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti Q_UNUSED(option) Q_UNUSED(widget) - painter->setPen(mPen); - painter->setBrush(mBrush); - painter->drawRect(mMarkerBoundingRect); + painter->setPen(m_pen); + painter->setBrush(m_brush); + painter->drawRect(m_markerBoundingRect); } QRectF LegendMarker::boundingRect() const { - return mBoundingRect; + return m_boundingRect; } void LegendMarker::layoutChanged() @@ -113,30 +113,30 @@ void LegendMarker::layoutChanged() QSizeF markerSize(10,10); qreal margin = 2; - mSize.setHeight(markerSize.height() + 2 * margin); - mSize.setWidth(mTextItem.boundingRect().width() + markerSize.width() + 3 * margin); + m_size.setHeight(markerSize.height() + 2 * margin); + m_size.setWidth(m_textItem->boundingRect().width() + markerSize.width() + 3 * margin); - mBoundingRect = QRectF(mPos.x(),mPos.y(),mSize.width(),mSize.height()); + m_boundingRect = QRectF(m_pos.x(),m_pos.y(),m_size.width(),m_size.height()); - mMarkerBoundingRect = QRectF(mPos.x() + margin, mPos.y() + margin, markerSize.width(),markerSize.height()); + m_markerBoundingRect = QRectF(m_pos.x() + margin, m_pos.y() + margin, markerSize.width(),markerSize.height()); - mTextItem.setPos(mPos.x() + markerSize.width() + 2 * margin, mPos.y() + margin); + m_textItem->setPos(m_pos.x() + markerSize.width() + 2 * margin, m_pos.y() + margin); } void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event) { - switch (mType) + switch (m_type) { case LegendMarkerTypeSeries: { - emit clicked(mSeries,event->button()); + emit clicked(m_series,event->button()); break; } case LegendMarkerTypeBarset: { - emit clicked(mBarset,event->button()); + emit clicked(m_barset,event->button()); break; } case LegendMarkerTypePieslice: { - emit clicked(mPieslice,event->button()); + emit clicked(m_pieslice,event->button()); break; } default: { @@ -147,22 +147,22 @@ void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event) void LegendMarker::changed() { - switch (mType) + switch (m_type) { case LegendMarkerTypeSeries: { - QXYSeries* s = static_cast (mSeries); + QXYSeries* s = static_cast (m_series); setBrush(s->brush()); setName(s->name()); break; } case LegendMarkerTypeBarset: { - setBrush(mBarset->brush()); - setName(mBarset->name()); + setBrush(m_barset->brush()); + setName(m_barset->name()); break; } case LegendMarkerTypePieslice: { - setBrush(mPieslice->brush()); - setName(mPieslice->label()); + setBrush(m_pieslice->brush()); + setName(m_pieslice->label()); break; } } diff --git a/src/legendmarker_p.h b/src/legendmarker_p.h index 45f10e0..5169e13 100644 --- a/src/legendmarker_p.h +++ b/src/legendmarker_p.h @@ -61,19 +61,19 @@ public Q_SLOTS: void changed(); private: - QPointF mPos; - QSize mSize; - QRectF mBoundingRect; - QRectF mMarkerBoundingRect; - QBrush mBrush; - QPen mPen; - - QSeries *mSeries; - QBarSet *mBarset; - QPieSlice *mPieslice; - - LegendMarkerType mType; - QGraphicsSimpleTextItem mTextItem; + QPointF m_pos; + QSize m_size; + QRectF m_boundingRect; + QRectF m_markerBoundingRect; + QBrush m_brush; + QPen m_pen; + + QSeries *m_series; + QBarSet *m_barset; + QPieSlice *m_pieslice; + + LegendMarkerType m_type; + QGraphicsSimpleTextItem *m_textItem; }; diff --git a/src/legendscrollbutton.cpp b/src/legendscrollbutton.cpp index 4a827eb..80bcee6 100644 --- a/src/legendscrollbutton.cpp +++ b/src/legendscrollbutton.cpp @@ -5,14 +5,14 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE LegendScrollButton::LegendScrollButton(ScrollButtonId id, QGraphicsItem *parent) : QGraphicsPolygonItem(parent) - ,mId(id) + ,m_id(id) { setAcceptedMouseButtons(Qt::LeftButton); } LegendScrollButton::ScrollButtonId LegendScrollButton::id() { - return mId; + return m_id; } void LegendScrollButton::mousePressEvent(QGraphicsSceneMouseEvent *event) diff --git a/src/legendscrollbutton_p.h b/src/legendscrollbutton_p.h index 62a1f6e..2ebd3dd 100644 --- a/src/legendscrollbutton_p.h +++ b/src/legendscrollbutton_p.h @@ -30,7 +30,7 @@ public Q_SLOTS: private: - ScrollButtonId mId; + ScrollButtonId m_id; }; QTCOMMERCIALCHART_END_NAMESPACE