HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2168:778c4543bf0c

layout work started

sauimone -

r2168:778c4543bf0c

parent child

Context file:

r2168:778c4543bf0c

Collapse all files

src/legend/legendlayout.cpp +80 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 "chartlayout_p.h"
+            #include "qlegendmarker_p.h"
+            #include "legendmarkeritem_p.h"
+            #include "qlegendmarker.h"
             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);
                             }
                         }
+                        */
+            // New markers -->>
+                        foreach (QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                            if (marker->isVisible()) {
+                                LegendMarkerItem* item = marker->d_ptr.data()->item();
+                                item->setGeometry(geometry);
+                                item->setPos(point.x(),geometry.height()/2 - item->boundingRect().height()/2);
+                                const QRectF& rect = item->boundingRect();
+                                size = size.expandedTo(rect.size());
+                                qreal w = rect.width();
+                                m_width+=w;
+                                point.setX(point.x() + w);
+                            }
+                        }
+            // <<-- New markers
                         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);
                             }
                         }
+            */
+            // New markers -->>
+                        foreach (QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                            if (marker->isVisible()) {
+                                LegendMarkerItem* item = marker->d_ptr.data()->item();
+                                item->setGeometry(geometry);
+                                item->setPos(point);
+                                const QRectF& rect = item->boundingRect();
+                                qreal h = rect.height();
+                                size = size.expandedTo(rect.size());
+                                m_height+=h;
+                                point.setY(point.y() + h);
+                            }
+                        }
+            // <<--- New markers
                         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;
+            */
+            // New markers -->>
+                QSizeF size(0, 0);
+                qreal left, top, right, bottom;
+                getContentsMargins(&left, &top, &right, &bottom);
+                if(constraint.isValid()) {
+                    foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                        LegendMarkerItem *item = marker->d_ptr.data()->item();
+                        size = size.expandedTo(item->effectiveSizeHint(which));
+                    }
+                    size = size.boundedTo(constraint);
+                }
+                else if (constraint.width() >= 0) {
+                    qreal width = 0;
+                    qreal height = 0;
+                    foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                        LegendMarkerItem *item = marker->d_ptr.data()->item();
+                        width+=item->effectiveSizeHint(which).width();
+                        height=qMax(height,item->effectiveSizeHint(which).height());
+                    }
+                    size = QSizeF(qMin(constraint.width(),width), height);
+                }
+                else if (constraint.height() >= 0) {
+                    qreal width = 0;
+                    qreal height = 0;
+                    foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                        LegendMarkerItem *item = marker->d_ptr.data()->item();
+                        width=qMax(width,item->effectiveSizeHint(which).width());
+                        height+=height,item->effectiveSizeHint(which).height();
+                    }
+                    size = QSizeF(width,qMin(constraint.height(),height));
+                }
+                else {
+                    foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                        LegendMarkerItem *item = marker->d_ptr.data()->item();
+                        size = size.expandedTo(item->effectiveSizeHint(which));
+                    }
+                }
+                size += QSize(left + right, top + bottom);
+                return size;
+            // <<-- New markers
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/legendmarkeritem.cpp +11 -9

             /****************************************************************************
              **
              ** 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 "legendmarkeritem_p.h"
             #include <QPainter>
             #include <QGraphicsSceneEvent>
             #include <QGraphicsSimpleTextItem>
             #include <QDebug>
             #include "qlegendmarker_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //LegendMarkerItem::LegendMarkerItem(QAbstractSeries *series, QGraphicsObject *parent) :
             LegendMarkerItem::LegendMarkerItem(QLegendMarkerPrivate *marker, QGraphicsObject *parent) :
                 QGraphicsObject(parent),
                 m_marker(marker),
                 m_markerRect(0,0,10.0,10.0),
-                m_boundingRect(0,0,0,0),
+                m_boundingRect(0,0,10,10),
                 m_textItem(new QGraphicsSimpleTextItem(this)),
                 m_rectItem(new QGraphicsRectItem(this)),
                 m_margin(4),
                 m_space(4)
             {
-                qDebug() << "LegendMarkerItem created for marker:" << m_marker;
+            //    qDebug() << "LegendMarkerItem created for marker:" << m_marker;
                 setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 m_rectItem->setRect(m_markerRect);
+            //    setZValue(zValue() + 20);
+            //    qDebug() << "z:" << this->zValue();
             }
             void LegendMarkerItem::setPen(const QPen &pen)
             {
                 m_rectItem->setPen(pen);
             }
             QPen LegendMarkerItem::pen() const
             {
                 return m_rectItem->pen();
             }
             void LegendMarkerItem::setBrush(const QBrush &brush)
             {
                 m_rectItem->setBrush(brush);
             }
             QBrush LegendMarkerItem::brush() const
             {
                 return m_rectItem->brush();
             }
             void LegendMarkerItem::setFont(const QFont &font)
             {
                 m_textItem->setFont(font);
                 QFontMetrics fn(font);
                 m_markerRect = QRectF(0,0,fn.height()/2,fn.height()/2);
                 updateGeometry();
             }
             QFont LegendMarkerItem::font() const
             {
                 return m_textItem->font();
             }
             void LegendMarkerItem::setLabel(const QString label)
             {
+                qDebug() << "LegendMarkerItem::setlabel" << label;
                 m_text = label;
                 updateGeometry();
             }
             QString LegendMarkerItem::label() const
             {
                 return m_text;
             }
-            QRectF LegendMarkerItem::boundingRect() const
-                return m_boundingRect;
             void LegendMarkerItem::setLabelBrush(const QBrush &brush)
             {
                 m_textItem->setBrush(brush);
             }
             QBrush LegendMarkerItem::labelBrush() const
             {
                 return m_textItem->brush();
             }
             void LegendMarkerItem::setGeometry(const QRectF& rect)
             {
-                QFontMetrics fn (font());
+                QFontMetrics fn (m_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);
             }
+            QRectF LegendMarkerItem::boundingRect() const
+            {
+                return m_boundingRect;
+            }
             void LegendMarkerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 Q_UNUSED(painter)
             }
             QSizeF LegendMarkerItem::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 LegendMarkerItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 qDebug() << "LegendMarkerItem::mousePressEvent";
             //    QGraphicsObject::mousePressEvent(event);
                 //TODO: selected signal removed for now
                 emit m_marker->handleMousePressEvent(event);
                 QGraphicsItem::mousePressEvent(event);
             }
             #include "moc_legendmarkeritem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/legendmarkeritem_p.h +11 -2

             /****************************************************************************
             **
             ** 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 LEGENDMARKERITEM_P_H
             #define LEGENDMARKERITEM_P_H
             #include "qchartglobal.h"
             #include <QGraphicsObject>
+            #include <QFont>
             #include <QBrush>
             #include <QPen>
             #include <QGraphicsSimpleTextItem>
             #include <QGraphicsLayoutItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLegendMarkerPrivate;
             class LegendMarkerItem : public QGraphicsObject, public QGraphicsLayoutItem
             {
                 Q_OBJECT
                 Q_INTERFACES(QGraphicsLayoutItem)
             public:
-            //    explicit LegendMarkerItem(QAbstractSeries *m_series, QGraphicsObject *parent = 0);
                 explicit LegendMarkerItem(QLegendMarkerPrivate *marker, QGraphicsObject *parent = 0);
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setFont(const QFont &font);
                 QFont font() const;
                 void setLabel(const QString label);
                 QString label() const;
                 void setLabelBrush(const QBrush &brush);
                 QBrush labelBrush() const;
                 void setGeometry(const QRectF& rect);
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                 QSizeF sizeHint (Qt::SizeHint which, const QSizeF& constraint) const;
             protected:
                 // From QGraphicsObject
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
             protected:
-                QLegendMarkerPrivate *m_marker;
+                QLegendMarkerPrivate *m_marker; // Knows
                 QRectF m_markerRect;
                 QRectF m_boundingRect;
                 QGraphicsSimpleTextItem *m_textItem;
                 QGraphicsRectItem *m_rectItem;
                 qreal m_margin;
                 qreal m_space;
                 QString m_text;
+                QString m_label;
+                QBrush m_labelBrush;
+                QFont m_font;
+                QPen m_pen;
+                QBrush m_brush;
+                bool m_visible;
+                friend class QLegendMarkerPrivate;
+                friend class LegendLayout;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // LEGENDMARKERITEM_P_H

src/legend/qlegend.cpp 0 -2

             /****************************************************************************
              **
              ** 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" // TODO: deprecated
             #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 "chartlayout_p.h"
             #include <QPainter>
             #include <QPen>
             #include <QTimer>
             #include <QGraphicsSceneEvent>
             #include <QLegendMarker>
             #include "qlegendmarker_p.h"
             #include "legendmarkeritem_p.h"
             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 Font 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;
                     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;
                 layout()->invalidate();
                 setParent(0);
             }
             /*!
              Attaches the legend to chart. Chart may change layout of the legend.
              */
             void QLegend::attachToChart()
             {
                 d_ptr->m_attachedToChart = true;
                 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;
             }
             QList<QLegendMarker*> QLegend::markers() const
             {
                 // TODO: name of PIMPL method will change.
                 return d_ptr->legendMarkers();
             }
             void QLegend::appendSeries(QAbstractSeries* series)
             {
                 d_ptr->appendSeries(series);
             }
             void QLegend::removeSeries(QAbstractSeries* series)
             {
                 d_ptr->removeSeries(series);
             }
             /*!
              \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->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::appendSeries(QAbstractSeries* series)
             {
                 Q_UNUSED(series);
                 // TODO:
                 /*
                 if (!m_series.contains(series)) {
                     m_series.append(series);
                     handleSeriesAdded(series,0);    // Dummy domain
                 }
                 */
             }
             void QLegendPrivate::removeSeries(QAbstractSeries* series)
             {
                 Q_UNUSED(series);
                 // TODO:
                 /*
                 if (m_series.contains(series)) {
                     m_series.removeOne(series);
                     handleSeriesRemoved(series);
                 }
                 */
             }
             void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series, Domain *domain)
             {
                 Q_UNUSED(domain)
                 qDebug() << "QLegendPrivate::handleSeriesAdded";
             // New markers --->
                 QList<QLegendMarker*> newMarkers = series->d_ptr->createLegendMarkers(q_ptr);
                 foreach (QLegendMarker* marker, newMarkers) {
                     marker->setFont(m_font);
                     marker->setLabelBrush(m_labelBrush);
                     marker->setVisible(series->isVisible());
-            // TODO: possible hazard. What if marker is deleted and group still has pointer?
                     m_items->addToGroup(marker->d_ptr.data()->item());
-            //        qDebug() << "item:" << marker->d_ptr.data()->item();
                     m_legendMarkers << marker;
                 }
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
             // <--- New markers
                 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);
                 m_layout->invalidate();
             }
             void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)
             {
             // New markers --->
                 foreach (QLegendMarker *marker, m_legendMarkers) {
                     if (marker->series() == series) {
                         delete marker;
                         m_legendMarkers.removeAll(marker);
                     }
                 }
                 QObject::disconnect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
             // <--- New markers
                 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();
             }
             void QLegendPrivate::handleSeriesVisibleChanged()
             {
                 QAbstractSeries *series = qobject_cast<QAbstractSeries *> (sender());
                 Q_ASSERT(series);
             // New markers --->
                 foreach (QLegendMarker* marker, m_legendMarkers) {
                     if (marker->series() == series) {
                         marker->setVisible(series->isVisible());
                     }
                 }
             // <--- New markers
                 foreach (LegendMarker* marker, m_markers) {
                     if (marker->series() == series) {
                         marker->setVisible(series->isVisible());
                 }
                 m_layout->invalidate();
             }
             void QLegendPrivate::handleCountChanged()
             {
                 // With new markers, the series shoud notify markers directly?
                 // Handle new or removed markers
                 // Handle changes of marker pen/brush/label. every property that legend is interested
                 handleSeriesRemoved(series);
                 Domain domain;
                 handleSeriesAdded(series, &domain);
             }
             #include "moc_qlegend.cpp"
             #include "moc_qlegend_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qlegendmarker.cpp +73 -21

             /****************************************************************************
              **
              ** 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 "qlegendmarker.h"
             #include "qlegendmarker_p.h"
             #include "legendmarkeritem_p.h"
             #include <QDebug>
             #include <QFontMetrics>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*
             QLegendMarker::QLegendMarker(QAbstractSeries* series, QObject *parent) :
                 QObject(parent),
                 d_ptr(new QLegendMarkerPrivate(series, this))
             {
             }
             */
             QLegendMarker::QLegendMarker(QLegendMarkerPrivate &d, QObject *parent) :
                 QObject(parent),
                 d_ptr(&d)
             {
             }
             QLegendMarker::~QLegendMarker()
             {
             }
             QString QLegendMarker::label() const
             {
-                return d_ptr->m_label;
+                return d_ptr->label();
             }
             void QLegendMarker::setLabel(const QString &label)
             {
-                d_ptr->m_label = label;
+                d_ptr->setLabel(label);
             }
             QBrush QLegendMarker::labelBrush() const
             {
-                return d_ptr->m_labelBrush;
+                return d_ptr->labelBrush();
             }
             void QLegendMarker::setLabelBrush(const QBrush &brush)
             {
-                d_ptr->m_labelBrush = brush;
+                d_ptr->setLabelBrush(brush);
             }
             QFont QLegendMarker::font() const
             {
-                return d_ptr->m_font;
+                return d_ptr->font();
             }
             void QLegendMarker::setFont(const QFont &font)
             {
-                d_ptr->m_font = font;
+                d_ptr->setFont(font);
             }
             QPen QLegendMarker::pen() const
             {
-                return d_ptr->m_pen;
+                return d_ptr->pen();
             }
             void QLegendMarker::setPen(const QPen &pen)
             {
-                d_ptr->m_pen = pen;
+                d_ptr->setPen(pen);
             }
             QBrush QLegendMarker::brush() const
             {
-                return d_ptr->m_brush;
+                return d_ptr->brush();
             }
             void QLegendMarker::setBrush(const QBrush &brush)
             {
-                d_ptr->m_brush = brush;
+                d_ptr->setBrush(brush);
             }
             bool QLegendMarker::isVisible() const
             {
-                return d_ptr->m_visible;
+                return d_ptr->isVisible();
             }
             void QLegendMarker::setVisible(bool visible)
             {
-                d_ptr->m_visible = visible;
+                d_ptr->setVisible(visible);
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            /*
-            QLegendMarkerPrivate::QLegendMarkerPrivate(QAbstractSeries *series, QLegendMarker *q) :
-                q_ptr(q),
-                m_series(series)
-                m_item = new LegendMarkerItem(m_series);
-            */
             QLegendMarkerPrivate::QLegendMarkerPrivate(QLegendMarker *q) :
                 q_ptr(q)
             {
-                qDebug() << "QLegendMarkerPrivate created";
+            //    qDebug() << "QLegendMarkerPrivate created";
                 m_item = new LegendMarkerItem(this);
             }
             QLegendMarkerPrivate::~QLegendMarkerPrivate()
             {
             }
             void QLegendMarkerPrivate::handleMousePressEvent(QGraphicsSceneEvent *event)
             {
                 // Just emit clicked signal for now
                 Q_UNUSED(event);
                 Q_Q(QLegendMarker);
                 emit q->clicked();
             }
+            void QLegendMarkerPrivate::setPen(const QPen &pen)
+            {
+                m_item->setPen(pen);
+            }
+            QPen QLegendMarkerPrivate::pen() const
+            {
+                return m_item->pen();
+            }
+            void QLegendMarkerPrivate::setBrush(const QBrush &brush)
+            {
+                m_item->setBrush(brush);
+            }
+            QBrush QLegendMarkerPrivate::brush() const
+            {
+                return m_item->brush();
+            }
+            void QLegendMarkerPrivate::setFont(const QFont &font)
+            {
+                m_item->setFont(font);
+            }
+            QFont QLegendMarkerPrivate::font() const
+            {
+                return m_item->font();
+            }
+            void QLegendMarkerPrivate::setLabel(const QString label)
+            {
+                m_item->setLabel(label);
+            }
+            QString QLegendMarkerPrivate::label() const
+            {
+                return m_item->label();
+            }
+            void QLegendMarkerPrivate::setLabelBrush(const QBrush &brush)
+            {
+                m_item->setLabelBrush(brush);
+            }
+            QBrush QLegendMarkerPrivate::labelBrush() const
+            {
+                return m_item->labelBrush();
+            }
+            bool QLegendMarkerPrivate::isVisible() const
+            {
+                return m_item->isVisible();
+            }
+            void QLegendMarkerPrivate::setVisible(bool visible)
+            {
+                m_item->setVisible(visible);
+            }
             #include "moc_qlegendmarker.cpp"
             #include "moc_qlegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qlegendmarker.h +1 -3

             /****************************************************************************
              **
              ** 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 QLEGENDMARKER_H
             #define QLEGENDMARKER_H
             #include <QChartGlobal>
             #include <QObject>
             #include <QPen>
             #include <QBrush>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLegendMarkerPrivate;
             class QAbstractSeries;
             // TODO: should this be QAbstractLegendMarker?
             class QTCOMMERCIALCHART_EXPORT QLegendMarker : public QObject
             {
                 Q_OBJECT
             // TODO: need for these?
             //    Q_PROPERTY(QString label READ label WRITE setlabel NOTIFY labelChanged);
             //    Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged);
             //    Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged);
             public:
             //    explicit QLegendMarker(QAbstractSeries* series, QObject *parent = 0);
                 virtual ~QLegendMarker();
                 QString label() const;
                 void setLabel(const QString &label);
                 QBrush labelBrush() const;
                 void setLabelBrush(const QBrush &brush);
                 QFont font() const;
                 void setFont(const QFont &font);
                 QPen pen() const;
                 void setPen(const QPen &pen);
                 QBrush brush() const;
                 void setBrush(const QBrush &brush);
                 bool isVisible() const;
                 void setVisible(bool visible);
             //    virtual QAbstractSeries::SeriesType type() = 0; // TODO?
                 virtual QAbstractSeries* series() = 0;
                 virtual QObject* peerObject() = 0;
             protected:
                 explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = 0);
             Q_SIGNALS:
                 void clicked();
                 void hovered(bool status);
-            public Q_SLOTS:
-                virtual void updated() = 0;  // TODO: private. Idea is that series signals, when some property has changed
             protected:
                 QScopedPointer<QLegendMarkerPrivate> d_ptr;
                 Q_DISABLE_COPY(QLegendMarker)
                 friend class QLegendPrivate;
                 friend class QLegendMarkerPrivate;
+                friend class LegendLayout;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QLEGENDMARKER_H

src/legend/qlegendmarker_p.h +7 -3

             /****************************************************************************
             **
             ** 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 QLEGENDMARKERPRIVATE_H
             #define QLEGENDMARKERPRIVATE_H
             #include "qchartglobal.h"
             #include <QGraphicsObject>
             #include <QBrush>
             #include <QPen>
             #include <QGraphicsSimpleTextItem>
             #include <QGraphicsLayoutItem>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // TODO: check these
             class QAbstractSeries;
             class QAreaSeries;
             class QXYSeries;
             class QBarSet;
             class QAbstractBarSeries;
             class QPieSlice;
             class QLegend;
             class QPieSeries;
             class QLegendMarker;
             class LegendMarkerItem;
             class QLegendMarkerPrivate : public QObject
             {
                 Q_OBJECT
             public:
             //    explicit QLegendMarkerPrivate(QAbstractSeries *series, QLegendMarker *q);
                 explicit QLegendMarkerPrivate(QLegendMarker *q);
                 virtual ~QLegendMarkerPrivate();
-            /*
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setFont(const QFont &font);
                 QFont font() const;
                 void setLabel(const QString label);
                 QString label() const;
                 void setLabelBrush(const QBrush &brush);
                 QBrush labelBrush() const;
-            */
+                bool isVisible() const;
+                void setVisible(bool visible);
                 // Helper for now.
                 LegendMarkerItem* item() const { return m_item; }
                 // Item gets the event, logic for event is here
                 void handleMousePressEvent(QGraphicsSceneEvent *event);
             public Q_SLOTS:
                 virtual void updated() {};
             protected:
                 LegendMarkerItem *m_item;
             private:
                 QLegendMarker *q_ptr;
             /*
                 QLegend* m_legend;
             */
             // New legend marker properties
+            /*
                 QString m_label;
                 QBrush m_labelBrush;
                 QFont m_font;
                 QPen m_pen;
                 QBrush m_brush;
                 bool m_visible;
+            */
                 friend class QLegendPrivate; // TODO: Is this needed?
                 Q_DECLARE_PUBLIC(QLegendMarker)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QLEGENDMARKERPRIVATE_H

src/legend/qpielegendmarker.cpp +10 -13

             /****************************************************************************
             **
             ** 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 "qpielegendmarker.h"
             #include "qpielegendmarker_p.h"
             #include <QPieSeries>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            /*
             QPieLegendMarker::QPieLegendMarker(QPieSeries* series, QPieSlice* slice, QObject *parent) :
-                QLegendMarker(series, parent),
+                QLegendMarker(*new QPieLegendMarkerPrivate(series,slice,this), parent)
-                d_ptr(new QPieLegendMarkerPrivate(series,slice,this))
             {
-                QObject::connect(slice, SIGNAL(labelChanged()), this, SLOT(updated()));
-                QObject::connect(slice, SIGNAL(brushChanged()), this, SLOT(updated()));
-                updated();
             }
-            */
+            QPieLegendMarker::~QPieLegendMarker()
-            QPieLegendMarker::QPieLegendMarker(QPieSeries* series, QPieSlice* slice, QObject *parent) :
-                QLegendMarker(*new QPieLegendMarkerPrivate(series,slice,this), parent)
             {
-                QObject::connect(slice, SIGNAL(labelChanged()), this, SLOT(updated()));
-                QObject::connect(slice, SIGNAL(brushChanged()), this, SLOT(updated()));
-            //    updated();
             }
             /*!
                 \internal
             */
             QPieLegendMarker::QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent) :
                 QLegendMarker(d, parent)
             {
             }
             QAbstractSeries* QPieLegendMarker::series()
             {
                 Q_D(QPieLegendMarker);
                 return d->m_series;
             }
             QPieSlice* QPieLegendMarker::peerObject()
             {
                 Q_D(QPieLegendMarker);
                 return d->m_slice;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            //QPieLegendMarkerPrivate::QPieLegendMarkerPrivate(QAbstractSeries *series, QPieLegendMarker *q) :
             QPieLegendMarkerPrivate::QPieLegendMarkerPrivate(QPieSeries *series, QPieSlice *slice, QPieLegendMarker *q) :
                 QLegendMarkerPrivate(q),
                 m_series(series),
                 m_slice(slice)
             {
                 qDebug() << "QPieLegendMarkerPrivate created";
+                QObject::connect(m_slice, SIGNAL(labelChanged()), this, SLOT(updated()));
+                QObject::connect(m_slice, SIGNAL(brushChanged()), this, SLOT(updated()));
                 updated();
             }
             QPieLegendMarkerPrivate::~QPieLegendMarkerPrivate()
             {
+                QObject::disconnect(m_slice, SIGNAL(labelChanged()), this, SLOT(updated()));
+                QObject::disconnect(m_slice, SIGNAL(brushChanged()), this, SLOT(updated()));
             }
             void QPieLegendMarkerPrivate::updated()
             {
+                qDebug() << "QPieLegendMarkerPrivate::updated";
                 m_item->setBrush(m_slice->brush());
                 m_item->setLabel(m_slice->label());
+                m_item->setPen(m_slice->pen());
+                m_item->setBrush(m_slice->brush());
             }
             #include "moc_qpielegendmarker.cpp"
             #include "moc_qpielegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qpielegendmarker.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 QPIELEGENDMARKER_H
             #define QPIELEGENDMARKER_H
             #include <QChartGlobal>
             #include <QLegendMarker>
             #include <QPieSlice>
             #include "qpielegendmarker_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QTCOMMERCIALCHART_EXPORT QPieLegendMarker : public QLegendMarker
             {
                 Q_OBJECT
             public:
                 explicit QPieLegendMarker(QPieSeries* series, QPieSlice* slice, QObject *parent = 0);
+                virtual ~QPieLegendMarker();
                 virtual QAbstractSeries* series();
                 virtual QPieSlice* peerObject();
             protected:
                 QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = 0);
             //Q_SIGNALS:
             //public Q_SLOTS:
             private:
                 Q_DECLARE_PRIVATE(QPieLegendMarker)
                 Q_DISABLE_COPY(QPieLegendMarker)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QPIELEGENDMARKER_H

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