HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r585:b761105be1ea

fixed bug in legend name drawing

sauimone -

r585:b761105be1ea

parent child

Context file:

r585:b761105be1ea

Collapse all files

src/legendmarker.cpp +18 -6

             LegendMarker::LegendMarker(QSeries* series, QGraphicsItem *parent)
                 : QGraphicsObject(parent)
                 ,mBoundingRect(0,0,1,1)
-                ,mName("")
+                ,mMarkerBoundingRect(0,0,1,1)
                 ,mSeries(series)
                 ,mBarset(0)
                 ,mPieslice(0)
                 ,mType(LegendMarkerTypeSeries)
+                ,mTextItem(new QGraphicsSimpleTextItem(this))
                 {
                     setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 }
             LegendMarker::LegendMarker(QSeries *series, QBarSet *barset, QGraphicsItem *parent)
                 : QGraphicsObject(parent)
                 ,mBoundingRect(0,0,1,1)
-                ,mName("")
+                ,mMarkerBoundingRect(0,0,1,1)
                 ,mSeries(series)
                 ,mBarset(barset)
                 ,mPieslice(0)
                 ,mType(LegendMarkerTypeBarset)
+                ,mTextItem(new QGraphicsSimpleTextItem(this))
                 {
                     setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 }
             LegendMarker::LegendMarker(QSeries *series, QPieSlice *pieslice, QGraphicsItem *parent)
                 : QGraphicsObject(parent)
                 ,mBoundingRect(0,0,1,1)
-                ,mName("")
+                ,mMarkerBoundingRect(0,0,1,1)
                 ,mSeries(series)
                 ,mBarset(0)
                 ,mPieslice(pieslice)
                 ,mType(LegendMarkerTypePieslice)
+                ,mTextItem(new QGraphicsSimpleTextItem(this))
                 {
                     setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 }
             void LegendMarker::setBoundingRect(const QRectF rect)
             {
                 mBoundingRect = rect;
+                // Calculate Marker pos
+                // TODO: remove hard coding. 5 is marigin around marker
+                QSizeF markerSize(10,10);
+                qreal x = mBoundingRect.x() + 5;
+                qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2;
+                mMarkerBoundingRect = QRectF(x,y,markerSize.width(),markerSize.height());
+                mTextItem.setPos(mBoundingRect.x() + markerSize.width() + 10, y );
             }
             void LegendMarker::setBrush(const QBrush brush)
             void LegendMarker::setName(const QString name)
             {
-                mName = name;
+                mTextItem.setText(name);
             }
             QString LegendMarker::name() const
             {
-                return mName;
+                return mTextItem.text();
             }
             QSeries* LegendMarker::series() const
             void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 painter->setBrush(mBrush);
-                painter->drawRect(mBoundingRect);
+                painter->drawRect(mMarkerBoundingRect);
             }
             QRectF LegendMarker::boundingRect() const

src/legendmarker_p.h +3 -1

             private:
                 QRectF mBoundingRect;
+                QRectF mMarkerBoundingRect;
                 QBrush mBrush;
-                QString mName;
                 QSeries* mSeries;
                 QBarSet* mBarset;
                 QPieSlice* mPieslice;
                 LegendMarkerType mType;
+                QGraphicsSimpleTextItem mTextItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.cpp +2 -3

                 // TODO: better layout
                 if (m_legend) {
                     QRectF boundingRect(m_rect.adjusted(margin(),
-                                                        rect.height() + margin() + margin()/2 - m_legend->minimumSize().height()/2,
+                                                        rect.height() + margin() + margin()/2,
                                                         -margin(),
-                                                        -margin()/2 + m_legend->minimumSize().height()/2));
+                                                        -margin()/2 + m_legend->minimumSize().height()));
                     m_legend->handleGeometryChanged(boundingRect);
-                    qDebug() << "legend rect:" << m_legend->boundingRect();
                 }
             }
             #include "moc_qchart.cpp"

src/qlegend.cpp +3 -16

             {
                 painter->setBrush(mBackgroundBrush);
                 painter->drawRect(mBoundingRect);
-                foreach(LegendMarker* m, mMarkers) {
-                    QRectF r = m->boundingRect();
-                    painter->setBrush(m->brush());
-                    painter->drawText(r.x() + r.width()*2, r.y() + r.height(), m->name());
             }
             QRectF QLegend::boundingRect() const
                     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();
-                qreal x = mBoundingRect.x() + 5;
+                qreal y = mBoundingRect.y() + (mBoundingRect.height()/4);
-                qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2;
                 foreach (LegendMarker* m, mMarkers) {
-                    m->setBoundingRect(QRectF(x,y,markerSize.width(),markerSize.height()));
+                    m->setBoundingRect(QRectF(x,y,xStep,mBoundingRect.height()/2));
                     x += xStep;
                 }
             }

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