HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2088:5149de44ec86

Fix title font resize does not invalidate layout

Michal Klocek -

r2088:5149de44ec86

parent child

Context file:

r2088:5149de44ec86

Collapse all files

src/chartlayout.cpp 0 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "chartlayout_p.h"
             #include "chartpresenter_p.h"
             #include "qlegend_p.h"
             #include "chartaxis_p.h"
             #include "charttitle_p.h"
             #include "chartbackground_p.h"
             #include "legendmarker_p.h"
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             static const qreal golden_ratio = 0.25;
             ChartLayout::ChartLayout(ChartPresenter* presenter):
             m_presenter(presenter),
             m_margins(20,20,20,20),
             m_minChartRect(0,0,200,200)
             {
             }
             ChartLayout::~ChartLayout()
             {
             }
             void ChartLayout::setGeometry(const QRectF& rect)
             {
                 if (!rect.isValid())
                     return;
                 QList<ChartAxis*> axes = m_presenter->axisItems();
                 ChartTitle* title = m_presenter->titleElement();
                 QLegend* legend = m_presenter->legend();
                 ChartBackground* background = m_presenter->backgroundElement();
                 QRectF contentGeometry = calculateBackgroundGeometry(rect,background);
                 contentGeometry = calculateContentGeometry(contentGeometry);
                 if (title && title->isVisible()) {
                     contentGeometry = calculateTitleGeometry(contentGeometry,title);
                 }
                 if (legend->isAttachedToChart() && legend->isVisible()) {
                     contentGeometry = calculateLegendGeometry(contentGeometry,legend);
                 }
                 calculateChartGeometry(contentGeometry,axes);
                 //TODO remove me
             #ifdef SHOW_LAYOUT
                 LayoutDebuger* debuger = LayoutDebuger::instance();
                 debuger->reset();
                 debuger->setPen(QPen(Qt::red));
                 debuger->add(backgroundGeometry,m_presenter->rootItem());
                 debuger->add(titleGeometry,m_presenter->rootItem());
                 debuger->add(legendGeometry ,m_presenter->rootItem());
                 debuger->add(axisGeometry ,m_presenter->rootItem());
                 debuger->add(geometry,m_presenter->rootItem());
                 foreach(LegendMarker* marker,legend->d_ptr->markers()){
                     debuger->add(marker->mapRectToScene(marker->boundingRect()),m_presenter->rootItem());
                 }
             #endif
                 QGraphicsLayout::setGeometry(rect);
             }
             QRectF ChartLayout::calculateContentGeometry(const QRectF& geometry) const
             {
             	return geometry.adjusted(m_margins.left(),m_margins.top(),-m_margins.right(),-m_margins.bottom());
             }
             QRectF ChartLayout::calculateContentMinimum(const QRectF& minimum) const
             {
                 return  minimum.adjusted(0,0,m_margins.left()+m_margins.right(),m_margins.top() + m_margins.bottom());
             }
             QRectF ChartLayout::calculateBackgroundGeometry(const QRectF& geometry,ChartBackground* background) const
             {
                 qreal left, top, right, bottom;
                 getContentsMargins(&left, &top, &right, &bottom);
                 QRectF backgroundGeometry = geometry.adjusted(left,top,-right,-bottom);
                 if(background) background->setRect(backgroundGeometry);
                 return backgroundGeometry;
             }
             QRectF ChartLayout::calculateBackgroundMinimum(const QRectF& minimum) const
             {
                 qreal left, top, right, bottom;
                 getContentsMargins(&left, &top, &right, &bottom);
                 return minimum.adjusted(0,0,left + right,top+bottom);
             }
             QRectF ChartLayout::calculateChartGeometry(const QRectF& geometry, const QList<ChartAxis*>& axes) const
             {
                 QSizeF vertical(0,0);
                 QSizeF horizontal(0,0);
                 // check axis size
                 foreach(ChartAxis* axis , axes) {
                     if(axis->orientation()==Qt::Vertical && axis->isVisible()) {
                         vertical = vertical.expandedTo(axis->effectiveSizeHint(Qt::MinimumSize));
                     }
                     else if(axis->orientation()==Qt::Horizontal && axis->isVisible()) {
                         horizontal = horizontal.expandedTo(axis->effectiveSizeHint(Qt::MinimumSize));
                     }
                 }
                 qreal width = qMin(vertical.width(),geometry.width() * golden_ratio);
                 QRectF rect = geometry.adjusted(width,vertical.height()/2,-horizontal.width()/2,-horizontal.height());
                 m_presenter->setChartsGeometry(rect);
                 foreach(ChartAxis* axis , axes) {
                     axis->setGeometry(geometry);
                 }
                 return rect;
             }
             QRectF ChartLayout::calculateAxisMinimum(const QRectF& minimum, const QList<ChartAxis*>& axes) const
             {
                 QSizeF vertical(0,0);
                 QSizeF horizontal(0,0);
                 // check axis size
                 foreach(ChartAxis* axis , axes) {
                     if(axis->orientation()==Qt::Vertical && axis->isVisible()){
                         vertical = vertical.expandedTo(axis->effectiveSizeHint(Qt::MinimumSize));
                     }else if(axis->orientation()==Qt::Horizontal && axis->isVisible()) {
                         horizontal = horizontal.expandedTo(axis->effectiveSizeHint(Qt::MinimumSize));
                     }
                 }
                 return  minimum.adjusted(0,0,horizontal.width()+vertical.width(),horizontal.height() + vertical.height());
             }
             QRectF ChartLayout::calculateLegendGeometry(const QRectF& geometry,QLegend* legend) const
             {
                 QSizeF size = legend->effectiveSizeHint(Qt::PreferredSize,QSizeF(-1,-1));
                 QRectF legendRect;
                 QRectF result;
                 switch (legend->alignment()) {
                     case Qt::AlignTop: {
                         legendRect = QRectF(geometry.topLeft(),QSizeF(geometry.width(),size.height()));
                         result = geometry.adjusted(0,legendRect.height(),0,0);
                         break;
                     }
                     case Qt::AlignBottom: {
                         legendRect = QRectF(QPointF(geometry.left(),geometry.bottom()-size.height()),QSizeF(geometry.width(),size.height()));
                         result = geometry.adjusted(0,0,0,-legendRect.height());
                         break;
                     }
                     case Qt::AlignLeft: {
                         qreal width = qMin(size.width(),geometry.width()*golden_ratio);
                         legendRect = QRectF(geometry.topLeft(),QSizeF(width,geometry.height()));
                         result = geometry.adjusted(width,0,0,0);
                         break;
                     }
                     case Qt::AlignRight: {
                         qreal width = qMin(size.width(),geometry.width()*golden_ratio);
                         legendRect = QRectF(QPointF(geometry.right()-width,geometry.top()),QSizeF(width,geometry.height()));
                         result = geometry.adjusted(0,0,-width,0);
                         break;
                     }
                     default: {
                         legendRect = QRectF(0,0,0,0);
                         result = geometry;
                         break;
                     }
                 }
                 legend->setGeometry(legendRect);
                 return result;
             }
             QRectF ChartLayout::calculateLegendMinimum(const QRectF& geometry,QLegend* legend) const
             {
                     QSizeF minSize = legend->effectiveSizeHint(Qt::MinimumSize,QSizeF(-1,-1));
                     return geometry.adjusted(0,0,minSize.width(),minSize.height());
             }
             QRectF ChartLayout::calculateTitleGeometry(const QRectF& geometry,ChartTitle* title) const
             {
                     title->setGeometry(geometry);
                     QPointF center = geometry.center() - title->boundingRect().center();
                     title->setPos(center.x(),title->pos().y());
                     return geometry.adjusted(0,title->boundingRect().height(),0,0);
             }
             QRectF ChartLayout::calculateTitleMinimum(const QRectF& minimum,ChartTitle* title) const
             {
                     QSizeF min = title->sizeHint(Qt::MinimumSize);
                     return  minimum.adjusted(0,0,min.width(),min.height());
             }
             QSizeF ChartLayout::sizeHint ( Qt::SizeHint which, const QSizeF & constraint) const
             {
                 Q_UNUSED(constraint);
                 if(which == Qt::MinimumSize){
                     QList<ChartAxis*> axes = m_presenter->axisItems();
                     ChartTitle* title = m_presenter->titleElement();
                     QLegend* legend = m_presenter->legend();
                     QRectF minimumRect(0,0,0,0);
                     minimumRect = calculateBackgroundMinimum(minimumRect);
                     minimumRect = calculateContentMinimum(minimumRect);
                     minimumRect = calculateTitleMinimum(minimumRect,title);
                     minimumRect = calculateLegendMinimum(minimumRect,legend);
                     minimumRect = calculateAxisMinimum(minimumRect,axes);
                     return  minimumRect.united(m_minChartRect).size().toSize();
                 }else
                     return QSize(-1,-1);
             }
             void ChartLayout::setMargins(const QMargins& margins)
             {
                 if(m_margins != margins){
                     m_margins = margins;
                     updateGeometry();
                 }
             }
             QMargins ChartLayout::margins() const
             {
                 return m_margins;
             }
             void ChartLayout::adjustChartGeometry()
             {
                 setGeometry(geometry());
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/legendlayout.cpp +8 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "legendlayout_p.h"
             #include "chartpresenter_p.h"
             #include "legendmarker_p.h"
             #include "qlegend_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             LegendLayout::LegendLayout(QLegend* legend):
             m_legend(legend)
             {
             }
             LegendLayout::~LegendLayout()
             {
             }
             void LegendLayout::setOffset(qreal x, qreal y)
             {
                 bool scrollHorizontal = true;
                 switch(m_legend->alignment()) {
                     case Qt::AlignTop:
                     case Qt::AlignBottom: {
                         scrollHorizontal = true;
                         break;
                     }
                     case Qt::AlignLeft:
                     case Qt::AlignRight: {
                         scrollHorizontal = false;
                         break;
                     }
                 }
                 // If detached, the scrolling direction is vertical instead of horizontal and vice versa.
                 if (!m_legend->isAttachedToChart()) {
                     scrollHorizontal = !scrollHorizontal;
                 }
                 QRectF boundingRect = geometry();
                 qreal left, top, right, bottom;
                 getContentsMargins(&left, &top, &right, &bottom);
                 boundingRect.adjust(left,top,-right,-bottom);
                 // Limit offset between m_minOffset and m_maxOffset
                 if (scrollHorizontal) {
                     if(m_width<=boundingRect.width()) return;
                     if (x != m_offsetX) {
                         m_offsetX = qBound(m_minOffsetX, x, m_maxOffsetX);
                         m_legend->d_ptr->items()->setPos(-m_offsetX,boundingRect.top());
                     }
                 }
                 else {
                     if(m_height<=boundingRect.height()) return;
                     if (y != m_offsetY) {
                         m_offsetY = qBound(m_minOffsetY, y, m_maxOffsetY);
                         m_legend->d_ptr->items()->setPos(boundingRect.left(),-m_offsetY);
                     }
                 }
             }
             QPointF LegendLayout::offset() const
             {
                 return QPointF(m_offsetX,m_offsetY);
             }
+            void LegendLayout::invalidate()
+            {
+                QGraphicsLayout::invalidate();
+                if(m_legend->isAttachedToChart()){
+                    m_legend->d_ptr->m_presenter->layout()->invalidate();
+                }
+            }
             void LegendLayout::setGeometry(const QRectF& rect)
             {
                 m_legend->d_ptr->items()->setVisible(m_legend->isVisible());
                 QGraphicsLayout::setGeometry(rect);
                 if(m_legend->isAttachedToChart()) {
                     setAttachedGeometry(rect);
                 } else {
                     setDettachedGeometry(rect);
                 }
             }
             void LegendLayout::setAttachedGeometry(const QRectF& rect)
             {
                 if (!rect.isValid()) return;
                 m_offsetX=0;
                 m_offsetY=0;
                 QSizeF size(0,0);
                 if( m_legend->d_ptr->markers().isEmpty()) return;
                 m_width=0;
                 m_height=0;
                 qreal left, top, right, bottom;
                 getContentsMargins(&left, &top, &right, &bottom);
                 QRectF geometry = rect.adjusted(left,top,-right,-bottom);
                 switch(m_legend->alignment()) {
                     case Qt::AlignTop:
                     case Qt::AlignBottom: {
                         QPointF point(0,0);
                         foreach (LegendMarker* marker, m_legend->d_ptr->markers()) {
                             if (marker->isVisible()) {
                                 marker->setGeometry(geometry);
                                 marker->setPos(point.x(),geometry.height()/2 - marker->boundingRect().height()/2);
                                 const QRectF& rect = marker->boundingRect();
                                 size = size.expandedTo(rect.size());
                                 qreal w = rect.width();
                                 m_width+=w;
                                 point.setX(point.x() + w);
                             }
                         }
                         if(m_width<geometry.width()) {
                             m_legend->d_ptr->items()->setPos(geometry.width()/2-m_width/2,geometry.top());
                         }
                         else {
                             m_legend->d_ptr->items()->setPos(geometry.topLeft());
                         }
                         m_height=size.height();
                     }
                     break;
                     case Qt::AlignLeft:
                     case Qt::AlignRight: {
                         QPointF point(0,0);
                         foreach (LegendMarker* marker, m_legend->d_ptr->markers()) {
                             if (marker->isVisible()) {
                                 marker->setGeometry(geometry);
                                 marker->setPos(point);
                                 const QRectF& rect = marker->boundingRect();
                                 qreal h = rect.height();
                                 size = size.expandedTo(rect.size());
                                 m_height+=h;
                                 point.setY(point.y() + h);
                             }
                         }
                         if(m_height<geometry.height()) {
                             m_legend->d_ptr->items()->setPos(geometry.left(),geometry.height()/2-m_height/2);
                         }
                         else {
                             m_legend->d_ptr->items()->setPos(geometry.topLeft());
                         }
                         m_width=size.width();
                     }
                     break;
                 }
                 m_minOffsetX = -left;
                 m_minOffsetY = - top;
                 m_maxOffsetX = m_width - geometry.width() - right;
                 m_maxOffsetY = m_height - geometry.height() - bottom;
             }
             void LegendLayout::setDettachedGeometry(const QRectF& rect)
             {
                 if (!rect.isValid()) return;
                 // Detached layout is different.
                 // In detached mode legend may have multiple rows and columns, so layout calculations
                 // differ a log from attached mode.
                 // Also the scrolling logic is bit different.
                 m_offsetX=0;
                 m_offsetY=0;
                 qreal left, top, right, bottom;
                 getContentsMargins(&left, &top, &right, &bottom);
                 QRectF geometry = rect.adjusted(left,top,-right,-bottom);
                 QSizeF size(0,0);
                 QList<LegendMarker *> markers = m_legend->d_ptr->markers();
                 if(markers.isEmpty()) return;
                 switch (m_legend->alignment()) {
                     case Qt::AlignTop: {
                         QPointF point(0,0);
                         m_width = 0;
                         m_height = 0;
                         for (int i=0; i<markers.count(); i++) {
                             LegendMarker *marker = markers.at(i);
                             if (marker->isVisible()) {
                                 marker->setGeometry(geometry);
                                 marker->setPos(point.x(),point.y());
                                 const QRectF& boundingRect = marker->boundingRect();
                                 qreal w = boundingRect.width();
                                 qreal h = boundingRect.height();
                                 m_width = qMax(m_width,w);
                                 m_height = qMax(m_height,h);
                                 point.setX(point.x() + w);
                                 if (point.x() + w > geometry.left() + geometry.width() - right) {
                                     // Next item would go off rect.
                                     point.setX(0);
                                     point.setY(point.y() + h);
                                     if (i+1 < markers.count()) {
                                         m_height += h;
                                     }
                                 }
                             }
                         }
                         m_legend->d_ptr->items()->setPos(geometry.topLeft());
                         m_minOffsetX = -left;
                         m_minOffsetY = -top;
                         m_maxOffsetX = m_width - geometry.width() - right;
                         m_maxOffsetY = m_height - geometry.height() - bottom;
                     }
                     break;
                     case Qt::AlignBottom: {
                         QPointF point(0,geometry.height());
                         m_width = 0;
                         m_height = 0;
                         for (int i=0; i<markers.count(); i++) {
                             LegendMarker *marker = markers.at(i);
                             if (marker->isVisible()) {
                                 marker->setGeometry(geometry);
                                 const QRectF& boundingRect = marker->boundingRect();
                                 qreal w = boundingRect.width();
                                 qreal h = boundingRect.height();
                                 m_width = qMax(m_width,w);
                                 m_height = qMax(m_height,h);
                                 marker->setPos(point.x(),point.y() - h);
                                 point.setX(point.x() + w);
                                 if (point.x() + w > geometry.left() + geometry.width() - right) {
                                     // Next item would go off rect.
                                     point.setX(0);
                                     point.setY(point.y() - h);
                                     if (i+1 < markers.count()) {
                                         m_height += h;
                                     }
                                 }
                             }
                         }
                         m_legend->d_ptr->items()->setPos(geometry.topLeft());
                         m_minOffsetX = -left;
                         m_minOffsetY = -m_height + geometry.height() - top;
                         m_maxOffsetX = m_width - geometry.width() - right;
                         m_maxOffsetY = -bottom;
                     }
                     break;
                     case Qt::AlignLeft: {
                         QPointF point(0,0);
                         m_width = 0;
                         m_height = 0;
                         qreal maxWidth = 0;
                         for (int i=0; i<markers.count(); i++) {
                             LegendMarker *marker = markers.at(i);
                             if (marker->isVisible()) {
                                 marker->setGeometry(geometry);
                                 const QRectF& boundingRect = marker->boundingRect();
                                 qreal w = boundingRect.width();
                                 qreal h = boundingRect.height();
                                 m_height = qMax(m_height,h);
                                 maxWidth = qMax(maxWidth,w);
                                 marker->setPos(point.x(),point.y());
                                 point.setY(point.y() + h);
                                 if (point.y() + h > geometry.bottom() - bottom) {
                                     // Next item would go off rect.
                                     point.setX(point.x() + maxWidth);
                                     point.setY(0);
                                     if (i+1 < markers.count()) {
                                         m_width += maxWidth;
                                         maxWidth = 0;
                                     }
                                 }
                             }
                         }
                         m_width += maxWidth;
                         m_legend->d_ptr->items()->setPos(geometry.topLeft());
                         m_minOffsetX = -left;
                         m_minOffsetY = -top;
                         m_maxOffsetX = m_width - geometry.width() - right;
                         m_maxOffsetY = m_height - geometry.height() - bottom;
                     }
                     break;
                     case Qt::AlignRight: {
                         QPointF point(geometry.width(),0);
                         m_width = 0;
                         m_height = 0;
                         qreal maxWidth = 0;
                         for (int i=0; i<markers.count(); i++) {
                             LegendMarker *marker = markers.at(i);
                             if (marker->isVisible()) {
                                 marker->setGeometry(geometry);
                                 const QRectF& boundingRect = marker->boundingRect();
                                 qreal w = boundingRect.width();
                                 qreal h = boundingRect.height();
                                 m_height = qMax(m_height,h);
                                 maxWidth = qMax(maxWidth,w);
                                 marker->setPos(point.x() - w,point.y());
                                 point.setY(point.y() + h);
                                 if (point.y() + h > geometry.bottom()-bottom) {
                                     // Next item would go off rect.
                                     point.setX(point.x() - maxWidth);
                                     point.setY(0);
                                     if (i+1 < markers.count()) {
                                         m_width += maxWidth;
                                         maxWidth = 0;
                                     }
                                 }
                             }
                         }
                         m_width += maxWidth;
                         m_legend->d_ptr->items()->setPos(geometry.topLeft());
                         m_minOffsetX = - m_width + geometry.width() - left;
                         m_minOffsetY = -top;
                         m_maxOffsetX = - right;
                         m_maxOffsetY = m_height - geometry.height() - bottom;
                     }
                     break;
                     default:
                     break;
                 }
             }
             QSizeF LegendLayout::sizeHint ( Qt::SizeHint which, const QSizeF & constraint) const
             {
                 QSizeF size(0, 0);
                 qreal left, top, right, bottom;
                 getContentsMargins(&left, &top, &right, &bottom);
                 if(constraint.isValid()) {
                     foreach(LegendMarker* marker, m_legend->d_ptr->markers()) {
                         size = size.expandedTo(marker->effectiveSizeHint(which));
                     }
                     size = size.boundedTo(constraint);
                 }
                 else if (constraint.width() >= 0) {
                     qreal width = 0;
                     qreal height = 0;
                     foreach(LegendMarker* marker, m_legend->d_ptr->markers()) {
                         width+=marker->effectiveSizeHint(which).width();
                         height=qMax(height,marker->effectiveSizeHint(which).height());
                     }
                     size = QSizeF(qMin(constraint.width(),width), height);
                 }
                 else if (constraint.height() >= 0) {
                     qreal width = 0;
                     qreal height = 0;
                     foreach(LegendMarker* marker, m_legend->d_ptr->markers()) {
                         width=qMax(width,marker->effectiveSizeHint(which).width());
                         height+=height,marker->effectiveSizeHint(which).height();
                     }
                     size = QSizeF(width,qMin(constraint.height(),height));
                 }
                 else {
                     foreach(LegendMarker* marker, m_legend->d_ptr->markers()) {
                         size = size.expandedTo(marker->effectiveSizeHint(which));
                     }
                 }
                 size += QSize(left + right, top + bottom);
                 return size;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/legendlayout_p.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef LEGENDLAYOUT_H
             #define LEGENDLAYOUT_H
             #include <QGraphicsLayout>
             #include "qchartglobal.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLegend;
             class LegendLayout : public QGraphicsLayout
             {
             public:
                 LegendLayout(QLegend* legend);
                 virtual ~LegendLayout();
                 void setGeometry(const QRectF& rect);
                 void setOffset(qreal x, qreal y);
                 QPointF offset() const;
+                void invalidate();
             protected:
                 QSizeF sizeHint ( Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
                 int count() const { return 0; }
                 QGraphicsLayoutItem* itemAt(int) const { return 0; };
                 void removeAt(int){};
             private:
                 void setAttachedGeometry(const QRectF& rect);
                 void setDettachedGeometry(const QRectF& rect);
             private:
                 QLegend* m_legend;
                 qreal m_offsetX;
                 qreal m_offsetY;
                 qreal m_minOffsetX;
                 qreal m_minOffsetY;
                 qreal m_maxOffsetX;
                 qreal m_maxOffsetY;
                 qreal m_width;
                 qreal m_height;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/legend/legendmarker.cpp +1 -1

             /****************************************************************************
              **
              ** Copyright (C) 2012 Digia Plc
              ** All rights reserved.
              ** For any questions to Digia, please use contact form at http://qt.digia.com
              **
              ** This file is part of the Qt Commercial Charts Add-on.
              **
              ** $QT_BEGIN_LICENSE$
              ** Licensees holding valid Qt Commercial licenses may use this file in
              ** accordance with the Qt Commercial License Agreement provided with the
              ** Software or, alternatively, in accordance with the terms contained in
              ** a written agreement between you and Digia.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.digia.com
              ** $QT_END_LICENSE$
              **
              ****************************************************************************/
             #include "legendmarker_p.h"
             #include "qxyseries.h"
             #include "qxyseries_p.h"
             #include "qlegend.h"
             #include "qabstractbarseries.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             #include "qareaseries.h"
             #include "qareaseries_p.h"
             #include <QPainter>
             #include <QGraphicsSceneEvent>
             #include <QGraphicsSimpleTextItem>
             #include <QGraphicsLayout>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             LegendMarker::LegendMarker(QAbstractSeries *series, QLegend *legend) :
                 QGraphicsObject(legend),
                 m_series(series),
                 m_markerRect(0,0,10.0,10.0),
                 m_boundingRect(0,0,0,0),
                 m_legend(legend),
                 m_textItem(new QGraphicsSimpleTextItem(this)),
                 m_rectItem(new QGraphicsRectItem(this)),
                 m_margin(4),
                 m_space(4)
             {
                 //setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 m_rectItem->setRect(m_markerRect);
             }
             void LegendMarker::setPen(const QPen &pen)
             {
                 m_rectItem->setPen(pen);
             }
             QPen LegendMarker::pen() const
             {
                 return m_rectItem->pen();
             }
             void LegendMarker::setBrush(const QBrush &brush)
             {
                 m_rectItem->setBrush(brush);
             }
             QBrush LegendMarker::brush() const
             {
                 return m_rectItem->brush();
             }
             void LegendMarker::setFont(const QFont &font)
             {
                 m_textItem->setFont(font);
                 QFontMetrics fn(font);
                 m_markerRect = QRectF(0,0,fn.height()/2,fn.height()/2);
                 updateGeometry();
+                m_legend->layout()->invalidate();
             }
             QFont LegendMarker::font() const
             {
                 return m_textItem->font();
             }
             void LegendMarker::setLabel(const QString label)
             {
                 m_text = label;
                 updateGeometry();
                 m_legend->layout()->invalidate();
             }
             QString LegendMarker::label() const
             {
                 return m_text;
             }
             QRectF LegendMarker::boundingRect() const
             {
                 return m_boundingRect;
             }
             void LegendMarker::setLabelBrush(const QBrush &brush)
             {
                 m_textItem->setBrush(brush);
             }
             QBrush LegendMarker::labelBrush() const
             {
                 return m_textItem->brush();
             }
             void LegendMarker::setGeometry(const QRectF& rect)
             {
                 QFontMetrics fn (font());
                 int width = rect.width();
                 qreal x = m_margin + m_markerRect.width() +  m_space + m_margin;
                 qreal y = qMax(m_markerRect.height()+2*m_margin,fn.height()+2*m_margin);
                 if (fn.boundingRect(m_text).width() + x > width)
                 {
                     QString string = m_text + "...";
                     while(fn.boundingRect(string).width() + x > width && string.length() > 3)
                         string.remove(string.length() - 4, 1);
                     m_textItem->setText(string);
                 }
                 else
                     m_textItem->setText(m_text);
                 const QRectF& textRect = m_textItem->boundingRect();
                 m_textItem->setPos(x-m_margin,y/2 - textRect.height()/2);
                 m_rectItem->setRect(m_markerRect);
                 m_rectItem->setPos(m_margin,y/2  - m_markerRect.height()/2);
                 prepareGeometryChange();
                 m_boundingRect = QRectF(0,0,x+textRect.width()+m_margin,y);
             }
             void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 Q_UNUSED(painter)
             }
             QSizeF LegendMarker::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(m_textItem->font());
                 QSizeF sh;
                   switch (which) {
                     case Qt::MinimumSize:
                         sh = QSizeF(fn.boundingRect("...").width() + 2*m_margin + m_space +m_markerRect.width(),qMax(m_markerRect.height()+2*m_margin,fn.height()+2*m_margin));
                         break;
                     case Qt::PreferredSize:
                         sh = QSizeF(fn.boundingRect(m_text).width() + 2*m_margin + m_space +m_markerRect.width(),qMax(m_markerRect.height()+2*m_margin,fn.height()+2*m_margin));
                         break;
                     default:
                       break;
                   }
                   return sh;
             }
             void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 QGraphicsObject::mousePressEvent(event);
                 //TODO: selected signal removed for now
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             AreaLegendMarker::AreaLegendMarker(QAreaSeries *series,QLegend *legend) : LegendMarker(series,legend),
             m_series(series)
             {
                 //QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected()));
                 QObject::connect(series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
                 QObject::connect(series, SIGNAL(nameChanged()), this, SLOT(updated()));
                 updated();
             }
             void AreaLegendMarker::updated()
             {
                 setBrush(m_series->brush());
                 setLabel(m_series->name());
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             BarLegendMarker::BarLegendMarker(QAbstractBarSeries *barseries,QBarSet *barset, QLegend *legend) : LegendMarker(barseries,legend),
             m_barset(barset)
             {
                 //QObject::connect(this, SIGNAL(selected()),barset->d_ptr.data(), SIGNAL(selected()));
                 QObject::connect(barset->d_ptr.data(), SIGNAL(updatedBars()), this, SLOT(updated()));
                 updated();
             }
             void BarLegendMarker::updated()
             {
                 setBrush(m_barset->brush());
                 setLabel(m_barset->label());
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             PieLegendMarker::PieLegendMarker(QPieSeries* series,QPieSlice *pieslice, QLegend *legend) : LegendMarker(series,legend),
             m_pieslice(pieslice)
             {
                 QObject::connect(pieslice, SIGNAL(labelChanged()), this, SLOT(updated()));
                 QObject::connect(pieslice, SIGNAL(brushChanged()), this, SLOT(updated()));
                 updated();
             }
             void PieLegendMarker::updated()
             {
                 setBrush(m_pieslice->brush());
                 setLabel(m_pieslice->label());
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             XYLegendMarker::XYLegendMarker(QXYSeries *series, QLegend *legend) : LegendMarker(series,legend),
             m_series(series)
             {
                 //QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected()));
                 QObject::connect(series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
                 QObject::connect(series, SIGNAL(nameChanged()), this, SLOT(updated()));
                 updated();
             }
             void XYLegendMarker::updated()
             {
                 setLabel(m_series->name());
                 if(m_series->type()== QAbstractSeries::SeriesTypeScatter)
                 {
                     setBrush(m_series->brush());
                 }
                 else {
                     setBrush(QBrush(m_series->pen().color()));
                 }
             }
             #include "moc_legendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qlegend.cpp +6 -15

             /****************************************************************************
              **
              ** Copyright (C) 2012 Digia Plc
              ** All rights reserved.
              ** For any questions to Digia, please use contact form at http://qt.digia.com
              **
              ** This file is part of the Qt Commercial Charts Add-on.
              **
              ** $QT_BEGIN_LICENSE$
              ** Licensees holding valid Qt Commercial licenses may use this file in
              ** accordance with the Qt Commercial License Agreement provided with the
              ** Software or, alternatively, in accordance with the terms contained in
              ** a written agreement between you and Digia.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.digia.com
              ** $QT_END_LICENSE$
              **
              ****************************************************************************/
             #include "qlegend.h"
             #include "qlegend_p.h"
             #include "qabstractseries.h"
             #include "qabstractseries_p.h"
             #include "qchart_p.h"
             #include "legendlayout_p.h"
             #include "legendmarker_p.h"
             #include "qxyseries.h"
             #include "qlineseries.h"
             #include "qareaseries.h"
             #include "qscatterseries.h"
             #include "qsplineseries.h"
             #include "qabstractbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qbarset.h"
             #include "qpieseries.h"
             #include "qpieseries_p.h"
             #include "qpieslice.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             #include <QPen>
             #include <QTimer>
             #include <QGraphicsLayout>
             #include <QGraphicsSceneEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QLegend
                 \brief Legend object
                 \mainclass
                 QLegend is a graphical object, whics displays legend of the chart. Legend state is updated by QChart, when
                 series have been changed. By default, legend is drawn by QChart, but user can set a new parent to legend and
                 handle the drawing manually.
                 User isn't supposed to create or delete legend objects, but can reference it via QChart class.
                 \image examples_percentbarchart_legend.png
                 \sa QChart
             */
             /*!
                 \qmlclass Legend QLegend
                 \brief Legend is part of QtCommercial Chart QML API.
                 Legend is a graphical object, whics displays legend of the chart. Legend state is updated by ChartView, when
                 series have been changed. Legend is used via ChartView class. For example:
                 \code
                     ChartView {
                         legend.visible: true
                         legend.alignment: Qt.AlignBottom
                         // Add a few series...
                     }
                 \endcode
                 \image examples_percentbarchart_legend.png
             */
             /*!
                 \property QLegend::alignment
                 \brief The alignment of the legend.
                 Legend paints on the defined position in the chart. The following alignments are supported:
                 Qt::AlignTop, Qt::AlignBottom, Qt::AlignLeft, Qt::AlignRight. If you set more than one flag the result is undefined.
             */
             /*!
                 \qmlproperty Qt.Alignment Legend::alignment
                 \brief The alignment of the legend.
                 Legend paints on the defined position in the chart. The following alignments are supported:
                 Qt.AlignTop, Qt.AlignBottom, Qt.AlignLeft, Qt.AlignRight. If you set more than one flag the result is undefined.
             */
             /*!
                 \property QLegend::backgroundVisible
                 Whether the legend background is visible or not.
             */
             /*!
                 \qmlproperty bool Legend::backgroundVisible
                 Whether the legend background is visible or not.
             */
             /*!
                 \property QLegend::color
                 The color of the legend, i.e. the background (brush) color. Note that if you change the color
                 of the legend, the style of the legend brush is set to Qt::SolidPattern.
             */
             /*!
                 \qmlproperty color Legend::color
                 The color of the legend, i.e. the background (brush) color.
             */
             /*!
                 \property QLegend::borderColor
                 The border color of the legend, i.e. the line color.
             */
             /*!
                 \qmlproperty color Legend::borderColor
                 The border color of the legend, i.e. the line color.
             */
             /*!
                 \property QLegend::font
                 The font of markers used by legend
             */
             /*!
                 \qmlproperty color Legend::font
                 The font of markers used by legend
             */
             /*!
                 \property QLegend::labelColor
                 The color of brush used to draw labels.
             */
             /*!
                 \qmlproperty color QLegend::labelColor
                 The color of brush used to draw labels.
             */
             /*!
                 \fn void QLegend::backgroundVisibleChanged(bool)
                 The visibility of the legend background changed to \a visible.
             */
             /*!
                 \fn void QLegend::colorChanged(QColor)
                 The color of the legend background changed to \a color.
             */
             /*!
                 \fn void QLegend::borderColorChanged(QColor)
                 The border color of the legend background changed to \a color.
             */
             /*!
                 \fn void QLegend::fontChanged(QFont)
                 The font of markers of the legend changed to \a font.
             */
             /*!
                 \fn void QLegend::labelColorChanged(QColor color)
                 This signal is emitted when the color of brush used to draw labels has changed to \a color.
             */
             /*!
              Constructs the legend object and sets the parent to \a parent
              */
             QLegend::QLegend(QChart *chart):QGraphicsWidget(chart),
             d_ptr(new QLegendPrivate(chart->d_ptr->m_presenter,chart,this))
             {
                 setZValue(ChartPresenter::LegendZValue);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesAdded(QAbstractSeries*,Domain*)),d_ptr.data(),SLOT(handleSeriesAdded(QAbstractSeries*,Domain*)));
                 QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesRemoved(QAbstractSeries*)),d_ptr.data(),SLOT(handleSeriesRemoved(QAbstractSeries*)));
             //    QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesUpdated(QAbstractSeries*)),d_ptr.data(),SLOT(handleSeriesUpdated(QAbstractSeries*)));
                 setLayout(d_ptr->m_layout);
             }
             /*!
                 Destroys the legend object. Legend is always owned by a QChart, so an application should never call this.
             */
             QLegend::~QLegend()
             {
             }
             /*!
              \internal
              */
             void QLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 if(!d_ptr->m_backgroundVisible) return;
                 painter->setOpacity(opacity());
                 painter->setPen(d_ptr->m_pen);
                 painter->setBrush(d_ptr->m_brush);
                 painter->drawRoundRect(rect(),d_ptr->roundness(rect().width()),d_ptr->roundness(rect().height()));
             }
             /*!
              Sets the \a brush of legend. Brush affects the background of legend.
              */
             void QLegend::setBrush(const QBrush &brush)
             {
                 if (d_ptr->m_brush != brush) {
                     d_ptr->m_brush = brush;
                     update();
                     emit colorChanged(brush.color());
                 }
             }
             /*!
              Returns the brush used by legend.
              */
             QBrush QLegend::brush() const
             {
                 return d_ptr->m_brush;
             }
             void QLegend::setColor(QColor color)
             {
                 QBrush b = d_ptr->m_brush;
                 if (b.style() != Qt::SolidPattern || b.color() != color) {
                     b.setStyle(Qt::SolidPattern);
                     b.setColor(color);
                     setBrush(b);
                 }
             }
             QColor QLegend::color()
             {
                 return d_ptr->m_brush.color();
             }
             /*!
              Sets the \a pen of legend. Pen affects the legend borders.
              */
             void QLegend::setPen(const QPen &pen)
             {
                 if (d_ptr->m_pen != pen) {
                     d_ptr->m_pen = pen;
                     update();
                     emit borderColorChanged(pen.color());
                 }
             }
             /*!
              Returns the pen used by legend
              */
             QPen QLegend::pen() const
             {
                 return d_ptr->m_pen;
             }
             void QLegend::setFont(const QFont &font)
             {
                 if (d_ptr->m_font != font) {
                     d_ptr->m_font = font;
                     foreach (LegendMarker *marker, d_ptr->markers()) {
                         marker->setFont(d_ptr->m_font);
                     }
                     layout()->invalidate();
                     emit fontChanged(font);
                 }
             }
             QFont QLegend::font() const
             {
                return d_ptr->m_font;
             }
             void QLegend::setBorderColor(QColor color)
             {
                 QPen p = d_ptr->m_pen;
                 if (p.color() != color) {
                     p.setColor(color);
                     setPen(p);
                 }
             }
             QColor QLegend::borderColor()
             {
                 return d_ptr->m_pen.color();
             }
             /*!
                 Set brush used to draw labels to \a brush.
             */
             void QLegend::setLabelBrush(const QBrush &brush)
             {
                 if (d_ptr->m_labelBrush != brush) {
                     d_ptr->m_labelBrush = brush;
                     foreach (LegendMarker *marker, d_ptr->markers()) {
                         marker->setLabelBrush(d_ptr->m_labelBrush);
                         // Note: The pen of the marker rectangle could be exposed in the public QLegend API
                         // instead of mapping it from label brush color
                         marker->setPen(brush.color());
                     }
                     emit labelColorChanged(brush.color());
                 }
             }
             /*!
                 Brush used to draw labels.
             */
             QBrush QLegend::labelBrush() const
             {
                 return d_ptr->m_labelBrush;
             }
             void QLegend::setLabelColor(QColor color)
             {
                 QBrush b = d_ptr->m_labelBrush;
                 if (b.style() != Qt::SolidPattern || b.color() != color) {
                     b.setStyle(Qt::SolidPattern);
                     b.setColor(color);
                     setLabelBrush(b);
                 }
             }
             QColor QLegend::labelColor() const
             {
                 return d_ptr->m_labelBrush.color();
             }
             void QLegend::setAlignment(Qt::Alignment alignment)
             {
                 if(d_ptr->m_alignment!=alignment) {
                     d_ptr->m_alignment = alignment;
-                    if(isAttachedToChart()){
+                    layout()->invalidate();
-                        d_ptr->m_presenter->layout()->invalidate();
-                    }else{
-                        layout()->invalidate();
                 }
             }
             Qt::Alignment QLegend::alignment() const
             {
                 return d_ptr->m_alignment;
             }
             /*!
              Detaches the legend from chart. Chart won't change layout of the legend.
              */
             void QLegend::detachFromChart()
             {
                 d_ptr->m_attachedToChart = false;
-                d_ptr->m_layout->invalidate();
+                layout()->invalidate();
                 setParent(0);
             }
             /*!
              Attaches the legend to chart. Chart may change layout of the legend.
              */
             void QLegend::attachToChart()
             {
                 d_ptr->m_attachedToChart = true;
-                d_ptr->m_presenter->layout()->invalidate();
+                layout()->invalidate();
                 setParent(d_ptr->m_chart);
             }
             /*!
              Returns true, if legend is attached to chart.
              */
             bool QLegend::isAttachedToChart()
             {
                 return d_ptr->m_attachedToChart;
             }
             /*!
              Sets the visibility of legend background to \a visible
              */
             void QLegend::setBackgroundVisible(bool visible)
             {
                 if(d_ptr->m_backgroundVisible != visible) {
                     d_ptr->m_backgroundVisible = visible;
                     update();
                     emit backgroundVisibleChanged(visible);
                 }
             }
             /*!
              Returns the visibility of legend background
              */
             bool QLegend::isBackgroundVisible() const
             {
                 return d_ptr->m_backgroundVisible;
             }
             /*!
              \internal \a event see QGraphicsWidget for details
              */
             void QLegend::hideEvent(QHideEvent *event)
             {
                if(isAttachedToChart()) d_ptr->m_presenter->layout()->invalidate();
                QGraphicsWidget::hideEvent(event);
             }
             /*!
              \internal \a event see QGraphicsWidget for details
              */
             void QLegend::showEvent(QShowEvent *event)
             {
                if(isAttachedToChart()) {
-                   d_ptr->m_presenter->layout()->invalidate();
                    d_ptr->items()->setVisible(false);
                    layout()->invalidate();
                }
                QGraphicsWidget::showEvent(event);
                //layout activation will show the items
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QLegendPrivate::QLegendPrivate(ChartPresenter* presenter, QChart *chart, QLegend *q):
                 q_ptr(q),
                 m_presenter(presenter),
                 m_layout(new LegendLayout(q)),
                 m_chart(chart),
                 m_items(new QGraphicsItemGroup(q)),
                 m_alignment(Qt::AlignTop),
                 m_brush(QBrush()),
                 m_pen(QPen()),
                 m_labelBrush(QBrush()),
                 m_diameter(5),
                 m_attachedToChart(true),
                 m_backgroundVisible(false)
             {
             }
             QLegendPrivate::~QLegendPrivate()
             {
             }
             void QLegendPrivate::setOffset(qreal x, qreal y)
             {
                m_layout->setOffset(x,y);
             }
             QPointF QLegendPrivate::offset() const
             {
                 return m_layout->offset();
             }
             int QLegendPrivate::roundness(qreal size)
             {
                 return 100*m_diameter/int(size);
             }
             void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series, Domain *domain)
             {
                 Q_UNUSED(domain)
                 QList<LegendMarker*> markers = series->d_ptr->createLegendMarker(q_ptr);
                 foreach (LegendMarker* marker, markers) {
                     marker->setFont(m_font);
                     marker->setLabelBrush(m_labelBrush);
                     marker->setVisible(series->isVisible());
                     m_items->addToGroup(marker);
                     m_markers<<marker;
                 }
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
                 QObject::connect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
                 m_items->setVisible(false);
-                q_ptr->layout()->invalidate();
+                m_layout->invalidate();
-                m_presenter->layout()->invalidate();
             }
             void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)
             {
                 foreach (LegendMarker *marker, m_markers) {
                     if (marker->series() == series) {
                         delete marker;
                         m_markers.removeAll(marker);
                     }
                 }
                 QObject::disconnect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
                 QObject::disconnect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
+                m_layout->invalidate();
-                q_ptr->layout()->invalidate();
             }
             void QLegendPrivate::handleSeriesVisibleChanged()
             {
                 QAbstractSeries* series = qobject_cast<QAbstractSeries *> (sender());
                 Q_ASSERT(series);
                 foreach (LegendMarker* marker, m_markers) {
                     if (marker->series() == series) {
                         marker->setVisible(series->isVisible());
                     }
                 }
+                m_layout->invalidate();
-                q_ptr->layout()->invalidate();
             }
             void QLegendPrivate::handleCountChanged()
             {
                 QAbstractSeriesPrivate* series = qobject_cast<QAbstractSeriesPrivate *> (sender());
                 Q_ASSERT(series);
                 handleSeriesRemoved(series->q_ptr);
                 handleSeriesAdded(series->q_ptr, 0);
             }
             #include "moc_qlegend.cpp"
             #include "moc_qlegend_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qlegend_p.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QLEGEND_P_H
             #define QLEGEND_P_H
             #include "qlegend.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class ChartPresenter;
             class QAbstractSeries;
             class LegendLayout;
             class LegendMarker;
             class Domain;
             class QLegendPrivate : public QObject
             {
                 Q_OBJECT
             public:
                 QLegendPrivate(ChartPresenter *presenter, QChart *chart, QLegend *q);
                 ~QLegendPrivate();
                 void setOffset(qreal x, qreal y);
                 QPointF offset() const;
                 int roundness(qreal size);
                 QList<LegendMarker*> markers() { return m_markers; }
                 QGraphicsItemGroup* items() { return m_items; }
             public Q_SLOTS:
                 void handleSeriesAdded(QAbstractSeries *series, Domain *domain);
                 void handleSeriesRemoved(QAbstractSeries *series);
                 void handleSeriesVisibleChanged();
                 void handleCountChanged();
             private:
                 QLegend *q_ptr;
                 ChartPresenter *m_presenter;
                 LegendLayout *m_layout;
                 QChart* m_chart;
                 QGraphicsItemGroup* m_items;
                 QList<LegendMarker*> m_markers;
                 Qt::Alignment m_alignment;
                 QBrush m_brush;
                 QPen m_pen;
                 QFont m_font;
                 QBrush m_labelBrush;
                 qreal m_diameter;
                 bool m_attachedToChart;
                 bool m_backgroundVisible;
             friend class QLegend;
+            friend class LegendLayout;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

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