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

examples/legendmarkers/mainwidget.cpp +22 -8

@@ -158,17 +158,31 void MainWidget::handleMarkerClicked()
158		158
159	//![6]	159	//![6]
160	// Dim the marker, if series is not visible	160	// Dim the marker, if series is not visible
161	QBrush labelBrush = marker->labelBrush();	161	qreal alpha = 1.0;
162	QColor color = labelBrush.color();
163		162
164	if (marker->series()->isVisible()) {	163	if (!marker->series()->isVisible()) {
165	~~color~~.~~setAlphaF~~(~~1.0~~);	164	alpha = 0.5;
166	} else {
167	color.setAlphaF(0.5);
168	}	165	}
169		166
170	~~labelBrush~~.~~setColor~~(color);	167	QColor color;
171	marker->~~setL~~abelBrush(~~labelBrush~~);	168	QBrush brush = marker->labelBrush();
		169	color = brush.color();
		170	color.setAlphaF(alpha);
		171	brush.setColor(color);
		172	marker->setLabelBrush(brush);
		173
		174	brush = marker->brush();
		175	color = brush.color();
		176	color.setAlphaF(alpha);
		177	brush.setColor(color);
		178	marker->setBrush(brush);
		179
		180	QPen pen = marker->pen();
		181	color = pen.color();
		182	color.setAlphaF(alpha);
		183	pen.setColor(color);
		184	marker->setPen(pen);
		185
172	//![6]	186	//![6]
173	break;	187	break;
174	}	188	}

src/legend/qarealegendmarker.cpp +2 -1

             QAreaLegendMarker::QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QAreaLegendMarkerPrivate(this,series,legend), parent)
             {
+                d_ptr->updated();
             }
             /*!
             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()

src/legend/qbarlegendmarker.cpp +2 -1

             QBarLegendMarker::QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QBarLegendMarkerPrivate(this,series,barset,legend), parent)
             {
+                d_ptr->updated();
             }
             /*!
             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()

src/legend/qlegendmarker_p.h +1 -1

                 void invalidateLegend();
             public Q_SLOTS:
-                virtual void updated() { invalidateLegend(); }
+                virtual void updated() = 0;
             protected:
                 LegendMarkerItem *m_item;

src/legend/qpielegendmarker.cpp +2 -1

             QPieLegendMarker::QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QPieLegendMarkerPrivate(this,series,slice,legend), parent)
             {
+                d_ptr->updated();
             }
             /*!
             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()

src/legend/qxylegendmarker.cpp +3 -4

             QXYLegendMarker::QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QXYLegendMarkerPrivate(this,series,legend), parent)
             {
+                d_ptr->updated();
             }
             /*!
             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()
                     }
                 } 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;
                     }
                 }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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