HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2227:d68dfe34c17e

fixed crash in legendmarker when calling update from private constructor

sauimone -

r2227:d68dfe34c17e

parent child

Context file:

r2227:d68dfe34c17e

Collapse all files

examples/legendmarkers/mainwidget.cpp +22 -8

             /****************************************************************************
             **
             ** 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 "mainwidget.h"
             #include <QChart>
             #include <QChartView>
             #include <QPushButton>
             #include <QLabel>
             #include <QDebug>
             #include <QLegend>
             #include <QFormLayout>
             #include <QLegendMarker>
             #include <QLineSeries>
             #include <QXYLegendMarker>
             #include <qmath.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
                 // Create buttons for ui
                 m_buttonLayout = new QGridLayout();
                 QPushButton *addSliceButton = new QPushButton("add series");
                 connect(addSliceButton, SIGNAL(clicked()), this, SLOT(addSeries()));
                 m_buttonLayout->addWidget(addSliceButton, 1, 0);
                 QPushButton *removeSliceButton = new QPushButton("remove series");
                 connect(removeSliceButton, SIGNAL(clicked()), this, SLOT(removeSeries()));
                 m_buttonLayout->addWidget(removeSliceButton, 2, 0);
                 QPushButton *connectButton = new QPushButton("Connect markers");
                 connect(connectButton, SIGNAL(clicked()), this, SLOT(connectMarkers()));
                 m_buttonLayout->addWidget(connectButton, 3, 0);
                 QPushButton *disConnectButton = new QPushButton("Disconnect markers");
                 connect(disConnectButton, SIGNAL(clicked()), this, SLOT(disconnectMarkers()));
                 m_buttonLayout->addWidget(disConnectButton, 4, 0);
                 // Create chart view with the chart
                 m_chart = new QChart();
                 m_chartView = new QChartView(m_chart, this);
                 // Create layout for grid and detached legend
                 m_mainLayout = new QGridLayout();
                 m_mainLayout->addLayout(m_buttonLayout, 0, 0);
                 m_mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
                 setLayout(m_mainLayout);
                 // Add few series
                 addSeries();
                 addSeries();
                 addSeries();
                 addSeries();
                 // Set the title and show legend
                 m_chart->setTitle("Legendmarker example");
                 m_chart->legend()->setVisible(true);
                 m_chart->legend()->setAlignment(Qt::AlignBottom);
                 m_chartView->setRenderHint(QPainter::Antialiasing);
             }
             void MainWidget::addSeries()
             {
                 QLineSeries *series = new QLineSeries();
                 m_series.append(series);
                 series->setName(QString("line " + QString::number(m_series.count())));
                 // Make some sine wave for data
                 QList<QPointF> data;
                 int offset = m_chart->series().count();
                 for (int i = 0; i < 360; i++) {
                     qreal x = offset * 20 + i;
                     data.append(QPointF(i, qSin(2.0 * 3.141592 * x / 360.0)));
                 }
                 series->append(data);
                 m_chart->addSeries(series);
                 if (m_series.count() == 1) {
                     m_chart->createDefaultAxes();
                 }
             }
             void MainWidget::removeSeries()
             {
                 // Remove last series from chart
                 if (m_series.count() > 0) {
                     QLineSeries *series = m_series.last();
                     m_chart->removeSeries(series);
                     m_series.removeLast();
                     delete series;
                 }
             }
             void MainWidget::connectMarkers()
             {
             //![1]
                 // Connect all markers to handler
                 foreach (QLegendMarker* marker, m_chart->legend()->markers()) {
                     // Disconnect possible existing connection to avoid multiple connections
                     QObject::disconnect(marker, SIGNAL(clicked()), this, SLOT(handleMarkerClicked()));
                     QObject::connect(marker, SIGNAL(clicked()), this, SLOT(handleMarkerClicked()));
                 }
             //![1]
             }
             void MainWidget::disconnectMarkers()
             {
             //![2]
                 foreach (QLegendMarker* marker, m_chart->legend()->markers()) {
                     QObject::disconnect(marker, SIGNAL(clicked()), this, SLOT(handleMarkerClicked()));
                 }
             //![2]
             }
             void MainWidget::handleMarkerClicked()
             {
             //![3]
                 QLegendMarker* marker = qobject_cast<QLegendMarker*> (sender());
                 Q_ASSERT(marker);
             //![3]
             //![4]
                 switch (marker->type())
             //![4]
                 {
                     case QLegendMarker::LegendMarkerTypeXY:
                     {
             //![5]
                     // Toggle visibility of series
                     marker->series()->setVisible(!marker->series()->isVisible());
                     // Turn legend marker back to visible, since hiding series also hides the marker
                     // and we don't want it to happen now.
                     marker->setVisible(true);
             //![5]
             //![6]
                     // Dim the marker, if series is not visible
-                    QBrush labelBrush = marker->labelBrush();
+                    qreal alpha = 1.0;
-                    QColor color = labelBrush.color();
-                    if (marker->series()->isVisible()) {
+                    if (!marker->series()->isVisible()) {
-                        color.setAlphaF(1.0);
+                        alpha = 0.5;
-                    } else {
-                        color.setAlphaF(0.5);
                     }
-                    labelBrush.setColor(color);
+                    QColor color;
-                    marker->setLabelBrush(labelBrush);
+                    QBrush brush = marker->labelBrush();
+                    color = brush.color();
+                    color.setAlphaF(alpha);
+                    brush.setColor(color);
+                    marker->setLabelBrush(brush);
+                    brush = marker->brush();
+                    color = brush.color();
+                    color.setAlphaF(alpha);
+                    brush.setColor(color);
+                    marker->setBrush(brush);
+                    QPen pen = marker->pen();
+                    color = pen.color();
+                    color.setAlphaF(alpha);
+                    pen.setColor(color);
+                    marker->setPen(pen);
             //![6]
                     break;
                     }
                 default:
                     {
                     qDebug() << "Unknown marker type";
                     break;
                     }
                 }
             }

src/legend/qarealegendmarker.cpp +2 -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 "qarealegendmarker.h"
             #include "qarealegendmarker_p.h"
             #include "qareaseries_p.h"
             #include <QAreaSeries>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QAreaLegendMarker
                 \brief QAreaLegendMarker object
                 \mainclass
                 QAreaLegendMarker is related to QAreaSeries. One QAreaSeries results in one marker.
                 \sa QLegend QAreaSeries
             */
             /*!
               \fn virtual LegendMarkerType QAreaLegendMarker::type()
               Returns QLegendMarker::LegendMarkerTypeArea
             */
             /*!
               Constructor
             */
             QAreaLegendMarker::QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QAreaLegendMarkerPrivate(this,series,legend), parent)
             {
+                d_ptr->updated();
             }
             /*!
               Destructor
             */
             QAreaLegendMarker::~QAreaLegendMarker()
             {
             }
             /*!
                 \internal
             */
             QAreaLegendMarker::QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent) :
                 QLegendMarker(d, parent)
             {
             }
             /*!
               Returns related series of marker
             */
             QAreaSeries* QAreaLegendMarker::series()
             {
                 Q_D(QAreaLegendMarker);
                 return d->m_series;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QAreaLegendMarkerPrivate::QAreaLegendMarkerPrivate(QAreaLegendMarker *q, QAreaSeries *series, QLegend *legend) :
                 QLegendMarkerPrivate(q,legend),
+                q_ptr(q),
                 m_series(series)
             {
                 QObject::connect(m_series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
                 QObject::connect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
-                updated();
             }
             QAreaLegendMarkerPrivate::~QAreaLegendMarkerPrivate()
             {
             }
             QAreaSeries* QAreaLegendMarkerPrivate::series()
             {
                 return m_series;
             }
             QObject* QAreaLegendMarkerPrivate::relatedObject()
             {
                 return m_series;
             }
             void QAreaLegendMarkerPrivate::updated()
             {
                 bool labelChanged = false;
                 bool brushChanged = false;
                 if (m_item->brush() != m_series->brush()) {
                     m_item->setBrush(m_series->brush());
                     brushChanged = true;
                 }
                 if (m_item->label() != m_series->name()) {
                     m_item->setLabel(m_series->name());
                     labelChanged = true;
                 }
                 invalidateLegend();
                 if (labelChanged)
                     emit q_ptr->labelChanged();
                 if (brushChanged)
                     emit q_ptr->brushChanged();
             }
             #include "moc_qarealegendmarker.cpp"
             #include "moc_qarealegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qbarlegendmarker.cpp +2 -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 "qbarlegendmarker.h"
             #include "qbarlegendmarker_p.h"
             #include <QAbstractBarSeries>
             #include <QBarSet>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBarLegendMarker
                 \brief QBarLegendMarker object
                 \mainclass
                 QBarLegendMarker is related to QAbstractBarSeries derived classes. With bar series, each marker is related to one QBarSet.
                 \sa QLegend QAbstractBarSeries QBarSet
             */
             /*!
               \fn virtual LegendMarkerType QBarLegendMarker::type()
               Returns QLegendMarker::LegendMarkerTypeBar
             */
             /*!
               Constructor
             */
             QBarLegendMarker::QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QBarLegendMarkerPrivate(this,series,barset,legend), parent)
             {
+                d_ptr->updated();
             }
             /*!
               Desturctor
             */
             QBarLegendMarker::~QBarLegendMarker()
             {
             }
             /*!
                 \internal
             */
             QBarLegendMarker::QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent) :
                 QLegendMarker(d, parent)
             {
             }
             /*!
               Returns the related series of marker
             */
             QAbstractBarSeries *QBarLegendMarker::series()
             {
                 Q_D(QBarLegendMarker);
                 return d->m_series;
             }
             /*!
               Returns the related barset of marker
             */
             QBarSet* QBarLegendMarker::barset()
             {
                 Q_D(QBarLegendMarker);
                 return d->m_barset;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarLegendMarkerPrivate::QBarLegendMarkerPrivate(QBarLegendMarker *q, QAbstractBarSeries *series, QBarSet *barset, QLegend *legend) :
                 QLegendMarkerPrivate(q,legend),
+                q_ptr(q),
                 m_series(series),
                 m_barset(barset)
             {
                 QObject::connect(m_barset, SIGNAL(penChanged()), this, SLOT(updated()));
                 QObject::connect(m_barset, SIGNAL(labelChanged()), this, SLOT(updated()));
                 QObject::connect(m_barset, SIGNAL(brushChanged()), this, SLOT(updated()));
-                updated();
             }
             QBarLegendMarkerPrivate::~QBarLegendMarkerPrivate()
             {
             }
             QAbstractBarSeries* QBarLegendMarkerPrivate::series()
             {
                 return m_series;
             }
             QObject* QBarLegendMarkerPrivate::relatedObject()
             {
                 return m_barset;
             }
             void QBarLegendMarkerPrivate::updated()
             {
                 bool labelChanged = false;
                 bool brushChanged = false;
                 bool penChanged = false;
                 if (m_item->pen() != m_barset->pen()) {
                     m_item->setPen(m_barset->pen());
                     penChanged = true;
                 }
                 if (m_item->brush() != m_barset->brush()) {
                     m_item->setBrush(m_barset->brush());
                     brushChanged = true;
                 }
                 if (m_item->label() != m_barset->label()) {
                     m_item->setLabel(m_barset->label());
                     labelChanged = true;
                 }
                 invalidateLegend();
                 if (labelChanged)
                     emit q_ptr->labelChanged();
                 if (brushChanged)
                     emit q_ptr->brushChanged();
                 if (penChanged)
                     emit q_ptr->penChanged();
             }
             #include "moc_qbarlegendmarker.cpp"
             #include "moc_qbarlegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qlegendmarker_p.h +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$
             **
             ****************************************************************************/
             //  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>
             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(QLegendMarker *q, QLegend *legend);
                 virtual ~QLegendMarkerPrivate();
                 // Helper for now. (or declare LegendLayout as friend)
                 LegendMarkerItem* item() const { return m_item; }
                 virtual QAbstractSeries* series() = 0;
                 virtual QObject* relatedObject() = 0;
                 void invalidateLegend();
             public Q_SLOTS:
-                virtual void updated() { invalidateLegend(); }
+                virtual void updated() = 0;
             protected:
                 LegendMarkerItem *m_item;
                 QLegend *m_legend;
             private:
                 QLegendMarker *q_ptr;
                 friend class QLegendPrivate;
                 friend class LegendMarkerItem;
                 Q_DECLARE_PUBLIC(QLegendMarker)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QLEGENDMARKERPRIVATE_H

src/legend/qpielegendmarker.cpp +2 -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 "qpielegendmarker.h"
             #include "qpielegendmarker_p.h"
             #include <QPieSeries>
             #include <QPieSlice>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QPieLegendMarker
                 \brief LegendMarker object
                 \mainclass
                 QPieLegendMarker is related to QPieSeries. With QPieSeries, each slice of pie is related to one marker in QLegend.
                 \sa QLegend QPieSeries QPieSlice
             */
             /*!
               \fn virtual LegendMarkerType QPieLegendMarker::type()
               Returns QLegendMarker::LegendMarkerTypePie
             */
             /*!
               Constructor
             */
             QPieLegendMarker::QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QPieLegendMarkerPrivate(this,series,slice,legend), parent)
             {
+                d_ptr->updated();
             }
             /*!
               Destructor
             */
             QPieLegendMarker::~QPieLegendMarker()
             {
             }
             /*!
                 \internal
             */
             QPieLegendMarker::QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent) :
                 QLegendMarker(d, parent)
             {
             }
             /*!
               Returns the related series of marker.
             */
             QPieSeries* QPieLegendMarker::series()
             {
                 Q_D(QPieLegendMarker);
                 return d->m_series;
             }
             /*!
               Returns the related slice of marker.
             */
             QPieSlice* QPieLegendMarker::slice()
             {
                 Q_D(QPieLegendMarker);
                 return d->m_slice;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QPieLegendMarkerPrivate::QPieLegendMarkerPrivate(QPieLegendMarker *q, QPieSeries *series, QPieSlice *slice, QLegend *legend) :
                 QLegendMarkerPrivate(q,legend),
+                q_ptr(q),
                 m_series(series),
                 m_slice(slice)
             {
                 QObject::connect(m_slice, SIGNAL(labelChanged()), this, SLOT(updated()));
                 QObject::connect(m_slice, SIGNAL(brushChanged()), this, SLOT(updated()));
                 QObject::connect(m_slice, SIGNAL(penChanged()), this, SLOT(updated()));
-                updated();
             }
             QPieLegendMarkerPrivate::~QPieLegendMarkerPrivate()
             {
             }
             QPieSeries* QPieLegendMarkerPrivate::series()
             {
                 return m_series;
             }
             QObject* QPieLegendMarkerPrivate::relatedObject()
             {
                 return m_slice;
             }
             void QPieLegendMarkerPrivate::updated()
             {
                 bool labelChanged = false;
                 bool brushChanged = false;
                 bool penChanged = false;
                 if (m_item->pen() != m_slice->pen()) {
                     m_item->setPen(m_slice->pen());
                     penChanged = true;
                 }
                 if (m_item->brush() != m_slice->brush()) {
                     m_item->setBrush(m_slice->brush());
                     brushChanged = true;
                 }
                 if (m_item->label() != m_slice->label()) {
                     m_item->setLabel(m_slice->label());
                     labelChanged = true;
                 }
                 invalidateLegend();
                 if (labelChanged)
                     emit q_ptr->labelChanged();
                 if (brushChanged)
                     emit q_ptr->brushChanged();
                 if (penChanged)
                     emit q_ptr->penChanged();
             }
             #include "moc_qpielegendmarker.cpp"
             #include "moc_qpielegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qxylegendmarker.cpp +3 -4

             /****************************************************************************
             **
             ** 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 "qxylegendmarker.h"
             #include "qxylegendmarker_p.h"
             #include "qxyseries_p.h"
             #include <QXYSeries>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QXYLegendMarker
                 \brief QXYLegendMarker object
                 \mainclass
                 QXYLegendMarker is related to QXYSeries derived classes. Each marker is related to one series.
                 \sa QLegend QXYSeries QSplineSeries QScatterSeries QLineSeries
             */
             /*!
               \fn virtual LegendMarkerType QXYLegendMarker::type()
               Returns QLegendMarker::LegendMarkerTypeXY
             */
             /*!
               Constructor
             */
             QXYLegendMarker::QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QXYLegendMarkerPrivate(this,series,legend), parent)
             {
+                d_ptr->updated();
             }
             /*!
               Destructor
             */
             QXYLegendMarker::~QXYLegendMarker()
             {
             }
             /*!
                 \internal
             */
             QXYLegendMarker::QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent) :
                 QLegendMarker(d, parent)
             {
             }
             /*!
               Returns the related series
             */
             QXYSeries* QXYLegendMarker::series()
             {
                 Q_D(QXYLegendMarker);
                 return d->m_series;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QXYLegendMarkerPrivate::QXYLegendMarkerPrivate(QXYLegendMarker *q, QXYSeries *series, QLegend *legend) :
                 QLegendMarkerPrivate(q,legend),
+                q_ptr(q),
                 m_series(series)
             {
                 QObject::connect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
                 QObject::connect(m_series->d_func(), SIGNAL(updated()), this, SLOT(updated()));
-                updated();
             }
             QXYLegendMarkerPrivate::~QXYLegendMarkerPrivate()
             {
             }
             QAbstractSeries* QXYLegendMarkerPrivate::series()
             {
                 return m_series;
             }
             QObject* QXYLegendMarkerPrivate::relatedObject()
             {
                 return m_series;
             }
             void QXYLegendMarkerPrivate::updated()
             {
                 bool labelChanged = false;
                 bool brushChanged = false;
                 if (m_item->label() != m_series->name()) {
                     m_item->setLabel(m_series->name());
                     labelChanged = true;
                 }
                 if (m_series->type()== QAbstractSeries::SeriesTypeScatter)  {
                     if (m_item->brush() != m_series->brush()) {
                         m_item->setBrush(m_series->brush());
                         brushChanged = true;
                     }
                 } else {
                     if (m_item->brush().color() != m_series->pen().color()) {
-                        QBrush b = m_item->brush();
+                        m_item->setBrush(QBrush(m_series->pen().color()));
-                        b.setColor(m_series->pen().color());
-                        m_item->setBrush(b);
                         brushChanged = true;
                     }
                 }
                 invalidateLegend();
                 if (labelChanged)
                     emit q_ptr->labelChanged();
                 if (brushChanged)
                     emit q_ptr->brushChanged();
             }
             #include "moc_qxylegendmarker.cpp"
             #include "moc_qxylegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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