HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1917:2390e49cbc51

fix: changing barset colors no more triggers layout calculations

sauimone -

r1917:2390e49cbc51

parent child

Context file:

r1917:2390e49cbc51

Collapse all files

src/barchart/abstractbarchartitem.cpp +27 -1

@@ -38,8 +38,10 AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries *series, ChartPres
38	m_animation(0),	38	m_animation(0),
39	m_series(series)	39	m_series(series)
40	{	40	{
		41
41	setFlag(ItemClipsChildrenToShape);	42	setFlag(ItemClipsChildrenToShape);
42	connect(series->d_func(), SIGNAL(updated~~Bars~~()), this, SLOT(handleLayoutChanged()));	43	connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged()));
		44	connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleUpdatedBars()));
43	connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(handleLabelsVisibleChanged(bool)));	45	connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(handleLabelsVisibleChanged(bool)));
44	connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));	46	connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
45	connect(series, SIGNAL(visibleChanged()), this, SLOT(handleVisibleChanged()));	47	connect(series, SIGNAL(visibleChanged()), this, SLOT(handleVisibleChanged()));
@@ -173,6 +175,30 void AbstractBarChartItem::handleVisibleChanged()
173	}	175	}
174	}	176	}
175		177
		178	void AbstractBarChartItem::handleUpdatedBars()
		179	{
		180	// Handle changes in pen, brush, labels etc.
		181	int categoryCount = m_series->d_func()->categoryCount();
		182	int setCount = m_series->count();
		183	int itemIndex(0);
		184
		185	for (int category = 0; category < categoryCount; category++) {
		186	for (int set = 0; set < setCount; set++) {
		187	QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
		188	Bar* bar = m_bars.at(itemIndex);
		189	bar->setPen(barSet->m_pen);
		190	bar->setBrush(barSet->m_brush);
		191	bar->update();
		192
		193	QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
		194	label->setFont(barSet->m_labelFont);
		195	label->setBrush(barSet->m_labelBrush);
		196	label->update();
		197	itemIndex++;
		198	}
		199	}
		200	}
		201
176	#include "moc_abstractbarchartitem_p.cpp"	202	#include "moc_abstractbarchartitem_p.cpp"
177		203
178	QTCOMMERCIALCHART_END_NAMESPACE	204	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/abstractbarchartitem_p.h +1 0

                 void handleLabelsVisibleChanged(bool visible);
                 void handleDataStructureChanged();     // structure of of series has changed, recreate graphic items
                 void handleVisibleChanged();
+                void handleUpdatedBars();
             protected:

src/barchart/qabstractbarseries.cpp +7 -2

                     width = 0.0;
                 }
                 m_barWidth = width;
-                emit updatedBars();
+                emit updatedLayout();
             }
             qreal QAbstractBarSeriesPrivate::barWidth() const
             void QAbstractBarSeriesPrivate::setVisible(bool visible)
             {
                 m_visible = visible;
-                emit updatedBars();
+                emit visibleChanged();
             }
             void QAbstractBarSeriesPrivate::setLabelsVisible(bool visible)
                     return false;
                 }
                 m_barSets.append(set);
+                QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();      // this notifies barchartitem
                     return false;
                 }
                 m_barSets.removeOne(set);
+                QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();        // this notifies barchartitem
                 foreach (QBarSet* set, sets) {
                     m_barSets.append(set);
+                    QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                     QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                     QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 }
                 foreach (QBarSet* set, sets) {
                     m_barSets.removeOne(set);
+                    QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 }
                     return false;
                 }
                 m_barSets.insert(index, set);
+                QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();      // this notifies barchartitem

src/barchart/qabstractbarseries_p.h +2 0

             Q_SIGNALS:
                 void clicked(int index, QBarSet *barset);
                 void updatedBars();
+                void updatedLayout();
                 void restructuredBars();
                 void labelsVisibleChanged(bool visible);
+                void visibleChanged();
             private:
                 void populateCategories(QBarCategoryAxis* axis);

src/barchart/qbarset.cpp +2 -2

             void QBarSetPrivate::replace(const int index, const qreal value)
             {
                 m_values.replace(index,QPointF(index,value));
-                emit updatedBars();
+                emit updatedLayout();
             }
             void QBarSetPrivate::replace(const int index, const QPointF value)
             {
                 m_values.replace(index,value);
-                emit updatedBars();
+                emit updatedLayout();
             }
             qreal QBarSetPrivate::pos(const int index)

src/barchart/qbarset_p.h +1 0

             Q_SIGNALS:
                 void restructuredBars();
                 void updatedBars();
+                void updatedLayout();
             public:
                 QBarSet * const q_ptr;

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